Browse Source

Fix tests

pull/15421/head
Madhura Bhave 7 years ago
parent
commit
5a18df2d69
  1. 1
      spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/task/TaskExecutionAutoConfigurationTests.java
  2. 3
      spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/extension/OutputCapture.java

1
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/task/TaskExecutionAutoConfigurationTests.java

@ -105,7 +105,6 @@ public class TaskExecutionAutoConfigurationTests { @@ -105,7 +105,6 @@ public class TaskExecutionAutoConfigurationTests {
@Test
public void taskExecutorAutoConfigured() {
this.output.reset();
this.contextRunner.run((context) -> {
assertThat(this.output.toString())
.doesNotContain("Initializing ExecutorService");

3
spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/extension/OutputCapture.java

@ -84,6 +84,9 @@ public class OutputCapture implements BeforeEachCallback, AfterEachCallback, @@ -84,6 +84,9 @@ public class OutputCapture implements BeforeEachCallback, AfterEachCallback,
}
private void releaseOutput() {
if (this.captureOut == null) {
return;
}
AnsiOutputControl.get().enabledAnsiOutput();
System.setOut(this.captureOut.getOriginal());
System.setErr(this.captureErr.getOriginal());

Loading…
Cancel
Save