Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polish output capture names

Browse Source
This commit is contained in:
Phillip Webb
2019-07-14 18:07:47 +01:00
parent cdf43a7489
commit c3816bfe7b
73 changed files with 328 additions and 335 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/ClassLoaderIntegrationTests.java
View File

@@ -36,8 +36,8 @@ class ClassLoaderIntegrationTests {
@RegisterExtension
CliTester cli;
ClassLoaderIntegrationTests(CapturedOutput capturedOutput) {
this.cli = new CliTester("src/test/resources/", capturedOutput);
ClassLoaderIntegrationTests(CapturedOutput output) {
this.cli = new CliTester("src/test/resources/", output);
}
@Test

8
spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/CliTester.java
View File

@@ -63,7 +63,7 @@ public class CliTester implements BeforeEachCallback, AfterEachCallback {
private final BuildOutput buildOutput = new BuildOutput(getClass());
private final CapturedOutput capturedOutput;
private final CapturedOutput output;
private String previousOutput = "";
@@ -75,7 +75,7 @@ public class CliTester implements BeforeEachCallback, AfterEachCallback {
private File serverPortFile;
public CliTester(String prefix, CapturedOutput capturedOutput) {
public CliTester(String prefix, CapturedOutput output) {
this.prefix = prefix;
try {
this.temp = Files.createTempDirectory("cli-tester").toFile();
@@ -83,7 +83,7 @@ public class CliTester implements BeforeEachCallback, AfterEachCallback {
catch (IOException ex) {
throw new IllegalStateException("Failed to create temp directory");
}
this.capturedOutput = capturedOutput;
this.output = output;
}
public void setTimeout(long timeout) {
@@ -182,7 +182,7 @@ public class CliTester implements BeforeEachCallback, AfterEachCallback {
}
private String getOutput() {
String output = this.capturedOutput.toString().substring(this.previousOutput.length());
String output = this.output.toString().substring(this.previousOutput.length());
this.previousOutput = output;
return output;
}

4
spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/DirectorySourcesIntegrationTests.java
View File

@@ -36,8 +36,8 @@ class DirectorySourcesIntegrationTests {
@RegisterExtension
CliTester cli;
DirectorySourcesIntegrationTests(CapturedOutput capturedOutput) {
this.cli = new CliTester("src/test/resources/dir-sample/", capturedOutput);
DirectorySourcesIntegrationTests(CapturedOutput output) {
this.cli = new CliTester("src/test/resources/dir-sample/", output);
}
@Test

4
spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/GrabCommandIntegrationTests.java
View File

@@ -44,8 +44,8 @@ class GrabCommandIntegrationTests {
@RegisterExtension
CliTester cli;
GrabCommandIntegrationTests(CapturedOutput capturedOutput) {
this.cli = new CliTester("src/test/resources/grab-samples/", capturedOutput);
GrabCommandIntegrationTests(CapturedOutput output) {
this.cli = new CliTester("src/test/resources/grab-samples/", output);
}
@BeforeEach

4
spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/ReproIntegrationTests.java
View File

@@ -41,8 +41,8 @@ class ReproIntegrationTests {
@RegisterExtension
CliTester cli;
ReproIntegrationTests(CapturedOutput capturedOutput) {
this.cli = new CliTester("src/test/resources/repro-samples/", capturedOutput);
ReproIntegrationTests(CapturedOutput output) {
this.cli = new CliTester("src/test/resources/repro-samples/", output);
}
@Test

4
spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/RunCommandIntegrationTests.java
View File

@@ -41,8 +41,8 @@ class RunCommandIntegrationTests {
@RegisterExtension
CliTester cli;
RunCommandIntegrationTests(CapturedOutput capturedOutput) {
this.cli = new CliTester("src/it/resources/run-command/", capturedOutput);
RunCommandIntegrationTests(CapturedOutput output) {
this.cli = new CliTester("src/it/resources/run-command/", output);
}
private Properties systemProperties = new Properties();

4
spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/SampleIntegrationTests.java
View File

@@ -43,8 +43,8 @@ class SampleIntegrationTests {
@RegisterExtension
CliTester cli;
SampleIntegrationTests(CapturedOutput capturedOutput) {
this.cli = new CliTester("samples/", capturedOutput);
SampleIntegrationTests(CapturedOutput output) {
this.cli = new CliTester("samples/", output);
}
@Test