SONARPY-235 Filter extensions for SonarLint

pynicolas · alban-auzeill · commit ff2289ed9a2c · 2018-01-15T16:20:42.000+01:00
diff --git a/sonar-python-plugin/src/main/java/org/sonar/plugins/python/PythonPlugin.java b/sonar-python-plugin/src/main/java/org/sonar/plugins/python/PythonPlugin.java
@@ -21,8 +21,10 @@
 
 import org.sonar.api.Plugin;
 import org.sonar.api.PropertyType;
+import org.sonar.api.SonarProduct;
 import org.sonar.api.config.PropertyDefinition;
 import org.sonar.api.resources.Qualifiers;
+import org.sonar.api.utils.Version;
 import org.sonar.plugins.python.coverage.PythonCoverageSensor;
 import org.sonar.plugins.python.pylint.PylintConfiguration;
 import org.sonar.plugins.python.pylint.PylintImportSensor;
@@ -142,14 +144,16 @@ public void define(Context context) {
       PythonProfile.class,
 
       PythonSquidSensor.class,
-      new PythonRuleRepository(context.getSonarQubeVersion()),
-
-      PylintConfiguration.class,
-      PylintSensor.class,
-      PylintImportSensor.class,
-      PylintRuleRepository.class,
-
-      PythonXUnitSensor.class);
+      new PythonRuleRepository(context.getSonarQubeVersion()));
+
+    if (!context.getSonarQubeVersion().isGreaterThanOrEqual(Version.create(6, 0)) || context.getRuntime().getProduct() != SonarProduct.SONARLINT) {
+      context.addExtensions(
+        PylintConfiguration.class,
+        PylintSensor.class,
+        PylintImportSensor.class,
+        PylintRuleRepository.class,
+        PythonXUnitSensor.class);
+    }
   }
 
 }
diff --git a/sonar-python-plugin/src/test/java/org/sonar/plugins/python/PythonPluginTest.java b/sonar-python-plugin/src/test/java/org/sonar/plugins/python/PythonPluginTest.java
@@ -19,6 +19,7 @@
  */
 package org.sonar.plugins.python;
 
+import java.util.List;
 import org.junit.Test;
 import org.sonar.api.Plugin;
 import org.sonar.api.SonarQubeSide;
@@ -32,10 +33,17 @@ public class PythonPluginTest {
 
   @Test
   public void testGetExtensions() {
-    SonarRuntime runtime = SonarRuntimeImpl.forSonarQube(Version.create(5, 6), SonarQubeSide.SERVER);
+    Version v56 = Version.create(5, 6);
+    Version v60 = Version.create(6, 0);
+    assertThat(extensions(SonarRuntimeImpl.forSonarQube(v56, SonarQubeSide.SERVER))).hasSize(19);
+    assertThat(extensions(SonarRuntimeImpl.forSonarQube(v60, SonarQubeSide.SERVER))).hasSize(19);
+    assertThat(extensions(SonarRuntimeImpl.forSonarLint(v60))).hasSize(14);
+  }
+
+  private List extensions(SonarRuntime runtime) {
     Plugin.Context context = new Plugin.Context(runtime);
     new PythonPlugin().define(context);
-    assertThat(context.getExtensions()).hasSize(19);
+    return context.getExtensions();
   }
 
 }
