SONARCLOUD-56 support SonarCloud in billing integration tests

diff --git a/build.gradle b/build.gradle
index 73db298cb641068af4e7dc8c01f5642ddc7b05be..2b2851fd838dee631bca2a871b85dbc3555e5298 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -207,7 +207,7 @@ subprojects {
       dependency 'org.postgresql:postgresql:42.2.2'
       dependency 'org.reflections:reflections:0.9.9'
       dependency 'org.simpleframework:simple:4.1.21'
-      dependency 'org.sonarsource.orchestrator:sonar-orchestrator:3.19.0.1621'
+      dependency 'org.sonarsource.orchestrator:sonar-orchestrator:3.19.0.1623'
       dependency('org.sonarsource:sonar-persistit:3.3.2') {
         exclude 'commons-logging:commons-logging'
       }

diff --git a/server/sonar-db-core/src/test/java/org/sonar/db/CreateDb.java b/server/sonar-db-core/src/test/java/org/sonar/db/CreateDb.java
index 25ec3a62482730205f7588f550530e65a9d795e8..803a5effdfecae181a7207a3feba603b4d718668 100644 (file)
--- a/server/sonar-db-core/src/test/java/org/sonar/db/CreateDb.java
+++ b/server/sonar-db-core/src/test/java/org/sonar/db/CreateDb.java
@@ -22,6 +22,7 @@ package org.sonar.db;
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.OrchestratorBuilder;
 import com.sonar.orchestrator.locator.FileLocation;
+import com.sonar.orchestrator.locator.Location;
 import org.apache.commons.lang.StringUtils;
 
 import java.io.File;
@@ -35,8 +36,8 @@ public class CreateDb {
     builder.setEdition(COMMUNITY);
     String version = System.getProperty("sonar.runtimeVersion");
     if (StringUtils.isEmpty(version)) {
-      File zip = FileLocation.byWildcardMavenFilename(new File("../../sonar-application/build/distributions"), "sonar-application-*.zip").getFile();
-      builder.setZipFile(zip);
+      Location zip = FileLocation.byWildcardMavenFilename(new File("../../sonar-application/build/distributions"), "sonar-application-*.zip");
+      builder.setZipLocation(zip);
     } else {
       builder.setSonarVersion(version);
     }

diff --git a/tests/src/test/java/util/ItUtils.java b/tests/src/test/java/util/ItUtils.java
index bb5f42009ca5a4fbf1aca800bfe33a01044b725d..d7451c66776c437cdca120a274d1dd032e7e4560 100644 (file)
--- a/tests/src/test/java/util/ItUtils.java
+++ b/tests/src/test/java/util/ItUtils.java
@@ -30,6 +30,7 @@ import com.sonar.orchestrator.build.BuildResult;
 import com.sonar.orchestrator.build.SonarScanner;
 import com.sonar.orchestrator.container.Server;
 import com.sonar.orchestrator.locator.FileLocation;
+import com.sonar.orchestrator.locator.Location;
 import java.io.File;
 import java.io.IOException;
 import java.lang.reflect.Type;
@@ -103,8 +104,8 @@ public class ItUtils {
     builder.setEdition(COMMUNITY);
     String version = System.getProperty("sonar.runtimeVersion");
     if (StringUtils.isEmpty(version)) {
-      File zip = FileLocation.byWildcardMavenFilename(new File("../sonar-application/build/distributions"), "sonar-application-*.zip").getFile();
-      builder.setZipFile(zip);
+      Location zip = FileLocation.byWildcardMavenFilename(new File("../sonar-application/build/distributions"), "sonar-application-*.zip");
+      builder.setZipLocation(zip);
     } else {
       builder.setSonarVersion(version);
     }