Skip to content

Commit 6223e3f

Browse files
GodinGodin
authored
JS-744 Use lightweight Enterprise SQ edition in integration tests (#5388)
1 parent 1d9bb4f commit 6223e3f

11 files changed

Lines changed: 27 additions & 4 deletions

File tree

‎its/plugin/tests/src/test/java/com/sonar/javascript/it/plugin/ConsumerPluginTest.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import com.sonar.orchestrator.Orchestrator;
2323
import com.sonar.orchestrator.build.BuildResult;
2424
import com.sonar.orchestrator.build.SonarScanner;
25+
import com.sonar.orchestrator.container.Edition;
2526
import com.sonar.orchestrator.junit5.OrchestratorExtension;
2627
import com.sonar.orchestrator.locator.FileLocation;
2728
import java.io.File;
@@ -48,6 +49,8 @@ public static void after() {
4849
static OrchestratorExtension initOrchestrator(String customRulesArtifactId) {
4950
var orchestrator = OrchestratorExtension.builderEnv()
5051
.useDefaultAdminCredentialsForBuilds(true)
52+
.setEdition(Edition.ENTERPRISE_LW)
53+
.activateLicense()
5154
.setSonarVersion(System.getProperty("sonar.runtimeVersion", "LATEST_RELEASE"))
5255
.addPlugin(JAVASCRIPT_PLUGIN_LOCATION)
5356
.restoreProfileAtStartup(FileLocation.ofClasspath("/empty-js-profile.xml"))

‎its/plugin/tests/src/test/java/com/sonar/javascript/it/plugin/EmbeddedNodeTest.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import static com.sonar.javascript.it.plugin.OrchestratorStarter.getSonarScanner;
2020
import static org.assertj.core.api.Assertions.assertThat;
2121

22+
import com.sonar.orchestrator.container.Edition;
2223
import com.sonar.orchestrator.junit5.OrchestratorExtension;
2324
import com.sonar.orchestrator.locator.FileLocation;
2425
import java.io.File;
@@ -40,6 +41,8 @@ void embedded_node() {
4041

4142
var orchestrator = OrchestratorExtension.builderEnv()
4243
.useDefaultAdminCredentialsForBuilds(true)
44+
.setEdition(Edition.ENTERPRISE_LW)
45+
.activateLicense()
4346
.setSonarVersion(System.getProperty("sonar.runtimeVersion", "LATEST_RELEASE"))
4447
.restoreProfileAtStartup(FileLocation.ofClasspath("/eslint-based-rules.xml"))
4548
.addPlugin(plugin)

‎its/plugin/tests/src/test/java/com/sonar/javascript/it/plugin/EslintCustomRulesTest.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import com.sonar.orchestrator.Orchestrator;
2323
import com.sonar.orchestrator.build.BuildResult;
2424
import com.sonar.orchestrator.build.SonarScanner;
25+
import com.sonar.orchestrator.container.Edition;
2526
import com.sonar.orchestrator.junit5.OrchestratorExtension;
2627
import com.sonar.orchestrator.locator.FileLocation;
2728
import java.io.File;
@@ -53,6 +54,8 @@ public static void after() {
5354
static OrchestratorExtension initOrchestrator(String customRulesArtifactId) {
5455
var orchestrator = OrchestratorExtension.builderEnv()
5556
.useDefaultAdminCredentialsForBuilds(true)
57+
.setEdition(Edition.ENTERPRISE_LW)
58+
.activateLicense()
5659
.setSonarVersion(System.getProperty("sonar.runtimeVersion", "LATEST_RELEASE"))
5760
.addPlugin(JAVASCRIPT_PLUGIN_LOCATION)
5861
.restoreProfileAtStartup(FileLocation.ofClasspath("/empty-js-profile.xml"))

‎its/plugin/tests/src/test/java/com/sonar/javascript/it/plugin/EslintReportTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,9 @@ private void createReportWithAbsolutePaths(
120120
File file = new File(PROJECT_DIR, "src/file." + (s.contains(".js") ? "js" : "ts"));
121121
String absolutePath = file.getAbsolutePath();
122122
if (System.getProperty("os.name").startsWith("Windows")) {
123+
// FIXME https://sonarsource.atlassian.net/browse/JS-747 import of ESLint report with absolute path containing lower-case drive letter does not work for SQ Developer Edition and above
123124
// try to "break" file resolution (see https://github.com/SonarSource/SonarJS/issues/1985) by low-casing drive letter
124-
absolutePath = absolutePath.substring(0, 1).toLowerCase() + absolutePath.substring(1);
125+
//absolutePath = absolutePath.substring(0, 1).toLowerCase() + absolutePath.substring(1);
125126
absolutePath = absolutePath.replace("\\", "\\\\");
126127
}
127128
return prefix + absolutePath + "\",";

‎its/plugin/tests/src/test/java/com/sonar/javascript/it/plugin/HtmlSecurityTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public static void startOrchestrator() {
6767
.useDefaultAdminCredentialsForBuilds(true)
6868
.setSonarVersion(System.getProperty("sonar.runtimeVersion", "LATEST_RELEASE"))
6969
.addPlugin(JAVASCRIPT_PLUGIN_LOCATION)
70-
.setEdition(Edition.DEVELOPER)
70+
.setEdition(Edition.ENTERPRISE_LW)
7171
.activateLicense()
7272
.addPlugin(MavenLocation.of("com.sonarsource.security", "sonar-security-plugin", "DEV"))
7373
.addPlugin(

‎its/plugin/tests/src/test/java/com/sonar/javascript/it/plugin/OrchestratorStarter.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323

2424
import com.sonar.orchestrator.Orchestrator;
2525
import com.sonar.orchestrator.build.SonarScanner;
26+
import com.sonar.orchestrator.container.Edition;
2627
import com.sonar.orchestrator.junit5.OrchestratorExtension;
2728
import com.sonar.orchestrator.locator.FileLocation;
2829
import com.sonar.orchestrator.locator.MavenLocation;
@@ -80,6 +81,8 @@ private static Pattern pluginFilenameMatcher() {
8081

8182
public static final OrchestratorExtension ORCHESTRATOR = OrchestratorExtension.builderEnv()
8283
.useDefaultAdminCredentialsForBuilds(true)
84+
.setEdition(Edition.ENTERPRISE_LW)
85+
.activateLicense()
8386
.setSonarVersion(System.getProperty("sonar.runtimeVersion", "LATEST_RELEASE"))
8487
.addPlugin(MavenLocation.of("org.sonarsource.php", "sonar-php-plugin", "LATEST_RELEASE"))
8588
.addPlugin(MavenLocation.of("org.sonarsource.html", "sonar-html-plugin", "LATEST_RELEASE"))

‎its/plugin/tests/src/test/java/com/sonar/javascript/it/plugin/PRAnalysisTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ public static void startOrchestrator() {
272272
"consumer-plugin-*.jar"
273273
)
274274
)
275-
.setEdition(Edition.DEVELOPER)
275+
.setEdition(Edition.ENTERPRISE_LW)
276276
.activateLicense()
277277
.addPlugin(MavenLocation.of("com.sonarsource.security", "sonar-security-plugin", "DEV"))
278278
.addPlugin(

‎its/plugin/tests/src/test/java/com/sonar/javascript/it/plugin/TypeScriptRuleTest.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import static org.assertj.core.api.Assertions.assertThat;
2323

2424
import com.sonar.orchestrator.build.SonarScanner;
25+
import com.sonar.orchestrator.container.Edition;
2526
import com.sonar.orchestrator.junit5.OrchestratorExtension;
2627
import com.sonar.orchestrator.locator.FileLocation;
2728
import com.sonar.orchestrator.locator.MavenLocation;
@@ -47,6 +48,8 @@ class TypeScriptRuleTest {
4748
public static void before() throws IOException, InterruptedException {
4849
orchestrator = OrchestratorExtension.builderEnv()
4950
.useDefaultAdminCredentialsForBuilds(true)
51+
.setEdition(Edition.ENTERPRISE_LW)
52+
.activateLicense()
5053
.setSonarVersion(System.getProperty("sonar.runtimeVersion", "LATEST_RELEASE"))
5154
.addPlugin(JAVASCRIPT_PLUGIN_LOCATION)
5255
.addPlugin(

‎its/plugin/tests/src/test/java/com/sonar/javascript/it/plugin/YamlSecurityTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public static void startOrchestrator() {
6969
.useDefaultAdminCredentialsForBuilds(true)
7070
.setSonarVersion(System.getProperty("sonar.runtimeVersion", "LATEST_RELEASE"))
7171
.addPlugin(JAVASCRIPT_PLUGIN_LOCATION)
72-
.setEdition(Edition.DEVELOPER)
72+
.setEdition(Edition.ENTERPRISE_LW)
7373
.activateLicense()
7474
.addPlugin(MavenLocation.of("com.sonarsource.security", "sonar-security-plugin", "DEV"))
7575
.addPlugin(

‎its/ruling/src/test/java/org/sonar/javascript/it/CssRulingTest.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import static org.sonar.javascript.it.JsTsRulingTest.LITS_VERSION;
2121

2222
import com.sonar.orchestrator.build.SonarScanner;
23+
import com.sonar.orchestrator.container.Edition;
2324
import com.sonar.orchestrator.junit5.OrchestratorExtension;
2425
import com.sonar.orchestrator.locator.FileLocation;
2526
import com.sonar.orchestrator.locator.MavenLocation;
@@ -41,6 +42,8 @@ class CssRulingTest {
4142
@RegisterExtension
4243
public static final OrchestratorExtension ORCHESTRATOR = OrchestratorExtension.builderEnv()
4344
.useDefaultAdminCredentialsForBuilds(true)
45+
.setEdition(Edition.ENTERPRISE_LW)
46+
.activateLicense()
4447
.setSonarVersion(System.getProperty(SQ_VERSION_PROPERTY, DEFAULT_SQ_VERSION))
4548
.addPlugin(MavenLocation.of("org.sonarsource.php", "sonar-php-plugin", "LATEST_RELEASE"))
4649
.addPlugin(MavenLocation.of("org.sonarsource.html", "sonar-html-plugin", "LATEST_RELEASE"))
@@ -103,6 +106,7 @@ void test() throws Exception {
103106
ORCHESTRATOR.getServer().associateProjectToQualityProfile(PROJECT_KEY, "ts", "rules");
104107
File litsDifferencesFile = FileLocation.of("target/differences").getFile();
105108
SonarScanner build = SonarScanner.create(FileLocation.of("../sources/css").getFile())
109+
.setProperty("sonar.scanner.skipJreProvisioning", "true")
106110
.setProjectKey(PROJECT_KEY)
107111
.setProjectName(PROJECT_KEY)
108112
.setProjectVersion("1")

0 commit comments

Comments
 (0)