SONARPY-177 Upgrade provided dependency on sonar-plugin-api from 5.6 to 6.0 (SonarSource#86)

ivandalbosco · pynicolas · commit 3f50bfdd1958 · 2017-04-25T16:31:51.000+02:00
* Upgrade provided dependency on sonar-plugin-api from 5.6 to 6.0

* Fix unit test that failed due to sensor executed twice (no longer possible in 6.0)
diff --git a/pom.xml b/pom.xml
@@ -76,6 +76,8 @@
     <gitRepositoryName>sonar-python</gitRepositoryName>
     <!-- Release: enable publication to Bintray -->
     <artifactsToPublish>${project.groupId}:sonar-python-plugin:jar</artifactsToPublish>
+    <!-- we depend on API ${sonar.version} but we keep backward compatibility with LTS -->
+    <sonarQubeMinVersion>5.6</sonarQubeMinVersion>
 
     <!-- versions -->
     <commons.io.version>2.5</commons.io.version>
@@ -86,7 +88,7 @@
     <maven.project.version>2.2.1</maven.project.version>
     <mockito.version>1.10.19</mockito.version>
     <slf4j.version>1.7.21</slf4j.version>
-    <sonar.version>5.6</sonar.version>
+    <sonar.version>6.0</sonar.version>
     <sonar.orchestrator.version>3.13</sonar.orchestrator.version>
     <sonarlint-core.version>2.4.1</sonarlint-core.version>
     <sslr.version>1.21</sslr.version>
diff --git a/python-squid/src/test/java/org/sonar/python/FileLinesVisitorTest.java b/python-squid/src/test/java/org/sonar/python/FileLinesVisitorTest.java
@@ -59,7 +59,7 @@ public void test() {
     HashMap<InputFile, Set<Integer>> linesOfCode = new HashMap<>();
     SquidAstVisitor<Grammar> visitor = new FileLinesVisitor(fileLinesContextFactory, fileSystem, linesOfCode, false);
 
-    SourceFile sourceFile = PythonAstScanner.scanSingleFile(inputFile.getFile().getPath(), visitor);
+    SourceFile sourceFile = PythonAstScanner.scanSingleFile(inputFile.file().getPath(), visitor);
 
     assertThat(sourceFile.getInt(PythonMetric.LINES_OF_CODE)).isEqualTo(12);
     assertThat(linesOfCode).hasSize(1);
@@ -80,7 +80,7 @@ public void test_ignoreHeaderComments() {
     HashMap<InputFile, Set<Integer>> linesOfCode = new HashMap<>();
     SquidAstVisitor<Grammar> visitor = new FileLinesVisitor(fileLinesContextFactory, fileSystem, linesOfCode, true);
 
-    PythonAstScanner.scanSingleFile(inputFile.getFile().getPath(), visitor);
+    PythonAstScanner.scanSingleFile(inputFile.file().getPath(), visitor);
 
     assertThat(linesOfCode).hasSize(1);
     assertThat(linesOfCode.get(inputFile)).as("Lines of codes").containsOnly(2, 4);
diff --git a/sonar-python-plugin/pom.xml b/sonar-python-plugin/pom.xml
@@ -23,12 +23,6 @@
     <tag>HEAD</tag>
   </scm>
 
-  <properties>
-    <sonar.pluginClass>org.sonar.plugins.python.PythonPlugin</sonar.pluginClass>
-    <sonar.pluginName>SonarPython</sonar.pluginName>
-    <sonar.skipDependenciesPackaging>true</sonar.skipDependenciesPackaging>
-  </properties>
-
   <dependencies>
     <dependency>
       <groupId>org.sonarsource.sonarqube</groupId>
@@ -72,6 +66,18 @@
 
   <build>
     <plugins>
+      <plugin>
+        <groupId>org.sonarsource.sonar-packaging-maven-plugin</groupId>
+        <artifactId>sonar-packaging-maven-plugin</artifactId>
+        <configuration>
+          <pluginName>SonarPython</pluginName>
+          <pluginClass>org.sonar.plugins.python.PythonPlugin</pluginClass>
+          <skipDependenciesPackaging>true</skipDependenciesPackaging>
+          <sonarLintSupported>true</sonarLintSupported>
+          <sonarQubeMinVersion>${sonarQubeMinVersion}</sonarQubeMinVersion>
+        </configuration>
+      </plugin>
+
       <plugin>
         <artifactId>maven-shade-plugin</artifactId>
         <executions>
diff --git a/sonar-python-plugin/src/test/java/org/sonar/plugins/python/coverage/PythonCoverageSensorTest.java b/sonar-python-plugin/src/test/java/org/sonar/plugins/python/coverage/PythonCoverageSensorTest.java
@@ -134,17 +134,22 @@ public void test_unresolved_path() {
   }
 
   @Test
-  public void test_force_zero_coverage_no_report() {
-    Settings newSettings = new Settings().setProperty(PythonCoverageSensor.FORCE_ZERO_COVERAGE_KEY, "true");
+  public void test_force_zero_coverage_without_report() {
+    Settings newSettings = new Settings();
+    newSettings.setProperty(PythonCoverageSensor.FORCE_ZERO_COVERAGE_KEY, "true");
     context.setSettings(newSettings);
     coverageSensor.execute(context, linesOfCode);
     assertThat(context.lineHits(FILE1_KEY, CoverageType.UNIT, 1)).isEqualTo(0);
-    assertThat(context.lineHits(FILE3_KEY, CoverageType.UNIT, 1)).isEqualTo(0);
+  }
 
-    context.setSettings(newSettings.setProperty(PythonCoverageSensor.REPORT_PATH_KEY, "coverage.xml"));
+  @Test
+  public void test_force_zero_coverage_with_report() {
+    Settings newSettings = new Settings();
+    newSettings.setProperty(PythonCoverageSensor.FORCE_ZERO_COVERAGE_KEY, "true");
+    newSettings.setProperty(PythonCoverageSensor.REPORT_PATH_KEY, "coverage.xml");
+    context.setSettings(newSettings);
     coverageSensor.execute(context, linesOfCode);
     assertThat(context.lineHits(FILE1_KEY, CoverageType.UNIT, 1)).isEqualTo(1);
-    assertThat(context.lineHits(FILE3_KEY, CoverageType.UNIT, 1)).isEqualTo(0);
   }
 
   @Test
