Fix tests

SonarSource · Dec 16, 2024 · efc1fc0 · efc1fc0
1 parent 49f4b49
commit efc1fc0
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 6 deletions.
diff --git a/its/plugin/src/integrationTest/java/org/sonarsource/slang/TestBase.java b/its/plugin/src/integrationTest/java/org/sonarsource/slang/TestBase.java
@@ -49,7 +49,7 @@ public abstract class TestBase {
   public static final boolean KEEP_ORCHESTRATOR_RUNNING = "true".equals(System.getenv(KEEP_ORCHESTRATOR_RUNNING_ENV));
   public static final String SQ_VERSION_PROPERTY = "sonar.runtimeVersion";
   public static final String DEFAULT_SQ_VERSION = "LATEST_RELEASE";
-  public static final FileLocation GO_PLUGIN_LOCATION = FileLocation.byWildcardMavenFilename(new File("../../sonar-go-plugin/build/libs"), "sonar-go-plugin-*-all.jar");
+  public static final FileLocation GO_PLUGIN_LOCATION = FileLocation.byWildcardFilename(new File("../../sonar-go-plugin/build/libs"), "sonar-go-plugin-*-all.jar");
   public static final Configuration CONFIGURATION = Configuration.createEnv();
 
   private static final AtomicInteger REQUESTED_ORCHESTRATORS_KEY = new AtomicInteger();

diff --git a/its/plugin/src/integrationTest/java/org/sonarsource/slang/TestReportTest.java b/its/plugin/src/integrationTest/java/org/sonarsource/slang/TestReportTest.java
@@ -16,7 +16,6 @@
  */
 package org.sonarsource.slang;
 
-import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.SonarScanner;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -28,8 +27,6 @@ public class TestReportTest extends TestBase {
 
   private static final Path BASE_DIRECTORY = Paths.get("projects","measures");
 
-  public static Orchestrator orchestrator = TestBase.ORCHESTRATOR;
-
   @Test
   public void go_test_report() {
     final String projectKey = "goTestReport";

diff --git a/its/ruling/src/integrationTest/java/org/sonarsource/slang/GoRulingTest.java b/its/ruling/src/integrationTest/java/org/sonarsource/slang/GoRulingTest.java
@@ -44,8 +44,7 @@ public class GoRulingTest {
 
   private static Orchestrator orchestrator;
   private static boolean keepSonarqubeRunning = "true".equals(System.getProperty("keepSonarqubeRunning"));
-  public static final FileLocation GO_PLUGIN_LOCATION = FileLocation.byWildcardMavenFilename(new File("../../sonar-go-plugin/build/libs"), "sonar-go-plugin-*-all.jar");
-
+  public static final FileLocation GO_PLUGIN_LOCATION = FileLocation.byWildcardFilename(new File("../../sonar-go-plugin/build/libs"), "sonar-go-plugin-*-all.jar");
 
   @BeforeAll
   public static void setUp() {