From: Sébastien Lesaint Date: Tue, 12 Jun 2018 09:55:53 +0000 (+0200) Subject: SONAR-10690 rename to newOrchestrator as it now return Orchestrator X-Git-Tag: 7.5~988 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=6ef18d84cd2f6dfc243b13cc6831a6b4b4f3c62b;p=sonarqube.git SONAR-10690 rename to newOrchestrator as it now return Orchestrator --- diff --git a/tests/src/test/java/org/sonarqube/tests/Category1Suite.java b/tests/src/test/java/org/sonarqube/tests/Category1Suite.java index 0a22aa2353a..72aa599bd2a 100644 --- a/tests/src/test/java/org/sonarqube/tests/Category1Suite.java +++ b/tests/src/test/java/org/sonarqube/tests/Category1Suite.java @@ -28,8 +28,9 @@ import org.sonarqube.tests.settings.DeprecatedPropertiesWsTest; import org.sonarqube.tests.settings.EmailsTest; import org.sonarqube.tests.settings.PropertySetsTest; import org.sonarqube.tests.settings.SettingsTest; +import util.ItUtils; -import static util.ItUtils.newOrchestratorBuilder; +import static util.ItUtils.newOrchestrator; import static util.ItUtils.pluginArtifact; import static util.ItUtils.xooPlugin; @@ -49,7 +50,7 @@ import static util.ItUtils.xooPlugin; public class Category1Suite { @ClassRule - public static final Orchestrator ORCHESTRATOR = newOrchestratorBuilder( + public static final Orchestrator ORCHESTRATOR = ItUtils.newOrchestrator( builder -> builder .setServerProperty("sonar.notifications.delay", "1") .addPlugin(pluginArtifact("property-sets-plugin")) diff --git a/tests/src/test/java/org/sonarqube/tests/Category3Suite.java b/tests/src/test/java/org/sonarqube/tests/Category3Suite.java index 468dbf14999..41eccee34e7 100644 --- a/tests/src/test/java/org/sonarqube/tests/Category3Suite.java +++ b/tests/src/test/java/org/sonarqube/tests/Category3Suite.java @@ -40,8 +40,9 @@ import org.sonarqube.tests.analysis.ScannerTest; import org.sonarqube.tests.analysis.SettingsEncryptionTest; import org.sonarqube.tests.analysis.TempFolderTest; import org.sonarqube.tests.plugins.VersionPluginTest; +import util.ItUtils; -import static util.ItUtils.newOrchestratorBuilder; +import static util.ItUtils.newOrchestrator; import static util.ItUtils.pluginArtifact; import static util.ItUtils.xooPlugin; @@ -73,7 +74,7 @@ import static util.ItUtils.xooPlugin; public class Category3Suite { @ClassRule - public static final Orchestrator ORCHESTRATOR = newOrchestratorBuilder( + public static final Orchestrator ORCHESTRATOR = ItUtils.newOrchestrator( builder -> builder .addPlugin(xooPlugin()) .addPlugin(MavenLocation.of("org.sonarsource.java", "sonar-java-plugin", "LATEST_RELEASE")) diff --git a/tests/src/test/java/org/sonarqube/tests/Category4Suite.java b/tests/src/test/java/org/sonarqube/tests/Category4Suite.java index b738d047fa7..46d18d78dfb 100644 --- a/tests/src/test/java/org/sonarqube/tests/Category4Suite.java +++ b/tests/src/test/java/org/sonarqube/tests/Category4Suite.java @@ -37,8 +37,9 @@ import org.sonarqube.tests.serverSystem.ServerSystemTest; import org.sonarqube.tests.serverSystem.SystemInfoTest; import org.sonarqube.tests.ws.WsLocalCallTest; import org.sonarqube.tests.ws.WsTest; +import util.ItUtils; -import static util.ItUtils.newOrchestratorBuilder; +import static util.ItUtils.newOrchestrator; import static util.ItUtils.pluginArtifact; import static util.ItUtils.xooPlugin; @@ -72,7 +73,7 @@ import static util.ItUtils.xooPlugin; public class Category4Suite { @ClassRule - public static final Orchestrator ORCHESTRATOR = newOrchestratorBuilder( + public static final Orchestrator ORCHESTRATOR = ItUtils.newOrchestrator( builder -> builder .addPlugin(xooPlugin()) diff --git a/tests/src/test/java/org/sonarqube/tests/Category6Suite.java b/tests/src/test/java/org/sonarqube/tests/Category6Suite.java index 123ab4aeb6f..e99d0ed68ea 100644 --- a/tests/src/test/java/org/sonarqube/tests/Category6Suite.java +++ b/tests/src/test/java/org/sonarqube/tests/Category6Suite.java @@ -36,8 +36,9 @@ import org.sonarqube.tests.qualityProfile.QualityProfilesEditTest; import org.sonarqube.tests.qualityProfile.QualityProfilesWsTest; import org.sonarqube.tests.rule.RulesMarkdownTest; import org.sonarqube.tests.rule.RulesWsTest; +import util.ItUtils; -import static util.ItUtils.newOrchestratorBuilder; +import static util.ItUtils.newOrchestrator; import static util.ItUtils.pluginArtifact; import static util.ItUtils.xooPlugin; @@ -67,7 +68,7 @@ public class Category6Suite { public static final int SEARCH_HTTP_PORT = NetworkUtils.getNextAvailablePort(InetAddress.getLoopbackAddress()); @ClassRule - public static final Orchestrator ORCHESTRATOR = newOrchestratorBuilder( + public static final Orchestrator ORCHESTRATOR = ItUtils.newOrchestrator( builder -> builder // for ES resiliency tests .setServerProperty("sonar.search.httpPort", "" + SEARCH_HTTP_PORT) diff --git a/tests/src/test/java/org/sonarqube/tests/analysis/AnalysisEsResilienceTest.java b/tests/src/test/java/org/sonarqube/tests/analysis/AnalysisEsResilienceTest.java index 2829597e286..f0e8310ea31 100644 --- a/tests/src/test/java/org/sonarqube/tests/analysis/AnalysisEsResilienceTest.java +++ b/tests/src/test/java/org/sonarqube/tests/analysis/AnalysisEsResilienceTest.java @@ -53,7 +53,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.tuple; import static org.sonarqube.tests.Byteman.Process.CE; import static org.sonarqube.ws.Ce.TaskStatus.FAILED; -import static util.ItUtils.newOrchestratorBuilder; +import static util.ItUtils.newOrchestrator; import static util.ItUtils.projectDir; public class AnalysisEsResilienceTest { @@ -65,7 +65,7 @@ public class AnalysisEsResilienceTest { static { byteman = new Byteman(); - orchestrator = newOrchestratorBuilder( + orchestrator = ItUtils.newOrchestrator( builder -> { byteman.install(builder, CE); builder diff --git a/tests/src/test/java/org/sonarqube/tests/authorization/AuthorizationSuite.java b/tests/src/test/java/org/sonarqube/tests/authorization/AuthorizationSuite.java index 2c92f49dfb7..cca17a9383c 100644 --- a/tests/src/test/java/org/sonarqube/tests/authorization/AuthorizationSuite.java +++ b/tests/src/test/java/org/sonarqube/tests/authorization/AuthorizationSuite.java @@ -25,7 +25,7 @@ import org.junit.runner.RunWith; import org.junit.runners.Suite; import static util.ItUtils.installCoreExtension; -import static util.ItUtils.newOrchestratorBuilder; +import static util.ItUtils.newOrchestrator; import static util.ItUtils.xooPlugin; @RunWith(Suite.class) @@ -42,7 +42,7 @@ import static util.ItUtils.xooPlugin; public class AuthorizationSuite { @ClassRule - public static final Orchestrator ORCHESTRATOR = newOrchestratorBuilder( + public static final Orchestrator ORCHESTRATOR = newOrchestrator( builder -> builder .setServerProperty("sonar.web.systemPasscode", SystemPasscodeTest.VALID_PASSCODE) .addPlugin(xooPlugin()), diff --git a/tests/src/test/java/org/sonarqube/tests/ce/CeShutdownTest.java b/tests/src/test/java/org/sonarqube/tests/ce/CeShutdownTest.java index a2253f43bcc..c61d2db5f03 100644 --- a/tests/src/test/java/org/sonarqube/tests/ce/CeShutdownTest.java +++ b/tests/src/test/java/org/sonarqube/tests/ce/CeShutdownTest.java @@ -37,7 +37,7 @@ import util.ItUtils; import static com.google.common.base.Preconditions.checkState; import static org.assertj.core.api.Assertions.assertThat; -import static util.ItUtils.newOrchestratorBuilder; +import static util.ItUtils.newOrchestrator; public class CeShutdownTest { @@ -116,7 +116,7 @@ public class CeShutdownTest { pauseFile = temp.newFile(); FileUtils.touch(pauseFile); - orchestrator = newOrchestratorBuilder( + orchestrator = ItUtils.newOrchestrator( builder -> builder .setServerProperty("sonar.ce.pauseTask.path", pauseFile.getAbsolutePath()) .setServerProperty("sonar.ce.gracefulStopTimeOutInMs", "" + timeOutInMs) diff --git a/tests/src/test/java/org/sonarqube/tests/ce/CeWorkersTest.java b/tests/src/test/java/org/sonarqube/tests/ce/CeWorkersTest.java index 2bfb2edbbb8..5142d1fe997 100644 --- a/tests/src/test/java/org/sonarqube/tests/ce/CeWorkersTest.java +++ b/tests/src/test/java/org/sonarqube/tests/ce/CeWorkersTest.java @@ -57,7 +57,7 @@ import static java.util.stream.Collectors.toSet; import static org.assertj.core.api.Assertions.assertThat; import static util.ItUtils.installCoreExtension; import static util.ItUtils.newAdminWsClient; -import static util.ItUtils.newOrchestratorBuilder; +import static util.ItUtils.newOrchestrator; import static util.ItUtils.xooPlugin; public class CeWorkersTest { @@ -81,7 +81,7 @@ public class CeWorkersTest { public static void setUp() throws Exception { sharedMemory = temporaryFolder.newFile(); - orchestrator = newOrchestratorBuilder( + orchestrator = newOrchestrator( builder -> builder .setServerProperty("itTests.workerLatch.sharedMemoryFile", sharedMemory.getAbsolutePath()) // overwrite default value to display heap dump on OOM and reduce max heap diff --git a/tests/src/test/java/org/sonarqube/tests/component/ComponentSuite.java b/tests/src/test/java/org/sonarqube/tests/component/ComponentSuite.java index cce0e2ad99b..e4e8fc699c9 100644 --- a/tests/src/test/java/org/sonarqube/tests/component/ComponentSuite.java +++ b/tests/src/test/java/org/sonarqube/tests/component/ComponentSuite.java @@ -37,7 +37,7 @@ import static util.ItUtils.xooPlugin; public class ComponentSuite { @ClassRule - public static final Orchestrator ORCHESTRATOR = ItUtils.newOrchestratorBuilder( + public static final Orchestrator ORCHESTRATOR = ItUtils.newOrchestrator( builder -> builder .addPlugin(xooPlugin()) diff --git a/tests/src/test/java/org/sonarqube/tests/duplication/DuplicationSuite.java b/tests/src/test/java/org/sonarqube/tests/duplication/DuplicationSuite.java index e0f4bd3c9ba..b8b8bac3ef0 100644 --- a/tests/src/test/java/org/sonarqube/tests/duplication/DuplicationSuite.java +++ b/tests/src/test/java/org/sonarqube/tests/duplication/DuplicationSuite.java @@ -23,8 +23,9 @@ import com.sonar.orchestrator.Orchestrator; import org.junit.ClassRule; import org.junit.runner.RunWith; import org.junit.runners.Suite; +import util.ItUtils; -import static util.ItUtils.newOrchestratorBuilder; +import static util.ItUtils.newOrchestrator; import static util.ItUtils.xooPlugin; @RunWith(Suite.class) @@ -37,7 +38,7 @@ import static util.ItUtils.xooPlugin; }) public class DuplicationSuite { @ClassRule - public static final Orchestrator ORCHESTRATOR = newOrchestratorBuilder( + public static final Orchestrator ORCHESTRATOR = ItUtils.newOrchestrator( builder -> builder .addPlugin(xooPlugin()) diff --git a/tests/src/test/java/org/sonarqube/tests/issue/ExternalIssueSuite.java b/tests/src/test/java/org/sonarqube/tests/issue/ExternalIssueSuite.java index e5d78462f05..39a736be8c9 100644 --- a/tests/src/test/java/org/sonarqube/tests/issue/ExternalIssueSuite.java +++ b/tests/src/test/java/org/sonarqube/tests/issue/ExternalIssueSuite.java @@ -36,7 +36,7 @@ import util.ItUtils; public class ExternalIssueSuite { @ClassRule - public static final Orchestrator ORCHESTRATOR = ItUtils.newOrchestratorBuilder( + public static final Orchestrator ORCHESTRATOR = ItUtils.newOrchestrator( builder -> builder .addPlugin(ItUtils.xooPlugin()) diff --git a/tests/src/test/java/org/sonarqube/tests/issue/IssueCreationDatePluginChangedTest.java b/tests/src/test/java/org/sonarqube/tests/issue/IssueCreationDatePluginChangedTest.java index fcd3d9e4d4d..f82b3b9ea17 100644 --- a/tests/src/test/java/org/sonarqube/tests/issue/IssueCreationDatePluginChangedTest.java +++ b/tests/src/test/java/org/sonarqube/tests/issue/IssueCreationDatePluginChangedTest.java @@ -43,7 +43,7 @@ import util.ItUtils; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.tuple; -import static util.ItUtils.newOrchestratorBuilder; +import static util.ItUtils.newOrchestrator; import static util.ItUtils.newUserWsClient; import static util.ItUtils.pluginArtifact; import static util.ItUtils.projectDir; @@ -69,7 +69,7 @@ public class IssueCreationDatePluginChangedTest { private static final String USER_EMAIL = "tester@example.org"; @ClassRule - public static final Orchestrator ORCHESTRATOR = newOrchestratorBuilder( + public static final Orchestrator ORCHESTRATOR = ItUtils.newOrchestrator( builder -> builder .addPlugin(xooPlugin()) .addPlugin(ItUtils.pluginArtifact("backdating-plugin-v1")) diff --git a/tests/src/test/java/org/sonarqube/tests/issue/IssueSuite.java b/tests/src/test/java/org/sonarqube/tests/issue/IssueSuite.java index 5d700760a77..6ca01ce940e 100644 --- a/tests/src/test/java/org/sonarqube/tests/issue/IssueSuite.java +++ b/tests/src/test/java/org/sonarqube/tests/issue/IssueSuite.java @@ -23,8 +23,9 @@ import com.sonar.orchestrator.Orchestrator; import org.junit.ClassRule; import org.junit.runner.RunWith; import org.junit.runners.Suite; +import util.ItUtils; -import static util.ItUtils.newOrchestratorBuilder; +import static util.ItUtils.newOrchestrator; import static util.ItUtils.pluginArtifact; import static util.ItUtils.xooPlugin; @@ -53,7 +54,7 @@ import static util.ItUtils.xooPlugin; public class IssueSuite { @ClassRule - public static final Orchestrator ORCHESTRATOR = newOrchestratorBuilder( + public static final Orchestrator ORCHESTRATOR = ItUtils.newOrchestrator( builder -> builder .setServerProperty("sonar.search.httpPort", "9025") .addPlugin(xooPlugin()) diff --git a/tests/src/test/java/org/sonarqube/tests/issue/OrganizationIssueSuite.java b/tests/src/test/java/org/sonarqube/tests/issue/OrganizationIssueSuite.java index 3cfc081c2ed..d28b6a9af52 100644 --- a/tests/src/test/java/org/sonarqube/tests/issue/OrganizationIssueSuite.java +++ b/tests/src/test/java/org/sonarqube/tests/issue/OrganizationIssueSuite.java @@ -23,8 +23,9 @@ import com.sonar.orchestrator.Orchestrator; import org.junit.ClassRule; import org.junit.runner.RunWith; import org.junit.runners.Suite; +import util.ItUtils; -import static util.ItUtils.newOrchestratorBuilder; +import static util.ItUtils.newOrchestrator; import static util.ItUtils.xooPlugin; @RunWith(Suite.class) @@ -34,7 +35,7 @@ import static util.ItUtils.xooPlugin; public class OrganizationIssueSuite { @ClassRule - public static final Orchestrator ORCHESTRATOR = newOrchestratorBuilder( + public static final Orchestrator ORCHESTRATOR = ItUtils.newOrchestrator( builder -> builder .addPlugin(xooPlugin()) diff --git a/tests/src/test/java/org/sonarqube/tests/lite/LiteTest.java b/tests/src/test/java/org/sonarqube/tests/lite/LiteTest.java index 87a49287b39..4ff831ede88 100644 --- a/tests/src/test/java/org/sonarqube/tests/lite/LiteTest.java +++ b/tests/src/test/java/org/sonarqube/tests/lite/LiteTest.java @@ -34,11 +34,12 @@ import org.sonarqube.ws.client.issues.SearchRequest; import org.sonarqube.ws.client.measures.ComponentRequest; import org.sonarqube.ws.client.measures.ComponentTreeRequest; import org.sonarqube.ws.client.measures.MeasuresService; +import util.ItUtils; import static java.util.Arrays.asList; import static java.util.Collections.singletonList; import static org.assertj.core.api.Assertions.assertThat; -import static util.ItUtils.newOrchestratorBuilder; +import static util.ItUtils.newOrchestrator; import static util.ItUtils.runProjectAnalysis; import static util.ItUtils.xooPlugin; @@ -46,7 +47,7 @@ public class LiteTest { private static final String PROJECT_KEY = "com.sonarsource.it.samples:multi-modules-sample"; - private static Orchestrator orchestrator = newOrchestratorBuilder( + private static Orchestrator orchestrator = ItUtils.newOrchestrator( builder -> builder .setOrchestratorProperty("sonar.web.context", "/sonarqube") .addPlugin(xooPlugin())); diff --git a/tests/src/test/java/org/sonarqube/tests/marketplace/UpdateCenterTest.java b/tests/src/test/java/org/sonarqube/tests/marketplace/UpdateCenterTest.java index e64590cb23e..ae2339e29c0 100644 --- a/tests/src/test/java/org/sonarqube/tests/marketplace/UpdateCenterTest.java +++ b/tests/src/test/java/org/sonarqube/tests/marketplace/UpdateCenterTest.java @@ -26,9 +26,10 @@ import org.junit.Rule; import org.junit.Test; import org.sonarqube.qa.util.pageobjects.MarketplacePage; import org.sonarqube.qa.util.pageobjects.Navigation; +import util.ItUtils; import util.user.UserRule; -import static util.ItUtils.newOrchestratorBuilder; +import static util.ItUtils.newOrchestrator; import static util.ItUtils.pluginArtifact; /** @@ -37,7 +38,7 @@ import static util.ItUtils.pluginArtifact; public class UpdateCenterTest { @ClassRule - public static final Orchestrator orchestrator = newOrchestratorBuilder( + public static final Orchestrator orchestrator = ItUtils.newOrchestrator( builder -> builder .setServerProperty("sonar.updatecenter.url", UpdateCenterTest.class.getResource("/marketplace/UpdateCenterTest/update-center.properties").toString()) .addPlugin(pluginArtifact("sonar-fake-plugin")) diff --git a/tests/src/test/java/org/sonarqube/tests/measure/MeasureSuite.java b/tests/src/test/java/org/sonarqube/tests/measure/MeasureSuite.java index ee937ed3658..1f1be5ecfc2 100644 --- a/tests/src/test/java/org/sonarqube/tests/measure/MeasureSuite.java +++ b/tests/src/test/java/org/sonarqube/tests/measure/MeasureSuite.java @@ -23,8 +23,9 @@ import com.sonar.orchestrator.Orchestrator; import org.junit.ClassRule; import org.junit.runner.RunWith; import org.junit.runners.Suite; +import util.ItUtils; -import static util.ItUtils.newOrchestratorBuilder; +import static util.ItUtils.newOrchestrator; import static util.ItUtils.pluginArtifact; import static util.ItUtils.xooPlugin; @@ -45,7 +46,7 @@ import static util.ItUtils.xooPlugin; public class MeasureSuite { @ClassRule - public static final Orchestrator ORCHESTRATOR = newOrchestratorBuilder( + public static final Orchestrator ORCHESTRATOR = ItUtils.newOrchestrator( builder -> builder .addPlugin(xooPlugin()) diff --git a/tests/src/test/java/org/sonarqube/tests/organization/OrganizationSuite.java b/tests/src/test/java/org/sonarqube/tests/organization/OrganizationSuite.java index 0d2d51231e2..20c70d4e636 100644 --- a/tests/src/test/java/org/sonarqube/tests/organization/OrganizationSuite.java +++ b/tests/src/test/java/org/sonarqube/tests/organization/OrganizationSuite.java @@ -25,7 +25,7 @@ import org.junit.runner.RunWith; import org.junit.runners.Suite; import static util.ItUtils.installCoreExtension; -import static util.ItUtils.newOrchestratorBuilder; +import static util.ItUtils.newOrchestrator; import static util.ItUtils.pluginArtifact; import static util.ItUtils.xooPlugin; @@ -42,7 +42,7 @@ import static util.ItUtils.xooPlugin; public class OrganizationSuite { @ClassRule - public static final Orchestrator ORCHESTRATOR = newOrchestratorBuilder( + public static final Orchestrator ORCHESTRATOR = newOrchestrator( builder -> builder .addPlugin(xooPlugin()) .addPlugin(pluginArtifact("ui-extensions-plugin")) diff --git a/tests/src/test/java/org/sonarqube/tests/performance/scanner/ScannerPerformanceSuite.java b/tests/src/test/java/org/sonarqube/tests/performance/scanner/ScannerPerformanceSuite.java index e7143961452..e77b53bb72e 100644 --- a/tests/src/test/java/org/sonarqube/tests/performance/scanner/ScannerPerformanceSuite.java +++ b/tests/src/test/java/org/sonarqube/tests/performance/scanner/ScannerPerformanceSuite.java @@ -27,8 +27,9 @@ import org.junit.ClassRule; import org.junit.runner.RunWith; import org.junit.runners.Suite; import org.sonarqube.tests.performance.AbstractPerfTest; +import util.ItUtils; -import static util.ItUtils.newOrchestratorBuilder; +import static util.ItUtils.newOrchestrator; import static util.ItUtils.xooPlugin; @RunWith(Suite.class) @@ -43,7 +44,7 @@ import static util.ItUtils.xooPlugin; public class ScannerPerformanceSuite { @ClassRule - public static final Orchestrator ORCHESTRATOR = newOrchestratorBuilder( + public static final Orchestrator ORCHESTRATOR = ItUtils.newOrchestrator( builder -> builder .addPlugin(xooPlugin()) // should not be so high, but required as long embedded h2 is used -> requires more memory on server diff --git a/tests/src/test/java/org/sonarqube/tests/performance/server/ComputeEnginePerfTest.java b/tests/src/test/java/org/sonarqube/tests/performance/server/ComputeEnginePerfTest.java index 864aba6512a..5ef26f34562 100644 --- a/tests/src/test/java/org/sonarqube/tests/performance/server/ComputeEnginePerfTest.java +++ b/tests/src/test/java/org/sonarqube/tests/performance/server/ComputeEnginePerfTest.java @@ -33,8 +33,9 @@ import org.junit.Test; import org.junit.rules.TemporaryFolder; import org.sonarqube.tests.performance.AbstractPerfTest; import org.sonarqube.tests.performance.ServerLogs; +import util.ItUtils; -import static util.ItUtils.newOrchestratorBuilder; +import static util.ItUtils.newOrchestrator; import static util.ItUtils.xooPlugin; public class ComputeEnginePerfTest extends AbstractPerfTest { @@ -44,7 +45,7 @@ public class ComputeEnginePerfTest extends AbstractPerfTest { public static TemporaryFolder temp = new TemporaryFolder(); @ClassRule - public static Orchestrator orchestrator = newOrchestratorBuilder( + public static Orchestrator orchestrator = ItUtils.newOrchestrator( builder -> builder .addPlugin(xooPlugin()) .setServerProperty( diff --git a/tests/src/test/java/org/sonarqube/tests/performance/server/ServerPerfTest.java b/tests/src/test/java/org/sonarqube/tests/performance/server/ServerPerfTest.java index 0b99aeaa36d..e5492676f0f 100644 --- a/tests/src/test/java/org/sonarqube/tests/performance/server/ServerPerfTest.java +++ b/tests/src/test/java/org/sonarqube/tests/performance/server/ServerPerfTest.java @@ -29,9 +29,10 @@ import org.junit.Test; import org.junit.rules.Timeout; import org.sonarqube.tests.performance.AbstractPerfTest; import org.sonarqube.tests.performance.ServerLogs; +import util.ItUtils; import static org.apache.commons.io.FileUtils.readLines; -import static util.ItUtils.newOrchestratorBuilder; +import static util.ItUtils.newOrchestrator; import static util.ItUtils.xooPlugin; public class ServerPerfTest extends AbstractPerfTest { @@ -44,7 +45,7 @@ public class ServerPerfTest extends AbstractPerfTest { @Test public void server_startup_and_shutdown() throws Exception { String defaultWebJavaOptions = "-Xmx768m -XX:+HeapDumpOnOutOfMemoryError -Djava.awt.headless=true -Dfile.encoding=UTF-8"; - Orchestrator orchestrator = newOrchestratorBuilder( + Orchestrator orchestrator = ItUtils.newOrchestrator( builder -> builder .addPlugin(xooPlugin()) diff --git a/tests/src/test/java/org/sonarqube/tests/project/OrganizationProjectSuite.java b/tests/src/test/java/org/sonarqube/tests/project/OrganizationProjectSuite.java index 7aae5bd8be3..2d7472fecbb 100644 --- a/tests/src/test/java/org/sonarqube/tests/project/OrganizationProjectSuite.java +++ b/tests/src/test/java/org/sonarqube/tests/project/OrganizationProjectSuite.java @@ -25,8 +25,9 @@ import java.net.InetAddress; import org.junit.ClassRule; import org.junit.runner.RunWith; import org.junit.runners.Suite; +import util.ItUtils; -import static util.ItUtils.newOrchestratorBuilder; +import static util.ItUtils.newOrchestrator; import static util.ItUtils.pluginArtifact; import static util.ItUtils.xooPlugin; @@ -52,7 +53,7 @@ public class OrganizationProjectSuite { static final int SEARCH_HTTP_PORT = NetworkUtils.getNextAvailablePort(InetAddress.getLoopbackAddress()); @ClassRule - public static final Orchestrator ORCHESTRATOR = newOrchestratorBuilder( + public static final Orchestrator ORCHESTRATOR = ItUtils.newOrchestrator( builder -> builder // for ES resiliency tests .setServerProperty("sonar.search.httpPort", "" + SEARCH_HTTP_PORT) diff --git a/tests/src/test/java/org/sonarqube/tests/project/ProjectSuite.java b/tests/src/test/java/org/sonarqube/tests/project/ProjectSuite.java index 79975d34715..431791d7b96 100644 --- a/tests/src/test/java/org/sonarqube/tests/project/ProjectSuite.java +++ b/tests/src/test/java/org/sonarqube/tests/project/ProjectSuite.java @@ -25,8 +25,9 @@ import java.net.InetAddress; import org.junit.ClassRule; import org.junit.runner.RunWith; import org.junit.runners.Suite; +import util.ItUtils; -import static util.ItUtils.newOrchestratorBuilder; +import static util.ItUtils.newOrchestrator; import static util.ItUtils.pluginArtifact; import static util.ItUtils.xooPlugin; @@ -40,7 +41,7 @@ public class ProjectSuite { static final int SEARCH_HTTP_PORT = NetworkUtils.getNextAvailablePort(InetAddress.getLoopbackAddress()); @ClassRule - public static final Orchestrator ORCHESTRATOR = newOrchestratorBuilder( + public static final Orchestrator ORCHESTRATOR = ItUtils.newOrchestrator( builder -> builder // for ES resiliency tests .setServerProperty("sonar.search.httpPort", "" + SEARCH_HTTP_PORT) diff --git a/tests/src/test/java/org/sonarqube/tests/qualityGate/OrganizationQualityGateSuite.java b/tests/src/test/java/org/sonarqube/tests/qualityGate/OrganizationQualityGateSuite.java index d3c1a816e6a..c6550b2f9c4 100644 --- a/tests/src/test/java/org/sonarqube/tests/qualityGate/OrganizationQualityGateSuite.java +++ b/tests/src/test/java/org/sonarqube/tests/qualityGate/OrganizationQualityGateSuite.java @@ -23,8 +23,9 @@ import com.sonar.orchestrator.Orchestrator; import org.junit.ClassRule; import org.junit.runner.RunWith; import org.junit.runners.Suite; +import util.ItUtils; -import static util.ItUtils.newOrchestratorBuilder; +import static util.ItUtils.newOrchestrator; import static util.ItUtils.pluginArtifact; import static util.ItUtils.xooPlugin; @@ -37,7 +38,7 @@ import static util.ItUtils.xooPlugin; public class OrganizationQualityGateSuite { @ClassRule - public static final Orchestrator ORCHESTRATOR = newOrchestratorBuilder( + public static final Orchestrator ORCHESTRATOR = ItUtils.newOrchestrator( builder -> builder // required for notification tests .setServerProperty("sonar.notifications.delay", "1") diff --git a/tests/src/test/java/org/sonarqube/tests/qualityGate/QualityGateSuite.java b/tests/src/test/java/org/sonarqube/tests/qualityGate/QualityGateSuite.java index 3cb1b8a9205..79e3563df35 100644 --- a/tests/src/test/java/org/sonarqube/tests/qualityGate/QualityGateSuite.java +++ b/tests/src/test/java/org/sonarqube/tests/qualityGate/QualityGateSuite.java @@ -23,8 +23,9 @@ import com.sonar.orchestrator.Orchestrator; import org.junit.ClassRule; import org.junit.runner.RunWith; import org.junit.runners.Suite; +import util.ItUtils; -import static util.ItUtils.newOrchestratorBuilder; +import static util.ItUtils.newOrchestrator; import static util.ItUtils.pluginArtifact; import static util.ItUtils.xooPlugin; @@ -39,7 +40,7 @@ import static util.ItUtils.xooPlugin; public class QualityGateSuite { @ClassRule - public static final Orchestrator ORCHESTRATOR = newOrchestratorBuilder( + public static final Orchestrator ORCHESTRATOR = ItUtils.newOrchestrator( builder -> builder // required for notification tests .setServerProperty("sonar.notifications.delay", "1") diff --git a/tests/src/test/java/org/sonarqube/tests/qualityModel/QualityModelSuite.java b/tests/src/test/java/org/sonarqube/tests/qualityModel/QualityModelSuite.java index ee286940e76..29fa2d7d85a 100644 --- a/tests/src/test/java/org/sonarqube/tests/qualityModel/QualityModelSuite.java +++ b/tests/src/test/java/org/sonarqube/tests/qualityModel/QualityModelSuite.java @@ -23,8 +23,9 @@ import com.sonar.orchestrator.Orchestrator; import org.junit.ClassRule; import org.junit.runner.RunWith; import org.junit.runners.Suite; +import util.ItUtils; -import static util.ItUtils.newOrchestratorBuilder; +import static util.ItUtils.newOrchestrator; import static util.ItUtils.xooPlugin; @RunWith(Suite.class) @@ -41,7 +42,7 @@ import static util.ItUtils.xooPlugin; public class QualityModelSuite { @ClassRule - public static final Orchestrator ORCHESTRATOR = newOrchestratorBuilder( + public static final Orchestrator ORCHESTRATOR = ItUtils.newOrchestrator( builder -> builder .addPlugin(xooPlugin()) diff --git a/tests/src/test/java/org/sonarqube/tests/qualityProfile/ActiveRuleEsResilienceTest.java b/tests/src/test/java/org/sonarqube/tests/qualityProfile/ActiveRuleEsResilienceTest.java index 9ba5c3505c7..406dd4caa6d 100644 --- a/tests/src/test/java/org/sonarqube/tests/qualityProfile/ActiveRuleEsResilienceTest.java +++ b/tests/src/test/java/org/sonarqube/tests/qualityProfile/ActiveRuleEsResilienceTest.java @@ -38,7 +38,7 @@ import util.ItUtils; import static org.assertj.core.api.Assertions.assertThat; import static org.sonarqube.tests.Byteman.Process.WEB; -import static util.ItUtils.newOrchestratorBuilder; +import static util.ItUtils.newOrchestrator; public class ActiveRuleEsResilienceTest { private static final String RULE_ONE_BUG_PER_LINE = "xoo:OneBugIssuePerLine"; @@ -49,7 +49,7 @@ public class ActiveRuleEsResilienceTest { static { byteman = new Byteman(); - orchestrator = newOrchestratorBuilder( + orchestrator = ItUtils.newOrchestrator( builder -> { byteman.install(builder, WEB); builder.setServerProperty("sonar.search.recovery.delayInMs", "1000") diff --git a/tests/src/test/java/org/sonarqube/tests/qualityProfile/BuiltInQualityProfilesNotificationTest.java b/tests/src/test/java/org/sonarqube/tests/qualityProfile/BuiltInQualityProfilesNotificationTest.java index 4001581cc8f..4dd554ff327 100644 --- a/tests/src/test/java/org/sonarqube/tests/qualityProfile/BuiltInQualityProfilesNotificationTest.java +++ b/tests/src/test/java/org/sonarqube/tests/qualityProfile/BuiltInQualityProfilesNotificationTest.java @@ -41,7 +41,7 @@ import util.user.UserRule; import static org.apache.commons.lang.RandomStringUtils.randomAlphanumeric; import static org.assertj.core.api.Assertions.assertThat; -import static util.ItUtils.newOrchestratorBuilder; +import static util.ItUtils.newOrchestrator; import static util.ItUtils.pluginArtifact; public class BuiltInQualityProfilesNotificationTest { @@ -68,7 +68,7 @@ public class BuiltInQualityProfilesNotificationTest { @Test public void does_not_send_mail_if_no_quality_profile_is_updated() throws Exception { - orchestrator = newOrchestratorBuilder( + orchestrator = ItUtils.newOrchestrator( builder -> builder .addPlugin(pluginArtifact("foo-plugin-v1")) .setServerProperty("email.smtp_host.secured", "localhost") @@ -87,7 +87,7 @@ public class BuiltInQualityProfilesNotificationTest { @Test public void send_mail_if_quality_profile_is_updated() throws Exception { - orchestrator = newOrchestratorBuilder( + orchestrator = ItUtils.newOrchestrator( builder -> builder .addPlugin(pluginArtifact("foo-plugin-v1")) .setServerProperty("sonar.notifications.delay", "1") @@ -174,7 +174,7 @@ public class BuiltInQualityProfilesNotificationTest { @Test public void do_not_send_mail_if_notifications_are_disabled_in_settings() throws Exception { - orchestrator = newOrchestratorBuilder( + orchestrator = ItUtils.newOrchestrator( builder -> builder .addPlugin(pluginArtifact("foo-plugin-v1")) .setServerProperty("sonar.builtInQualityProfiles.disableNotificationOnUpdate", "true") diff --git a/tests/src/test/java/org/sonarqube/tests/qualityProfile/PluginWithoutBuiltinQualityProfileTest.java b/tests/src/test/java/org/sonarqube/tests/qualityProfile/PluginWithoutBuiltinQualityProfileTest.java index f6ed25067fe..ece31deeac8 100644 --- a/tests/src/test/java/org/sonarqube/tests/qualityProfile/PluginWithoutBuiltinQualityProfileTest.java +++ b/tests/src/test/java/org/sonarqube/tests/qualityProfile/PluginWithoutBuiltinQualityProfileTest.java @@ -25,10 +25,11 @@ import java.nio.charset.StandardCharsets; import org.apache.commons.io.FileUtils; import org.junit.After; import org.junit.Test; +import util.ItUtils; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.fail; -import static util.ItUtils.newOrchestratorBuilder; +import static util.ItUtils.newOrchestrator; import static util.ItUtils.pluginArtifact; public class PluginWithoutBuiltinQualityProfileTest { @@ -36,7 +37,7 @@ public class PluginWithoutBuiltinQualityProfileTest { @Test public void should_fail_if_plugin_defines_language_and_no_builtin_qprofile() throws IOException { - orchestrator = newOrchestratorBuilder(b -> b.addPlugin(pluginArtifact("foo-plugin-without-qprofile"))); + orchestrator = ItUtils.newOrchestrator(b -> b.addPlugin(pluginArtifact("foo-plugin-without-qprofile"))); try { orchestrator.start(); diff --git a/tests/src/test/java/org/sonarqube/tests/qualityProfile/QualityProfileUpdateTest.java b/tests/src/test/java/org/sonarqube/tests/qualityProfile/QualityProfileUpdateTest.java index f0a66d8ca5e..83285702785 100644 --- a/tests/src/test/java/org/sonarqube/tests/qualityProfile/QualityProfileUpdateTest.java +++ b/tests/src/test/java/org/sonarqube/tests/qualityProfile/QualityProfileUpdateTest.java @@ -31,10 +31,11 @@ import org.sonarqube.ws.Qualityprofiles.SearchWsResponse.QualityProfile; import org.sonarqube.ws.Rules; import org.sonarqube.ws.client.PostRequest; import org.sonarqube.ws.client.qualityprofiles.SearchRequest; +import util.ItUtils; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.tuple; -import static util.ItUtils.newOrchestratorBuilder; +import static util.ItUtils.newOrchestrator; import static util.ItUtils.pluginArtifact; public class QualityProfileUpdateTest { @@ -54,7 +55,7 @@ public class QualityProfileUpdateTest { @Test // SONAR-10363 public void updating_an_analyzer_must_update_default_quality_profile() { - orchestrator = newOrchestratorBuilder( + orchestrator = ItUtils.newOrchestrator( builder -> builder .addPlugin(pluginArtifact("foo-plugin-v1")) // .setServerProperty("sonar.sonarcloud.enabled", "true")) diff --git a/tests/src/test/java/org/sonarqube/tests/rule/RuleEsResilienceTest.java b/tests/src/test/java/org/sonarqube/tests/rule/RuleEsResilienceTest.java index 4749cb89790..c0fc140d874 100644 --- a/tests/src/test/java/org/sonarqube/tests/rule/RuleEsResilienceTest.java +++ b/tests/src/test/java/org/sonarqube/tests/rule/RuleEsResilienceTest.java @@ -38,7 +38,7 @@ import util.ItUtils; import static java.util.Collections.singletonList; import static org.assertj.core.api.Assertions.assertThat; import static org.sonarqube.tests.Byteman.Process.WEB; -import static util.ItUtils.newOrchestratorBuilder; +import static util.ItUtils.newOrchestrator; public class RuleEsResilienceTest { @@ -48,7 +48,7 @@ public class RuleEsResilienceTest { static { byteman = new Byteman(); - orchestrator = newOrchestratorBuilder( + orchestrator = ItUtils.newOrchestrator( builder -> { byteman.install(builder, WEB); builder diff --git a/tests/src/test/java/org/sonarqube/tests/rule/RuleReKeyingTest.java b/tests/src/test/java/org/sonarqube/tests/rule/RuleReKeyingTest.java index 7508cdd8a37..c6e0522a08f 100644 --- a/tests/src/test/java/org/sonarqube/tests/rule/RuleReKeyingTest.java +++ b/tests/src/test/java/org/sonarqube/tests/rule/RuleReKeyingTest.java @@ -36,11 +36,12 @@ import org.sonarqube.ws.Issues; import org.sonarqube.ws.Rules; import org.sonarqube.ws.client.PostRequest; import org.sonarqube.ws.client.issues.SearchRequest; +import util.ItUtils; import static java.util.Collections.singletonList; import static java.util.stream.Collectors.toSet; import static org.assertj.core.api.Assertions.assertThat; -import static util.ItUtils.newOrchestratorBuilder; +import static util.ItUtils.newOrchestrator; import static util.ItUtils.pluginArtifact; import static util.ItUtils.projectDir; @@ -61,7 +62,7 @@ public class RuleReKeyingTest { @Test public void rules_are_re_keyed_when_upgrading_and_downgrading_plugin() { - orchestrator = newOrchestratorBuilder( + orchestrator = ItUtils.newOrchestrator( builder -> builder .addPlugin(pluginArtifact("foo-plugin-v1"))); orchestrator.start(); diff --git a/tests/src/test/java/org/sonarqube/tests/serverSystem/BlueGreenTest.java b/tests/src/test/java/org/sonarqube/tests/serverSystem/BlueGreenTest.java index 041bc71e128..65e84687552 100644 --- a/tests/src/test/java/org/sonarqube/tests/serverSystem/BlueGreenTest.java +++ b/tests/src/test/java/org/sonarqube/tests/serverSystem/BlueGreenTest.java @@ -42,7 +42,7 @@ import org.sonarqube.ws.client.qualityprofiles.AddProjectRequest; import util.ItUtils; import static org.assertj.core.api.Assertions.assertThat; -import static util.ItUtils.newOrchestratorBuilder; +import static util.ItUtils.newOrchestrator; import static util.ItUtils.pluginArtifact; import static util.ItUtils.xooPlugin; @@ -69,7 +69,7 @@ public class BlueGreenTest { @Test public void upgrade_analyzer_when_analysis_is_pending_in_compute_engine_queue() throws Exception { - orchestrator = newOrchestratorBuilder( + orchestrator = ItUtils.newOrchestrator( builder -> builder .addPlugin(pluginArtifact("blue-green-plugin-v1")) .addPlugin(xooPlugin())); diff --git a/tests/src/test/java/org/sonarqube/tests/serverSystem/RestartTest.java b/tests/src/test/java/org/sonarqube/tests/serverSystem/RestartTest.java index 52d45e81933..c61e16b4194 100644 --- a/tests/src/test/java/org/sonarqube/tests/serverSystem/RestartTest.java +++ b/tests/src/test/java/org/sonarqube/tests/serverSystem/RestartTest.java @@ -38,7 +38,7 @@ import util.ItUtils; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.fail; import static util.ItUtils.newAdminWsClient; -import static util.ItUtils.newOrchestratorBuilder; +import static util.ItUtils.newOrchestrator; import static util.ItUtils.newWsClient; /** @@ -64,7 +64,7 @@ public class RestartTest { public void restart_in_prod_mode_requires_sysadmin_permission_and_restarts() throws Exception { // server classloader locks Jar files on Windows if (!SystemUtils.IS_OS_WINDOWS) { - orchestrator = newOrchestratorBuilder( + orchestrator = ItUtils.newOrchestrator( builder -> builder .setOrchestratorProperty("orchestrator.keepWorkspace", "true")); orchestrator.start(); diff --git a/tests/src/test/java/org/sonarqube/tests/serverSystem/ServerSystemRestartingOrchestrator.java b/tests/src/test/java/org/sonarqube/tests/serverSystem/ServerSystemRestartingOrchestrator.java index 593a06215e3..d49a6411765 100644 --- a/tests/src/test/java/org/sonarqube/tests/serverSystem/ServerSystemRestartingOrchestrator.java +++ b/tests/src/test/java/org/sonarqube/tests/serverSystem/ServerSystemRestartingOrchestrator.java @@ -33,7 +33,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.fail; import static util.ItUtils.locationOf; import static util.ItUtils.newAdminWsClient; -import static util.ItUtils.newOrchestratorBuilder; +import static util.ItUtils.newOrchestrator; /** * This class start a new orchestrator on each test case @@ -58,7 +58,7 @@ public class ServerSystemRestartingOrchestrator { @Test public void check_minimal_sonar_version_at_startup() throws Exception { try { - orchestrator = newOrchestratorBuilder( + orchestrator = ItUtils.newOrchestrator( builder -> builder .addPlugin(locationOf(ServerSystemRestartingOrchestrator.class.getResource("/serverSystem/ServerSystemTest/incompatible-plugin-1.0.jar")))); orchestrator.start(); @@ -73,7 +73,7 @@ public class ServerSystemRestartingOrchestrator { public void support_install_dir_with_whitespaces() throws Exception { String dirName = "build/distributions/has space"; FileUtils.deleteDirectory(new File(dirName)); - orchestrator = newOrchestratorBuilder( + orchestrator = ItUtils.newOrchestrator( builder -> builder .setOrchestratorProperty("orchestrator.workspaceDir", dirName)); orchestrator.start(); @@ -84,7 +84,7 @@ public class ServerSystemRestartingOrchestrator { // SONAR-4748 @Test public void should_create_in_temp_folder() throws Exception { - orchestrator = newOrchestratorBuilder( + orchestrator = ItUtils.newOrchestrator( builder -> builder .addPlugin(ItUtils.pluginArtifact("server-plugin")) .setServerProperty("sonar.createTempFiles", "true")); diff --git a/tests/src/test/java/org/sonarqube/tests/serverSystem/SystemStateTest.java b/tests/src/test/java/org/sonarqube/tests/serverSystem/SystemStateTest.java index 14cf8137b5f..57fe4ecca3a 100644 --- a/tests/src/test/java/org/sonarqube/tests/serverSystem/SystemStateTest.java +++ b/tests/src/test/java/org/sonarqube/tests/serverSystem/SystemStateTest.java @@ -38,10 +38,11 @@ import org.junit.rules.Timeout; import org.sonarqube.qa.util.Elasticsearch; import org.sonarqube.ws.System; import org.sonarqube.ws.client.WsClient; +import util.ItUtils; import static com.google.common.base.Preconditions.checkState; import static org.assertj.core.api.Assertions.assertThat; -import static util.ItUtils.newOrchestratorBuilder; +import static util.ItUtils.newOrchestrator; import static util.ItUtils.newSystemUserWsClient; import static util.ItUtils.newWsClient; import static util.ItUtils.pluginArtifact; @@ -129,7 +130,7 @@ public class SystemStateTest { void start(Lock lock) { checkState(orchestrator == null); - orchestrator = newOrchestratorBuilder( + orchestrator = ItUtils.newOrchestrator( builder -> builder .addPlugin(pluginArtifact("server-plugin")) .setServerProperty("sonar.web.startupLock.path", lock.webFile.getAbsolutePath()) diff --git a/tests/src/test/java/org/sonarqube/tests/settings/SettingsSuite.java b/tests/src/test/java/org/sonarqube/tests/settings/SettingsSuite.java index d987479b1d0..4701557275b 100644 --- a/tests/src/test/java/org/sonarqube/tests/settings/SettingsSuite.java +++ b/tests/src/test/java/org/sonarqube/tests/settings/SettingsSuite.java @@ -34,7 +34,7 @@ import static util.ItUtils.xooPlugin; public class SettingsSuite { @ClassRule - public static final Orchestrator ORCHESTRATOR = ItUtils.newOrchestratorBuilder( + public static final Orchestrator ORCHESTRATOR = ItUtils.newOrchestrator( builder -> builder .addPlugin(xooPlugin())); diff --git a/tests/src/test/java/org/sonarqube/tests/settings/SettingsTestRestartingOrchestrator.java b/tests/src/test/java/org/sonarqube/tests/settings/SettingsTestRestartingOrchestrator.java index 5360e463b55..d8d95ec6a43 100644 --- a/tests/src/test/java/org/sonarqube/tests/settings/SettingsTestRestartingOrchestrator.java +++ b/tests/src/test/java/org/sonarqube/tests/settings/SettingsTestRestartingOrchestrator.java @@ -28,11 +28,12 @@ import org.junit.Test; import org.junit.rules.ExpectedException; import org.sonarqube.qa.util.pageobjects.EncryptionPage; import org.sonarqube.qa.util.pageobjects.Navigation; +import util.ItUtils; import util.user.UserRule; import static com.codeborne.selenide.Condition.visible; import static org.assertj.core.api.Assertions.assertThat; -import static util.ItUtils.newOrchestratorBuilder; +import static util.ItUtils.newOrchestrator; import static util.ItUtils.pluginArtifact; import static util.ItUtils.projectDir; import static util.ItUtils.xooPlugin; @@ -60,7 +61,7 @@ public class SettingsTestRestartingOrchestrator { @Test public void test_settings() { URL secretKeyUrl = getClass().getResource("/settings/SettingsTest/sonar-secret.txt"); - orchestrator = newOrchestratorBuilder( + orchestrator = ItUtils.newOrchestrator( builder -> builder .addPlugin(pluginArtifact("settings-plugin")) .addPlugin(pluginArtifact("license-plugin")) @@ -86,7 +87,7 @@ public class SettingsTestRestartingOrchestrator { @Test public void property_relocation() { - orchestrator = newOrchestratorBuilder( + orchestrator = ItUtils.newOrchestrator( builder -> builder .addPlugin(pluginArtifact("property-relocation-plugin")) .addPlugin(xooPlugin()) diff --git a/tests/src/test/java/org/sonarqube/tests/source/SourceSuite.java b/tests/src/test/java/org/sonarqube/tests/source/SourceSuite.java index 075ffdf6d64..cffc1cd3c32 100644 --- a/tests/src/test/java/org/sonarqube/tests/source/SourceSuite.java +++ b/tests/src/test/java/org/sonarqube/tests/source/SourceSuite.java @@ -24,8 +24,9 @@ import com.sonar.orchestrator.locator.MavenLocation; import org.junit.ClassRule; import org.junit.runner.RunWith; import org.junit.runners.Suite; +import util.ItUtils; -import static util.ItUtils.newOrchestratorBuilder; +import static util.ItUtils.newOrchestrator; import static util.ItUtils.xooPlugin; @RunWith(Suite.class) @@ -39,7 +40,7 @@ import static util.ItUtils.xooPlugin; public class SourceSuite { @ClassRule - public static final Orchestrator ORCHESTRATOR = newOrchestratorBuilder( + public static final Orchestrator ORCHESTRATOR = ItUtils.newOrchestrator( builder -> builder .addPlugin(xooPlugin()) .addPlugin(MavenLocation.of("org.sonarsource.scm.git", "sonar-scm-git-plugin", "LATEST_RELEASE"))); diff --git a/tests/src/test/java/org/sonarqube/tests/startup/StartupIndexationTest.java b/tests/src/test/java/org/sonarqube/tests/startup/StartupIndexationTest.java index 47a5eb16fe6..a5c0c5620ab 100644 --- a/tests/src/test/java/org/sonarqube/tests/startup/StartupIndexationTest.java +++ b/tests/src/test/java/org/sonarqube/tests/startup/StartupIndexationTest.java @@ -36,9 +36,10 @@ import org.sonarqube.qa.util.LogsTailer; import org.sonarqube.qa.util.Tester; import org.sonarqube.ws.Users; import org.sonarqube.ws.client.users.SearchRequest; +import util.ItUtils; import static org.assertj.core.api.Assertions.assertThat; -import static util.ItUtils.newOrchestratorBuilder; +import static util.ItUtils.newOrchestrator; import static util.ItUtils.pluginArtifact; public class StartupIndexationTest { @@ -82,7 +83,7 @@ public class StartupIndexationTest { pauseFile = temp.newFile(); FileUtils.touch(pauseFile); - orchestrator = newOrchestratorBuilder( + orchestrator = ItUtils.newOrchestrator( builder -> builder .setServerProperty("sonar.web.pause.path", pauseFile.getAbsolutePath()) .addPlugin(pluginArtifact("wait-at-platform-level4-plugin")) diff --git a/tests/src/test/java/org/sonarqube/tests/telemetry/TelemetryOptOutTest.java b/tests/src/test/java/org/sonarqube/tests/telemetry/TelemetryOptOutTest.java index 120e4e55f3d..d859cd7c5a4 100644 --- a/tests/src/test/java/org/sonarqube/tests/telemetry/TelemetryOptOutTest.java +++ b/tests/src/test/java/org/sonarqube/tests/telemetry/TelemetryOptOutTest.java @@ -29,17 +29,18 @@ import org.junit.Test; import org.junit.rules.RuleChain; import org.sonarqube.qa.util.Tester; import org.sonarqube.ws.client.GetRequest; +import util.ItUtils; import static org.assertj.core.api.Assertions.assertThat; import static util.ItUtils.jsonToMap; -import static util.ItUtils.newOrchestratorBuilder; +import static util.ItUtils.newOrchestrator; import static util.ItUtils.xooPlugin; public class TelemetryOptOutTest { public static MockWebServer server = new MockWebServer(); - private static Orchestrator orchestrator = newOrchestratorBuilder( + private static Orchestrator orchestrator = ItUtils.newOrchestrator( builder -> builder .addPlugin(xooPlugin()) .setServerProperty("sonar.telemetry.enable", "false") diff --git a/tests/src/test/java/org/sonarqube/tests/telemetry/TelemetryUploadTest.java b/tests/src/test/java/org/sonarqube/tests/telemetry/TelemetryUploadTest.java index 56790db2bdb..15bc9cbe41c 100644 --- a/tests/src/test/java/org/sonarqube/tests/telemetry/TelemetryUploadTest.java +++ b/tests/src/test/java/org/sonarqube/tests/telemetry/TelemetryUploadTest.java @@ -37,7 +37,7 @@ import util.ItUtils; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.tuple; import static util.ItUtils.jsonToMap; -import static util.ItUtils.newOrchestratorBuilder; +import static util.ItUtils.newOrchestrator; import static util.ItUtils.runProjectAnalysis; import static util.ItUtils.xooPlugin; @@ -61,7 +61,7 @@ public class TelemetryUploadTest { @Test public void sent_telemetry_data() throws Exception { telemetryServer.enqueue(new MockResponse().setResponseCode(200)); - orchestrator = newOrchestratorBuilder( + orchestrator = ItUtils.newOrchestrator( builder -> builder .addPlugin(xooPlugin()) .setServerProperty("sonar.telemetry.url", telemetryServer.url("").toString()) @@ -105,7 +105,7 @@ public class TelemetryUploadTest { @Test public void does_not_send_telemetry_data_right_away_by_Default() { - orchestrator = newOrchestratorBuilder( + orchestrator = ItUtils.newOrchestrator( builder -> builder .addPlugin(xooPlugin()) .setServerProperty("sonar.telemetry.url", telemetryServer.url("").toString())); diff --git a/tests/src/test/java/org/sonarqube/tests/test/TestSuite.java b/tests/src/test/java/org/sonarqube/tests/test/TestSuite.java index e4177ca8ab1..c9f1c39382e 100644 --- a/tests/src/test/java/org/sonarqube/tests/test/TestSuite.java +++ b/tests/src/test/java/org/sonarqube/tests/test/TestSuite.java @@ -23,8 +23,9 @@ import com.sonar.orchestrator.Orchestrator; import org.junit.ClassRule; import org.junit.runner.RunWith; import org.junit.runners.Suite; +import util.ItUtils; -import static util.ItUtils.newOrchestratorBuilder; +import static util.ItUtils.newOrchestrator; import static util.ItUtils.xooPlugin; @RunWith(Suite.class) @@ -37,7 +38,7 @@ import static util.ItUtils.xooPlugin; public class TestSuite { @ClassRule - public static final Orchestrator ORCHESTRATOR = newOrchestratorBuilder( + public static final Orchestrator ORCHESTRATOR = ItUtils.newOrchestrator( builder -> builder .addPlugin(xooPlugin())); diff --git a/tests/src/test/java/org/sonarqube/tests/ui/UiSuite.java b/tests/src/test/java/org/sonarqube/tests/ui/UiSuite.java index 31338ac3031..678201c7f7a 100644 --- a/tests/src/test/java/org/sonarqube/tests/ui/UiSuite.java +++ b/tests/src/test/java/org/sonarqube/tests/ui/UiSuite.java @@ -23,8 +23,9 @@ import com.sonar.orchestrator.Orchestrator; import org.junit.ClassRule; import org.junit.runner.RunWith; import org.junit.runners.Suite; +import util.ItUtils; -import static util.ItUtils.newOrchestratorBuilder; +import static util.ItUtils.newOrchestrator; import static util.ItUtils.pluginArtifact; import static util.ItUtils.xooPlugin; @@ -37,7 +38,7 @@ import static util.ItUtils.xooPlugin; public class UiSuite { @ClassRule - public static final Orchestrator ORCHESTRATOR = newOrchestratorBuilder( + public static final Orchestrator ORCHESTRATOR = ItUtils.newOrchestrator( builder -> builder .addPlugin(xooPlugin()) // Used in UiExtensionsTest diff --git a/tests/src/test/java/org/sonarqube/tests/upgrade/UpgradeTest.java b/tests/src/test/java/org/sonarqube/tests/upgrade/UpgradeTest.java index 2ec884365d3..41284247d78 100644 --- a/tests/src/test/java/org/sonarqube/tests/upgrade/UpgradeTest.java +++ b/tests/src/test/java/org/sonarqube/tests/upgrade/UpgradeTest.java @@ -44,13 +44,14 @@ import org.sonarqube.ws.client.WsClient; import org.sonarqube.ws.client.WsClientFactories; import org.sonarqube.ws.client.WsResponse; import org.sonarqube.ws.client.measures.ComponentRequest; +import util.ItUtils; import static com.codeborne.selenide.Condition.hasText; import static com.codeborne.selenide.Selenide.$; import static java.lang.Integer.parseInt; import static java.util.Collections.singletonList; import static org.assertj.core.api.Assertions.assertThat; -import static util.ItUtils.newOrchestratorBuilder; +import static util.ItUtils.newOrchestrator; public class UpgradeTest { @@ -156,7 +157,7 @@ public class UpgradeTest { } private void startAndUpgradeDevServer() { - orchestrator = newOrchestratorBuilder( + orchestrator = ItUtils.newOrchestrator( builder -> builder .setOrchestratorProperty("orchestrator.keepDatabase", "true") .keepBundledPlugins() diff --git a/tests/src/test/java/org/sonarqube/tests/user/HttpHeadersAuthenticationTest.java b/tests/src/test/java/org/sonarqube/tests/user/HttpHeadersAuthenticationTest.java index 61659c545d5..30032d53f2e 100644 --- a/tests/src/test/java/org/sonarqube/tests/user/HttpHeadersAuthenticationTest.java +++ b/tests/src/test/java/org/sonarqube/tests/user/HttpHeadersAuthenticationTest.java @@ -33,6 +33,7 @@ import org.sonarqube.ws.UserGroups.Group; import org.sonarqube.ws.Users.CreateWsResponse.User; import org.sonarqube.ws.Users.SearchWsResponse; import org.sonarqube.ws.client.users.SearchRequest; +import util.ItUtils; import static java.lang.String.format; import static java.nio.charset.StandardCharsets.UTF_8; @@ -40,7 +41,7 @@ import static java.util.Arrays.asList; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.groups.Tuple.tuple; import static util.ItUtils.call; -import static util.ItUtils.newOrchestratorBuilder; +import static util.ItUtils.newOrchestrator; /** * Test authentication using HTTP headers. @@ -55,7 +56,7 @@ public class HttpHeadersAuthenticationTest { private static final String GROUPS_HEADER = "H-Groups"; @ClassRule - public static final Orchestrator orchestrator = newOrchestratorBuilder( + public static final Orchestrator orchestrator = ItUtils.newOrchestrator( builder -> builder .setServerProperty("sonar.web.sso.enable", "true") .setServerProperty("sonar.web.sso.loginHeader", LOGIN_HEADER) diff --git a/tests/src/test/java/org/sonarqube/tests/user/OnboardingTest.java b/tests/src/test/java/org/sonarqube/tests/user/OnboardingTest.java index 515f813f2de..a93681186bf 100644 --- a/tests/src/test/java/org/sonarqube/tests/user/OnboardingTest.java +++ b/tests/src/test/java/org/sonarqube/tests/user/OnboardingTest.java @@ -30,14 +30,14 @@ import org.sonarqube.ws.client.users.DeactivateRequest; import util.ItUtils; import static org.assertj.core.api.Assertions.assertThat; -import static util.ItUtils.newOrchestratorBuilder; +import static util.ItUtils.newOrchestrator; public class OnboardingTest { private static final String ONBOARDING_TUTORIAL_SHOW_TO_NEW_USERS = "sonar.onboardingTutorial.showToNewUsers"; @ClassRule - public static final Orchestrator orchestrator = newOrchestratorBuilder(); + public static final Orchestrator orchestrator = ItUtils.newOrchestrator(); @Rule public Tester tester = new Tester(orchestrator).disableOrganizations(); diff --git a/tests/src/test/java/org/sonarqube/tests/user/RealmAuthenticationTest.java b/tests/src/test/java/org/sonarqube/tests/user/RealmAuthenticationTest.java index 45f5c23eb97..b1e64b15b4e 100644 --- a/tests/src/test/java/org/sonarqube/tests/user/RealmAuthenticationTest.java +++ b/tests/src/test/java/org/sonarqube/tests/user/RealmAuthenticationTest.java @@ -38,12 +38,13 @@ import org.sonarqube.ws.Users; import org.sonarqube.ws.Users.SearchWsResponse.User; import org.sonarqube.ws.client.users.ChangePasswordRequest; import org.sonarqube.ws.client.users.SearchRequest; +import util.ItUtils; import static java.util.Arrays.asList; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.groups.Tuple.tuple; import static util.ItUtils.expectHttpError; -import static util.ItUtils.newOrchestratorBuilder; +import static util.ItUtils.newOrchestrator; import static util.ItUtils.pluginArtifact; /** @@ -57,7 +58,7 @@ public class RealmAuthenticationTest { public ExpectedException thrown = ExpectedException.none(); @ClassRule - public static final Orchestrator orchestrator = newOrchestratorBuilder( + public static final Orchestrator orchestrator = ItUtils.newOrchestrator( builder -> builder .addPlugin(pluginArtifact("security-plugin")) .setServerProperty("sonar.security.realm", "FakeRealm")); diff --git a/tests/src/test/java/org/sonarqube/tests/user/SonarCloudUserSuite.java b/tests/src/test/java/org/sonarqube/tests/user/SonarCloudUserSuite.java index 45c3e1436cd..a8ffc366be2 100644 --- a/tests/src/test/java/org/sonarqube/tests/user/SonarCloudUserSuite.java +++ b/tests/src/test/java/org/sonarqube/tests/user/SonarCloudUserSuite.java @@ -24,8 +24,9 @@ import com.sonar.orchestrator.Orchestrator; import org.junit.ClassRule; import org.junit.runner.RunWith; import org.junit.runners.Suite; +import util.ItUtils; -import static util.ItUtils.newOrchestratorBuilder; +import static util.ItUtils.newOrchestrator; import static util.ItUtils.pluginArtifact; import static util.ItUtils.xooPlugin; @@ -40,7 +41,7 @@ import static util.ItUtils.xooPlugin; public class SonarCloudUserSuite { @ClassRule - public static final Orchestrator ORCHESTRATOR = newOrchestratorBuilder( + public static final Orchestrator ORCHESTRATOR = ItUtils.newOrchestrator( builder -> builder .addPlugin(xooPlugin()) diff --git a/tests/src/test/java/org/sonarqube/tests/user/UserEsResilienceTest.java b/tests/src/test/java/org/sonarqube/tests/user/UserEsResilienceTest.java index c0205324ebf..b36ed86d373 100644 --- a/tests/src/test/java/org/sonarqube/tests/user/UserEsResilienceTest.java +++ b/tests/src/test/java/org/sonarqube/tests/user/UserEsResilienceTest.java @@ -39,7 +39,7 @@ import util.ItUtils; import static org.assertj.core.api.Assertions.assertThat; import static org.sonarqube.tests.Byteman.Process.WEB; import static util.ItUtils.expectHttpError; -import static util.ItUtils.newOrchestratorBuilder; +import static util.ItUtils.newOrchestrator; public class UserEsResilienceTest { @@ -49,7 +49,7 @@ public class UserEsResilienceTest { static { byteman = new Byteman(); - orchestrator = newOrchestratorBuilder( + orchestrator = ItUtils.newOrchestrator( builder -> { byteman.install(builder, WEB); builder diff --git a/tests/src/test/java/org/sonarqube/tests/user/UserSuite.java b/tests/src/test/java/org/sonarqube/tests/user/UserSuite.java index 8e07ffe8404..502aaafdf28 100644 --- a/tests/src/test/java/org/sonarqube/tests/user/UserSuite.java +++ b/tests/src/test/java/org/sonarqube/tests/user/UserSuite.java @@ -24,8 +24,9 @@ import com.sonar.orchestrator.Orchestrator; import org.junit.ClassRule; import org.junit.runner.RunWith; import org.junit.runners.Suite; +import util.ItUtils; -import static util.ItUtils.newOrchestratorBuilder; +import static util.ItUtils.newOrchestrator; import static util.ItUtils.pluginArtifact; import static util.ItUtils.xooPlugin; @@ -46,7 +47,7 @@ import static util.ItUtils.xooPlugin; public class UserSuite { @ClassRule - public static final Orchestrator ORCHESTRATOR = newOrchestratorBuilder( + public static final Orchestrator ORCHESTRATOR = ItUtils.newOrchestrator( builder -> builder .addPlugin(xooPlugin()) diff --git a/tests/src/test/java/org/sonarqube/tests/webhook/WebhooksSuite.java b/tests/src/test/java/org/sonarqube/tests/webhook/WebhooksSuite.java index ae1048dc5eb..f99ccf9ab50 100644 --- a/tests/src/test/java/org/sonarqube/tests/webhook/WebhooksSuite.java +++ b/tests/src/test/java/org/sonarqube/tests/webhook/WebhooksSuite.java @@ -23,8 +23,9 @@ import com.sonar.orchestrator.Orchestrator; import org.junit.ClassRule; import org.junit.runner.RunWith; import org.junit.runners.Suite; +import util.ItUtils; -import static util.ItUtils.newOrchestratorBuilder; +import static util.ItUtils.newOrchestrator; import static util.ItUtils.xooPlugin; @RunWith(Suite.class) @@ -35,7 +36,7 @@ import static util.ItUtils.xooPlugin; public class WebhooksSuite { @ClassRule - public static final Orchestrator ORCHESTRATOR = newOrchestratorBuilder( + public static final Orchestrator ORCHESTRATOR = ItUtils.newOrchestrator( builder -> builder .addPlugin(xooPlugin()) diff --git a/tests/src/test/java/util/ItUtils.java b/tests/src/test/java/util/ItUtils.java index 6daaeefcfd6..926db82c684 100644 --- a/tests/src/test/java/util/ItUtils.java +++ b/tests/src/test/java/util/ItUtils.java @@ -100,16 +100,16 @@ public class ItUtils { private ItUtils() { } - public static Orchestrator newOrchestratorBuilder() { - return newOrchestratorBuilder(t -> {}, server -> {}); + public static Orchestrator newOrchestrator() { + return newOrchestrator(t -> {}, server -> {}); } - public static Orchestrator newOrchestratorBuilder(Consumer beforeInstall) { - return newOrchestratorBuilder(beforeInstall, server -> { + public static Orchestrator newOrchestrator(Consumer beforeInstall) { + return newOrchestrator(beforeInstall, server -> { }); } - public static Orchestrator newOrchestratorBuilder(Consumer beforeInstall, Consumer afterInstall) { + public static Orchestrator newOrchestrator(Consumer beforeInstall, Consumer afterInstall) { OrchestratorBuilder builder = Orchestrator.builderEnv() .setEdition(COMMUNITY) // reduce memory for Elasticsearch