Skip to content

Commit e36b662

Browse files
renovate[bot]zglicz
renovate[bot]
and
zglicz
authored
Update dependency com.sonarsource.scanner.integrationtester:sonar-scanner-integration-tester to v0.3.0.201 (#5849)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Michal Zgliczynski <mzglicz@gmail.com>
1 parent def8694 commit e36b662

24 files changed

Lines changed: 259 additions & 397 deletions

‎its/plugin/fast-tests/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<dependency>
3333
<groupId>com.sonarsource.scanner.integrationtester</groupId>
3434
<artifactId>sonar-scanner-integration-tester</artifactId>
35-
<version>0.2.0.166</version>
35+
<version>0.4.0.215</version>
3636
<scope>test</scope>
3737
</dependency>
3838
<dependency>

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

Lines changed: 12 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -16,61 +16,39 @@
1616
*/
1717
package com.sonar.javascript.it.plugin;
1818

19-
import static com.sonarsource.scanner.integrationtester.utility.QualityProfileLoader.loadActiveRulesFromXmlProfile;
2019
import static org.assertj.core.api.Assertions.assertThat;
2120

22-
import com.sonarsource.scanner.integrationtester.dsl.EngineVersion;
21+
import com.sonar.orchestrator.locator.FileLocation;
2322
import com.sonarsource.scanner.integrationtester.dsl.Log;
2423
import com.sonarsource.scanner.integrationtester.dsl.ScannerInput;
2524
import com.sonarsource.scanner.integrationtester.dsl.SonarServerContext;
2625
import com.sonarsource.scanner.integrationtester.runner.ScannerRunner;
2726
import java.io.File;
2827
import java.nio.file.Path;
28+
import java.util.List;
2929
import org.junit.jupiter.api.Test;
3030
import org.sonar.plugins.javascript.JavaScriptLanguage;
3131
import org.sonar.plugins.javascript.TypeScriptLanguage;
32-
import shadow.com.sonar.orchestrator.locator.FileLocation;
3332

3433
class ConsumerPluginTest {
3534

3635
private static final String PLUGIN_ARTIFACT_ID = "consumer-plugin";
3736

38-
private static final SonarServerContext SERVER_CONTEXT = SonarServerContext.builder()
39-
.withProduct(SonarServerContext.Product.SERVER)
40-
.withEngineVersion(EngineVersion.latestMasterBuild())
41-
.withPlugin(SonarScannerIntegrationHelper.getJavascriptPlugin())
42-
.withPlugin(
37+
private static final SonarServerContext SERVER_CONTEXT = SonarScannerIntegrationHelper.getContext(
38+
List.of(JavaScriptLanguage.KEY, TypeScriptLanguage.KEY),
39+
List.of(
40+
SonarScannerIntegrationHelper.getJavascriptPlugin(),
4341
FileLocation.byWildcardMavenFilename(
4442
new File("../plugins/" + PLUGIN_ARTIFACT_ID + "/target"),
4543
PLUGIN_ARTIFACT_ID + "-*.jar"
4644
)
45+
),
46+
List.of(
47+
Path.of("src", "test", "resources", "profile-javascript-custom-rules.xml"),
48+
Path.of("src", "test", "resources", "profile-typescript-custom-rules.xml"),
49+
Path.of("src", "test", "resources", "nosonar.xml")
4750
)
48-
.withLanguage(
49-
JavaScriptLanguage.KEY,
50-
"JAVASCRIPT",
51-
JavaScriptLanguage.FILE_SUFFIXES_KEY,
52-
JavaScriptLanguage.DEFAULT_FILE_SUFFIXES
53-
)
54-
.withLanguage(
55-
TypeScriptLanguage.KEY,
56-
"TYPESCRIPT",
57-
TypeScriptLanguage.FILE_SUFFIXES_KEY,
58-
TypeScriptLanguage.DEFAULT_FILE_SUFFIXES
59-
)
60-
.withActiveRules(
61-
loadActiveRulesFromXmlProfile(
62-
Path.of("src", "test", "resources", "profile-javascript-custom-rules.xml")
63-
)
64-
)
65-
.withActiveRules(
66-
loadActiveRulesFromXmlProfile(
67-
Path.of("src", "test", "resources", "profile-typescript-custom-rules.xml")
68-
)
69-
)
70-
.withActiveRules(
71-
loadActiveRulesFromXmlProfile(Path.of("src", "test", "resources", "nosonar.xml"))
72-
)
73-
.build();
51+
);
7452

7553
@Test
7654
void test() {

‎its/plugin/fast-tests/src/test/java/com/sonar/javascript/it/plugin/CssIssuesTest.java‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import com.sonarsource.scanner.integrationtester.dsl.ScannerInput;
2525
import com.sonarsource.scanner.integrationtester.dsl.ScannerOutputReader;
2626
import com.sonarsource.scanner.integrationtester.dsl.ScannerResult;
27+
import com.sonarsource.scanner.integrationtester.dsl.SonarProjectContext;
2728
import com.sonarsource.scanner.integrationtester.dsl.SonarServerContext;
2829
import com.sonarsource.scanner.integrationtester.runner.ScannerRunner;
2930
import java.nio.file.Path;
@@ -51,7 +52,11 @@ class CssIssuesTest {
5152
JavaScriptLanguage.DEFAULT_FILE_SUFFIXES
5253
)
5354
.withPlugin(SonarScannerIntegrationHelper.getJavascriptPlugin())
54-
.withActiveRules(SonarScannerIntegrationHelper.getAllCSSRules())
55+
.withProjectContext(
56+
SonarProjectContext.builder()
57+
.withActiveRules(SonarScannerIntegrationHelper.getAllCSSRules())
58+
.build()
59+
)
5560
.build();
5661

5762
@Test

‎its/plugin/fast-tests/src/test/java/com/sonar/javascript/it/plugin/CssNoCssFileProjectTest.java‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@
1616
*/
1717
package com.sonar.javascript.it.plugin;
1818

19-
import static com.sonar.javascript.it.plugin.SonarScannerIntegrationHelper.getAllCSSRules;
2019
import static org.assertj.core.api.Assertions.assertThat;
2120
import static org.assertj.core.api.Assertions.tuple;
2221

2322
import com.sonarsource.scanner.integrationtester.dsl.EngineVersion;
2423
import com.sonarsource.scanner.integrationtester.dsl.ScannerInput;
2524
import com.sonarsource.scanner.integrationtester.dsl.ScannerOutputReader;
25+
import com.sonarsource.scanner.integrationtester.dsl.SonarProjectContext;
2626
import com.sonarsource.scanner.integrationtester.dsl.SonarServerContext;
2727
import com.sonarsource.scanner.integrationtester.runner.ScannerRunner;
2828
import org.junit.jupiter.api.Test;
@@ -36,7 +36,11 @@ class CssNoCssFileProjectTest {
3636
.withEngineVersion(EngineVersion.latestRelease())
3737
.withLanguage("web", "HTML", "sonar.html.file.suffixes", ".html")
3838
.withPlugin(SonarScannerIntegrationHelper.getJavascriptPlugin())
39-
.withActiveRules(getAllCSSRules())
39+
.withProjectContext(
40+
SonarProjectContext.builder()
41+
.withActiveRules(SonarScannerIntegrationHelper.getAllCSSRules())
42+
.build()
43+
)
4044
.build();
4145

4246
@Test

‎its/plugin/fast-tests/src/test/java/com/sonar/javascript/it/plugin/CssNonStandardPathTest.java‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import com.sonarsource.scanner.integrationtester.dsl.EngineVersion;
2323
import com.sonarsource.scanner.integrationtester.dsl.ScannerInput;
2424
import com.sonarsource.scanner.integrationtester.dsl.ScannerOutputReader;
25+
import com.sonarsource.scanner.integrationtester.dsl.SonarProjectContext;
2526
import com.sonarsource.scanner.integrationtester.dsl.SonarServerContext;
2627
import com.sonarsource.scanner.integrationtester.runner.ScannerRunner;
2728
import org.junit.jupiter.api.Test;
@@ -41,7 +42,11 @@ class CssNonStandardPathTest {
4142
CssLanguage.DEFAULT_FILE_SUFFIXES
4243
)
4344
.withPlugin(SonarScannerIntegrationHelper.getJavascriptPlugin())
44-
.withActiveRules(SonarScannerIntegrationHelper.getAllCSSRules())
45+
.withProjectContext(
46+
SonarProjectContext.builder()
47+
.withActiveRules(SonarScannerIntegrationHelper.getAllCSSRules())
48+
.build()
49+
)
4550
.build();
4651

4752
@Test

‎its/plugin/fast-tests/src/test/java/com/sonar/javascript/it/plugin/CssStylelintReportTest.java‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import com.sonarsource.scanner.integrationtester.dsl.EngineVersion;
2222
import com.sonarsource.scanner.integrationtester.dsl.ScannerInput;
2323
import com.sonarsource.scanner.integrationtester.dsl.ScannerOutputReader;
24+
import com.sonarsource.scanner.integrationtester.dsl.SonarProjectContext;
2425
import com.sonarsource.scanner.integrationtester.dsl.SonarServerContext;
2526
import com.sonarsource.scanner.integrationtester.runner.ScannerRunner;
2627
import org.junit.jupiter.api.Test;
@@ -40,7 +41,11 @@ class CssStylelintReportTest {
4041
CssLanguage.DEFAULT_FILE_SUFFIXES
4142
)
4243
.withPlugin(SonarScannerIntegrationHelper.getJavascriptPlugin())
43-
.withActiveRules(SonarScannerIntegrationHelper.getAllCSSRules())
44+
.withProjectContext(
45+
SonarProjectContext.builder()
46+
.withActiveRules(SonarScannerIntegrationHelper.getAllCSSRules())
47+
.build()
48+
)
4449
.build();
4550

4651
@Test

‎its/plugin/fast-tests/src/test/java/com/sonar/javascript/it/plugin/ECMAScriptModulesTest.java‎

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -16,35 +16,25 @@
1616
*/
1717
package com.sonar.javascript.it.plugin;
1818

19-
import static com.sonarsource.scanner.integrationtester.utility.QualityProfileLoader.loadActiveRulesFromXmlProfile;
2019
import static org.assertj.core.api.Assertions.assertThat;
2120

22-
import com.sonarsource.scanner.integrationtester.dsl.EngineVersion;
2321
import com.sonarsource.scanner.integrationtester.dsl.ScannerInput;
2422
import com.sonarsource.scanner.integrationtester.dsl.ScannerOutputReader;
2523
import com.sonarsource.scanner.integrationtester.dsl.SonarServerContext;
2624
import com.sonarsource.scanner.integrationtester.runner.ScannerRunner;
2725
import java.nio.file.Path;
26+
import java.util.List;
2827
import org.assertj.core.api.Assertions;
2928
import org.junit.jupiter.api.Test;
3029
import org.sonar.plugins.javascript.JavaScriptLanguage;
3130

3231
class ECMAScriptModulesTest {
3332

34-
private static final SonarServerContext SERVER_CONTEXT = SonarServerContext.builder()
35-
.withProduct(SonarServerContext.Product.SERVER)
36-
.withEngineVersion(EngineVersion.latestMasterBuild())
37-
.withPlugin(SonarScannerIntegrationHelper.getJavascriptPlugin())
38-
.withLanguage(
39-
JavaScriptLanguage.KEY,
40-
"JAVASCRIPT",
41-
JavaScriptLanguage.FILE_SUFFIXES_KEY,
42-
JavaScriptLanguage.DEFAULT_FILE_SUFFIXES
43-
)
44-
.withActiveRules(
45-
loadActiveRulesFromXmlProfile(Path.of("src", "test", "resources", "eslint-based-rules.xml"))
46-
)
47-
.build();
33+
private static final SonarServerContext SERVER_CONTEXT = SonarScannerIntegrationHelper.getContext(
34+
List.of(JavaScriptLanguage.KEY),
35+
List.of(SonarScannerIntegrationHelper.getJavascriptPlugin()),
36+
List.of(Path.of("src", "test", "resources", "eslint-based-rules.xml"))
37+
);
4838

4939
@Test
5040
void test() {

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

Lines changed: 8 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -16,44 +16,33 @@
1616
*/
1717
package com.sonar.javascript.it.plugin;
1818

19-
import static com.sonarsource.scanner.integrationtester.utility.QualityProfileLoader.loadActiveRulesFromXmlProfile;
2019
import static org.assertj.core.api.Assertions.assertThat;
2120

22-
import com.sonarsource.scanner.integrationtester.dsl.EngineVersion;
21+
import com.sonar.orchestrator.locator.FileLocation;
2322
import com.sonarsource.scanner.integrationtester.dsl.Log;
2423
import com.sonarsource.scanner.integrationtester.dsl.ScannerInput;
2524
import com.sonarsource.scanner.integrationtester.dsl.SonarServerContext;
2625
import com.sonarsource.scanner.integrationtester.runner.ScannerRunner;
2726
import java.io.File;
2827
import java.nio.file.Files;
2928
import java.nio.file.Path;
29+
import java.util.List;
3030
import java.util.Locale;
31-
import org.assertj.core.api.Assertions;
3231
import org.junit.jupiter.api.Test;
3332
import org.sonar.plugins.javascript.JavaScriptLanguage;
34-
import shadow.com.sonar.orchestrator.locator.FileLocation;
3533

3634
class EmbeddedNodeTest {
3735

38-
private static final SonarServerContext SERVER_CONTEXT = SonarServerContext.builder()
39-
.withProduct(SonarServerContext.Product.SERVER)
40-
.withEngineVersion(EngineVersion.latestMasterBuild())
41-
.withPlugin(
36+
private static final SonarServerContext SERVER_CONTEXT = SonarScannerIntegrationHelper.getContext(
37+
List.of(JavaScriptLanguage.KEY),
38+
List.of(
4239
FileLocation.byWildcardMavenFilename(
4340
new File("../../../sonar-plugin/sonar-javascript-plugin/target"),
4441
"sonar-javascript-plugin-*" + classifier() + ".jar"
4542
)
46-
)
47-
.withLanguage(
48-
JavaScriptLanguage.KEY,
49-
"JAVASCRIPT",
50-
JavaScriptLanguage.FILE_SUFFIXES_KEY,
51-
JavaScriptLanguage.DEFAULT_FILE_SUFFIXES
52-
)
53-
.withActiveRules(
54-
loadActiveRulesFromXmlProfile(Path.of("src", "test", "resources", "eslint-based-rules.xml"))
55-
)
56-
.build();
43+
),
44+
List.of(Path.of("src", "test", "resources", "eslint-based-rules.xml"))
45+
);
5746

5847
@Test
5948
void embedded_node() {

‎its/plugin/fast-tests/src/test/java/com/sonar/javascript/it/plugin/EslintBasedRulesTest.java‎

Lines changed: 13 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -17,58 +17,37 @@
1717
package com.sonar.javascript.it.plugin;
1818

1919
import static com.sonarsource.scanner.integrationtester.utility.QualityProfileLoader.loadActiveRulesFromXmlProfile;
20-
import static java.util.Collections.emptySet;
21-
import static java.util.Collections.singletonList;
2220
import static org.assertj.core.api.Assertions.assertThat;
2321
import static org.assertj.core.api.Assertions.tuple;
2422

2523
import com.sonarsource.scanner.integrationtester.dsl.EngineVersion;
2624
import com.sonarsource.scanner.integrationtester.dsl.Log;
2725
import com.sonarsource.scanner.integrationtester.dsl.ScannerInput;
2826
import com.sonarsource.scanner.integrationtester.dsl.ScannerOutputReader;
27+
import com.sonarsource.scanner.integrationtester.dsl.SonarProjectContext;
2928
import com.sonarsource.scanner.integrationtester.dsl.SonarServerContext;
3029
import com.sonarsource.scanner.integrationtester.runner.ScannerRunner;
31-
import java.io.File;
32-
import java.io.IOException;
3330
import java.nio.file.Files;
3431
import java.nio.file.Path;
3532
import java.nio.file.Paths;
3633
import java.nio.file.StandardCopyOption;
3734
import java.util.List;
3835
import java.util.regex.Pattern;
3936
import org.assertj.core.api.Assertions;
40-
import org.junit.jupiter.api.BeforeAll;
4137
import org.junit.jupiter.api.Test;
4238
import org.sonar.plugins.javascript.JavaScriptLanguage;
4339
import org.sonar.plugins.javascript.TypeScriptLanguage;
4440

4541
class EslintBasedRulesTest {
4642

47-
private static final SonarServerContext SERVER_CONTEXT = SonarServerContext.builder()
48-
.withProduct(SonarServerContext.Product.SERVER)
49-
.withEngineVersion(EngineVersion.latestMasterBuild())
50-
.withPlugin(SonarScannerIntegrationHelper.getJavascriptPlugin())
51-
.withLanguage(
52-
JavaScriptLanguage.KEY,
53-
"JAVASCRIPT",
54-
JavaScriptLanguage.FILE_SUFFIXES_KEY,
55-
JavaScriptLanguage.DEFAULT_FILE_SUFFIXES
43+
private static final SonarServerContext SERVER_CONTEXT = SonarScannerIntegrationHelper.getContext(
44+
List.of(JavaScriptLanguage.KEY, TypeScriptLanguage.KEY),
45+
List.of(SonarScannerIntegrationHelper.getJavascriptPlugin()),
46+
List.of(
47+
Path.of("src", "test", "resources", "eslint-based-rules.xml"),
48+
Path.of("src", "test", "resources", "ts-eslint-based-rules.xml")
5649
)
57-
.withLanguage(
58-
TypeScriptLanguage.KEY,
59-
"TYPESCRIPT",
60-
TypeScriptLanguage.FILE_SUFFIXES_KEY,
61-
TypeScriptLanguage.DEFAULT_FILE_SUFFIXES
62-
)
63-
.withActiveRules(
64-
loadActiveRulesFromXmlProfile(Path.of("src", "test", "resources", "eslint-based-rules.xml"))
65-
)
66-
.withActiveRules(
67-
loadActiveRulesFromXmlProfile(
68-
Path.of("src", "test", "resources", "ts-eslint-based-rules.xml")
69-
)
70-
)
71-
.build();
50+
);
7251

7352
@Test
7453
void test_without_ts() {
@@ -354,7 +333,11 @@ private SonarServerContext getServerContext(String xml) {
354333
TypeScriptLanguage.FILE_SUFFIXES_KEY,
355334
TypeScriptLanguage.DEFAULT_FILE_SUFFIXES
356335
)
357-
.withActiveRules(loadActiveRulesFromXmlProfile(Path.of("src", "test", "resources", xml)))
336+
.withProjectContext(
337+
SonarProjectContext.builder()
338+
.withActiveRules(loadActiveRulesFromXmlProfile(Path.of("src", "test", "resources", xml)))
339+
.build()
340+
)
358341
.build();
359342
}
360343
}

0 commit comments

Comments
 (0)