GitHub-Spring
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge branch '3.1.x' 

Closes gh-37967
pull/37973/head
Phillip Webb 2 years ago
parent
e25886f2de 1d456e09d2
commit
d638bbb0ba
32 changed files with 167 additions and 159 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      buildSrc/src/test/java/org/springframework/boot/build/mavenplugin/PluginXmlParserTests.java
  2. 6
      spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/orm/jpa/HibernateMetricsAutoConfigurationTests.java
  3. 10
      spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/observation/ObservationAutoConfigurationTests.java
  4. 23
      spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/tracing/BraveAutoConfigurationTests.java
  5. 6
      spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/tracing/zipkin/ZipkinHttpSenderTests.java
  6. 6
      spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/tracing/zipkin/ZipkinRestTemplateSenderTests.java
  7. 10
      spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/tracing/zipkin/ZipkinWebClientSenderTests.java
  8. 8
      spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/wavefront/WavefrontPropertiesTests.java
  9. 8
      spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/amqp/RabbitPropertiesTests.java
  10. 10
      spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cassandra/CassandraAutoConfigurationTests.java
  11. 8
      spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cassandra/CassandraAutoConfigurationWithPasswordAuthenticationIntegrationTests.java
  12. 4
      spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/OnBeanConditionTypeDeductionFailureTests.java
  13. 12
      spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/integration/IntegrationPropertiesEnvironmentPostProcessorTests.java
  14. 10
      spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jackson/JacksonAutoConfigurationTests.java
  15. 6
      spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/logging/ConditionEvaluationReportLoggingListenerTests.java
  16. 6
      spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/runner/ContextConsumerTests.java
  17. 6
      spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/tasks/buildinfo/BuildInfoTests.java
  18. 7
      spring-boot-project/spring-boot/src/test/java/org/springframework/boot/SpringApplicationShutdownHookTests.java
  19. 14
      spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/metrics/buffering/BufferingApplicationStartupTests.java
  20. 24
      spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/ConfigurationPropertiesTests.java
  21. 4
      spring-boot-project/spring-boot/src/test/java/org/springframework/boot/diagnostics/FailureAnalyzersIntegrationTests.java
  22. 5
      spring-boot-project/spring-boot/src/test/java/org/springframework/boot/diagnostics/analyzer/JakartaApiValidationExceptionFailureAnalyzerTests.java
  23. 4
      spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jdbc/init/DataSourceScriptDatabaseInitializerTests.java
  24. 7
      spring-boot-project/spring-boot/src/test/java/org/springframework/boot/ssl/DefaultSslBundleRegistryTests.java
  25. 37
      spring-boot-project/spring-boot/src/test/java/org/springframework/boot/ssl/pem/PemPrivateKeyParserTests.java
  26. 6
      spring-boot-project/spring-boot/src/test/java/org/springframework/boot/validation/MessageSourceMessageInterpolatorIntegrationTests.java
  27. 4
      spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/reactive/server/AbstractReactiveWebServerFactoryTests.java
  28. 14
      spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/server/SslConfigurationValidatorTests.java
  29. 21
      spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/AbstractFilterRegistrationBeanTests.java
  30. 21
      spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/ServletRegistrationBeanTests.java
  31. 5
      spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/server/AbstractServletWebServerFactoryTests.java
  32. 6
      spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-test/src/test/java/smoketest/test/web/UserVehicleControllerTests.java

8
buildSrc/src/test/java/org/springframework/boot/build/mavenplugin/PluginXmlParserTests.java
Unescape View File

@ -24,7 +24,7 @@ import org.junit.jupiter.api.Test;
import org.springframework.boot.build.mavenplugin.PluginXmlParser.Plugin; import org.springframework.boot.build.mavenplugin.PluginXmlParser.Plugin;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
/** /**
* Tests for {@link PluginXmlParser}. * Tests for {@link PluginXmlParser}.
@ -49,9 +49,9 @@ class PluginXmlParserTests {
@Test @Test
void parseNonExistingFileThrowException() { void parseNonExistingFileThrowException() {
assertThatThrownBy(() -> this.parser.parse(new File("src/test/resources/nonexistent.xml"))) assertThatExceptionOfType(RuntimeException.class)
.isInstanceOf(RuntimeException.class) .isThrownBy(() -> this.parser.parse(new File("src/test/resources/nonexistent.xml")))
.hasCauseInstanceOf(FileNotFoundException.class); .withCauseInstanceOf(FileNotFoundException.class);
} }
} }

6
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/orm/jpa/HibernateMetricsAutoConfigurationTests.java
Unescape View File

@ -50,7 +50,7 @@ import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter; import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
import static org.mockito.BDDMockito.given; import static org.mockito.BDDMockito.given;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
@ -117,8 +117,8 @@ class HibernateMetricsAutoConfigurationTests {
.withUserConfiguration(NonHibernateEntityManagerFactoryConfiguration.class) .withUserConfiguration(NonHibernateEntityManagerFactoryConfiguration.class)
.run((context) -> { .run((context) -> {
// ensure EntityManagerFactory is not a Hibernate SessionFactory // ensure EntityManagerFactory is not a Hibernate SessionFactory
assertThatThrownBy(() -> context.getBean(EntityManagerFactory.class).unwrap(SessionFactory.class)) assertThatExceptionOfType(PersistenceException.class)
.isInstanceOf(PersistenceException.class); .isThrownBy(() -> context.getBean(EntityManagerFactory.class).unwrap(SessionFactory.class));
MeterRegistry registry = context.getBean(MeterRegistry.class); MeterRegistry registry = context.getBean(MeterRegistry.class);
assertThat(registry.find("hibernate.statements").meter()).isNull(); assertThat(registry.find("hibernate.statements").meter()).isNull();
}); });

10
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/observation/ObservationAutoConfigurationTests.java
Unescape View File

@ -52,7 +52,7 @@ import org.springframework.context.annotation.Import;
import org.springframework.core.annotation.Order; import org.springframework.core.annotation.Order;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
/** /**
@ -198,8 +198,8 @@ class ObservationAutoConfigurationTests {
Observation.start("observation2", observationRegistry).stop(); Observation.start("observation2", observationRegistry).stop();
MeterRegistry meterRegistry = context.getBean(MeterRegistry.class); MeterRegistry meterRegistry = context.getBean(MeterRegistry.class);
assertThat(meterRegistry.get("observation1").timer().count()).isOne(); assertThat(meterRegistry.get("observation1").timer().count()).isOne();
assertThatThrownBy(() -> meterRegistry.get("observation2").timer()) assertThatExceptionOfType(MeterNotFoundException.class)
.isInstanceOf(MeterNotFoundException.class); .isThrownBy(() -> meterRegistry.get("observation2").timer());
}); });
} }
@ -329,8 +329,8 @@ class ObservationAutoConfigurationTests {
ObservationRegistry observationRegistry = context.getBean(ObservationRegistry.class); ObservationRegistry observationRegistry = context.getBean(ObservationRegistry.class);
Observation.start("spring.security.filterchains", observationRegistry).stop(); Observation.start("spring.security.filterchains", observationRegistry).stop();
MeterRegistry meterRegistry = context.getBean(MeterRegistry.class); MeterRegistry meterRegistry = context.getBean(MeterRegistry.class);
assertThatThrownBy(() -> meterRegistry.get("spring.security.filterchains").timer()) assertThatExceptionOfType(MeterNotFoundException.class)
.isInstanceOf(MeterNotFoundException.class); .isThrownBy(() -> meterRegistry.get("spring.security.filterchains").timer());
}); });
} }

23
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/tracing/BraveAutoConfigurationTests.java
Unescape View File

@ -57,7 +57,7 @@ import org.springframework.context.annotation.Configuration;
import org.springframework.core.annotation.Order; import org.springframework.core.annotation.Order;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.assertj.core.api.Assertions.assertThatException;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
/** /**
@ -285,30 +285,33 @@ class BraveAutoConfigurationTests {
this.contextRunner this.contextRunner
.withPropertyValues("management.tracing.propagation.type=W3C", .withPropertyValues("management.tracing.propagation.type=W3C",
"management.tracing.brave.span-joining-supported=true") "management.tracing.brave.span-joining-supported=true")
.run((context) -> assertThatThrownBy(() -> context.getBean(Tracing.class)).rootCause() .run((context) -> assertThatException().isThrownBy(() -> context.getBean(Tracing.class))
.havingRootCause()
.isExactlyInstanceOf(IncompatibleConfigurationException.class) .isExactlyInstanceOf(IncompatibleConfigurationException.class)
.hasMessage( .withMessage("The following configuration properties have incompatible values: "
"The following configuration properties have incompatible values: [management.tracing.propagation.type, management.tracing.brave.span-joining-supported]")); + "[management.tracing.propagation.type, management.tracing.brave.span-joining-supported]"));
} }
@Test @Test
void shouldFailIfSupportJoinedSpansIsEnabledAndW3cIsChosenAsConsume() { void shouldFailIfSupportJoinedSpansIsEnabledAndW3cIsChosenAsConsume() {
this.contextRunner.withPropertyValues("management.tracing.propagation.produce=B3", this.contextRunner.withPropertyValues("management.tracing.propagation.produce=B3",
"management.tracing.propagation.consume=W3C", "management.tracing.brave.span-joining-supported=true") "management.tracing.propagation.consume=W3C", "management.tracing.brave.span-joining-supported=true")
.run((context) -> assertThatThrownBy(() -> context.getBean(Tracing.class)).rootCause() .run((context) -> assertThatException().isThrownBy(() -> context.getBean(Tracing.class))
.havingRootCause()
.isExactlyInstanceOf(IncompatibleConfigurationException.class) .isExactlyInstanceOf(IncompatibleConfigurationException.class)
.hasMessage( .withMessage("The following configuration properties have incompatible values: "
"The following configuration properties have incompatible values: [management.tracing.propagation.consume, management.tracing.brave.span-joining-supported]")); + "[management.tracing.propagation.consume, management.tracing.brave.span-joining-supported]"));
} }
@Test @Test
void shouldFailIfSupportJoinedSpansIsEnabledAndW3cIsChosenAsProduce() { void shouldFailIfSupportJoinedSpansIsEnabledAndW3cIsChosenAsProduce() {
this.contextRunner.withPropertyValues("management.tracing.propagation.consume=B3", this.contextRunner.withPropertyValues("management.tracing.propagation.consume=B3",
"management.tracing.propagation.produce=W3C", "management.tracing.brave.span-joining-supported=true") "management.tracing.propagation.produce=W3C", "management.tracing.brave.span-joining-supported=true")
.run((context) -> assertThatThrownBy(() -> context.getBean(Tracing.class)).rootCause() .run((context) -> assertThatException().isThrownBy(() -> context.getBean(Tracing.class))
.havingRootCause()
.isExactlyInstanceOf(IncompatibleConfigurationException.class) .isExactlyInstanceOf(IncompatibleConfigurationException.class)
.hasMessage( .withMessage("The following configuration properties have incompatible values: "
"The following configuration properties have incompatible values: [management.tracing.propagation.produce, management.tracing.brave.span-joining-supported]")); + "[management.tracing.propagation.produce, management.tracing.brave.span-joining-supported]"));
} }
@Test @Test

6
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/tracing/zipkin/ZipkinHttpSenderTests.java
Unescape View File

@ -33,7 +33,7 @@ import zipkin2.reporter.ClosedSenderException;
import zipkin2.reporter.Sender; import zipkin2.reporter.Sender;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
/** /**
* Abstract base test class which is used for testing the different implementations of the * Abstract base test class which is used for testing the different implementations of the
@ -60,8 +60,8 @@ abstract class ZipkinHttpSenderTests {
@Test @Test
void sendSpansShouldThrowIfCloseWasCalled() throws IOException { void sendSpansShouldThrowIfCloseWasCalled() throws IOException {
this.sender.close(); this.sender.close();
assertThatThrownBy(() -> this.sender.sendSpans(Collections.emptyList())) assertThatExceptionOfType(ClosedSenderException.class)
.isInstanceOf(ClosedSenderException.class); .isThrownBy(() -> this.sender.sendSpans(Collections.emptyList()));
} }
protected void makeRequest(List<byte[]> encodedSpans, boolean async) throws IOException { protected void makeRequest(List<byte[]> encodedSpans, boolean async) throws IOException {

6
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/tracing/zipkin/ZipkinRestTemplateSenderTests.java
Unescape View File

@ -34,7 +34,7 @@ import org.springframework.test.web.client.MockRestServiceServer;
import org.springframework.web.client.RestTemplate; import org.springframework.web.client.RestTemplate;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.assertj.core.api.Assertions.assertThatException;
import static org.springframework.test.web.client.match.MockRestRequestMatchers.content; import static org.springframework.test.web.client.match.MockRestRequestMatchers.content;
import static org.springframework.test.web.client.match.MockRestRequestMatchers.header; import static org.springframework.test.web.client.match.MockRestRequestMatchers.header;
import static org.springframework.test.web.client.match.MockRestRequestMatchers.method; import static org.springframework.test.web.client.match.MockRestRequestMatchers.method;
@ -109,8 +109,8 @@ class ZipkinRestTemplateSenderTests extends ZipkinHttpSenderTests {
assertThat(callbackResult.error()).isNotNull().hasMessageContaining("500 Internal Server Error"); assertThat(callbackResult.error()).isNotNull().hasMessageContaining("500 Internal Server Error");
} }
else { else {
assertThatThrownBy(() -> makeSyncRequest(Collections.emptyList())) assertThatException().isThrownBy(() -> makeSyncRequest(Collections.emptyList()))
.hasMessageContaining("500 Internal Server Error"); .withMessageContaining("500 Internal Server Error");
} }
} }

10
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/tracing/zipkin/ZipkinWebClientSenderTests.java
Unescape View File

@ -41,7 +41,7 @@ import zipkin2.reporter.Sender;
import org.springframework.web.reactive.function.client.WebClient; import org.springframework.web.reactive.function.client.WebClient;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.assertj.core.api.Assertions.assertThatException;
/** /**
* Tests for {@link ZipkinWebClientSender}. * Tests for {@link ZipkinWebClientSender}.
@ -130,8 +130,8 @@ class ZipkinWebClientSenderTests extends ZipkinHttpSenderTests {
assertThat(callbackResult.error()).isNotNull().hasMessageContaining("500 Internal Server Error"); assertThat(callbackResult.error()).isNotNull().hasMessageContaining("500 Internal Server Error");
} }
else { else {
assertThatThrownBy(() -> makeSyncRequest(Collections.emptyList())) assertThatException().isThrownBy(() -> makeSyncRequest(Collections.emptyList()))
.hasMessageContaining("500 Internal Server Error"); .withMessageContaining("500 Internal Server Error");
} }
requestAssertions((request) -> assertThat(request.getMethod()).isEqualTo("POST")); requestAssertions((request) -> assertThat(request.getMethod()).isEqualTo("POST"));
} }
@ -165,8 +165,8 @@ class ZipkinWebClientSenderTests extends ZipkinHttpSenderTests {
assertThat(callbackResult.error()).isNotNull().isInstanceOf(TimeoutException.class); assertThat(callbackResult.error()).isNotNull().isInstanceOf(TimeoutException.class);
} }
else { else {
assertThatThrownBy(() -> makeSyncRequest(sender, Collections.emptyList())) assertThatException().isThrownBy(() -> makeSyncRequest(sender, Collections.emptyList()))
.hasCauseInstanceOf(TimeoutException.class); .withCauseInstanceOf(TimeoutException.class);
} }
} }

8
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/wavefront/WavefrontPropertiesTests.java
Unescape View File

@ -27,7 +27,7 @@ import org.springframework.boot.actuate.autoconfigure.wavefront.WavefrontPropert
import org.springframework.boot.context.properties.source.InvalidConfigurationPropertyValueException; import org.springframework.boot.context.properties.source.InvalidConfigurationPropertyValueException;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
/** /**
* Tests for {@link WavefrontProperties}. * Tests for {@link WavefrontProperties}.
@ -51,9 +51,9 @@ class WavefrontPropertiesTests {
properties.setUri(URI.create("http://localhost:2878")); properties.setUri(URI.create("http://localhost:2878"));
properties.setApiToken(null); properties.setApiToken(null);
assertThat(properties.getEffectiveUri()).isEqualTo(URI.create("http://localhost:2878")); assertThat(properties.getEffectiveUri()).isEqualTo(URI.create("http://localhost:2878"));
assertThatThrownBy(properties::getApiTokenOrThrow) assertThatExceptionOfType(InvalidConfigurationPropertyValueException.class)
.isInstanceOf(InvalidConfigurationPropertyValueException.class) .isThrownBy(properties::getApiTokenOrThrow)
.hasMessageContaining("management.wavefront.api-token"); .withMessageContaining("management.wavefront.api-token");
} }
@Test @Test

8
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/amqp/RabbitPropertiesTests.java
Unescape View File

@ -26,7 +26,7 @@ import org.springframework.amqp.rabbit.listener.SimpleMessageListenerContainer;
import org.springframework.boot.context.properties.source.InvalidConfigurationPropertyValueException; import org.springframework.boot.context.properties.source.InvalidConfigurationPropertyValueException;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
/** /**
* Tests for {@link RabbitProperties}. * Tests for {@link RabbitProperties}.
@ -369,9 +369,9 @@ class RabbitPropertiesTests {
void hostPropertyMustBeSingleHost() { void hostPropertyMustBeSingleHost() {
this.properties.setHost("my-rmq-host.net,my-rmq-host-2.net"); this.properties.setHost("my-rmq-host.net,my-rmq-host-2.net");
assertThat(this.properties.getHost()).isEqualTo("my-rmq-host.net,my-rmq-host-2.net"); assertThat(this.properties.getHost()).isEqualTo("my-rmq-host.net,my-rmq-host-2.net");
assertThatThrownBy(this.properties::determineAddresses) assertThatExceptionOfType(InvalidConfigurationPropertyValueException.class)
.isInstanceOf(InvalidConfigurationPropertyValueException.class) .isThrownBy(this.properties::determineAddresses)
.hasMessageContaining("spring.rabbitmq.host"); .withMessageContaining("spring.rabbitmq.host");
} }
} }

10
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cassandra/CassandraAutoConfigurationTests.java
Unescape View File

@ -32,6 +32,7 @@ import com.datastax.oss.driver.internal.core.session.throttling.PassThroughReque
import com.datastax.oss.driver.internal.core.session.throttling.RateLimitingRequestThrottler; import com.datastax.oss.driver.internal.core.session.throttling.RateLimitingRequestThrottler;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.BeanCreationException;
import org.springframework.boot.autoconfigure.AutoConfigurations; import org.springframework.boot.autoconfigure.AutoConfigurations;
import org.springframework.boot.autoconfigure.cassandra.CassandraAutoConfiguration.PropertiesCassandraConnectionDetails; import org.springframework.boot.autoconfigure.cassandra.CassandraAutoConfiguration.PropertiesCassandraConnectionDetails;
import org.springframework.boot.autoconfigure.ssl.SslAutoConfiguration; import org.springframework.boot.autoconfigure.ssl.SslAutoConfiguration;
@ -42,7 +43,7 @@ import org.springframework.context.annotation.Configuration;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatException; import static org.assertj.core.api.Assertions.assertThatException;
import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
/** /**
* Tests for {@link CassandraAutoConfiguration} * Tests for {@link CassandraAutoConfiguration}
@ -299,9 +300,10 @@ class CassandraAutoConfigurationTests {
@Test @Test
void driverConfigLoaderWithRateLimitingRequiresExtraConfiguration() { void driverConfigLoaderWithRateLimitingRequiresExtraConfiguration() {
this.contextRunner.withPropertyValues("spring.cassandra.request.throttler.type=rate-limiting") this.contextRunner.withPropertyValues("spring.cassandra.request.throttler.type=rate-limiting")
.run((context) -> assertThatThrownBy(() -> context.getBean(CqlSession.class)) .run((context) -> assertThatExceptionOfType(BeanCreationException.class)
.hasMessageContaining("Error instantiating class RateLimitingRequestThrottler") .isThrownBy(() -> context.getBean(CqlSession.class))
.hasMessageContaining("No configuration setting found for key")); .withMessageContaining("Error instantiating class RateLimitingRequestThrottler")
.withMessageContaining("No configuration setting found for key"));
} }
@Test @Test

8
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cassandra/CassandraAutoConfigurationWithPasswordAuthenticationIntegrationTests.java
Unescape View File

@ -34,13 +34,14 @@ import org.testcontainers.images.builder.Transferable;
import org.testcontainers.junit.jupiter.Container; import org.testcontainers.junit.jupiter.Container;
import org.testcontainers.junit.jupiter.Testcontainers; import org.testcontainers.junit.jupiter.Testcontainers;
import org.springframework.beans.factory.BeanCreationException;
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.testsupport.testcontainers.CassandraContainer; import org.springframework.boot.testsupport.testcontainers.CassandraContainer;
import org.springframework.util.StreamUtils; import org.springframework.util.StreamUtils;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
/** /**
* Tests for {@link CassandraAutoConfiguration} that only uses password authentication. * Tests for {@link CassandraAutoConfiguration} that only uses password authentication.
@ -77,8 +78,9 @@ class CassandraAutoConfigurationWithPasswordAuthenticationIntegrationTests {
void authenticationWithInvalidCredentials() { void authenticationWithInvalidCredentials() {
this.contextRunner this.contextRunner
.withPropertyValues("spring.cassandra.username=not-a-user", "spring.cassandra.password=invalid-password") .withPropertyValues("spring.cassandra.username=not-a-user", "spring.cassandra.password=invalid-password")
.run((context) -> assertThatThrownBy(() -> context.getBean(CqlSession.class)) .run((context) -> assertThatExceptionOfType(BeanCreationException.class)
.hasMessageContaining("Authentication error")); .isThrownBy(() -> context.getBean(CqlSession.class))
.withMessageContaining("Authentication error"));
} }
static final class PasswordAuthenticatorCassandraContainer extends CassandraContainer { static final class PasswordAuthenticatorCassandraContainer extends CassandraContainer {

4
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/OnBeanConditionTypeDeductionFailureTests.java
Unescape View File

@ -29,7 +29,7 @@ import org.springframework.context.annotation.ImportSelector;
import org.springframework.core.type.AnnotationMetadata; import org.springframework.core.type.AnnotationMetadata;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.assertThatException;
/** /**
* Tests for {@link OnBeanCondition} when deduction of the bean's type fails * Tests for {@link OnBeanCondition} when deduction of the bean's type fails
@ -41,7 +41,7 @@ class OnBeanConditionTypeDeductionFailureTests {
@Test @Test
void conditionalOnMissingBeanWithDeducedTypeThatIsPartiallyMissingFromClassPath() { void conditionalOnMissingBeanWithDeducedTypeThatIsPartiallyMissingFromClassPath() {
assertThatExceptionOfType(Exception.class) assertThatException()
.isThrownBy(() -> new AnnotationConfigApplicationContext(ImportingConfiguration.class).close()) .isThrownBy(() -> new AnnotationConfigApplicationContext(ImportingConfiguration.class).close())
.satisfies((ex) -> { .satisfies((ex) -> {
Throwable beanTypeDeductionException = findNestedCause(ex, BeanTypeDeductionException.class); Throwable beanTypeDeductionException = findNestedCause(ex, BeanTypeDeductionException.class);

12
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/integration/IntegrationPropertiesEnvironmentPostProcessorTests.java
Unescape View File

@ -34,7 +34,7 @@ import org.springframework.core.io.ClassPathResource;
import org.springframework.core.io.Resource; import org.springframework.core.io.Resource;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
/** /**
@ -69,11 +69,11 @@ class IntegrationPropertiesEnvironmentPostProcessorTests {
void registerIntegrationPropertiesPropertySourceWithUnknownResourceThrowsException() { void registerIntegrationPropertiesPropertySourceWithUnknownResourceThrowsException() {
ConfigurableEnvironment environment = new StandardEnvironment(); ConfigurableEnvironment environment = new StandardEnvironment();
ClassPathResource unknown = new ClassPathResource("does-not-exist.properties", getClass()); ClassPathResource unknown = new ClassPathResource("does-not-exist.properties", getClass());
assertThatThrownBy(() -> new IntegrationPropertiesEnvironmentPostProcessor() assertThatIllegalStateException()
.registerIntegrationPropertiesPropertySource(environment, unknown)) .isThrownBy(() -> new IntegrationPropertiesEnvironmentPostProcessor()
.isInstanceOf(IllegalStateException.class) .registerIntegrationPropertiesPropertySource(environment, unknown))
.hasCauseInstanceOf(FileNotFoundException.class) .withCauseInstanceOf(FileNotFoundException.class)
.hasMessageContaining(unknown.toString()); .withMessageContaining(unknown.toString());
} }
@Test @Test

10
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jackson/JacksonAutoConfigurationTests.java
Unescape View File

@ -75,7 +75,7 @@ import org.springframework.context.annotation.Primary;
import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder; import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
import static org.assertj.core.api.Assertions.entry; import static org.assertj.core.api.Assertions.entry;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
@ -363,10 +363,10 @@ class JacksonAutoConfigurationTests {
void disableDefaultLeniency() { void disableDefaultLeniency() {
this.contextRunner.withPropertyValues("spring.jackson.default-leniency:false").run((context) -> { this.contextRunner.withPropertyValues("spring.jackson.default-leniency:false").run((context) -> {
ObjectMapper mapper = context.getBean(ObjectMapper.class); ObjectMapper mapper = context.getBean(ObjectMapper.class);
assertThatThrownBy(() -> mapper.readValue("{\"birthDate\": \"2010-12-30\"}", Person.class)) assertThatExceptionOfType(InvalidFormatException.class)
.isInstanceOf(InvalidFormatException.class) .isThrownBy(() -> mapper.readValue("{\"birthDate\": \"2010-12-30\"}", Person.class))
.hasMessageContaining("expected format") .withMessageContaining("expected format")
.hasMessageContaining("yyyyMMdd"); .withMessageContaining("yyyyMMdd");
}); });
} }

6
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/logging/ConditionEvaluationReportLoggingListenerTests.java
Unescape View File

@ -39,7 +39,7 @@ import org.springframework.context.annotation.Import;
import org.springframework.mock.web.MockServletContext; import org.springframework.mock.web.MockServletContext;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.assertThatException;
/** /**
* Tests for {@link ConditionEvaluationReportLoggingListener}. * Tests for {@link ConditionEvaluationReportLoggingListener}.
@ -67,7 +67,7 @@ class ConditionEvaluationReportLoggingListenerTests {
AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(); AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
this.initializer.initialize(context); this.initializer.initialize(context);
context.register(ErrorConfig.class); context.register(ErrorConfig.class);
assertThatExceptionOfType(Exception.class).isThrownBy(context::refresh) assertThatException().isThrownBy(context::refresh)
.satisfies((ex) -> withDebugLogging(() -> context .satisfies((ex) -> withDebugLogging(() -> context
.publishEvent(new ApplicationFailedEvent(new SpringApplication(), new String[0], context, ex)))); .publishEvent(new ApplicationFailedEvent(new SpringApplication(), new String[0], context, ex))));
assertThat(output).contains("CONDITIONS EVALUATION REPORT"); assertThat(output).contains("CONDITIONS EVALUATION REPORT");
@ -78,7 +78,7 @@ class ConditionEvaluationReportLoggingListenerTests {
AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(); AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
this.initializer.initialize(context); this.initializer.initialize(context);
context.register(ErrorConfig.class); context.register(ErrorConfig.class);
assertThatExceptionOfType(Exception.class).isThrownBy(context::refresh) assertThatException().isThrownBy(context::refresh)
.satisfies((ex) -> withInfoLogging(() -> context .satisfies((ex) -> withInfoLogging(() -> context
.publishEvent(new ApplicationFailedEvent(new SpringApplication(), new String[0], context, ex)))); .publishEvent(new ApplicationFailedEvent(new SpringApplication(), new String[0], context, ex))));
assertThat(output).doesNotContain("CONDITIONS EVALUATION REPORT") assertThat(output).doesNotContain("CONDITIONS EVALUATION REPORT")

6
spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/runner/ContextConsumerTests.java
Unescape View File

@ -24,8 +24,8 @@ import org.mockito.InOrder;
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;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.mockito.BDDMockito.given; import static org.mockito.BDDMockito.given;
import static org.mockito.BDDMockito.then; import static org.mockito.BDDMockito.then;
import static org.mockito.Mockito.inOrder; import static org.mockito.Mockito.inOrder;
@ -59,8 +59,8 @@ class ContextConsumerTests {
given(predicate.test(24)).willReturn(false); given(predicate.test(24)).willReturn(false);
ContextConsumer<ApplicationContext> firstConsumer = (context) -> assertThat(predicate.test(42)).isFalse(); ContextConsumer<ApplicationContext> firstConsumer = (context) -> assertThat(predicate.test(42)).isFalse();
ContextConsumer<ApplicationContext> secondConsumer = (context) -> assertThat(predicate.test(24)).isFalse(); ContextConsumer<ApplicationContext> secondConsumer = (context) -> assertThat(predicate.test(24)).isFalse();
assertThatThrownBy(() -> firstConsumer.andThen(secondConsumer).accept(mock(ApplicationContext.class))) assertThatExceptionOfType(AssertionError.class)
.isInstanceOf(AssertionError.class); .isThrownBy(() -> firstConsumer.andThen(secondConsumer).accept(mock(ApplicationContext.class)));
then(predicate).should().test(42); then(predicate).should().test(42);
then(predicate).shouldHaveNoMoreInteractions(); then(predicate).shouldHaveNoMoreInteractions();
} }

6
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/tasks/buildinfo/BuildInfoTests.java
Unescape View File

@ -33,7 +33,7 @@ import org.springframework.boot.gradle.junit.GradleProjectBuilder;
import org.springframework.boot.testsupport.classpath.ClassPathExclusions; import org.springframework.boot.testsupport.classpath.ClassPathExclusions;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.assertj.core.api.Assertions.assertThatException;
/** /**
* Tests for {@link BuildInfo}. * Tests for {@link BuildInfo}.
@ -167,8 +167,8 @@ class BuildInfoTests {
@Test @Test
void nullAdditionalPropertyProducesInformativeFailure() { void nullAdditionalPropertyProducesInformativeFailure() {
BuildInfo task = createTask(createProject("test")); BuildInfo task = createTask(createProject("test"));
assertThatThrownBy(() -> task.getProperties().getAdditional().put("a", null)) assertThatException().isThrownBy(() -> task.getProperties().getAdditional().put("a", null))
.hasMessage("Cannot add an entry with a null value to a property of type Map."); .withMessage("Cannot add an entry with a null value to a property of type Map.");
} }
private Project createProject(String projectName) { private Project createProject(String projectName) {

7
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/SpringApplicationShutdownHookTests.java
Unescape View File

@ -35,9 +35,9 @@ import org.springframework.context.support.AbstractApplicationContext;
import org.springframework.context.support.GenericApplicationContext; import org.springframework.context.support.GenericApplicationContext;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
import static org.assertj.core.api.Assertions.assertThatIllegalStateException; import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
/** /**
* Tests for {@link SpringApplicationShutdownHook}. * Tests for {@link SpringApplicationShutdownHook}.
@ -186,8 +186,7 @@ class SpringApplicationShutdownHookTests {
ConfigurableApplicationContext context = new GenericApplicationContext(); ConfigurableApplicationContext context = new GenericApplicationContext();
shutdownHook.registerApplicationContext(context); shutdownHook.registerApplicationContext(context);
context.refresh(); context.refresh();
assertThatThrownBy(() -> shutdownHook.deregisterFailedApplicationContext(context)) assertThatIllegalStateException().isThrownBy(() -> shutdownHook.deregisterFailedApplicationContext(context));
.isInstanceOf(IllegalStateException.class);
assertThat(shutdownHook.isApplicationContextRegistered(context)).isTrue(); assertThat(shutdownHook.isApplicationContextRegistered(context)).isTrue();
} }
@ -197,7 +196,7 @@ class SpringApplicationShutdownHookTests {
GenericApplicationContext context = new GenericApplicationContext(); GenericApplicationContext context = new GenericApplicationContext();
shutdownHook.registerApplicationContext(context); shutdownHook.registerApplicationContext(context);
context.registerBean(FailingBean.class); context.registerBean(FailingBean.class);
assertThatThrownBy(context::refresh).isInstanceOf(BeanCreationException.class); assertThatExceptionOfType(BeanCreationException.class).isThrownBy(context::refresh);
assertThat(shutdownHook.isApplicationContextRegistered(context)).isTrue(); assertThat(shutdownHook.isApplicationContextRegistered(context)).isTrue();
shutdownHook.deregisterFailedApplicationContext(context); shutdownHook.deregisterFailedApplicationContext(context);
assertThat(shutdownHook.isApplicationContextRegistered(context)).isFalse(); assertThat(shutdownHook.isApplicationContextRegistered(context)).isFalse();

14
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/metrics/buffering/BufferingApplicationStartupTests.java
Unescape View File

@ -27,7 +27,8 @@ import org.springframework.boot.context.metrics.buffering.StartupTimeline.Timeli
import org.springframework.core.metrics.StartupStep; import org.springframework.core.metrics.StartupStep;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
/** /**
* Tests for {@link BufferingApplicationStartup}. * Tests for {@link BufferingApplicationStartup}.
@ -86,8 +87,8 @@ class BufferingApplicationStartupTests {
void startRecordingShouldFailIfEventsWereRecorded() { void startRecordingShouldFailIfEventsWereRecorded() {
BufferingApplicationStartup applicationStartup = new BufferingApplicationStartup(2); BufferingApplicationStartup applicationStartup = new BufferingApplicationStartup(2);
applicationStartup.start("first").end(); applicationStartup.start("first").end();
assertThatThrownBy(applicationStartup::startRecording).isInstanceOf(IllegalStateException.class) assertThatIllegalStateException().isThrownBy(applicationStartup::startRecording)
.hasMessage("Cannot restart recording once steps have been buffered."); .withMessage("Cannot restart recording once steps have been buffered.");
} }
@Test @Test
@ -95,8 +96,8 @@ class BufferingApplicationStartupTests {
BufferingApplicationStartup applicationStartup = new BufferingApplicationStartup(2); BufferingApplicationStartup applicationStartup = new BufferingApplicationStartup(2);
StartupStep step = applicationStartup.start("first"); StartupStep step = applicationStartup.start("first");
step.end(); step.end();
assertThatThrownBy(() -> step.tag("name", "value")).isInstanceOf(IllegalStateException.class) assertThatIllegalStateException().isThrownBy(() -> step.tag("name", "value"))
.hasMessage("StartupStep has already ended."); .withMessage("StartupStep has already ended.");
} }
@Test @Test
@ -104,7 +105,8 @@ class BufferingApplicationStartupTests {
BufferingApplicationStartup applicationStartup = new BufferingApplicationStartup(2); BufferingApplicationStartup applicationStartup = new BufferingApplicationStartup(2);
StartupStep step = applicationStartup.start("first"); StartupStep step = applicationStartup.start("first");
step.tag("name", "value"); step.tag("name", "value");
assertThatThrownBy(() -> step.getTags().iterator().remove()).isInstanceOf(UnsupportedOperationException.class); assertThatExceptionOfType(UnsupportedOperationException.class)
.isThrownBy(() -> step.getTags().iterator().remove());
} }
@Test // gh-25792 @Test // gh-25792

24
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/ConfigurationPropertiesTests.java
Unescape View File

@ -102,6 +102,7 @@ import org.springframework.validation.Validator;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatException;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
import static org.assertj.core.api.Assertions.assertThatIllegalStateException; import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
import static org.assertj.core.api.Assertions.entry; import static org.assertj.core.api.Assertions.entry;
@ -722,11 +723,10 @@ class ConfigurationPropertiesTests {
@Test @Test
void loadWhenHasConfigurationPropertiesValidatorShouldApplyValidator() { void loadWhenHasConfigurationPropertiesValidatorShouldApplyValidator() {
assertThatExceptionOfType(Exception.class).isThrownBy(() -> load(WithCustomValidatorConfiguration.class)) assertThatException().isThrownBy(() -> load(WithCustomValidatorConfiguration.class)).satisfies((ex) -> {
.satisfies((ex) -> { assertThat(ex).hasCauseInstanceOf(BindException.class);
assertThat(ex).hasCauseInstanceOf(BindException.class); assertThat(ex.getCause()).hasCauseExactlyInstanceOf(BindValidationException.class);
assertThat(ex.getCause()).hasCauseExactlyInstanceOf(BindValidationException.class); });
});
} }
@Test @Test
@ -739,7 +739,7 @@ class ConfigurationPropertiesTests {
@Test @Test
void loadWhenConfigurationPropertiesIsAlsoValidatorShouldApplyValidator() { void loadWhenConfigurationPropertiesIsAlsoValidatorShouldApplyValidator() {
assertThatExceptionOfType(Exception.class).isThrownBy(() -> load(ValidatorProperties.class)).satisfies((ex) -> { assertThatException().isThrownBy(() -> load(ValidatorProperties.class)).satisfies((ex) -> {
assertThat(ex).hasCauseInstanceOf(BindException.class); assertThat(ex).hasCauseInstanceOf(BindException.class);
assertThat(ex.getCause()).hasCauseExactlyInstanceOf(BindValidationException.class); assertThat(ex.getCause()).hasCauseExactlyInstanceOf(BindValidationException.class);
}); });
@ -747,8 +747,7 @@ class ConfigurationPropertiesTests {
@Test @Test
void loadWhenConstructorBoundConfigurationPropertiesIsAlsoValidatorShouldApplyValidator() { void loadWhenConstructorBoundConfigurationPropertiesIsAlsoValidatorShouldApplyValidator() {
assertThatExceptionOfType(Exception.class) assertThatException().isThrownBy(() -> load(ValidatorConstructorBoundPropertiesConfiguration.class))
.isThrownBy(() -> load(ValidatorConstructorBoundPropertiesConfiguration.class))
.satisfies((ex) -> { .satisfies((ex) -> {
assertThat(ex).hasCauseInstanceOf(BindException.class); assertThat(ex).hasCauseInstanceOf(BindException.class);
assertThat(ex.getCause()).hasCauseExactlyInstanceOf(BindValidationException.class); assertThat(ex.getCause()).hasCauseExactlyInstanceOf(BindValidationException.class);
@ -922,8 +921,7 @@ class ConfigurationPropertiesTests {
Map<String, Object> source = new HashMap<>(); Map<String, Object> source = new HashMap<>();
source.put("test.duration", "P12D"); source.put("test.duration", "P12D");
sources.addLast(new MapPropertySource("test", source)); sources.addLast(new MapPropertySource("test", source));
assertThatExceptionOfType(Exception.class) assertThatException().isThrownBy(() -> load(ConstructorParameterWithFormatConfiguration.class))
.isThrownBy(() -> load(ConstructorParameterWithFormatConfiguration.class))
.havingCause() .havingCause()
.isInstanceOf(BindException.class); .isInstanceOf(BindException.class);
} }
@ -934,8 +932,7 @@ class ConfigurationPropertiesTests {
Map<String, Object> source = new HashMap<>(); Map<String, Object> source = new HashMap<>();
source.put("test.period", "P12D"); source.put("test.period", "P12D");
sources.addLast(new MapPropertySource("test", source)); sources.addLast(new MapPropertySource("test", source));
assertThatExceptionOfType(Exception.class) assertThatException().isThrownBy(() -> load(ConstructorParameterWithFormatConfiguration.class))
.isThrownBy(() -> load(ConstructorParameterWithFormatConfiguration.class))
.havingCause() .havingCause()
.isInstanceOf(BindException.class); .isInstanceOf(BindException.class);
} }
@ -951,8 +948,7 @@ class ConfigurationPropertiesTests {
@Test @Test
void loadWhenBindingToConstructorParametersShouldValidate() { void loadWhenBindingToConstructorParametersShouldValidate() {
assertThatExceptionOfType(Exception.class) assertThatException().isThrownBy(() -> load(ConstructorParameterValidationConfiguration.class))
.isThrownBy(() -> load(ConstructorParameterValidationConfiguration.class))
.satisfies((ex) -> { .satisfies((ex) -> {
assertThat(ex).hasCauseInstanceOf(BindException.class); assertThat(ex).hasCauseInstanceOf(BindException.class);
assertThat(ex.getCause()).hasCauseExactlyInstanceOf(BindValidationException.class); assertThat(ex.getCause()).hasCauseExactlyInstanceOf(BindValidationException.class);

4
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/diagnostics/FailureAnalyzersIntegrationTests.java
Unescape View File

@ -28,7 +28,7 @@ import org.springframework.boot.web.server.PortInUseException;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.assertThatException;
/** /**
* Integration tests for {@link FailureAnalyzers}. * Integration tests for {@link FailureAnalyzers}.
@ -40,7 +40,7 @@ class FailureAnalyzersIntegrationTests {
@Test @Test
void analysisIsPerformed(CapturedOutput output) { void analysisIsPerformed(CapturedOutput output) {
assertThatExceptionOfType(Exception.class) assertThatException()
.isThrownBy(() -> new SpringApplicationBuilder(TestConfiguration.class).web(WebApplicationType.NONE).run()); .isThrownBy(() -> new SpringApplicationBuilder(TestConfiguration.class).web(WebApplicationType.NONE).run());
assertThat(output).contains("APPLICATION FAILED TO START"); assertThat(output).contains("APPLICATION FAILED TO START");
} }

5
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/diagnostics/analyzer/JakartaApiValidationExceptionFailureAnalyzerTests.java
Unescape View File

@ -25,7 +25,7 @@ import org.springframework.context.annotation.AnnotationConfigApplicationContext
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.assertThatException;
/** /**
* Tests for {@link ValidationExceptionFailureAnalyzer} * Tests for {@link ValidationExceptionFailureAnalyzer}
@ -37,8 +37,7 @@ class JakartaApiValidationExceptionFailureAnalyzerTests {
@Test @Test
void validatedPropertiesTest() { void validatedPropertiesTest() {
assertThatExceptionOfType(Exception.class) assertThatException().isThrownBy(() -> new AnnotationConfigApplicationContext(TestConfiguration.class).close())
.isThrownBy(() -> new AnnotationConfigApplicationContext(TestConfiguration.class).close())
.satisfies((ex) -> assertThat(new ValidationExceptionFailureAnalyzer().analyze(ex)).isNotNull()); .satisfies((ex) -> assertThat(new ValidationExceptionFailureAnalyzer().analyze(ex)).isNotNull());
} }

4
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jdbc/init/DataSourceScriptDatabaseInitializerTests.java
Unescape View File

@ -34,7 +34,7 @@ import org.springframework.jdbc.datasource.init.ResourceDatabasePopulator;
import org.springframework.jdbc.datasource.init.ScriptStatementFailedException; import org.springframework.jdbc.datasource.init.ScriptStatementFailedException;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
/** /**
* Tests for {@link DataSourceScriptDatabaseInitializer}. * Tests for {@link DataSourceScriptDatabaseInitializer}.
@ -82,7 +82,7 @@ class DataSourceScriptDatabaseInitializerTests
populator.setContinueOnError(false); populator.setContinueOnError(false);
} }
}; };
assertThatThrownBy(initializer::initializeDatabase).isInstanceOf(ScriptStatementFailedException.class); assertThatExceptionOfType(ScriptStatementFailedException.class).isThrownBy(initializer::initializeDatabase);
} }
@Override @Override

7
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/ssl/DefaultSslBundleRegistryTests.java
Unescape View File

@ -31,7 +31,6 @@ import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
import static org.assertj.core.api.Assertions.assertThatIllegalStateException; import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
/** /**
@ -117,9 +116,9 @@ class DefaultSslBundleRegistryTests {
@Test @Test
void shouldFailIfUpdatingNonRegisteredBundle() { void shouldFailIfUpdatingNonRegisteredBundle() {
assertThatThrownBy(() -> this.registry.updateBundle("dummy", this.bundle1)) assertThatExceptionOfType(NoSuchSslBundleException.class)
.isInstanceOf(NoSuchSslBundleException.class) .isThrownBy(() -> this.registry.updateBundle("dummy", this.bundle1))
.hasMessageContaining("'dummy'"); .withMessageContaining("'dummy'");
} }
@Test @Test

37
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/ssl/pem/PemPrivateKeyParserTests.java
Unescape View File

@ -30,7 +30,6 @@ import org.springframework.core.io.ClassPathResource;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatIllegalStateException; import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
/** /**
* Tests for {@link PemPrivateKeyParser}. * Tests for {@link PemPrivateKeyParser}.
@ -76,12 +75,12 @@ class PemPrivateKeyParserTests {
}) })
// @formatter:on // @formatter:on
void shouldNotParseUnsupportedTraditionalPkcs1(String file) { void shouldNotParseUnsupportedTraditionalPkcs1(String file) {
assertThatThrownBy(() -> PemPrivateKeyParser.parse(read("org/springframework/boot/web/server/pkcs1/" + file))) assertThatIllegalStateException()
.isInstanceOf(IllegalStateException.class) .isThrownBy(() -> PemPrivateKeyParser.parse(read("org/springframework/boot/web/server/pkcs1/" + file)))
.hasMessageContaining("Error loading private key file") .withMessageContaining("Error loading private key file")
.hasCauseInstanceOf(IllegalStateException.class) .withCauseInstanceOf(IllegalStateException.class)
.cause() .havingCause()
.hasMessageContaining("Unrecognized private key format"); .withMessageContaining("Unrecognized private key format");
} }
@ParameterizedTest @ParameterizedTest
@ -119,12 +118,12 @@ class PemPrivateKeyParserTests {
}) })
// @formatter:on // @formatter:on
void shouldNotParseUnsupportedEcPkcs8(String file) { void shouldNotParseUnsupportedEcPkcs8(String file) {
assertThatThrownBy(() -> PemPrivateKeyParser.parse(read("org/springframework/boot/web/server/pkcs8/" + file))) assertThatIllegalStateException()
.isInstanceOf(IllegalStateException.class) .isThrownBy(() -> PemPrivateKeyParser.parse(read("org/springframework/boot/web/server/pkcs8/" + file)))
.hasMessageContaining("Error loading private key file") .withMessageContaining("Error loading private key file")
.hasCauseInstanceOf(IllegalStateException.class) .withCauseInstanceOf(IllegalStateException.class)
.cause() .havingCause()
.hasMessageContaining("Unrecognized private key format"); .withMessageContaining("Unrecognized private key format");
} }
@ParameterizedTest @ParameterizedTest
@ -190,12 +189,12 @@ class PemPrivateKeyParserTests {
}) })
// @formatter:on // @formatter:on
void shouldNotParseUnsupportedEcSec1(String file) { void shouldNotParseUnsupportedEcSec1(String file) {
assertThatThrownBy(() -> PemPrivateKeyParser.parse(read("org/springframework/boot/web/server/sec1/" + file))) assertThatIllegalStateException()
.isInstanceOf(IllegalStateException.class) .isThrownBy(() -> PemPrivateKeyParser.parse(read("org/springframework/boot/web/server/sec1/" + file)))
.hasMessageContaining("Error loading private key file") .withMessageContaining("Error loading private key file")
.hasCauseInstanceOf(IllegalStateException.class) .withCauseInstanceOf(IllegalStateException.class)
.cause() .havingCause()
.hasMessageContaining("Unrecognized private key format"); .withMessageContaining("Unrecognized private key format");
} }
@Test @Test

6
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/validation/MessageSourceMessageInterpolatorIntegrationTests.java
Unescape View File

@ -32,7 +32,7 @@ import org.springframework.context.support.StaticMessageSource;
import org.springframework.validation.beanvalidation.LocalValidatorFactoryBean; import org.springframework.validation.beanvalidation.LocalValidatorFactoryBean;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.assertj.core.api.Assertions.assertThatException;
/** /**
* Integration tests for {@link MessageSourceMessageInterpolator}. * Integration tests for {@link MessageSourceMessageInterpolator}.
@ -85,8 +85,8 @@ class MessageSourceMessageInterpolatorIntegrationTests {
@Test @Test
void recursion() { void recursion() {
assertThatThrownBy(() -> validate("recursion")) assertThatException().isThrownBy(() -> validate("recursion"))
.hasStackTraceContaining("Circular reference '{recursion -> middle -> recursion}'"); .withStackTraceContaining("Circular reference '{recursion -> middle -> recursion}'");
} }
@Test @Test

4
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/reactive/server/AbstractReactiveWebServerFactoryTests.java
Unescape View File

@ -79,7 +79,6 @@ import org.springframework.web.reactive.function.client.WebClientRequestExceptio
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatException; import static org.assertj.core.api.Assertions.assertThatException;
import static org.assertj.core.api.Assertions.assertThatIllegalStateException; import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
/** /**
* Base for testing classes that extends {@link AbstractReactiveWebServerFactory}. * Base for testing classes that extends {@link AbstractReactiveWebServerFactory}.
@ -242,7 +241,8 @@ public abstract class AbstractReactiveWebServerFactoryTests {
} }
protected void assertThatSslWithInvalidAliasCallFails(ThrowingCallable call) { protected void assertThatSslWithInvalidAliasCallFails(ThrowingCallable call) {
assertThatThrownBy(call).hasStackTraceContaining("Keystore does not contain alias 'test-alias-404'"); assertThatException().isThrownBy(call)
.withStackTraceContaining("Keystore does not contain alias 'test-alias-404'");
} }
protected ReactorClientHttpConnector buildTrustAllSslConnector() { protected ReactorClientHttpConnector buildTrustAllSslConnector() {

14
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/server/SslConfigurationValidatorTests.java
Unescape View File

@ -24,7 +24,7 @@ import java.security.KeyStoreException;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
/** /**
* Tests for {@link SslConfigurationValidator}. * Tests for {@link SslConfigurationValidator}.
@ -66,17 +66,17 @@ class SslConfigurationValidatorTests {
@Test @Test
void validateKeyAliasWhenAliasNotFoundShouldThrowException() { void validateKeyAliasWhenAliasNotFoundShouldThrowException() {
assertThatThrownBy(() -> SslConfigurationValidator.validateKeyAlias(this.keyStore, INVALID_ALIAS)) assertThatIllegalStateException()
.isInstanceOf(IllegalStateException.class) .isThrownBy(() -> SslConfigurationValidator.validateKeyAlias(this.keyStore, INVALID_ALIAS))
.hasMessage("Keystore does not contain alias '" + INVALID_ALIAS + "'"); .withMessage("Keystore does not contain alias '" + INVALID_ALIAS + "'");
} }
@Test @Test
void validateKeyAliasWhenKeyStoreThrowsExceptionOnContains() throws KeyStoreException { void validateKeyAliasWhenKeyStoreThrowsExceptionOnContains() throws KeyStoreException {
KeyStore uninitializedKeyStore = KeyStore.getInstance(KeyStore.getDefaultType()); KeyStore uninitializedKeyStore = KeyStore.getInstance(KeyStore.getDefaultType());
assertThatThrownBy(() -> SslConfigurationValidator.validateKeyAlias(uninitializedKeyStore, "alias")) assertThatIllegalStateException()
.isInstanceOf(IllegalStateException.class) .isThrownBy(() -> SslConfigurationValidator.validateKeyAlias(uninitializedKeyStore, "alias"))
.hasMessage("Could not determine if keystore contains alias 'alias'"); .withMessage("Could not determine if keystore contains alias 'alias'");
} }
} }

21
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/AbstractFilterRegistrationBeanTests.java
Unescape View File

@ -27,6 +27,7 @@ import jakarta.servlet.DispatcherType;
import jakarta.servlet.Filter; import jakarta.servlet.Filter;
import jakarta.servlet.FilterRegistration; import jakarta.servlet.FilterRegistration;
import jakarta.servlet.ServletContext; import jakarta.servlet.ServletContext;
import jakarta.servlet.ServletException;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock; import org.mockito.Mock;
@ -34,7 +35,7 @@ import org.mockito.junit.jupiter.MockitoExtension;
import static org.assertj.core.api.Assertions.assertThatCode; import static org.assertj.core.api.Assertions.assertThatCode;
import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.eq; import static org.mockito.ArgumentMatchers.eq;
@ -204,14 +205,16 @@ abstract class AbstractFilterRegistrationBeanTests {
@Test @Test
void failsWithDoubleRegistration() { void failsWithDoubleRegistration() {
assertThatThrownBy(() -> { assertThatIllegalStateException().isThrownBy(() -> doubleRegistration())
AbstractFilterRegistrationBean<?> bean = createFilterRegistrationBean(); .withMessage("Failed to register 'filter double-registration' on the "
bean.setName("double-registration"); + "servlet context. Possibly already registered?");
given(this.servletContext.addFilter(anyString(), any(Filter.class))).willReturn(null); }
bean.onStartup(this.servletContext);
}).isInstanceOf(IllegalStateException.class) private void doubleRegistration() throws ServletException {
.hasMessage( AbstractFilterRegistrationBean<?> bean = createFilterRegistrationBean();
"Failed to register 'filter double-registration' on the servlet context. Possibly already registered?"); bean.setName("double-registration");
given(this.servletContext.addFilter(anyString(), any(Filter.class))).willReturn(null);
bean.onStartup(this.servletContext);
} }
@Test @Test

21
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/ServletRegistrationBeanTests.java
Unescape View File

@ -24,6 +24,7 @@ import java.util.Map;
import jakarta.servlet.Servlet; import jakarta.servlet.Servlet;
import jakarta.servlet.ServletContext; import jakarta.servlet.ServletContext;
import jakarta.servlet.ServletException;
import jakarta.servlet.ServletRegistration; import jakarta.servlet.ServletRegistration;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.extension.ExtendWith;
@ -33,7 +34,7 @@ import org.mockito.junit.jupiter.MockitoExtension;
import org.springframework.boot.web.servlet.mock.MockServlet; import org.springframework.boot.web.servlet.mock.MockServlet;
import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.BDDMockito.given; import static org.mockito.BDDMockito.given;
@ -68,14 +69,16 @@ class ServletRegistrationBeanTests {
@Test @Test
void failsWithDoubleRegistration() { void failsWithDoubleRegistration() {
assertThatThrownBy(() -> { assertThatIllegalStateException().isThrownBy(() -> doubleRegistration())
ServletRegistrationBean<MockServlet> bean = new ServletRegistrationBean<>(this.servlet); .withMessage("Failed to register 'servlet double-registration' on "
bean.setName("double-registration"); + "the servlet context. Possibly already registered?");
given(this.servletContext.addServlet(anyString(), any(Servlet.class))).willReturn(null); }
bean.onStartup(this.servletContext);
}).isInstanceOf(IllegalStateException.class) private void doubleRegistration() throws ServletException {
.hasMessage( ServletRegistrationBean<MockServlet> bean = new ServletRegistrationBean<>(this.servlet);
"Failed to register 'servlet double-registration' on the servlet context. Possibly already registered?"); bean.setName("double-registration");
given(this.servletContext.addServlet(anyString(), any(Servlet.class))).willReturn(null);
bean.onStartup(this.servletContext);
} }
@Test @Test

5
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/server/AbstractServletWebServerFactoryTests.java
Unescape View File

@ -155,11 +155,11 @@ import org.springframework.util.FileCopyUtils;
import org.springframework.util.StreamUtils; import org.springframework.util.StreamUtils;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatException;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
import static org.assertj.core.api.Assertions.assertThatIOException; import static org.assertj.core.api.Assertions.assertThatIOException;
import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
import static org.assertj.core.api.Assertions.assertThatIllegalStateException; import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.assertj.core.api.Assertions.fail; import static org.assertj.core.api.Assertions.fail;
import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.any;
import static org.mockito.BDDMockito.given; import static org.mockito.BDDMockito.given;
@ -497,7 +497,8 @@ public abstract class AbstractServletWebServerFactoryTests {
} }
protected void assertThatSslWithInvalidAliasCallFails(ThrowingCallable call) { protected void assertThatSslWithInvalidAliasCallFails(ThrowingCallable call) {
assertThatThrownBy(call).hasStackTraceContaining("Keystore does not contain alias 'test-alias-404'"); assertThatException().isThrownBy(call)
.withStackTraceContaining("Keystore does not contain alias 'test-alias-404'");
} }
@Test @Test

6
spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-test/src/test/java/smoketest/test/web/UserVehicleControllerTests.java
Unescape View File

@ -16,7 +16,6 @@
package smoketest.test.web; package smoketest.test.web;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import smoketest.test.WelcomeCommandLineRunner; import smoketest.test.WelcomeCommandLineRunner;
import smoketest.test.domain.VehicleIdentificationNumber; import smoketest.test.domain.VehicleIdentificationNumber;
@ -31,6 +30,7 @@ import org.springframework.context.ApplicationContext;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.MockMvc;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.containsString;
import static org.mockito.BDDMockito.given; import static org.mockito.BDDMockito.given;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
@ -96,8 +96,8 @@ class UserVehicleControllerTests {
@Test @Test
void welcomeCommandLineRunnerShouldNotBeAvailable() { void welcomeCommandLineRunnerShouldNotBeAvailable() {
// Since we're a @WebMvcTest WelcomeCommandLineRunner should not be available. // Since we're a @WebMvcTest WelcomeCommandLineRunner should not be available.
Assertions.assertThatThrownBy(() -> this.applicationContext.getBean(WelcomeCommandLineRunner.class)) assertThatExceptionOfType(NoSuchBeanDefinitionException.class)
.isInstanceOf(NoSuchBeanDefinitionException.class); .isThrownBy(() -> this.applicationContext.getBean(WelcomeCommandLineRunner.class));
} }
} }

Write Preview
Loading…
Cancel
Save