Skip to content

Commit b9993e3

Browse files
benzonicobenzonico
committed
SONARJAVA-1994 Bump SQ API to 6.2
1 parent 24651f5 commit b9993e3

4 files changed

Lines changed: 14 additions & 17 deletions

File tree

‎java-jacoco/src/test/java/org/sonar/plugins/jacoco/JaCoCoItSensorTest.java‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
import org.sonar.api.batch.fs.internal.DefaultFileSystem;
2929
import org.sonar.api.batch.fs.internal.DefaultInputFile;
3030
import org.sonar.api.batch.sensor.SensorContext;
31-
import org.sonar.api.batch.sensor.coverage.CoverageType;
3231
import org.sonar.api.batch.sensor.internal.SensorContextTester;
3332
import org.sonar.api.component.ResourcePerspectives;
3433
import org.sonar.api.scan.filesystem.PathResolver;
@@ -108,13 +107,13 @@ public void testReadExecutionData() {
108107
int[] oneHitlines = new int[] {6, 7, 8, 11};
109108
int[] zeroHitlines = new int[] {15, 16, 18};
110109
for (int zeroHitline : zeroHitlines) {
111-
assertThat(context.lineHits(":org/sonar/plugins/jacoco/tests/Hello", CoverageType.IT, zeroHitline)).isEqualTo(0);
110+
assertThat(context.lineHits(":org/sonar/plugins/jacoco/tests/Hello", zeroHitline)).isEqualTo(0);
112111
}
113112
for (int oneHitline : oneHitlines) {
114-
assertThat(context.lineHits(":org/sonar/plugins/jacoco/tests/Hello", CoverageType.IT, oneHitline)).isEqualTo(1);
113+
assertThat(context.lineHits(":org/sonar/plugins/jacoco/tests/Hello", oneHitline)).isEqualTo(1);
115114
}
116-
assertThat(context.conditions(":org/sonar/plugins/jacoco/tests/Hello", CoverageType.IT, 15)).isEqualTo(2);
117-
assertThat(context.coveredConditions(":org/sonar/plugins/jacoco/tests/Hello", CoverageType.IT, 15)).isEqualTo(0);
115+
assertThat(context.conditions(":org/sonar/plugins/jacoco/tests/Hello", 15)).isEqualTo(2);
116+
assertThat(context.coveredConditions(":org/sonar/plugins/jacoco/tests/Hello", 15)).isEqualTo(0);
118117
}
119118

120119
@Test

‎java-jacoco/src/test/java/org/sonar/plugins/jacoco/JaCoCoOverallSensorTest.java‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import org.sonar.api.batch.fs.InputFile;
2727
import org.sonar.api.batch.fs.internal.DefaultFileSystem;
2828
import org.sonar.api.batch.fs.internal.DefaultInputFile;
29-
import org.sonar.api.batch.sensor.coverage.CoverageType;
3029
import org.sonar.api.batch.sensor.internal.SensorContextTester;
3130
import org.sonar.api.component.ResourcePerspectives;
3231
import org.sonar.api.scan.filesystem.PathResolver;
@@ -140,13 +139,13 @@ public void should_save_measures_when_no_reports_and_force_property() throws IOE
140139

141140
private void verifyOverallMetrics(InputFile resource,int[] zeroHitlines, int[] oneHitlines, int coveredConditions) {
142141
for (int zeroHitline : zeroHitlines) {
143-
assertThat(context.lineHits(resource.key(), CoverageType.OVERALL, zeroHitline)).isEqualTo(0);
142+
assertThat(context.lineHits(resource.key(), zeroHitline)).isEqualTo(0);
144143
}
145144
for (int oneHitline : oneHitlines) {
146-
assertThat(context.lineHits(resource.key(), CoverageType.OVERALL, oneHitline)).isEqualTo(1);
145+
assertThat(context.lineHits(resource.key(), oneHitline)).isEqualTo(1);
147146
}
148-
assertThat(context.conditions(resource.key(), CoverageType.OVERALL, 14)).isEqualTo(2);
149-
assertThat(context.coveredConditions(resource.key(), CoverageType.OVERALL, 14)).isEqualTo(coveredConditions);
147+
assertThat(context.conditions(resource.key(), 14)).isEqualTo(2);
148+
assertThat(context.coveredConditions(resource.key(), 14)).isEqualTo(coveredConditions);
150149
}
151150

152151
private InputFile analyseReports(String utReport, String itReport) throws IOException {

‎java-jacoco/src/test/java/org/sonar/plugins/jacoco/JaCoCoSensorTest.java‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
import org.sonar.api.batch.fs.internal.DefaultFileSystem;
2929
import org.sonar.api.batch.fs.internal.DefaultInputFile;
3030
import org.sonar.api.batch.sensor.SensorContext;
31-
import org.sonar.api.batch.sensor.coverage.CoverageType;
3231
import org.sonar.api.batch.sensor.internal.SensorContextTester;
3332
import org.sonar.api.component.ResourcePerspectives;
3433
import org.sonar.api.config.MapSettings;
@@ -120,13 +119,13 @@ public void test_read_execution_data() {
120119
int[] oneHitlines = new int[] {6, 7, 8, 11};
121120
int[] zeroHitlines = new int[] {15, 16, 18};
122121
for (int zeroHitline : zeroHitlines) {
123-
assertThat(context.lineHits(":org/sonar/plugins/jacoco/tests/Hello", CoverageType.UNIT, zeroHitline)).isEqualTo(0);
122+
assertThat(context.lineHits(":org/sonar/plugins/jacoco/tests/Hello", zeroHitline)).isEqualTo(0);
124123
}
125124
for (int oneHitline : oneHitlines) {
126-
assertThat(context.lineHits(":org/sonar/plugins/jacoco/tests/Hello", CoverageType.UNIT, oneHitline)).isEqualTo(1);
125+
assertThat(context.lineHits(":org/sonar/plugins/jacoco/tests/Hello", oneHitline)).isEqualTo(1);
127126
}
128-
assertThat(context.conditions(":org/sonar/plugins/jacoco/tests/Hello", CoverageType.UNIT, 15)).isEqualTo(2);
129-
assertThat(context.coveredConditions(":org/sonar/plugins/jacoco/tests/Hello", CoverageType.UNIT, 15)).isEqualTo(0);
127+
assertThat(context.conditions(":org/sonar/plugins/jacoco/tests/Hello", 15)).isEqualTo(2);
128+
assertThat(context.coveredConditions(":org/sonar/plugins/jacoco/tests/Hello", 15)).isEqualTo(0);
130129
}
131130

132131
@Test
@@ -219,7 +218,7 @@ public void force_coverage_to_zero_when_no_report() {
219218
sensor_force_coverage.execute(context);
220219
int[] zeroHitlines = new int[] {6, 7, 8, 11, 15, 16, 18};
221220
for (int zeroHitline : zeroHitlines) {
222-
assertThat(context.lineHits(":", CoverageType.UNIT, zeroHitline)).isEqualTo(0);
221+
assertThat(context.lineHits(":", zeroHitline)).isEqualTo(0);
223222
}
224223
}
225224

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474

7575
<maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
7676

77-
<sonar.version>6.1</sonar.version>
77+
<sonar.version>6.2</sonar.version>
7878
<orchestrator.version>3.13</orchestrator.version>
7979
<sslr.version>1.21</sslr.version>
8080
<jacoco.previous.version>0.7.4.201502262128</jacoco.previous.version>

0 commit comments

Comments
 (0)