Split up JUnit 5 OutputCapture class

Split the JUnit 5 `OutputCapture` class into separate `OutputExtension`
and `CapturedOutput` classes. The JUnit 5 callback methods are now
contained only in the `OutputExtension` class so no longer pollute the
public API that users will interact with.

The `CapturedOutput` class has also been updated to capture System.err
and System.out separately to allow distinct assertions if required.

Closes gh-17029
pull/17010/head
Phillip Webb 6 years ago
parent 68a3fbd7a0
commit d11d5ceb29

@ -29,7 +29,8 @@ import org.springframework.boot.actuate.metrics.export.prometheus.PrometheusScra
import org.springframework.boot.autoconfigure.AutoConfigurations; import org.springframework.boot.autoconfigure.AutoConfigurations;
import org.springframework.boot.test.context.assertj.AssertableApplicationContext; import org.springframework.boot.test.context.assertj.AssertableApplicationContext;
import org.springframework.boot.test.context.runner.ApplicationContextRunner; import org.springframework.boot.test.context.runner.ApplicationContextRunner;
import org.springframework.boot.test.extension.OutputCapture; import org.springframework.boot.test.extension.CapturedOutput;
import org.springframework.boot.test.extension.OutputExtension;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import; import org.springframework.context.annotation.Import;
@ -45,7 +46,7 @@ import static org.assertj.core.api.Assertions.assertThat;
public class PrometheusMetricsExportAutoConfigurationTests { public class PrometheusMetricsExportAutoConfigurationTests {
@RegisterExtension @RegisterExtension
public OutputCapture output = new OutputCapture(); CapturedOutput output = OutputExtension.capture();
private final ApplicationContextRunner contextRunner = new ApplicationContextRunner() private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
.withConfiguration(AutoConfigurations .withConfiguration(AutoConfigurations

@ -29,7 +29,8 @@ import org.springframework.boot.autoconfigure.AutoConfigurations;
import org.springframework.boot.autoconfigure.web.client.RestTemplateAutoConfiguration; import org.springframework.boot.autoconfigure.web.client.RestTemplateAutoConfiguration;
import org.springframework.boot.test.context.assertj.AssertableApplicationContext; import org.springframework.boot.test.context.assertj.AssertableApplicationContext;
import org.springframework.boot.test.context.runner.ApplicationContextRunner; import org.springframework.boot.test.context.runner.ApplicationContextRunner;
import org.springframework.boot.test.extension.OutputCapture; import org.springframework.boot.test.extension.CapturedOutput;
import org.springframework.boot.test.extension.OutputExtension;
import org.springframework.boot.web.client.RestTemplateBuilder; import org.springframework.boot.web.client.RestTemplateBuilder;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
import org.springframework.test.web.client.MockRestServiceServer; import org.springframework.test.web.client.MockRestServiceServer;
@ -54,7 +55,7 @@ public class RestTemplateMetricsConfigurationTests {
HttpClientMetricsAutoConfiguration.class)); HttpClientMetricsAutoConfiguration.class));
@RegisterExtension @RegisterExtension
public OutputCapture output = new OutputCapture(); CapturedOutput output = OutputExtension.capture();
@Test @Test
public void restTemplateCreatedWithBuilderIsInstrumented() { public void restTemplateCreatedWithBuilderIsInstrumented() {

@ -31,7 +31,8 @@ import org.springframework.boot.autoconfigure.AutoConfigurations;
import org.springframework.boot.autoconfigure.web.reactive.function.client.WebClientAutoConfiguration; import org.springframework.boot.autoconfigure.web.reactive.function.client.WebClientAutoConfiguration;
import org.springframework.boot.test.context.assertj.AssertableApplicationContext; import org.springframework.boot.test.context.assertj.AssertableApplicationContext;
import org.springframework.boot.test.context.runner.ApplicationContextRunner; import org.springframework.boot.test.context.runner.ApplicationContextRunner;
import org.springframework.boot.test.extension.OutputCapture; import org.springframework.boot.test.extension.CapturedOutput;
import org.springframework.boot.test.extension.OutputExtension;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
@ -58,7 +59,7 @@ public class WebClientMetricsConfigurationTests {
HttpClientMetricsAutoConfiguration.class)); HttpClientMetricsAutoConfiguration.class));
@RegisterExtension @RegisterExtension
public OutputCapture output = new OutputCapture(); CapturedOutput output = OutputExtension.capture();
@Test @Test
public void webClientCreatedWithBuilderIsInstrumented() { public void webClientCreatedWithBuilderIsInstrumented() {

@ -29,7 +29,8 @@ import org.springframework.boot.autoconfigure.AutoConfigurations;
import org.springframework.boot.autoconfigure.web.reactive.WebFluxAutoConfiguration; import org.springframework.boot.autoconfigure.web.reactive.WebFluxAutoConfiguration;
import org.springframework.boot.test.context.assertj.AssertableReactiveWebApplicationContext; import org.springframework.boot.test.context.assertj.AssertableReactiveWebApplicationContext;
import org.springframework.boot.test.context.runner.ReactiveWebApplicationContextRunner; import org.springframework.boot.test.context.runner.ReactiveWebApplicationContextRunner;
import org.springframework.boot.test.extension.OutputCapture; import org.springframework.boot.test.extension.CapturedOutput;
import org.springframework.boot.test.extension.OutputExtension;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.test.web.reactive.server.WebTestClient; import org.springframework.test.web.reactive.server.WebTestClient;
@ -50,7 +51,7 @@ public class WebFluxMetricsAutoConfigurationTests {
AutoConfigurations.of(WebFluxMetricsAutoConfiguration.class)); AutoConfigurations.of(WebFluxMetricsAutoConfiguration.class));
@RegisterExtension @RegisterExtension
public OutputCapture output = new OutputCapture(); CapturedOutput output = OutputExtension.capture();
@Test @Test
public void shouldProvideWebFluxMetricsBeans() { public void shouldProvideWebFluxMetricsBeans() {

@ -42,7 +42,8 @@ import org.springframework.boot.autoconfigure.AutoConfigurations;
import org.springframework.boot.autoconfigure.web.servlet.WebMvcAutoConfiguration; import org.springframework.boot.autoconfigure.web.servlet.WebMvcAutoConfiguration;
import org.springframework.boot.test.context.assertj.AssertableWebApplicationContext; import org.springframework.boot.test.context.assertj.AssertableWebApplicationContext;
import org.springframework.boot.test.context.runner.WebApplicationContextRunner; import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
import org.springframework.boot.test.extension.OutputCapture; import org.springframework.boot.test.extension.CapturedOutput;
import org.springframework.boot.test.extension.OutputExtension;
import org.springframework.boot.web.servlet.FilterRegistrationBean; import org.springframework.boot.web.servlet.FilterRegistrationBean;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
@ -69,7 +70,7 @@ public class WebMvcMetricsAutoConfigurationTests {
AutoConfigurations.of(WebMvcMetricsAutoConfiguration.class)); AutoConfigurations.of(WebMvcMetricsAutoConfiguration.class));
@RegisterExtension @RegisterExtension
public OutputCapture output = new OutputCapture(); CapturedOutput output = OutputExtension.capture();
@Test @Test
public void backsOffWhenMeterRegistryIsMissing() { public void backsOffWhenMeterRegistryIsMissing() {

@ -27,7 +27,8 @@ import org.springframework.boot.actuate.autoconfigure.web.servlet.ServletManagem
import org.springframework.boot.autoconfigure.AutoConfigurations; import org.springframework.boot.autoconfigure.AutoConfigurations;
import org.springframework.boot.autoconfigure.web.servlet.ServletWebServerFactoryAutoConfiguration; import org.springframework.boot.autoconfigure.web.servlet.ServletWebServerFactoryAutoConfiguration;
import org.springframework.boot.test.context.runner.WebApplicationContextRunner; import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
import org.springframework.boot.test.extension.OutputCapture; import org.springframework.boot.test.extension.CapturedOutput;
import org.springframework.boot.test.extension.OutputExtension;
import org.springframework.boot.web.servlet.context.AnnotationConfigServletWebServerApplicationContext; import org.springframework.boot.web.servlet.context.AnnotationConfigServletWebServerApplicationContext;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
@ -41,7 +42,7 @@ import static org.assertj.core.api.Assertions.assertThat;
public class ManagementContextAutoConfigurationTests { public class ManagementContextAutoConfigurationTests {
@RegisterExtension @RegisterExtension
public OutputCapture output = new OutputCapture(); CapturedOutput output = OutputExtension.capture();
@Test @Test
public void childManagementContextShouldStartForEmbeddedServer() { public void childManagementContextShouldStartForEmbeddedServer() {

@ -19,7 +19,8 @@ package org.springframework.boot.actuate.endpoint;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.api.extension.RegisterExtension;
import org.springframework.boot.test.extension.OutputCapture; import org.springframework.boot.test.extension.CapturedOutput;
import org.springframework.boot.test.extension.OutputExtension;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
@ -32,7 +33,7 @@ import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException
public class EndpointIdTests { public class EndpointIdTests {
@RegisterExtension @RegisterExtension
public OutputCapture output = new OutputCapture(); CapturedOutput output = OutputExtension.capture();
@Test @Test
public void ofWhenNullThrowsException() { public void ofWhenNullThrowsException() {

@ -24,7 +24,8 @@ import org.junit.jupiter.api.extension.RegisterExtension;
import org.springframework.boot.autoconfigure.AutoConfigurations; import org.springframework.boot.autoconfigure.AutoConfigurations;
import org.springframework.boot.test.context.runner.ApplicationContextRunner; import org.springframework.boot.test.context.runner.ApplicationContextRunner;
import org.springframework.boot.test.extension.OutputCapture; import org.springframework.boot.test.extension.CapturedOutput;
import org.springframework.boot.test.extension.OutputExtension;
import org.springframework.boot.testsupport.BuildOutput; import org.springframework.boot.testsupport.BuildOutput;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
@ -38,7 +39,7 @@ import static org.assertj.core.api.Assertions.assertThat;
public class FreeMarkerAutoConfigurationTests { public class FreeMarkerAutoConfigurationTests {
@RegisterExtension @RegisterExtension
public OutputCapture output = new OutputCapture(); CapturedOutput output = OutputExtension.capture();
private final BuildOutput buildOutput = new BuildOutput(getClass()); private final BuildOutput buildOutput = new BuildOutput(getClass());

@ -27,7 +27,8 @@ import retrofit2.Retrofit;
import org.springframework.boot.autoconfigure.AutoConfigurations; import org.springframework.boot.autoconfigure.AutoConfigurations;
import org.springframework.boot.test.context.assertj.AssertableApplicationContext; import org.springframework.boot.test.context.assertj.AssertableApplicationContext;
import org.springframework.boot.test.context.runner.ApplicationContextRunner; import org.springframework.boot.test.context.runner.ApplicationContextRunner;
import org.springframework.boot.test.extension.OutputCapture; import org.springframework.boot.test.extension.CapturedOutput;
import org.springframework.boot.test.extension.OutputExtension;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.test.util.ReflectionTestUtils; import org.springframework.test.util.ReflectionTestUtils;
@ -44,7 +45,7 @@ import static org.assertj.core.api.Assertions.assertThat;
public class InfluxDbAutoConfigurationTests { public class InfluxDbAutoConfigurationTests {
@RegisterExtension @RegisterExtension
public OutputCapture output = new OutputCapture(); CapturedOutput output = OutputExtension.capture();
private final ApplicationContextRunner contextRunner = new ApplicationContextRunner() private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
.withConfiguration(AutoConfigurations.of(InfluxDbAutoConfiguration.class)); .withConfiguration(AutoConfigurations.of(InfluxDbAutoConfiguration.class));

@ -36,7 +36,8 @@ import org.springframework.boot.autoconfigure.jersey.JerseyAutoConfigurationServ
import org.springframework.boot.autoconfigure.web.servlet.ServletWebServerFactoryAutoConfiguration; import org.springframework.boot.autoconfigure.web.servlet.ServletWebServerFactoryAutoConfiguration;
import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
import org.springframework.boot.test.extension.OutputCapture; import org.springframework.boot.test.extension.CapturedOutput;
import org.springframework.boot.test.extension.OutputExtension;
import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory; import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
@ -53,11 +54,11 @@ import static org.assertj.core.api.Assertions.assertThat;
*/ */
@SpringBootTest(classes = Application.class, webEnvironment = WebEnvironment.RANDOM_PORT) @SpringBootTest(classes = Application.class, webEnvironment = WebEnvironment.RANDOM_PORT)
@DirtiesContext @DirtiesContext
@ExtendWith(OutputCapture.class) @ExtendWith(OutputExtension.class)
public class JerseyAutoConfigurationServletContainerTests { public class JerseyAutoConfigurationServletContainerTests {
@Test @Test
public void existingJerseyServletIsAmended(OutputCapture output) { public void existingJerseyServletIsAmended(CapturedOutput output) {
assertThat(output) assertThat(output)
.contains("Configuring existing registration for Jersey servlet"); .contains("Configuring existing registration for Jersey servlet");
assertThat(output).contains( assertThat(output).contains(

@ -43,7 +43,8 @@ import org.springframework.boot.liquibase.LiquibaseServiceLocatorApplicationList
import org.springframework.boot.test.context.assertj.AssertableApplicationContext; import org.springframework.boot.test.context.assertj.AssertableApplicationContext;
import org.springframework.boot.test.context.runner.ApplicationContextRunner; import org.springframework.boot.test.context.runner.ApplicationContextRunner;
import org.springframework.boot.test.context.runner.ContextConsumer; import org.springframework.boot.test.context.runner.ContextConsumer;
import org.springframework.boot.test.extension.OutputCapture; import org.springframework.boot.test.extension.CapturedOutput;
import org.springframework.boot.test.extension.OutputExtension;
import org.springframework.boot.testsupport.Assume; import org.springframework.boot.testsupport.Assume;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
@ -63,7 +64,7 @@ import static org.assertj.core.api.Assertions.contentOf;
* @author Stephane Nicoll * @author Stephane Nicoll
* @author Dominic Gunn * @author Dominic Gunn
*/ */
@ExtendWith(OutputCapture.class) @ExtendWith(OutputExtension.class)
public class LiquibaseAutoConfigurationTests { public class LiquibaseAutoConfigurationTests {
@BeforeEach @BeforeEach
@ -254,7 +255,7 @@ public class LiquibaseAutoConfigurationTests {
} }
@Test @Test
public void logging(OutputCapture output) { public void logging(CapturedOutput output) {
this.contextRunner.withUserConfiguration(EmbeddedDataSourceConfiguration.class) this.contextRunner.withUserConfiguration(EmbeddedDataSourceConfiguration.class)
.run(assertLiquibase((liquibase) -> { .run(assertLiquibase((liquibase) -> {
Object log = ReflectionTestUtils.getField(liquibase, "log"); Object log = ReflectionTestUtils.getField(liquibase, "log");

@ -32,7 +32,8 @@ import org.springframework.boot.autoconfigure.http.HttpMessageConvertersAutoConf
import org.springframework.boot.autoconfigure.web.servlet.WebMvcAutoConfiguration; import org.springframework.boot.autoconfigure.web.servlet.WebMvcAutoConfiguration;
import org.springframework.boot.context.event.ApplicationFailedEvent; import org.springframework.boot.context.event.ApplicationFailedEvent;
import org.springframework.boot.logging.LogLevel; import org.springframework.boot.logging.LogLevel;
import org.springframework.boot.test.extension.OutputCapture; import org.springframework.boot.test.extension.CapturedOutput;
import org.springframework.boot.test.extension.OutputExtension;
import org.springframework.boot.web.servlet.context.AnnotationConfigServletWebApplicationContext; import org.springframework.boot.web.servlet.context.AnnotationConfigServletWebApplicationContext;
import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.AnnotationConfigApplicationContext;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
@ -55,7 +56,7 @@ import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException
public class ConditionEvaluationReportLoggingListenerTests { public class ConditionEvaluationReportLoggingListenerTests {
@RegisterExtension @RegisterExtension
public OutputCapture output = new OutputCapture(); CapturedOutput output = OutputExtension.capture();
private ConditionEvaluationReportLoggingListener initializer = new ConditionEvaluationReportLoggingListener(); private ConditionEvaluationReportLoggingListener initializer = new ConditionEvaluationReportLoggingListener();

@ -45,7 +45,8 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerA
import org.springframework.boot.test.context.assertj.AssertableApplicationContext; import org.springframework.boot.test.context.assertj.AssertableApplicationContext;
import org.springframework.boot.test.context.runner.ApplicationContextRunner; import org.springframework.boot.test.context.runner.ApplicationContextRunner;
import org.springframework.boot.test.context.runner.ContextConsumer; import org.springframework.boot.test.context.runner.ContextConsumer;
import org.springframework.boot.test.extension.OutputCapture; import org.springframework.boot.test.extension.CapturedOutput;
import org.springframework.boot.test.extension.OutputExtension;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import; import org.springframework.context.annotation.Import;
@ -70,7 +71,7 @@ import static org.mockito.Mockito.verifyZeroInteractions;
public class QuartzAutoConfigurationTests { public class QuartzAutoConfigurationTests {
@RegisterExtension @RegisterExtension
public OutputCapture output = new OutputCapture(); CapturedOutput output = OutputExtension.capture();
private final ApplicationContextRunner contextRunner = new ApplicationContextRunner() private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
.withPropertyValues("spring.datasource.generate-unique-name=true") .withPropertyValues("spring.datasource.generate-unique-name=true")

@ -30,7 +30,8 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration; import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration;
import org.springframework.boot.autoconfigure.orm.jpa.test.City; import org.springframework.boot.autoconfigure.orm.jpa.test.City;
import org.springframework.boot.test.context.runner.WebApplicationContextRunner; import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
import org.springframework.boot.test.extension.OutputCapture; import org.springframework.boot.test.extension.CapturedOutput;
import org.springframework.boot.test.extension.OutputExtension;
import org.springframework.boot.web.servlet.DelegatingFilterProxyRegistrationBean; import org.springframework.boot.web.servlet.DelegatingFilterProxyRegistrationBean;
import org.springframework.boot.web.servlet.filter.OrderedFilter; import org.springframework.boot.web.servlet.filter.OrderedFilter;
import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.AnnotationConfigApplicationContext;
@ -65,7 +66,7 @@ public class SecurityAutoConfigurationTests {
PropertyPlaceholderAutoConfiguration.class)); PropertyPlaceholderAutoConfiguration.class));
@RegisterExtension @RegisterExtension
public OutputCapture output = new OutputCapture(); CapturedOutput output = OutputExtension.capture();
@Test @Test
public void testWebConfiguration() { public void testWebConfiguration() {

@ -30,7 +30,8 @@ import org.springframework.boot.autoconfigure.http.HttpMessageConvertersAutoConf
import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration; import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration;
import org.springframework.boot.autoconfigure.web.servlet.DispatcherServletAutoConfiguration; import org.springframework.boot.autoconfigure.web.servlet.DispatcherServletAutoConfiguration;
import org.springframework.boot.autoconfigure.web.servlet.WebMvcAutoConfiguration; import org.springframework.boot.autoconfigure.web.servlet.WebMvcAutoConfiguration;
import org.springframework.boot.test.extension.OutputCapture; import org.springframework.boot.test.extension.CapturedOutput;
import org.springframework.boot.test.extension.OutputExtension;
import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.boot.test.util.TestPropertyValues;
import org.springframework.boot.test.web.client.TestRestTemplate; import org.springframework.boot.test.web.client.TestRestTemplate;
import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory; import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory;
@ -53,7 +54,7 @@ import org.springframework.web.bind.annotation.RestController;
public class SecurityFilterAutoConfigurationEarlyInitializationTests { public class SecurityFilterAutoConfigurationEarlyInitializationTests {
@RegisterExtension @RegisterExtension
public OutputCapture output = new OutputCapture(); CapturedOutput output = OutputExtension.capture();
@Test @Test
public void testSecurityFilterDoesNotCauseEarlyInitialization() { public void testSecurityFilterDoesNotCauseEarlyInitialization() {

@ -25,7 +25,8 @@ import org.springframework.boot.autoconfigure.AutoConfigurations;
import org.springframework.boot.autoconfigure.security.SecurityProperties; import org.springframework.boot.autoconfigure.security.SecurityProperties;
import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.boot.test.context.runner.ApplicationContextRunner; import org.springframework.boot.test.context.runner.ApplicationContextRunner;
import org.springframework.boot.test.extension.OutputCapture; import org.springframework.boot.test.extension.CapturedOutput;
import org.springframework.boot.test.extension.OutputExtension;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import; import org.springframework.context.annotation.Import;
@ -58,7 +59,7 @@ public class UserDetailsServiceAutoConfigurationTests {
AutoConfigurations.of(UserDetailsServiceAutoConfiguration.class)); AutoConfigurations.of(UserDetailsServiceAutoConfiguration.class));
@RegisterExtension @RegisterExtension
public OutputCapture output = new OutputCapture(); CapturedOutput output = OutputExtension.capture();
@Test @Test
public void testDefaultUsernamePassword() { public void testDefaultUsernamePassword() {

@ -29,7 +29,8 @@ import org.springframework.boot.task.TaskExecutorCustomizer;
import org.springframework.boot.test.context.assertj.AssertableApplicationContext; import org.springframework.boot.test.context.assertj.AssertableApplicationContext;
import org.springframework.boot.test.context.runner.ApplicationContextRunner; import org.springframework.boot.test.context.runner.ApplicationContextRunner;
import org.springframework.boot.test.context.runner.ContextConsumer; import org.springframework.boot.test.context.runner.ContextConsumer;
import org.springframework.boot.test.extension.OutputCapture; import org.springframework.boot.test.extension.CapturedOutput;
import org.springframework.boot.test.extension.OutputExtension;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.core.task.SyncTaskExecutor; import org.springframework.core.task.SyncTaskExecutor;
@ -59,7 +60,7 @@ public class TaskExecutionAutoConfigurationTests {
AutoConfigurations.of(TaskExecutionAutoConfiguration.class)); AutoConfigurations.of(TaskExecutionAutoConfiguration.class));
@RegisterExtension @RegisterExtension
public OutputCapture output = new OutputCapture(); CapturedOutput output = OutputExtension.capture();
@Test @Test
public void taskExecutorBuilderShouldApplyCustomSettings() { public void taskExecutorBuilderShouldApplyCustomSettings() {

@ -37,7 +37,8 @@ import org.thymeleaf.templateresolver.ITemplateResolver;
import org.springframework.boot.autoconfigure.AutoConfigurations; import org.springframework.boot.autoconfigure.AutoConfigurations;
import org.springframework.boot.test.context.runner.ReactiveWebApplicationContextRunner; import org.springframework.boot.test.context.runner.ReactiveWebApplicationContextRunner;
import org.springframework.boot.test.extension.OutputCapture; import org.springframework.boot.test.extension.CapturedOutput;
import org.springframework.boot.test.extension.OutputExtension;
import org.springframework.boot.testsupport.BuildOutput; import org.springframework.boot.testsupport.BuildOutput;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
@ -60,7 +61,7 @@ import static org.assertj.core.api.Assertions.assertThat;
public class ThymeleafReactiveAutoConfigurationTests { public class ThymeleafReactiveAutoConfigurationTests {
@RegisterExtension @RegisterExtension
public OutputCapture output = new OutputCapture(); CapturedOutput output = OutputExtension.capture();
private final BuildOutput buildOutput = new BuildOutput(getClass()); private final BuildOutput buildOutput = new BuildOutput(getClass());

@ -32,7 +32,8 @@ import org.springframework.boot.autoconfigure.web.reactive.ReactiveWebServerFact
import org.springframework.boot.autoconfigure.web.reactive.WebFluxAutoConfiguration; import org.springframework.boot.autoconfigure.web.reactive.WebFluxAutoConfiguration;
import org.springframework.boot.test.context.assertj.AssertableReactiveWebApplicationContext; import org.springframework.boot.test.context.assertj.AssertableReactiveWebApplicationContext;
import org.springframework.boot.test.context.runner.ReactiveWebApplicationContextRunner; import org.springframework.boot.test.context.runner.ReactiveWebApplicationContextRunner;
import org.springframework.boot.test.extension.OutputCapture; import org.springframework.boot.test.extension.CapturedOutput;
import org.springframework.boot.test.extension.OutputExtension;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
@ -63,7 +64,7 @@ public class DefaultErrorWebExceptionHandlerIntegrationTests {
private final LogIdFilter logIdFilter = new LogIdFilter(); private final LogIdFilter logIdFilter = new LogIdFilter();
@RegisterExtension @RegisterExtension
public OutputCapture output = new OutputCapture(); CapturedOutput output = OutputExtension.capture();
private ReactiveWebApplicationContextRunner contextRunner = new ReactiveWebApplicationContextRunner() private ReactiveWebApplicationContextRunner contextRunner = new ReactiveWebApplicationContextRunner()
.withConfiguration(AutoConfigurations.of( .withConfiguration(AutoConfigurations.of(

@ -22,7 +22,8 @@ import org.junit.jupiter.api.extension.RegisterExtension;
import org.springframework.boot.autoconfigure.AutoConfigurations; import org.springframework.boot.autoconfigure.AutoConfigurations;
import org.springframework.boot.autoconfigure.web.servlet.DispatcherServletAutoConfiguration; import org.springframework.boot.autoconfigure.web.servlet.DispatcherServletAutoConfiguration;
import org.springframework.boot.test.context.runner.WebApplicationContextRunner; import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
import org.springframework.boot.test.extension.OutputCapture; import org.springframework.boot.test.extension.CapturedOutput;
import org.springframework.boot.test.extension.OutputExtension;
import org.springframework.boot.web.servlet.error.ErrorAttributes; import org.springframework.boot.web.servlet.error.ErrorAttributes;
import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse; import org.springframework.mock.web.MockHttpServletResponse;
@ -45,7 +46,7 @@ public class ErrorMvcAutoConfigurationTests {
ErrorMvcAutoConfiguration.class)); ErrorMvcAutoConfiguration.class));
@RegisterExtension @RegisterExtension
public OutputCapture output = new OutputCapture(); CapturedOutput output = OutputExtension.capture();
@Test @Test
public void renderContainsViewWithExceptionDetails() throws Exception { public void renderContainsViewWithExceptionDetails() throws Exception {

@ -0,0 +1,314 @@
/*
* Copyright 2012-2019 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.boot.test.extension;
import java.io.IOException;
import java.io.OutputStream;
import java.io.PrintStream;
import java.util.ArrayDeque;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Deque;
import java.util.List;
import java.util.function.Consumer;
import java.util.function.Predicate;
import org.junit.jupiter.api.extension.Extension;
import org.springframework.boot.ansi.AnsiOutput;
import org.springframework.boot.ansi.AnsiOutput.Enabled;
import org.springframework.util.Assert;
import org.springframework.util.ClassUtils;
/**
* Provides access to {@link System#out System.out} and {@link System#err System.err}
* output that has been capture by the {@link OutputExtension}. Can be used to apply
* assertions either using AssertJ or standard JUnit assertions. For example:
* <pre class="code">
* assertThat(output).contains("started"); // Checks all output
* assertThat(output.getErr()).contains("failed"); // Only checks System.err
* assertThat(output.getOut()).contains("ok"); // Only checks System.put
* </pre>
*
* @author Madhura Bhave
* @author Phillip Webb
* @since 2.2.0
* @see OutputExtension
*/
public class CapturedOutput implements CharSequence, Extension {
private final Deque<SystemCapture> systemCaptures = new ArrayDeque<>();
private AnsiOutputState ansiOutputState;
protected CapturedOutput() {
}
/**
* Push a new system capture session onto the stack.
*/
protected final void push() {
if (this.systemCaptures.isEmpty()) {
this.ansiOutputState = AnsiOutputState.saveAndDisable();
}
this.systemCaptures.addLast(new SystemCapture());
}
/**
* Pop the last system capture session from the stack.
*/
protected final void pop() {
this.systemCaptures.removeLast().release();
if (this.systemCaptures.isEmpty() && this.ansiOutputState != null) {
this.ansiOutputState.restore();
this.ansiOutputState = null;
}
}
@Override
public int length() {
return toString().length();
}
@Override
public char charAt(int index) {
return toString().charAt(index);
}
@Override
public CharSequence subSequence(int start, int end) {
return toString().subSequence(start, end);
}
@Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
}
if (obj instanceof CapturedOutput || obj instanceof CharSequence) {
return getAll().equals(obj.toString());
}
return false;
}
@Override
public int hashCode() {
return toString().hashCode();
}
@Override
public String toString() {
return getAll();
}
/**
* Return all content (both {@link System#out System.out} and {@link System#err
* System.err}) in the order that it was was captured.
* @return all captured output
*/
public String getAll() {
return get((type) -> true);
}
/**
* Return {@link System#out System.out} content in the order that it was was captured.
* @return {@link System#out System.out} captured output
*/
public String getOut() {
return get(Type.OUT::equals);
}
/**
* Return {@link System#err System.err} content in the order that it was was captured.
* @return {@link System#err System.err} captured output
*/
public String getErr() {
return get(Type.ERR::equals);
}
private String get(Predicate<Type> filter) {
Assert.state(!this.systemCaptures.isEmpty(),
"No system captures found. Check that you have used @RegisterExtension "
+ "or @ExtendWith and the fields are not private");
StringBuilder builder = new StringBuilder();
for (SystemCapture systemCapture : this.systemCaptures) {
systemCapture.append(builder, filter);
}
return builder.toString();
}
/**
* A capture session that captures {@link System#out System.out} and {@link System#out
* System.err}.
*/
private static class SystemCapture {
private final PrintStreamCapture out;
private final PrintStreamCapture err;
private final List<CapturedString> capturedStrings = Collections
.synchronizedList(new ArrayList<>());
SystemCapture() {
this.out = new PrintStreamCapture(System.out, this::captureOut);
this.err = new PrintStreamCapture(System.err, this::captureErr);
System.setOut(this.out);
System.setErr(this.err);
}
public void release() {
System.setOut(this.out.getParent());
System.setErr(this.err.getParent());
}
private void captureOut(String string) {
this.capturedStrings.add(new CapturedString(Type.OUT, string));
}
private void captureErr(String string) {
this.capturedStrings.add(new CapturedString(Type.ERR, string));
}
public void append(StringBuilder builder, Predicate<Type> filter) {
for (CapturedString stringCapture : this.capturedStrings) {
if (filter.test(stringCapture.getType())) {
builder.append(stringCapture);
}
}
}
}
/**
* A {@link PrintStream} implementation that captures written strings.
*/
private static class PrintStreamCapture extends PrintStream {
private final PrintStream parent;
PrintStreamCapture(PrintStream parent, Consumer<String> copy) {
super(new OutputStreamCapture(getSystemStream(parent), copy));
this.parent = parent;
}
public PrintStream getParent() {
return this.parent;
}
private static PrintStream getSystemStream(PrintStream printStream) {
while (printStream instanceof PrintStreamCapture) {
return ((PrintStreamCapture) printStream).getParent();
}
return printStream;
}
}
/**
* An {@link OutputStream} implementation that captures written strings.
*/
private static class OutputStreamCapture extends OutputStream {
private final PrintStream systemStream;
private final Consumer<String> copy;
OutputStreamCapture(PrintStream systemStream, Consumer<String> copy) {
this.systemStream = systemStream;
this.copy = copy;
}
@Override
public void write(int b) throws IOException {
write(new byte[] { (byte) (b & 0xFF) });
}
@Override
public void write(byte[] b, int off, int len) throws IOException {
this.copy.accept(new String(b, off, len));
this.systemStream.write(b, off, len);
}
@Override
public void flush() throws IOException {
this.systemStream.flush();
}
}
/**
* A captured string that forms part of the full output.
*/
private static class CapturedString {
private final Type type;
private final String string;
CapturedString(Type type, String string) {
this.type = type;
this.string = string;
}
public Type getType() {
return this.type;
}
@Override
public String toString() {
return this.string;
}
}
/**
* Types of content that can be captured.
*/
private enum Type {
OUT, ERR
}
/**
* Save disable and restore AnsiOutput without it needing to be on the classpath.
*/
private static class AnsiOutputState {
private Enabled saved;
AnsiOutputState() {
this.saved = AnsiOutput.getEnabled();
AnsiOutput.setEnabled(Enabled.NEVER);
}
public void restore() {
AnsiOutput.setEnabled(this.saved);
}
public static AnsiOutputState saveAndDisable() {
if (!ClassUtils.isPresent("org.springframework.boot.ansi.AnsiOutput",
CapturedOutput.class.getClassLoader())) {
return null;
}
return new AnsiOutputState();
}
}
}

@ -1,210 +0,0 @@
/*
* Copyright 2012-2019 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.boot.test.extension;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.OutputStream;
import java.io.PrintStream;
import org.junit.jupiter.api.extension.AfterEachCallback;
import org.junit.jupiter.api.extension.BeforeAllCallback;
import org.junit.jupiter.api.extension.BeforeEachCallback;
import org.junit.jupiter.api.extension.ExtensionContext;
import org.junit.jupiter.api.extension.ParameterContext;
import org.junit.jupiter.api.extension.ParameterResolutionException;
import org.junit.jupiter.api.extension.ParameterResolver;
import org.springframework.boot.ansi.AnsiOutput;
/**
* JUnit5 {@code @Extension} to capture output from System.out and System.err.
*
* @author Madhura Bhave
* @since 2.2.0
*/
public class OutputCapture implements BeforeEachCallback, AfterEachCallback,
BeforeAllCallback, ParameterResolver, CharSequence {
private CaptureOutputStream captureOut;
private CaptureOutputStream captureErr;
private ByteArrayOutputStream methodLevelCopy;
private ByteArrayOutputStream classLevelCopy;
@Override
public void afterEach(ExtensionContext context) {
releaseOutput();
}
@Override
public void beforeEach(ExtensionContext context) {
releaseOutput();
this.methodLevelCopy = new ByteArrayOutputStream();
captureOutput(this.methodLevelCopy);
}
private void captureOutput(ByteArrayOutputStream copy) {
AnsiOutputControl.get().disableAnsiOutput();
this.captureOut = new CaptureOutputStream(System.out, copy);
this.captureErr = new CaptureOutputStream(System.err, copy);
System.setOut(new PrintStream(this.captureOut));
System.setErr(new PrintStream(this.captureErr));
}
private void releaseOutput() {
if (this.captureOut == null) {
return;
}
AnsiOutputControl.get().enabledAnsiOutput();
System.setOut(this.captureOut.getOriginal());
System.setErr(this.captureErr.getOriginal());
this.methodLevelCopy = null;
}
private void flush() {
try {
this.captureOut.flush();
this.captureErr.flush();
}
catch (IOException ex) {
// ignore
}
}
@Override
public int length() {
return this.toString().length();
}
@Override
public char charAt(int index) {
return this.toString().charAt(index);
}
@Override
public CharSequence subSequence(int start, int end) {
return this.toString().subSequence(start, end);
}
@Override
public String toString() {
flush();
if (this.classLevelCopy == null && this.methodLevelCopy == null) {
return "";
}
StringBuilder builder = new StringBuilder();
if (this.classLevelCopy != null) {
builder.append(this.classLevelCopy.toString());
}
builder.append(this.methodLevelCopy.toString());
return builder.toString();
}
@Override
public void beforeAll(ExtensionContext context) {
this.classLevelCopy = new ByteArrayOutputStream();
captureOutput(this.classLevelCopy);
}
@Override
public boolean supportsParameter(ParameterContext parameterContext,
ExtensionContext extensionContext) throws ParameterResolutionException {
return OutputCapture.class.equals(parameterContext.getParameter().getType());
}
@Override
public Object resolveParameter(ParameterContext parameterContext,
ExtensionContext extensionContext) throws ParameterResolutionException {
return this;
}
private static class CaptureOutputStream extends OutputStream {
private final PrintStream original;
private final OutputStream copy;
CaptureOutputStream(PrintStream original, OutputStream copy) {
this.original = original;
this.copy = copy;
}
@Override
public void write(int b) throws IOException {
this.copy.write(b);
this.original.write(b);
this.original.flush();
}
@Override
public void write(byte[] b, int off, int len) throws IOException {
this.copy.write(b, off, len);
this.original.write(b, off, len);
}
public PrintStream getOriginal() {
return this.original;
}
@Override
public void flush() throws IOException {
this.copy.flush();
this.original.flush();
}
}
/**
* Allow AnsiOutput to not be on the test classpath.
*/
private static class AnsiOutputControl {
public void disableAnsiOutput() {
}
public void enabledAnsiOutput() {
}
public static AnsiOutputControl get() {
try {
Class.forName("org.springframework.boot.ansi.AnsiOutput");
return new AnsiPresentOutputControl();
}
catch (ClassNotFoundException ex) {
return new AnsiOutputControl();
}
}
}
private static class AnsiPresentOutputControl extends AnsiOutputControl {
@Override
public void disableAnsiOutput() {
AnsiOutput.setEnabled(AnsiOutput.Enabled.NEVER);
}
@Override
public void enabledAnsiOutput() {
AnsiOutput.setEnabled(AnsiOutput.Enabled.DETECT);
}
}
}

@ -0,0 +1,118 @@
/*
* Copyright 2012-2019 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.boot.test.extension;
import org.junit.jupiter.api.extension.AfterAllCallback;
import org.junit.jupiter.api.extension.AfterEachCallback;
import org.junit.jupiter.api.extension.BeforeAllCallback;
import org.junit.jupiter.api.extension.BeforeEachCallback;
import org.junit.jupiter.api.extension.ExtendWith;
import org.junit.jupiter.api.extension.ExtensionContext;
import org.junit.jupiter.api.extension.ParameterContext;
import org.junit.jupiter.api.extension.ParameterResolutionException;
import org.junit.jupiter.api.extension.ParameterResolver;
import org.junit.jupiter.api.extension.RegisterExtension;
/**
* JUnit5 {@code @Extension} to capture output {@link System#out System.out} and
* {@link System#err System.err}. Can be used on a test class via
* {@link ExtendWith @ExtendWith}, or on field using
* {@link RegisterExtension @RegisterExtension}. This extension provides access to
* {@link CapturedOutput} instances which can be used to assert that the correct output
* was written.
* <p>
* To use with {@link ExtendWith @ExtendWith}, inject the {@link CapturedOutput} as a test
* argument: <pre class="code">
* &#064;ExtendWith(OutputExtension.class)
* class MyTest {
*
* &#064;Test
* void test(CapturedOutput output) {
* assertThat(output).contains("ok");
* }
*
* }
* </pre>
* <p>
* To use with {@link RegisterExtension @RegisterExtension}, use the {@link #capture()
* capture} factory method: argument: <pre class="code">
* class MyTest {
*
* &#064;RegisterExtension
* CapturedOutput output = OutputExtension.capture();
*
* &#064;Test
* void test() {
* assertThat(output).contains("ok");
* }
*
* }
* </pre>
*
* @author Madhura Bhave
* @author Phillip Webb
* @since 2.2.0
* @see CapturedOutput
*/
public class OutputExtension extends CapturedOutput implements BeforeAllCallback,
AfterAllCallback, BeforeEachCallback, AfterEachCallback, ParameterResolver {
OutputExtension() {
// Package private to prevent users from directly creating an instance.
}
@Override
public void beforeAll(ExtensionContext context) throws Exception {
push();
}
@Override
public void afterAll(ExtensionContext context) throws Exception {
pop();
}
@Override
public void beforeEach(ExtensionContext context) throws Exception {
push();
}
@Override
public void afterEach(ExtensionContext context) throws Exception {
pop();
}
@Override
public boolean supportsParameter(ParameterContext parameterContext,
ExtensionContext extensionContext) throws ParameterResolutionException {
return CapturedOutput.class.equals(parameterContext.getParameter().getType());
}
@Override
public Object resolveParameter(ParameterContext parameterContext,
ExtensionContext extensionContext) throws ParameterResolutionException {
return this;
}
/**
* Factory method for use with {@link RegisterExtension @RegisterExtension} fields.
* @return a new {@link CapturedOutput} instance
*/
public static CapturedOutput capture() {
return new OutputExtension();
}
}

@ -0,0 +1,180 @@
/*
* Copyright 2012-2019 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.boot.test.extension;
import java.io.ByteArrayOutputStream;
import java.io.PrintStream;
import java.util.NoSuchElementException;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
/**
* Tests for {@link CapturedOutput}.
*
* @author Phillip Webb
*/
class CapturedOutputTests {
private PrintStream originalOut;
private PrintStream originalErr;
private TestPrintStream systemOut;
private TestPrintStream systemErr;
private CapturedOutput output = new CapturedOutput();
@BeforeEach
void replaceSystemStreams() {
this.originalOut = System.out;
this.originalErr = System.err;
this.systemOut = new TestPrintStream();
this.systemErr = new TestPrintStream();
System.setOut(this.systemOut);
System.setErr(this.systemErr);
}
@AfterEach
void restoreSystemStreams() {
System.setOut(this.originalOut);
System.setErr(this.originalErr);
}
@Test
void pushWhenEmptyStartsCapture() {
System.out.print("A");
this.output.push();
System.out.print("B");
assertThat(this.output).isEqualTo("B");
}
@Test
void pushWhenHasExistingStartesNewCapture() {
System.out.print("A");
this.output.push();
System.out.print("B");
this.output.push();
System.out.print("C");
assertThat(this.output).isEqualTo("BC");
}
@Test
void popWhenEmptyThrowsException() {
assertThatExceptionOfType(NoSuchElementException.class)
.isThrownBy(this.output::pop);
}
@Test
void popWhenHasExistingEndsCapture() {
this.output.push();
System.out.print("A");
this.output.pop();
System.out.print("B");
assertThat(this.systemOut.toString()).isEqualTo("AB");
}
@Test
void captureAlsoWritesToSystemOut() {
this.output.push();
System.out.print("A");
assertThat(this.systemOut.toString()).isEqualTo("A");
}
@Test
void captureAlsoWritesToSystemErr() {
this.output.push();
System.err.print("A");
assertThat(this.systemErr.toString()).isEqualTo("A");
}
@Test
void lengthReturnsCapturedLength() {
this.output.push();
System.out.print("ABC");
assertThat(this.output.length()).isEqualTo(3);
}
@Test
void charAtReturnsCapturedCharAt() {
this.output.push();
System.out.print("ABC");
assertThat(this.output.charAt(1)).isEqualTo('B');
}
@Test
void subSequenceReturnsCapturedSubSequence() {
this.output.push();
System.out.print("ABC");
assertThat(this.output.subSequence(1, 3)).isEqualTo("BC");
}
@Test
void getAllReturnsAllCapturedOutput() {
this.output.push();
System.out.print("A");
System.err.print("B");
System.out.print("C");
assertThat(this.output.getAll()).isEqualTo("ABC");
}
@Test
void toStringReturnsAllCapturedOutput() {
this.output.push();
System.out.print("A");
System.err.print("B");
System.out.print("C");
assertThat(this.output.toString()).isEqualTo("ABC");
}
@Test
void getErrReturnsOnlyCapturedErrOutput() {
this.output.push();
System.out.print("A");
System.err.print("B");
System.out.print("C");
assertThat(this.output.getErr()).isEqualTo("B");
}
@Test
void getOutReturnsOnlyCapturedOutOutput() {
this.output.push();
System.out.print("A");
System.err.print("B");
System.out.print("C");
assertThat(this.output.getOut()).isEqualTo("AC");
}
private static class TestPrintStream extends PrintStream {
TestPrintStream() {
super(new ByteArrayOutputStream());
}
@Override
public String toString() {
return this.out.toString();
}
}
}

@ -23,21 +23,21 @@ import org.junit.jupiter.api.extension.ExtensionContext;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
/** /**
* Tests for {@link OutputCapture} when used via {@link ExtendWith @ExtendWith}. * Tests for {@link OutputExtension} when used via {@link ExtendWith @ExtendWith}.
* *
* @author Madhura Bhave * @author Madhura Bhave
*/ */
@ExtendWith(OutputCapture.class) @ExtendWith(OutputExtension.class)
@ExtendWith(OutputCaptureExtendWithTests.BeforeAllExtension.class) @ExtendWith(OutputExtensionExtendWithTests.BeforeAllExtension.class)
class OutputCaptureExtendWithTests { class OutputExtensionExtendWithTests {
@Test @Test
void captureShouldReturnOutputCapturedBeforeTestMethod(OutputCapture output) { void captureShouldReturnOutputCapturedBeforeTestMethod(CapturedOutput output) {
assertThat(output).contains("Before all").doesNotContain("Hello"); assertThat(output).contains("Before all").doesNotContain("Hello");
} }
@Test @Test
void captureShouldReturnAllCapturedOutput(OutputCapture output) { void captureShouldReturnAllCapturedOutput(CapturedOutput output) {
System.out.println("Hello World"); System.out.println("Hello World");
System.err.println("Error!!!"); System.err.println("Error!!!");
assertThat(output).contains("Before all").contains("Hello World") assertThat(output).contains("Before all").contains("Hello World")

@ -21,15 +21,15 @@ import org.junit.jupiter.api.extension.RegisterExtension;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
/** /**
* Tests for {@link OutputCapture} when used via * Tests for {@link OutputExtension} when used via
* {@link RegisterExtension @RegisterExtension}. * {@link RegisterExtension @RegisterExtension}.
* *
* @author Madhura Bhave * @author Madhura Bhave
*/ */
class OutputCaptureRegisterExtensionTests { class OutputExtensionRegisterExtensionTests {
@RegisterExtension @RegisterExtension
OutputCapture output = new OutputCapture(); CapturedOutput output = OutputExtension.capture();
@Test @Test
void captureShouldReturnAllCapturedOutput() { void captureShouldReturnAllCapturedOutput() {

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2018 the original author or authors. * Copyright 2012-2019 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -54,6 +54,14 @@ public abstract class AnsiOutput {
AnsiOutput.enabled = enabled; AnsiOutput.enabled = enabled;
} }
/**
* Returns if ANSI output is enabled
* @return if ANSI enabled, disabled or detected
*/
public static Enabled getEnabled() {
return AnsiOutput.enabled;
}
/** /**
* Sets if the System.console() is known to be available. * Sets if the System.console() is known to be available.
* @param consoleAvailable if the console is known to be available or {@code null} to * @param consoleAvailable if the console is known to be available or {@code null} to
@ -63,10 +71,6 @@ public abstract class AnsiOutput {
AnsiOutput.consoleAvailable = consoleAvailable; AnsiOutput.consoleAvailable = consoleAvailable;
} }
static Enabled getEnabled() {
return AnsiOutput.enabled;
}
/** /**
* Encode a single {@link AnsiElement} if output is enabled. * Encode a single {@link AnsiElement} if output is enabled.
* @param element the element to encode * @param element the element to encode

@ -21,7 +21,8 @@ import org.junit.jupiter.api.extension.RegisterExtension;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.extension.OutputCapture; import org.springframework.boot.test.extension.CapturedOutput;
import org.springframework.boot.test.extension.OutputExtension;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
@ -34,7 +35,7 @@ import static org.assertj.core.api.Assertions.assertThat;
class SampleActiveMqTests { class SampleActiveMqTests {
@RegisterExtension @RegisterExtension
OutputCapture output = new OutputCapture(); CapturedOutput output = OutputExtension.capture();
@Autowired @Autowired
private Producer producer; private Producer producer;

@ -26,7 +26,8 @@ import org.junit.jupiter.api.extension.RegisterExtension;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.extension.OutputCapture; import org.springframework.boot.test.extension.CapturedOutput;
import org.springframework.boot.test.extension.OutputExtension;
import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.MockMvc;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
@ -49,7 +50,7 @@ class SampleActuatorLog4J2ApplicationTests {
.getLogger(SampleActuatorLog4J2ApplicationTests.class); .getLogger(SampleActuatorLog4J2ApplicationTests.class);
@RegisterExtension @RegisterExtension
OutputCapture output = new OutputCapture(); CapturedOutput output = OutputExtension.capture();
@Autowired @Autowired
private MockMvc mvc; private MockMvc mvc;

@ -21,7 +21,8 @@ import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.api.extension.RegisterExtension;
import org.springframework.boot.test.extension.OutputCapture; import org.springframework.boot.test.extension.CapturedOutput;
import org.springframework.boot.test.extension.OutputExtension;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
@ -34,7 +35,7 @@ import static org.assertj.core.api.Assertions.assertThat;
class SampleAopApplicationTests { class SampleAopApplicationTests {
@RegisterExtension @RegisterExtension
OutputCapture output = new OutputCapture(); CapturedOutput output = OutputExtension.capture();
private String profiles; private String profiles;

@ -20,14 +20,15 @@ import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.api.extension.RegisterExtension;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.test.extension.OutputCapture; import org.springframework.boot.test.extension.CapturedOutput;
import org.springframework.boot.test.extension.OutputExtension;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
class SampleBatchApplicationTests { class SampleBatchApplicationTests {
@RegisterExtension @RegisterExtension
OutputCapture output = new OutputCapture(); CapturedOutput output = OutputExtension.capture();
@Test @Test
void testDefaultSettings() { void testDefaultSettings() {

@ -25,7 +25,8 @@ import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.extension.OutputCapture; import org.springframework.boot.test.extension.CapturedOutput;
import org.springframework.boot.test.extension.OutputExtension;
import org.springframework.test.context.TestExecutionListeners; import org.springframework.test.context.TestExecutionListeners;
import org.springframework.test.context.TestExecutionListeners.MergeMode; import org.springframework.test.context.TestExecutionListeners.MergeMode;
@ -36,14 +37,14 @@ import static org.assertj.core.api.Assertions.assertThat;
*/ */
@TestExecutionListeners(mergeMode = MergeMode.MERGE_WITH_DEFAULTS, @TestExecutionListeners(mergeMode = MergeMode.MERGE_WITH_DEFAULTS,
listeners = { OrderedCassandraTestExecutionListener.class }) listeners = { OrderedCassandraTestExecutionListener.class })
@ExtendWith(OutputCapture.class) @ExtendWith(OutputExtension.class)
@SpringBootTest @SpringBootTest
@CassandraDataSet(keyspace = "mykeyspace", value = "setup.cql") @CassandraDataSet(keyspace = "mykeyspace", value = "setup.cql")
@EmbeddedCassandra(timeout = 60000) @EmbeddedCassandra(timeout = 60000)
class SampleCassandraApplicationTests { class SampleCassandraApplicationTests {
@Test @Test
void testDefaultSettings(OutputCapture output) { void testDefaultSettings(CapturedOutput output) {
Assumptions.assumeFalse(this::runningOnWindows); Assumptions.assumeFalse(this::runningOnWindows);
assertThat(output).contains("firstName='Alice', lastName='Smith'"); assertThat(output).contains("firstName='Alice', lastName='Smith'");
} }

@ -21,7 +21,8 @@ import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.api.extension.RegisterExtension;
import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.test.extension.OutputCapture; import org.springframework.boot.test.extension.CapturedOutput;
import org.springframework.boot.test.extension.OutputExtension;
import org.springframework.core.NestedCheckedException; import org.springframework.core.NestedCheckedException;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
@ -29,7 +30,7 @@ import static org.assertj.core.api.Assertions.assertThat;
class SampleCouchbaseApplicationTests { class SampleCouchbaseApplicationTests {
@RegisterExtension @RegisterExtension
OutputCapture output = new OutputCapture(); CapturedOutput output = OutputExtension.capture();
@Test @Test
void testDefaultSettings() { void testDefaultSettings() {

@ -21,7 +21,8 @@ import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.api.extension.RegisterExtension;
import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.test.extension.OutputCapture; import org.springframework.boot.test.extension.CapturedOutput;
import org.springframework.boot.test.extension.OutputExtension;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
@ -33,7 +34,7 @@ import static org.assertj.core.api.Assertions.assertThat;
class SampleElasticsearchApplicationTests { class SampleElasticsearchApplicationTests {
@RegisterExtension @RegisterExtension
OutputCapture output = new OutputCapture(); CapturedOutput output = OutputExtension.capture();
@Test @Test
void testDefaultSettings() { void testDefaultSettings() {

@ -20,7 +20,8 @@ import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.extension.OutputCapture; import org.springframework.boot.test.extension.CapturedOutput;
import org.springframework.boot.test.extension.OutputExtension;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
@ -29,12 +30,12 @@ import static org.assertj.core.api.Assertions.assertThat;
* *
* @author Phillip Webb * @author Phillip Webb
*/ */
@ExtendWith(OutputCapture.class) @ExtendWith(OutputExtension.class)
@SpringBootTest @SpringBootTest
class SampleLdapApplicationTests { class SampleLdapApplicationTests {
@Test @Test
void testDefaultSettings(OutputCapture output) { void testDefaultSettings(CapturedOutput output) {
assertThat(output).contains("cn=Alice Smith"); assertThat(output).contains("cn=Alice Smith");
} }

@ -20,7 +20,8 @@ import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.extension.OutputCapture; import org.springframework.boot.test.extension.CapturedOutput;
import org.springframework.boot.test.extension.OutputExtension;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
@ -30,12 +31,12 @@ import static org.assertj.core.api.Assertions.assertThat;
* @author Dave Syer * @author Dave Syer
* @author Andy Wilkinson * @author Andy Wilkinson
*/ */
@ExtendWith(OutputCapture.class) @ExtendWith(OutputExtension.class)
@SpringBootTest @SpringBootTest
class SampleMongoApplicationTests { class SampleMongoApplicationTests {
@Test @Test
void testDefaultSettings(OutputCapture output) { void testDefaultSettings(CapturedOutput output) {
assertThat(output).contains("firstName='Alice', lastName='Smith'"); assertThat(output).contains("firstName='Alice', lastName='Smith'");
} }

@ -20,7 +20,8 @@ import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.api.extension.RegisterExtension;
import org.neo4j.driver.v1.exceptions.ServiceUnavailableException; import org.neo4j.driver.v1.exceptions.ServiceUnavailableException;
import org.springframework.boot.test.extension.OutputCapture; import org.springframework.boot.test.extension.CapturedOutput;
import org.springframework.boot.test.extension.OutputExtension;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
@ -32,7 +33,7 @@ import static org.assertj.core.api.Assertions.assertThat;
class SampleNeo4jApplicationTests { class SampleNeo4jApplicationTests {
@RegisterExtension @RegisterExtension
OutputCapture output = new OutputCapture(); CapturedOutput output = OutputExtension.capture();
@Test @Test
void testDefaultSettings() { void testDefaultSettings() {

@ -19,7 +19,8 @@ package sample.data.redis;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.api.extension.RegisterExtension;
import org.springframework.boot.test.extension.OutputCapture; import org.springframework.boot.test.extension.CapturedOutput;
import org.springframework.boot.test.extension.OutputExtension;
import org.springframework.data.redis.RedisConnectionFailureException; import org.springframework.data.redis.RedisConnectionFailureException;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
@ -32,7 +33,7 @@ import static org.assertj.core.api.Assertions.assertThat;
class SampleRedisApplicationTests { class SampleRedisApplicationTests {
@RegisterExtension @RegisterExtension
OutputCapture output = new OutputCapture(); CapturedOutput output = OutputExtension.capture();
@Test @Test
void testDefaultSettings() { void testDefaultSettings() {

@ -19,7 +19,8 @@ package sample.data.solr;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.api.extension.RegisterExtension;
import org.springframework.boot.test.extension.OutputCapture; import org.springframework.boot.test.extension.CapturedOutput;
import org.springframework.boot.test.extension.OutputExtension;
import org.springframework.core.NestedCheckedException; import org.springframework.core.NestedCheckedException;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
@ -27,7 +28,7 @@ import static org.assertj.core.api.Assertions.assertThat;
class SampleSolrApplicationTests { class SampleSolrApplicationTests {
@RegisterExtension @RegisterExtension
OutputCapture output = new OutputCapture(); CapturedOutput output = OutputExtension.capture();
@Test @Test
void testDefaultSettings() throws Exception { void testDefaultSettings() throws Exception {

@ -19,7 +19,8 @@ package sample.jooq;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.api.extension.RegisterExtension;
import org.springframework.boot.test.extension.OutputCapture; import org.springframework.boot.test.extension.CapturedOutput;
import org.springframework.boot.test.extension.OutputExtension;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
@ -31,7 +32,7 @@ class SampleJooqApplicationTests {
private static final String[] NO_ARGS = {}; private static final String[] NO_ARGS = {};
@RegisterExtension @RegisterExtension
OutputCapture output = new OutputCapture(); CapturedOutput output = OutputExtension.capture();
@Test @Test
void outputResults() { void outputResults() {

@ -20,7 +20,8 @@ import org.assertj.core.api.Condition;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.api.extension.RegisterExtension;
import org.springframework.boot.test.extension.OutputCapture; import org.springframework.boot.test.extension.CapturedOutput;
import org.springframework.boot.test.extension.OutputExtension;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
@ -32,7 +33,7 @@ import static org.assertj.core.api.Assertions.assertThat;
class SampleAtomikosApplicationTests { class SampleAtomikosApplicationTests {
@RegisterExtension @RegisterExtension
OutputCapture output = new OutputCapture(); CapturedOutput output = OutputExtension.capture();
@Test @Test
void testTransactionRollback() throws Exception { void testTransactionRollback() throws Exception {

@ -22,7 +22,8 @@ import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.api.extension.RegisterExtension;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.test.extension.OutputCapture; import org.springframework.boot.test.extension.CapturedOutput;
import org.springframework.boot.test.extension.OutputExtension;
import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContext;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
@ -35,7 +36,7 @@ import static org.assertj.core.api.Assertions.assertThat;
class SampleBitronixApplicationTests { class SampleBitronixApplicationTests {
@RegisterExtension @RegisterExtension
OutputCapture output = new OutputCapture(); CapturedOutput output = OutputExtension.capture();
@Test @Test
void testTransactionRollback() throws Exception { void testTransactionRollback() throws Exception {

@ -21,7 +21,8 @@ import java.net.ConnectException;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.api.extension.RegisterExtension;
import org.springframework.boot.test.extension.OutputCapture; import org.springframework.boot.test.extension.CapturedOutput;
import org.springframework.boot.test.extension.OutputExtension;
import org.springframework.core.NestedCheckedException; import org.springframework.core.NestedCheckedException;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
@ -29,7 +30,7 @@ import static org.assertj.core.api.Assertions.assertThat;
class SampleLiquibaseApplicationTests { class SampleLiquibaseApplicationTests {
@RegisterExtension @RegisterExtension
OutputCapture output = new OutputCapture(); CapturedOutput output = OutputExtension.capture();
@Test @Test
void testDefaultSettings() throws Exception { void testDefaultSettings() throws Exception {

@ -19,14 +19,15 @@ package sample.logback;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.api.extension.RegisterExtension;
import org.springframework.boot.test.extension.OutputCapture; import org.springframework.boot.test.extension.CapturedOutput;
import org.springframework.boot.test.extension.OutputExtension;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
class SampleLogbackApplicationTests { class SampleLogbackApplicationTests {
@RegisterExtension @RegisterExtension
OutputCapture output = new OutputCapture(); CapturedOutput output = OutputExtension.capture();
@Test @Test
void testLoadedCustomLogbackConfig() throws Exception { void testLoadedCustomLogbackConfig() throws Exception {

@ -21,14 +21,15 @@ import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.api.extension.RegisterExtension;
import org.springframework.boot.test.extension.OutputCapture; import org.springframework.boot.test.extension.CapturedOutput;
import org.springframework.boot.test.extension.OutputExtension;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
class SampleProfileApplicationTests { class SampleProfileApplicationTests {
@RegisterExtension @RegisterExtension
OutputCapture output = new OutputCapture(); CapturedOutput output = OutputExtension.capture();
private String profiles; private String profiles;

@ -20,7 +20,8 @@ import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.api.extension.RegisterExtension;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.test.extension.OutputCapture; import org.springframework.boot.test.extension.CapturedOutput;
import org.springframework.boot.test.extension.OutputExtension;
import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.ConfigurableApplicationContext;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
@ -33,7 +34,7 @@ import static org.assertj.core.api.Assertions.assertThat;
class SampleQuartzApplicationTests { class SampleQuartzApplicationTests {
@RegisterExtension @RegisterExtension
OutputCapture output = new OutputCapture(); CapturedOutput output = OutputExtension.capture();
@Test @Test
void quartzJobIsTriggered() throws InterruptedException { void quartzJobIsTriggered() throws InterruptedException {

@ -21,7 +21,8 @@ import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.api.extension.RegisterExtension;
import org.springframework.boot.test.extension.OutputCapture; import org.springframework.boot.test.extension.CapturedOutput;
import org.springframework.boot.test.extension.OutputExtension;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
@ -34,7 +35,7 @@ import static org.assertj.core.api.Assertions.assertThat;
class SampleSimpleApplicationTests { class SampleSimpleApplicationTests {
@RegisterExtension @RegisterExtension
OutputCapture output = new OutputCapture(); CapturedOutput output = OutputExtension.capture();
private String profiles; private String profiles;

@ -27,7 +27,8 @@ import org.junit.jupiter.api.extension.RegisterExtension;
import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
import org.springframework.boot.test.extension.OutputCapture; import org.springframework.boot.test.extension.CapturedOutput;
import org.springframework.boot.test.extension.OutputExtension;
import org.springframework.boot.web.server.LocalServerPort; import org.springframework.boot.web.server.LocalServerPort;
import org.springframework.ws.client.core.WebServiceTemplate; import org.springframework.ws.client.core.WebServiceTemplate;
@ -37,7 +38,7 @@ import static org.assertj.core.api.Assertions.assertThat;
class SampleWsApplicationTests { class SampleWsApplicationTests {
@RegisterExtension @RegisterExtension
OutputCapture output = new OutputCapture(); CapturedOutput output = OutputExtension.capture();
private WebServiceTemplate webServiceTemplate = new WebServiceTemplate(); private WebServiceTemplate webServiceTemplate = new WebServiceTemplate();

@ -19,14 +19,15 @@ package sample.xml;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.api.extension.RegisterExtension;
import org.springframework.boot.test.extension.OutputCapture; import org.springframework.boot.test.extension.CapturedOutput;
import org.springframework.boot.test.extension.OutputExtension;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
class SampleSpringXmlApplicationTests { class SampleSpringXmlApplicationTests {
@RegisterExtension @RegisterExtension
OutputCapture output = new OutputCapture(); CapturedOutput output = OutputExtension.capture();
@Test @Test
void testDefaultSettings() throws Exception { void testDefaultSettings() throws Exception {

Loading…
Cancel
Save