Skip to content

Commit 313a19c

Browse files
authored
SONARPHP-1669 Use lightweight Enterprise SQ edition in integration tests (#1414)
1 parent b2d8fa8 commit 313a19c

File tree

3 files changed

+7
-13
lines changed

3 files changed

+7
-13
lines changed

its/plugin/src/integrationTest/java/com/sonar/it/php/Tests.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import com.sonar.orchestrator.Orchestrator;
2020
import com.sonar.orchestrator.build.BuildResult;
2121
import com.sonar.orchestrator.build.SonarScanner;
22+
import com.sonar.orchestrator.container.Edition;
2223
import com.sonar.orchestrator.container.Server;
2324
import com.sonar.orchestrator.junit5.OrchestratorExtension;
2425
import com.sonar.orchestrator.locator.FileLocation;
@@ -65,6 +66,8 @@ class Tests {
6566
public static final OrchestratorExtension ORCHESTRATOR = OrchestratorExtension.builderEnv()
6667
.useDefaultAdminCredentialsForBuilds(true)
6768
.setSonarVersion(System.getProperty("sonar.runtimeVersion", "LATEST_RELEASE"))
69+
.setEdition(Edition.ENTERPRISE_LW)
70+
.activateLicense()
6871
// PHP Plugin
6972
.addPlugin(PHP_PLUGIN_LOCATION)
7073
.restoreProfileAtStartup(FileLocation.ofClasspath(RESOURCE_DIRECTORY + "profile.xml"))

its/ruling/src/integrationTest/java/org/sonar/php/it/PhpPrAnalysisTest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import com.sonar.orchestrator.Orchestrator;
2020
import com.sonar.orchestrator.build.BuildResult;
2121
import com.sonar.orchestrator.build.SonarScanner;
22-
import com.sonar.orchestrator.container.Edition;
2322
import com.sonar.orchestrator.locator.FileLocation;
2423
import java.io.File;
2524
import java.io.IOException;
@@ -42,7 +41,7 @@
4241
public class PhpPrAnalysisTest {
4342

4443
@RegisterExtension
45-
public static final Orchestrator ORCHESTRATOR = RulingHelper.getOrchestrator(Edition.DEVELOPER);
44+
public static final Orchestrator ORCHESTRATOR = RulingHelper.getOrchestrator();
4645

4746
private static final String PROJECT_KEY = "prAnalysis";
4847

its/ruling/src/integrationTest/java/org/sonar/php/it/RulingHelper.java

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -42,25 +42,17 @@ public class RulingHelper {
4242
private static final Pattern CODE_LINE_LOG_LINE_PATTERN = Pattern.compile("\\s*\\d+: .*");
4343
private static final Pattern CODE_POINTER_LOG_LINE_PATTERN = Pattern.compile("\\s*\\^+");
4444

45-
static OrchestratorExtension getOrchestrator(Edition sonarEdition) {
45+
static OrchestratorExtension getOrchestrator() {
4646
OrchestratorBuilder<OrchestratorExtensionBuilder, OrchestratorExtension> builder = OrchestratorExtension.builderEnv()
4747
.useDefaultAdminCredentialsForBuilds(true)
4848
.setSonarVersion(System.getProperty(SQ_VERSION_PROPERTY, DEFAULT_SQ_VERSION))
49-
.setEdition(sonarEdition)
49+
.setEdition(Edition.ENTERPRISE_LW)
50+
.activateLicense()
5051
.addPlugin(FileLocation.byWildcardFilename(new File("../../sonar-php-plugin/build/libs"), "sonar-php-plugin-*-all.jar"))
5152
.addPlugin(MavenLocation.of("org.sonarsource.sonar-lits-plugin", "sonar-lits-plugin", "0.11.0.2659"));
52-
53-
if (sonarEdition != Edition.COMMUNITY) {
54-
builder.activateLicense();
55-
}
56-
5753
return builder.build();
5854
}
5955

60-
static OrchestratorExtension getOrchestrator() {
61-
return getOrchestrator(Edition.COMMUNITY);
62-
}
63-
6456
static SonarScanner prepareScanner(File path, String projectKey, String expectedIssueLocation, File litsDifferencesFile, String... keyValueProperties) {
6557
var sonarScanner = SonarScanner.create(path, keyValueProperties)
6658
.setProperty("sonar.scanner.skipJreProvisioning", "true")

0 commit comments

Comments
 (0)