Skip to content

Commit 8f52888

Browse files
alban-auzeillalban-auzeill
authored
SCANMAVEN-278 Fix quality flaws (#288)
1 parent 4c796c8 commit 8f52888

File tree

9 files changed

+171
-61
lines changed

9 files changed

+171
-61
lines changed

‎its/src/test/java/com/sonar/maven/it/suite/AbstractMavenTest.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -204,11 +204,11 @@ private static String getSonarVersion() {
204204
return versionProperty != null ? versionProperty : "LATEST_RELEASE";
205205
}
206206

207-
public BuildResult executeBuildAndValidateWithCE(Build<?> build) {
208-
return validateBuildWithCE(ORCHESTRATOR.executeBuild(build));
207+
public BuildResult executeBuildAndAssertWithCE(Build<?> build) {
208+
return assertBuildWithCE(ORCHESTRATOR.executeBuild(build));
209209
}
210210

211-
public BuildResult validateBuildWithCE(BuildResult result) {
211+
public BuildResult assertBuildWithCE(BuildResult result) {
212212
assertBuildResultStatuses(result, 0);
213213
List<String> ceTaskIds = extractCETaskIds(result);
214214
if (ceTaskIds.isEmpty()) {
@@ -220,15 +220,15 @@ public BuildResult validateBuildWithCE(BuildResult result) {
220220
return result;
221221
}
222222

223-
public BuildResult executeBuildAndValidateWithoutCE(Build<?> build) {
224-
return validateBuildWithoutCE(ORCHESTRATOR.executeBuild(build));
223+
public BuildResult executeBuildAndAssertWithoutCE(Build<?> build) {
224+
return assertBuildWithoutCE(ORCHESTRATOR.executeBuild(build));
225225
}
226226

227-
public static BuildResult validateBuildWithoutCE(BuildResult result) {
228-
return validateBuildWithoutCE(result, EXEC_SUCCESS);
227+
public static BuildResult assertBuildWithoutCE(BuildResult result) {
228+
return assertBuildWithoutCE(result, EXEC_SUCCESS);
229229
}
230230

231-
public static BuildResult validateBuildWithoutCE(BuildResult result, int expectedStatus) {
231+
public static BuildResult assertBuildWithoutCE(BuildResult result, int expectedStatus) {
232232
assertBuildResultStatuses(result, expectedStatus);
233233
assertThat(extractCETaskIds(result))
234234
.withFailMessage("The build result contains unexpected CE task ids")

‎its/src/test/java/com/sonar/maven/it/suite/BootstrapTest.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -58,12 +58,12 @@ void test_unsupported_platform() {
5858
.setGoals(cleanSonarGoal());
5959

6060
if (isSonarQubeSupportsJREProvisioning()) {
61-
BuildResult result = validateBuildWithoutCE(runner.runQuietly(null, build), EXEC_FAILED);
61+
BuildResult result = assertBuildWithoutCE(runner.runQuietly(null, build), EXEC_FAILED);
6262
assertThat(result.getLogs())
6363
.contains(String.format("JRE provisioning: os[%s], arch[%s]", unsupportedOS, arch))
6464
.contains("Failed to query JRE metadata");
6565
} else {
66-
validateBuildWithCE(runner.runQuietly(null, build));
66+
assertBuildWithCE(runner.runQuietly(null, build));
6767
}
6868
}
6969

@@ -75,7 +75,7 @@ void test_bootstrapping_with_sonar_skip_in_pom_xml() {
7575
// activate in the pom.xml <properties><sonar.skip>true</sonar.skip></properties>
7676
.addArguments("-Ptest-sonar-skip")
7777
.setGoals(sonarGoal());
78-
BuildResult result = executeBuildAndValidateWithoutCE(build);
78+
BuildResult result = executeBuildAndAssertWithoutCE(build);
7979
assertThat(result.getLogs())
8080
.contains(SKIPPING_ANALYSIS)
8181
.doesNotContain(EFFECTIVE_JRE_PROVISIONING_LOG, COMMUNICATING_WITH_SONARQUBE, STARTING_SCANNER_ENGINE);
@@ -89,7 +89,7 @@ void test_bootstrapping_with_sonar_skip_in_system_property() {
8989
// analyze using: mvn sonar:sonar -Dsonar.skip=true
9090
.setProperty("sonar.skip", "true")
9191
.setGoals(sonarGoal());
92-
BuildResult result = executeBuildAndValidateWithoutCE(build);
92+
BuildResult result = executeBuildAndAssertWithoutCE(build);
9393
assertThat(result.getLogs())
9494
.contains(SKIPPING_ANALYSIS)
9595
.doesNotContain(EFFECTIVE_JRE_PROVISIONING_LOG, COMMUNICATING_WITH_SONARQUBE, STARTING_SCANNER_ENGINE);
@@ -103,7 +103,7 @@ void test_bootstrapping_with_sonar_skip_in_plugin_configuration() {
103103
// activate in the pom.xml <configuration><skip>true</skip></configuration>
104104
.addArguments("-Ptest-plugin-skip")
105105
.setGoals(sonarGoal());
106-
BuildResult result = executeBuildAndValidateWithoutCE(build);
106+
BuildResult result = executeBuildAndAssertWithoutCE(build);
107107
assertThat(result.getLogs())
108108
.contains(SKIPPING_ANALYSIS)
109109
.doesNotContain(EFFECTIVE_JRE_PROVISIONING_LOG, COMMUNICATING_WITH_SONARQUBE, STARTING_SCANNER_ENGINE);
@@ -118,7 +118,7 @@ void test_bootstrapping_that_skip_the_JRE_provisioning() throws IOException {
118118
.setProperty("sonar.scanner.skipJreProvisioning", "true")
119119
.setEnvironmentVariable("DUMP_SYSTEM_PROPERTIES", "java.home")
120120
.setGoals(sonarGoal());
121-
BuildResult result = executeBuildAndValidateWithCE(build);
121+
BuildResult result = executeBuildAndAssertWithCE(build);
122122
assertThat(result.getLogs())
123123
.doesNotContain(EFFECTIVE_JRE_PROVISIONING_LOG);
124124
if (isSonarQubeSupportsJREProvisioning()) {
@@ -141,7 +141,7 @@ void test_bootstrapping_that_use_the_provided_JRE_instead_of_downloading_a_JRE()
141141
.setProperty("sonar.scanner.javaExePath", mvnJavaHome + File.separator + "bin" + File.separator + "java")
142142
.setEnvironmentVariable("DUMP_SYSTEM_PROPERTIES", "java.home")
143143
.setGoals(sonarGoal());
144-
BuildResult result = executeBuildAndValidateWithCE(build);
144+
BuildResult result = executeBuildAndAssertWithCE(build);
145145
assertThat(result.getLogs())
146146
.doesNotContain(EFFECTIVE_JRE_PROVISIONING_LOG, JRE_PROVISIONING_IS_DISABLED);
147147
if (isSonarQubeSupportsJREProvisioning()) {
@@ -191,7 +191,7 @@ void test_supported_arch_to_assert_jre_used() throws IOException {
191191
.setProperty("sonar.scanner.javaOpts", "-Dhttp.proxyUser=my-custom-user-from-system-properties")
192192
.setGoals(cleanSonarGoal());
193193

194-
BuildResult result = validateBuildWithCE(runner.runQuietly(null, build));
194+
BuildResult result = assertBuildWithCE(runner.runQuietly(null, build));
195195
assertThat(result.isSuccess()).isTrue();
196196
Path propertiesFile = ItUtils.locateProjectDir(projectName).toPath().resolve("target/sonar/dumpSensor.system.properties");
197197
Properties props = new Properties();

‎its/src/test/java/com/sonar/maven/it/suite/JavaTest.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ void shouldPopulateLibraries() throws IOException {
4949
MavenBuild build = MavenBuild.create(projectPom)
5050
.setGoals(cleanPackageSonarGoal())
5151
.setProperty("sonar.scanner.internal.dumpToFile", outputProps.getAbsolutePath());
52-
executeBuildAndValidateWithoutCE(build);
52+
executeBuildAndAssertWithoutCE(build);
5353

5454
Properties generatedProps = getProps(outputProps);
5555
String[] moduleIds = generatedProps.getProperty("sonar.modules").split(",");
@@ -76,7 +76,7 @@ void read_default_from_plugins_config() throws Exception {
7676
MavenBuild build = MavenBuild.create(pom)
7777
.setGoals(cleanPackageSonarGoal())
7878
.setProperty("sonar.scanner.internal.dumpToFile", outputProps.getAbsolutePath());
79-
executeBuildAndValidateWithoutCE(build);
79+
executeBuildAndAssertWithoutCE(build);
8080

8181
Properties props = getProps(outputProps);
8282
assertThat(props).contains(
@@ -95,7 +95,7 @@ void setJavaVersionCompilerConfiguration() throws IOException {
9595
MavenBuild build = MavenBuild.create(pom)
9696
.setGoals(cleanPackageSonarGoal())
9797
.setProperty("sonar.scanner.internal.dumpToFile", outputProps.getAbsolutePath());
98-
executeBuildAndValidateWithoutCE(build);
98+
executeBuildAndAssertWithoutCE(build);
9999

100100
Properties props = getProps(outputProps);
101101
assertThat(props).contains(
@@ -112,7 +112,7 @@ void setJavaVersionProperties() throws IOException {
112112
MavenBuild build = MavenBuild.create(pom)
113113
.setGoals(cleanPackageSonarGoal())
114114
.setProperty("sonar.scanner.internal.dumpToFile", outputProps.getAbsolutePath());
115-
executeBuildAndValidateWithoutCE(build);
115+
executeBuildAndAssertWithoutCE(build);
116116

117117
Properties props = getProps(outputProps);
118118
assertThat(props).contains(
@@ -132,7 +132,7 @@ void when_java_home_exists_it_is_used_as_default_sonar_java_jdkHome_value() thro
132132
MavenBuild build = MavenBuild.create(pom)
133133
.setGoals(sonarGoal())
134134
.setProperty("sonar.scanner.internal.dumpToFile", outputProps.getAbsolutePath());
135-
executeBuildAndValidateWithoutCE(build);
135+
executeBuildAndAssertWithoutCE(build);
136136

137137
Properties props = getProps(outputProps);
138138
String jdkHome = props.getProperty("sonar.java.jdkHome");
@@ -149,7 +149,7 @@ void setJdkHomeFromCompilerExecutableConfiguration() throws IOException {
149149
MavenBuild build = MavenBuild.create(pom)
150150
.setGoals(sonarGoal())
151151
.setProperty("sonar.scanner.internal.dumpToFile", outputProps.getAbsolutePath());
152-
executeBuildAndValidateWithoutCE(build);
152+
executeBuildAndAssertWithoutCE(build);
153153

154154
Properties props = getProps(outputProps);
155155
String expected = "path/to/java_executable".replace('/', File.separatorChar);
@@ -168,7 +168,7 @@ void setJdkHomeFromGlobalToolchainsPlugin() throws IOException {
168168
.setGoals("toolchains:toolchain " + sonarGoal())
169169
.addArguments("--toolchains", new File(pom.getParent(), "toolchains.xml").getAbsolutePath())
170170
.setProperty("sonar.scanner.internal.dumpToFile", outputProps.getAbsolutePath());
171-
executeBuildAndValidateWithoutCE(build);
171+
executeBuildAndAssertWithoutCE(build);
172172

173173
Properties props = getProps(outputProps);
174174
assertThat(props).contains(entry("sonar.java.jdkHome", "fake_jdk_1.5"));
@@ -188,7 +188,7 @@ void setJdkHomeFromCompilerToolchainsConfiguration() throws IOException {
188188
.setGoals(sonarGoal())
189189
.addArguments("--toolchains", new File(pom.getParent(), "toolchains.xml").getAbsolutePath())
190190
.setProperty("sonar.scanner.internal.dumpToFile", outputProps.getAbsolutePath());
191-
executeBuildAndValidateWithoutCE(build);
191+
executeBuildAndAssertWithoutCE(build);
192192

193193
Properties props = getProps(outputProps);
194194
assertThat(props).contains(entry("sonar.java.jdkHome", "fake_jdk_1.6"));
@@ -208,7 +208,7 @@ void takeFirstToolchainIfMultipleExecutions() throws IOException {
208208
.setGoals(sonarGoal())
209209
.addArguments("--toolchains", new File(pom.getParent(), "toolchains.xml").getAbsolutePath())
210210
.setProperty("sonar.scanner.internal.dumpToFile", outputProps.getAbsolutePath());
211-
executeBuildAndValidateWithoutCE(build);
211+
executeBuildAndAssertWithoutCE(build);
212212

213213
Properties props = getProps(outputProps);
214214
assertThat(props).contains(entry("sonar.java.jdkHome", "fake_jdk_9"));

‎its/src/test/java/com/sonar/maven/it/suite/LinksTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ void shouldUseLinkPropertiesOverPomLinksInMaven() {
4040
MavenBuild build = MavenBuild.create(ItUtils.locateProjectPom("batch/links-project"))
4141
.setGoals(cleanPackageSonarGoal())
4242
.setProperty("sonar.scm.disabled", "true");
43-
executeBuildAndValidateWithCE(build);
43+
executeBuildAndAssertWithCE(build);
4444

4545
checkLinks();
4646
}

0 commit comments

Comments
 (0)