adapt ITs to produced plugin jar

pmayweg · Nov 2, 2015 · 2780774 · 2780774
1 parent a489145
commit 2780774
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/its/plugin/src/test/java/com/sonar/groovy/it/Tests.java b/its/plugin/src/test/java/com/sonar/groovy/it/Tests.java
@@ -19,13 +19,18 @@
  */
 package com.sonar.groovy.it;
 
+import com.google.common.collect.Iterables;
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.MavenBuild;
 import com.sonar.orchestrator.locator.FileLocation;
 import org.junit.ClassRule;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 
+import java.io.File;
+import java.io.FilenameFilter;
+import java.util.Arrays;
+
 @RunWith(Suite.class)
 @Suite.SuiteClasses({
   GroovyTest.class,
@@ -38,7 +43,12 @@ public class Tests {
 
   @ClassRule
   public static final Orchestrator ORCHESTRATOR = Orchestrator.builderEnv()
-    .addPlugin(FileLocation.of("../../sonar-groovy-plugin/target/sonar-groovy-plugin.jar"))
+    .addPlugin(FileLocation.of(Iterables.getOnlyElement(Arrays.asList(new File("../../sonar-groovy-plugin/target/").listFiles(new FilenameFilter() {
+      @Override
+      public boolean accept(File dir, String name) {
+        return name.endsWith(".jar") && !name.endsWith("-sources.jar");
+      }
+    }))).getAbsolutePath()))
     .addPlugin("java")
     .restoreProfileAtStartup(FileLocation.of("src/test/resources/default.xml"))
     .build();

diff --git a/its/ruling/src/test/java/org/sonarqube/groovy/it/GroovyRulingTest.java b/its/ruling/src/test/java/org/sonarqube/groovy/it/GroovyRulingTest.java
@@ -19,6 +19,7 @@
  */
 package org.sonarqube.groovy.it;
 
+import com.google.common.collect.Iterables;
 import com.google.common.io.Files;
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.SonarRunner;
@@ -27,15 +28,22 @@
 import org.junit.Test;
 
 import java.io.File;
+import java.io.FilenameFilter;
 import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
 
 import static org.fest.assertions.Assertions.assertThat;
 
 public class GroovyRulingTest {
 
   @ClassRule
   public static Orchestrator orchestrator = Orchestrator.builderEnv()
-    .addPlugin(FileLocation.of("../../sonar-groovy-plugin/target/sonar-groovy-plugin.jar"))
+    .addPlugin(FileLocation.of(Iterables.getOnlyElement(Arrays.asList(new File("../../sonar-groovy-plugin/target/").listFiles(new FilenameFilter() {
+      @Override
+      public boolean accept(File dir, String name) {
+        return name.endsWith(".jar") && !name.endsWith("-sources.jar");
+      }
+    }))).getAbsolutePath()))
     .setOrchestratorProperty("litsVersion", "0.5")
     .addPlugin("lits")
     .restoreProfileAtStartup(FileLocation.of("src/test/resources/profile.xml"))