Fix ITs after upgrade of orchestrator (SonarSource#160)

pynicolas · web-flow · commit 672f2b0e5c99 · 2018-08-27T14:13:40.000+02:00
diff --git a/.cix.yml b/.cix.yml
@@ -8,7 +8,7 @@ TEST:
 SQ_VERSION: 
   - DEV
   - LATEST_RELEASE
-  - LTS
+  - LATEST_RELEASE[6.7]
 
 exclude:
   - TEST: plugin
@@ -18,4 +18,4 @@ exclude:
     SQ_VERSION: DEV
 
   - TEST: ruling
-    SQ_VERSION: LTS
+    SQ_VERSION: LATEST_RELEASE[6.7]
diff --git a/its/plugin/src/test/java/com/sonar/python/it/plugin/Tests.java b/its/plugin/src/test/java/com/sonar/python/it/plugin/Tests.java
@@ -58,10 +58,14 @@
 })
 public class Tests {
 
+  private static final String SQ_VERSION_PROPERTY = "sonar.runtimeVersion";
+  private static final String DEFAULT_SQ_VERSION = "LATEST_RELEASE";
+
   public static final FileLocation PLUGIN_LOCATION = FileLocation.byWildcardMavenFilename(new File("../../sonar-python-plugin/target"), "sonar-python-plugin-*.jar");
 
   @ClassRule
   public static Orchestrator ORCHESTRATOR = Orchestrator.builderEnv()
+    .setSonarVersion(System.getProperty(SQ_VERSION_PROPERTY, DEFAULT_SQ_VERSION))
     .addPlugin(PLUGIN_LOCATION)
     .restoreProfileAtStartup(FileLocation.of("profiles/no_rule.xml"))
     .restoreProfileAtStartup(FileLocation.of("profiles/pylint.xml"))
diff --git a/its/ruling/src/test/java/org/sonar/python/it/PythonRulingTest.java b/its/ruling/src/test/java/org/sonar/python/it/PythonRulingTest.java
@@ -23,30 +23,29 @@
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.SonarScanner;
 import com.sonar.orchestrator.locator.FileLocation;
-import org.junit.ClassRule;
-import org.junit.Test;
-
+import com.sonar.orchestrator.locator.MavenLocation;
 import java.io.File;
 import java.nio.charset.StandardCharsets;
+import org.junit.ClassRule;
+import org.junit.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertTrue;
 
 public class PythonRulingTest {
 
+  private static final String SQ_VERSION_PROPERTY = "sonar.runtimeVersion";
+  private static final String DEFAULT_SQ_VERSION = "LATEST_RELEASE";
+
   @ClassRule
   public static Orchestrator orchestrator = Orchestrator.builderEnv()
+    .setSonarVersion(System.getProperty(SQ_VERSION_PROPERTY, DEFAULT_SQ_VERSION))
     .addPlugin(FileLocation.byWildcardMavenFilename(new File("../../sonar-python-plugin/target"), "sonar-python-plugin-*.jar"))
-    .setOrchestratorProperty("litsVersion", "0.6")
-    .addPlugin("lits")
+    .addPlugin(MavenLocation.of("org.sonarsource.sonar-lits-plugin", "sonar-lits-plugin", "0.6"))
     .restoreProfileAtStartup(FileLocation.of("src/test/resources/profile.xml"))
     .build();
 
   @Test
   public void test() throws Exception {
-    assertTrue(
-      "SonarQube 5.6 is the minimum version to generate the issues report",
-      orchestrator.getConfiguration().getSonarVersion().isGreaterThanOrEquals("5.6"));
     orchestrator.getServer().provisionProject("project", "project");
     orchestrator.getServer().associateProjectToQualityProfile("project", "py", "rules");
     File litsDifferencesFile = FileLocation.of("target/differences").getFile();
