Skip to content

Commit 9b6ed08

Browse files
pynicolaspynicolas
committed
SONARPY-201 Upgrade to SonarQube 6.2 API
1 parent 46bbdae commit 9b6ed08

8 files changed

Lines changed: 32 additions & 40 deletions

File tree

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@
8888
<maven.project.version>2.2.1</maven.project.version>
8989
<mockito.version>1.10.19</mockito.version>
9090
<slf4j.version>1.7.21</slf4j.version>
91-
<sonar.version>6.0</sonar.version>
91+
<sonar.version>6.2</sonar.version>
9292
<sonar.orchestrator.version>3.13</sonar.orchestrator.version>
9393
<sonarlint-core.version>2.4.1</sonarlint-core.version>
9494
<sslr.version>1.21</sslr.version>

‎sonar-python-plugin/src/test/java/org/sonar/plugins/python/PythonSquidSensorTest.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
import org.sonar.api.batch.rule.ActiveRules;
3434
import org.sonar.api.batch.rule.CheckFactory;
3535
import org.sonar.api.batch.rule.internal.ActiveRulesBuilder;
36-
import org.sonar.api.batch.sensor.coverage.CoverageType;
3736
import org.sonar.api.batch.sensor.internal.DefaultSensorDescriptor;
3837
import org.sonar.api.batch.sensor.internal.SensorContextTester;
3938
import org.sonar.api.batch.sensor.issue.Issue;
@@ -127,7 +126,7 @@ private void test_execute(SonarRuntime runtime, Integer expectedNumberOfLineHits
127126
String msg = "number of TypeOfText for the highlighting of keyword 'def'";
128127
assertThat(context.highlightingTypeAt(key, 15, 2)).as(msg).hasSize(1);
129128

130-
assertThat(context.lineHits("moduleKey:file1.py", CoverageType.OVERALL, 1)).isEqualTo(expectedNumberOfLineHits);
129+
assertThat(context.lineHits("moduleKey:file1.py", 1)).isEqualTo(expectedNumberOfLineHits);
131130
}
132131

133132
@Test

‎sonar-python-plugin/src/test/java/org/sonar/plugins/python/PythonTest.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import com.google.common.collect.Maps;
2323
import java.util.Map;
2424
import org.junit.Test;
25+
import org.sonar.api.config.MapSettings;
2526
import org.sonar.api.config.Settings;
2627

2728
import static org.assertj.core.api.Assertions.assertThat;
@@ -30,7 +31,7 @@ public class PythonTest {
3031

3132
@Test
3233
public void test() {
33-
Python language = new Python(new Settings());
34+
Python language = new Python(new MapSettings());
3435
assertThat(language.getKey()).isEqualTo("py");
3536
assertThat(language.getName()).isEqualTo("Python");
3637
assertThat(language.getFileSuffixes()).hasSize(1).contains("py");
@@ -41,7 +42,7 @@ public void custom_file_suffixes() {
4142
Map<String, String> props = Maps.newHashMap();
4243
props.put(PythonPlugin.FILE_SUFFIXES_KEY, "py,python");
4344

44-
Settings settings = new Settings();
45+
Settings settings = new MapSettings();
4546
settings.addProperties(props);
4647

4748
Python language = new Python(settings);

‎sonar-python-plugin/src/test/java/org/sonar/plugins/python/coverage/PythonCoverageSensorTest.java‎

Lines changed: 18 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
import org.sonar.api.batch.fs.InputFile.Type;
3131
import org.sonar.api.batch.fs.internal.DefaultInputFile;
3232
import org.sonar.api.batch.fs.internal.FileMetadata;
33-
import org.sonar.api.batch.sensor.coverage.CoverageType;
3433
import org.sonar.api.batch.sensor.internal.SensorContextTester;
34+
import org.sonar.api.config.MapSettings;
3535
import org.sonar.api.config.Settings;
3636
import org.sonar.api.internal.google.common.base.Charsets;
3737

@@ -52,10 +52,8 @@ public class PythonCoverageSensorTest {
5252

5353
@Before
5454
public void init() {
55-
settings = new Settings();
55+
settings = new MapSettings();
5656
settings.setProperty(PythonCoverageSensor.REPORT_PATH_KEY, "coverage.xml");
57-
settings.setProperty(PythonCoverageSensor.IT_REPORT_PATH_KEY, "coverage.xml");
58-
settings.setProperty(PythonCoverageSensor.OVERALL_REPORT_PATH_KEY, "coverage.xml");
5957
context = SensorContextTester.create(moduleBaseDir);
6058
context.setSettings(settings);
6159

@@ -88,7 +86,7 @@ public void report_not_found() throws Exception {
8886
coverageSensor.execute(context, linesOfCode);
8987

9088
// expected logged text: "No report was found for sonar.python.coverage.reportPath using pattern /fake/path/report.xml"
91-
assertThat(context.lineHits(FILE1_KEY, CoverageType.UNIT, 1)).isNull();
89+
assertThat(context.lineHits(FILE1_KEY, 1)).isNull();
9290
}
9391

9492
@Test
@@ -97,7 +95,7 @@ public void absolute_path() throws Exception {
9795

9896
coverageSensor.execute(context, linesOfCode);
9997

100-
assertThat(context.lineHits(FILE1_KEY, CoverageType.UNIT, 1)).isEqualTo(1);
98+
assertThat(context.lineHits(FILE1_KEY, 1)).isEqualTo(1);
10199
}
102100

103101
@Test
@@ -107,57 +105,49 @@ public void test_coverage() {
107105
Integer[] file2Expected = {1, 3, 1, 0, 1, 1};
108106

109107
for (int line = 1; line <= 6; line++) {
110-
assertThat(context.lineHits(FILE1_KEY, CoverageType.UNIT, line)).isEqualTo(file1Expected[line - 1]);
111-
assertThat(context.lineHits(FILE1_KEY, CoverageType.IT, line)).isEqualTo(file1Expected[line - 1]);
112-
assertThat(context.lineHits(FILE1_KEY, CoverageType.OVERALL, line)).isEqualTo(file1Expected[line - 1]);
113-
114-
assertThat(context.lineHits(FILE2_KEY, CoverageType.UNIT, line)).isEqualTo(file2Expected[line - 1]);
115-
assertThat(context.lineHits(FILE2_KEY, CoverageType.IT, line)).isEqualTo(file2Expected[line - 1]);
116-
assertThat(context.lineHits(FILE2_KEY, CoverageType.OVERALL, line)).isEqualTo(file2Expected[line - 1]);
117-
118-
assertThat(context.lineHits(FILE3_KEY, CoverageType.UNIT, line)).isNull();
119-
assertThat(context.lineHits(FILE3_KEY, CoverageType.IT, line)).isNull();
120-
assertThat(context.lineHits(FILE3_KEY, CoverageType.OVERALL, line)).isNull();
108+
assertThat(context.lineHits(FILE1_KEY, line)).isEqualTo(file1Expected[line - 1]);
109+
assertThat(context.lineHits(FILE2_KEY, line)).isEqualTo(file2Expected[line - 1]);
110+
assertThat(context.lineHits(FILE3_KEY, line)).isNull();
121111
}
122112

123-
assertThat(context.conditions(FILE2_KEY, CoverageType.UNIT, 2)).isNull();
124-
assertThat(context.conditions(FILE2_KEY, CoverageType.UNIT, 3)).isEqualTo(2);
125-
assertThat(context.coveredConditions(FILE2_KEY, CoverageType.UNIT, 3)).isEqualTo(1);
113+
assertThat(context.conditions(FILE2_KEY, 2)).isNull();
114+
assertThat(context.conditions(FILE2_KEY, 3)).isEqualTo(2);
115+
assertThat(context.coveredConditions(FILE2_KEY, 3)).isEqualTo(1);
126116
}
127117

128118
@Test
129119
public void test_unresolved_path() {
130120
settings.setProperty(PythonCoverageSensor.REPORT_PATH_KEY, "coverage_with_unresolved_path.xml");
131121
coverageSensor.execute(context, linesOfCode);
132122

133-
assertThat(context.lineHits(FILE1_KEY, CoverageType.UNIT, 1)).isEqualTo(1);
123+
assertThat(context.lineHits(FILE1_KEY, 1)).isEqualTo(1);
134124
}
135125

136126
@Test
137127
public void test_force_zero_coverage_without_report() {
138-
Settings newSettings = new Settings();
128+
Settings newSettings = new MapSettings();
139129
newSettings.setProperty(PythonCoverageSensor.FORCE_ZERO_COVERAGE_KEY, "true");
140130
context.setSettings(newSettings);
141131
coverageSensor.execute(context, linesOfCode);
142-
assertThat(context.lineHits(FILE1_KEY, CoverageType.UNIT, 1)).isEqualTo(0);
132+
assertThat(context.lineHits(FILE1_KEY, 1)).isEqualTo(0);
143133
}
144134

145135
@Test
146136
public void test_force_zero_coverage_with_report() {
147-
Settings newSettings = new Settings();
137+
Settings newSettings = new MapSettings();
148138
newSettings.setProperty(PythonCoverageSensor.FORCE_ZERO_COVERAGE_KEY, "true");
149139
newSettings.setProperty(PythonCoverageSensor.REPORT_PATH_KEY, "coverage.xml");
150140
context.setSettings(newSettings);
151141
coverageSensor.execute(context, linesOfCode);
152-
assertThat(context.lineHits(FILE1_KEY, CoverageType.UNIT, 1)).isEqualTo(1);
142+
assertThat(context.lineHits(FILE1_KEY, 1)).isEqualTo(1);
153143
}
154144

155145
@Test
156146
public void test_force_zero_coverage_no_lines_of_code() throws Exception {
157-
Settings newSettings = new Settings().setProperty(PythonCoverageSensor.FORCE_ZERO_COVERAGE_KEY, "true");
147+
Settings newSettings = new MapSettings().setProperty(PythonCoverageSensor.FORCE_ZERO_COVERAGE_KEY, "true");
158148
context.setSettings(newSettings);
159149
coverageSensor.execute(context, new HashMap<>());
160-
assertThat(context.lineHits(FILE1_KEY, CoverageType.UNIT, 1)).isNull();
150+
assertThat(context.lineHits(FILE1_KEY, 1)).isNull();
161151
}
162152

163153
@Test(expected = IllegalStateException.class)
@@ -178,7 +168,7 @@ public void should_do_nothing_on_empty_report() {
178168
settings.setProperty(PythonCoverageSensor.IT_REPORT_PATH_KEY, "this-file-does-not-exist.xml");
179169
coverageSensor.execute(context, linesOfCode);
180170

181-
assertThat(context.lineHits(FILE1_KEY, CoverageType.UNIT, 1)).isNull();
171+
assertThat(context.lineHits(FILE1_KEY, 1)).isNull();
182172
}
183173

184174
}

‎sonar-python-plugin/src/test/java/org/sonar/plugins/python/pylint/PylintConfigurationTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@
1919
*/
2020
package org.sonar.plugins.python.pylint;
2121

22+
import java.io.File;
2223
import org.junit.Before;
2324
import org.junit.Test;
2425
import org.sonar.api.batch.fs.internal.DefaultFileSystem;
26+
import org.sonar.api.config.MapSettings;
2527
import org.sonar.api.config.Settings;
2628

27-
import java.io.File;
28-
2929
import static org.assertj.core.api.Assertions.assertThat;
3030

3131
public class PylintConfigurationTest {
@@ -35,7 +35,7 @@ public class PylintConfigurationTest {
3535

3636
@Before
3737
public void setUp() throws Exception {
38-
settings = new Settings();
38+
settings = new MapSettings();
3939
pylintConfiguration = new PylintConfiguration(settings);
4040
}
4141

‎sonar-python-plugin/src/test/java/org/sonar/plugins/python/pylint/PylintImportSensorTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
import org.sonar.api.batch.rule.ActiveRules;
3131
import org.sonar.api.batch.rule.internal.ActiveRulesBuilder;
3232
import org.sonar.api.component.ResourcePerspectives;
33+
import org.sonar.api.config.MapSettings;
3334
import org.sonar.api.config.Settings;
3435
import org.sonar.api.issue.Issuable;
3536
import org.sonar.api.resources.Project;
@@ -52,7 +53,7 @@ public class PylintImportSensorTest {
5253

5354
@Before
5455
public void init() {
55-
settings = new Settings();
56+
settings = new MapSettings();
5657
settings.setProperty(PylintImportSensor.REPORT_PATH_KEY, "pylint-report.txt");
5758
fileSystem = new DefaultFileSystem(new File("src/test/resources/org/sonar/plugins/python/pylint"));
5859

‎sonar-python-plugin/src/test/java/org/sonar/plugins/python/pylint/PylintSensorTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import org.sonar.api.batch.rule.ActiveRules;
2929
import org.sonar.api.batch.rule.internal.ActiveRulesBuilder;
3030
import org.sonar.api.component.ResourcePerspectives;
31-
import org.sonar.api.config.Settings;
31+
import org.sonar.api.config.MapSettings;
3232
import org.sonar.api.resources.Project;
3333
import org.sonar.api.rule.RuleKey;
3434
import org.sonar.plugins.python.Python;
@@ -70,7 +70,7 @@ public void shouldExecuteOnlyWhenNecessary() {
7070
}
7171

7272
private void checkNecessityOfExecution(Project project, ActiveRules currentActiveRules, DefaultFileSystem currentFileSystem, boolean shouldExecute) {
73-
PylintSensor sensor = new PylintSensor(conf, currentActiveRules, currentFileSystem, mock(ResourcePerspectives.class), new Settings());
73+
PylintSensor sensor = new PylintSensor(conf, currentActiveRules, currentFileSystem, mock(ResourcePerspectives.class), new MapSettings());
7474
assertThat(sensor.shouldExecuteOnProject(project)).isEqualTo(shouldExecute);
7575
}
7676

‎sonar-python-plugin/src/test/java/org/sonar/plugins/python/xunit/PythonXUnitSensorTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import org.sonar.api.batch.SensorContext;
2626
import org.sonar.api.batch.fs.internal.DefaultFileSystem;
2727
import org.sonar.api.batch.fs.internal.DefaultInputFile;
28+
import org.sonar.api.config.MapSettings;
2829
import org.sonar.api.config.Settings;
2930
import org.sonar.api.measures.CoreMetrics;
3031
import org.sonar.api.resources.Project;
@@ -44,7 +45,7 @@ public class PythonXUnitSensorTest {
4445

4546
@Before
4647
public void setUp() {
47-
settings = new Settings();
48+
settings = new MapSettings();
4849
project = mock(Project.class);
4950
fs = new DefaultFileSystem(new File("src/test/resources/org/sonar/plugins/python"));
5051
context = mock(SensorContext.class);

0 commit comments

Comments
 (0)