Skip to content

Commit 98222fb

Browse files
JRE Provisioning: Add ITs for parameter propagation to end step (#2068)
1 parent 4a6a539 commit 98222fb

File tree

2 files changed

+37
-1
lines changed

2 files changed

+37
-1
lines changed

its/src/test/java/com/sonar/it/scanner/msbuild/sonarcloud/JreProvisioningTest.java

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,4 +134,40 @@ void jreProvisioning_endToEnd_cacheHit_reusesJre() throws IOException {
134134
"JreResolver: Cache miss",
135135
"Starting the Java Runtime Environment download.");
136136
}
137+
138+
@Test
139+
void jreProvisioning_endToEnd_parameters_propagated() throws IOException {
140+
var projectDir = TestUtils.projectDir(basePath, PROJECT_NAME);
141+
142+
SonarCloudUtils.runBeginStep(
143+
projectDir,
144+
SONARCLOUD_PROJECT_KEY,
145+
new StreamConsumer.Pipe(new StringWriter()),
146+
"/d:sonar.scanner.os=windows",
147+
"/d:sonar.scanner.arch=x64",
148+
"/d:sonar.scanner.skipJreProvisioning=true",
149+
"/d:sonar.scanner.connectTimeout=42",
150+
"/d:sonar.scanner.socketTimeout=100",
151+
"/d:sonar.scanner.responseTimeout=500",
152+
"/d:sonar.userHome=" + projectDir.toAbsolutePath());
153+
154+
SonarCloudUtils.runBuild(projectDir);
155+
156+
var logWriter = new StringWriter();
157+
StreamConsumer.Pipe logConsumer = new StreamConsumer.Pipe(logWriter);
158+
SonarCloudUtils.runEndStep(projectDir, logConsumer);
159+
160+
var logs = logWriter.toString();
161+
assertThat(logs).contains(
162+
"Dumping content of sonar-project.properties",
163+
"sonar.scanner.sonarcloudUrl=" + Constants.SONARCLOUD_URL,
164+
"sonar.scanner.apiBaseUrl=" + Constants.SONARCLOUD_API_URL,
165+
"sonar.scanner.os=windows",
166+
"sonar.scanner.arch=x64",
167+
"sonar.scanner.skipJreProvisioning=true",
168+
"sonar.scanner.connectTimeout=42",
169+
"sonar.scanner.socketTimeout=100",
170+
"sonar.scanner.responseTimeout=500",
171+
"sonar.userHome=" + projectDir.toAbsolutePath().toString().replace("\\", "\\\\"));
172+
}
137173
}

its/src/test/java/com/sonar/it/scanner/msbuild/sonarcloud/SonarCloudUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ public static void runBeginStep(Path projectDir, String projectKey, StreamConsum
8080
assertThat(beginResult).isZero();
8181
}
8282

83-
private static void runEndStep(Path projectDir, StreamConsumer.Pipe logConsumer) {
83+
public static void runEndStep(Path projectDir, StreamConsumer.Pipe logConsumer) {
8484
var endCommand = Command.create(new File(Constants.SCANNER_PATH).getAbsolutePath())
8585
.setDirectory(projectDir.toFile())
8686
.addArgument("end")

0 commit comments

Comments
 (0)