Fix compilation issue after merge

diff --git a/sonar-batch-protocol/src/test/java/org/sonar/batch/protocol/output/BatchReportReaderTest.java b/sonar-batch-protocol/src/test/java/org/sonar/batch/protocol/output/BatchReportReaderTest.java
index c109796fd3529cbe71fcb5c13f080bed204663bd..184e1209804ad5fef8693c4c8124bf73aa259096 100644 (file)
--- a/sonar-batch-protocol/src/test/java/org/sonar/batch/protocol/output/BatchReportReaderTest.java
+++ b/sonar-batch-protocol/src/test/java/org/sonar/batch/protocol/output/BatchReportReaderTest.java
@@ -196,8 +196,7 @@ public class BatchReportReaderTest {
 
     sut = new BatchReportReader(dir);
 
-    InputStream inputStream = FileUtils.openInputStream(new BatchReportReader(dir).readFileCoverage(1));
-    try {
+    try (InputStream inputStream = FileUtils.openInputStream(new BatchReportReader(dir).readFileCoverage(1))) {
       BatchReport.Coverage coverage = BatchReport.Coverage.PARSER.parseDelimitedFrom(inputStream);
       assertThat(coverage.getLine()).isEqualTo(1);
       assertThat(coverage.getConditions()).isEqualTo(1);
@@ -215,8 +214,6 @@ public class BatchReportReaderTest {
       assertThat(coverage.getUtCoveredConditions()).isEqualTo(4);
       assertThat(coverage.getItCoveredConditions()).isEqualTo(5);
       assertThat(coverage.getOverallCoveredConditions()).isEqualTo(5);
-    } finally {
-      inputStream.close();
     }
   }
 

diff --git a/sonar-batch/src/test/java/org/sonar/batch/report/CoveragePublisherTest.java b/sonar-batch/src/test/java/org/sonar/batch/report/CoveragePublisherTest.java
index 347761203f72a4bf34e141817fe96e2d7869ec6f..3e3c4cf284d7699c565604347b617296d357edd9 100644 (file)
--- a/sonar-batch/src/test/java/org/sonar/batch/report/CoveragePublisherTest.java
+++ b/sonar-batch/src/test/java/org/sonar/batch/report/CoveragePublisherTest.java
@@ -19,6 +19,7 @@
  */
 package org.sonar.batch.report;
 
+import org.apache.commons.io.FileUtils;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -29,12 +30,14 @@ import org.sonar.api.measures.CoreMetrics;
 import org.sonar.api.measures.Measure;
 import org.sonar.api.resources.Project;
 import org.sonar.batch.index.ResourceCache;
+import org.sonar.batch.protocol.output.BatchReport;
 import org.sonar.batch.protocol.output.BatchReport.Coverage;
 import org.sonar.batch.protocol.output.BatchReportReader;
 import org.sonar.batch.protocol.output.BatchReportWriter;
 import org.sonar.batch.scan.measure.MeasureCache;
 
 import java.io.File;
+import java.io.InputStream;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Date;
@@ -92,15 +95,13 @@ public class CoveragePublisherTest {
 
     publisher.publish(writer);
 
-    BatchReportReader reader = new BatchReportReader(outputDir);
-
-    assertThat(reader.readFileCoverage(2).iterator()).containsOnly(
-      Coverage.newBuilder()
+    try (InputStream inputStream = FileUtils.openInputStream(new BatchReportReader(outputDir).readFileCoverage(2))) {
+      assertThat(BatchReport.Coverage.PARSER.parseDelimitedFrom(inputStream)).isEqualTo(Coverage.newBuilder()
         .setLine(2)
         .setUtHits(true)
         .setItHits(false)
-        .build(),
-      Coverage.newBuilder()
+        .build());
+      assertThat(BatchReport.Coverage.PARSER.parseDelimitedFrom(inputStream)).isEqualTo(Coverage.newBuilder()
         .setLine(3)
         .setUtHits(true)
         .setItHits(false)
@@ -108,13 +109,14 @@ public class CoveragePublisherTest {
         .setUtCoveredConditions(2)
         .setItCoveredConditions(1)
         .setOverallCoveredConditions(2)
-        .build(),
-      Coverage.newBuilder()
+        .build());
+      assertThat(BatchReport.Coverage.PARSER.parseDelimitedFrom(inputStream)).isEqualTo(Coverage.newBuilder()
         .setLine(5)
         .setUtHits(false)
         .setItHits(true)
         .build());
 
+    }
   }
 
 }