Skip to content

Commit 1d456e0

Browse files
philwebbphilwebb
committed
Merge branch '3.0.x' into 3.1.x
Closes gh-37966
2 parents 8b8e23f + a0b999c commit 1d456e0

File tree

31 files changed

+162
-151
lines changed

31 files changed

+162
-151
lines changed

‎buildSrc/src/test/java/org/springframework/boot/build/mavenplugin/PluginXmlParserTests.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import org.springframework.boot.build.mavenplugin.PluginXmlParser.Plugin;
2525

2626
import static org.assertj.core.api.Assertions.assertThat;
27-
import static org.assertj.core.api.Assertions.assertThatThrownBy;
27+
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
2828

2929
/**
3030
* Tests for {@link PluginXmlParser}.
@@ -49,9 +49,9 @@ void parseExistingDescriptorReturnPluginDescriptor() {
4949

5050
@Test
5151
void parseNonExistingFileThrowException() {
52-
assertThatThrownBy(() -> this.parser.parse(new File("src/test/resources/nonexistent.xml")))
53-
.isInstanceOf(RuntimeException.class)
54-
.hasCauseInstanceOf(FileNotFoundException.class);
52+
assertThatExceptionOfType(RuntimeException.class)
53+
.isThrownBy(() -> this.parser.parse(new File("src/test/resources/nonexistent.xml")))
54+
.withCauseInstanceOf(FileNotFoundException.class);
5555
}
5656

5757
}

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/orm/jpa/HibernateMetricsAutoConfigurationTests.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter;
5151

5252
import static org.assertj.core.api.Assertions.assertThat;
53-
import static org.assertj.core.api.Assertions.assertThatThrownBy;
53+
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
5454
import static org.mockito.BDDMockito.given;
5555
import static org.mockito.Mockito.mock;
5656

@@ -117,8 +117,8 @@ void entityManagerFactoryInstrumentationIsDisabledIfNotHibernateSessionFactory()
117117
.withUserConfiguration(NonHibernateEntityManagerFactoryConfiguration.class)
118118
.run((context) -> {
119119
// ensure EntityManagerFactory is not a Hibernate SessionFactory
120-
assertThatThrownBy(() -> context.getBean(EntityManagerFactory.class).unwrap(SessionFactory.class))
121-
.isInstanceOf(PersistenceException.class);
120+
assertThatExceptionOfType(PersistenceException.class)
121+
.isThrownBy(() -> context.getBean(EntityManagerFactory.class).unwrap(SessionFactory.class));
122122
MeterRegistry registry = context.getBean(MeterRegistry.class);
123123
assertThat(registry.find("hibernate.statements").meter()).isNull();
124124
});

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/observation/ObservationAutoConfigurationTests.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
import org.springframework.core.annotation.Order;
5151

5252
import static org.assertj.core.api.Assertions.assertThat;
53-
import static org.assertj.core.api.Assertions.assertThatThrownBy;
53+
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
5454
import static org.mockito.Mockito.mock;
5555

5656
/**
@@ -174,8 +174,8 @@ void autoConfiguresObservationPredicates() {
174174
Observation.start("observation2", observationRegistry).stop();
175175
MeterRegistry meterRegistry = context.getBean(MeterRegistry.class);
176176
assertThat(meterRegistry.get("observation1").timer().count()).isOne();
177-
assertThatThrownBy(() -> meterRegistry.get("observation2").timer())
178-
.isInstanceOf(MeterNotFoundException.class);
177+
assertThatExceptionOfType(MeterNotFoundException.class)
178+
.isThrownBy(() -> meterRegistry.get("observation2").timer());
179179
});
180180
}
181181

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/tracing/BraveAutoConfigurationTests.java‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
import org.springframework.core.annotation.Order;
5555

5656
import static org.assertj.core.api.Assertions.assertThat;
57-
import static org.assertj.core.api.Assertions.assertThatThrownBy;
57+
import static org.assertj.core.api.Assertions.assertThatException;
5858
import static org.mockito.Mockito.mock;
5959

6060
/**
@@ -263,30 +263,33 @@ void shouldFailIfSupportJoinedSpansIsEnabledAndW3cIsChosenAsType() {
263263
this.contextRunner
264264
.withPropertyValues("management.tracing.propagation.type=W3C",
265265
"management.tracing.brave.span-joining-supported=true")
266-
.run((context) -> assertThatThrownBy(() -> context.getBean(Tracing.class)).rootCause()
266+
.run((context) -> assertThatException().isThrownBy(() -> context.getBean(Tracing.class))
267+
.havingRootCause()
267268
.isExactlyInstanceOf(IncompatibleConfigurationException.class)
268-
.hasMessage(
269-
"The following configuration properties have incompatible values: [management.tracing.propagation.type, management.tracing.brave.span-joining-supported]"));
269+
.withMessage("The following configuration properties have incompatible values: "
270+
+ "[management.tracing.propagation.type, management.tracing.brave.span-joining-supported]"));
270271
}
271272

272273
@Test
273274
void shouldFailIfSupportJoinedSpansIsEnabledAndW3cIsChosenAsConsume() {
274275
this.contextRunner.withPropertyValues("management.tracing.propagation.produce=B3",
275276
"management.tracing.propagation.consume=W3C", "management.tracing.brave.span-joining-supported=true")
276-
.run((context) -> assertThatThrownBy(() -> context.getBean(Tracing.class)).rootCause()
277+
.run((context) -> assertThatException().isThrownBy(() -> context.getBean(Tracing.class))
278+
.havingRootCause()
277279
.isExactlyInstanceOf(IncompatibleConfigurationException.class)
278-
.hasMessage(
279-
"The following configuration properties have incompatible values: [management.tracing.propagation.consume, management.tracing.brave.span-joining-supported]"));
280+
.withMessage("The following configuration properties have incompatible values: "
281+
+ "[management.tracing.propagation.consume, management.tracing.brave.span-joining-supported]"));
280282
}
281283

282284
@Test
283285
void shouldFailIfSupportJoinedSpansIsEnabledAndW3cIsChosenAsProduce() {
284286
this.contextRunner.withPropertyValues("management.tracing.propagation.consume=B3",
285287
"management.tracing.propagation.produce=W3C", "management.tracing.brave.span-joining-supported=true")
286-
.run((context) -> assertThatThrownBy(() -> context.getBean(Tracing.class)).rootCause()
288+
.run((context) -> assertThatException().isThrownBy(() -> context.getBean(Tracing.class))
289+
.havingRootCause()
287290
.isExactlyInstanceOf(IncompatibleConfigurationException.class)
288-
.hasMessage(
289-
"The following configuration properties have incompatible values: [management.tracing.propagation.produce, management.tracing.brave.span-joining-supported]"));
291+
.withMessage("The following configuration properties have incompatible values: "
292+
+ "[management.tracing.propagation.produce, management.tracing.brave.span-joining-supported]"));
290293
}
291294

292295
@Test

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/tracing/zipkin/ZipkinHttpSenderTests.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
import zipkin2.reporter.Sender;
3333

3434
import static org.assertj.core.api.Assertions.assertThat;
35-
import static org.assertj.core.api.Assertions.assertThatThrownBy;
35+
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
3636

3737
/**
3838
* Abstract base test class which is used for testing the different implementations of the
@@ -54,7 +54,8 @@ void setUp() {
5454
@Test
5555
void sendSpansShouldThrowIfCloseWasCalled() throws IOException {
5656
this.sut.close();
57-
assertThatThrownBy(() -> this.sut.sendSpans(Collections.emptyList())).isInstanceOf(ClosedSenderException.class);
57+
assertThatExceptionOfType(ClosedSenderException.class)
58+
.isThrownBy(() -> this.sut.sendSpans(Collections.emptyList()));
5859
}
5960

6061
protected void makeRequest(List<byte[]> encodedSpans, boolean async) throws IOException {

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/tracing/zipkin/ZipkinRestTemplateSenderTests.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
import org.springframework.web.client.RestTemplate;
3535

3636
import static org.assertj.core.api.Assertions.assertThat;
37-
import static org.assertj.core.api.Assertions.assertThatThrownBy;
37+
import static org.assertj.core.api.Assertions.assertThatException;
3838
import static org.springframework.test.web.client.match.MockRestRequestMatchers.content;
3939
import static org.springframework.test.web.client.match.MockRestRequestMatchers.header;
4040
import static org.springframework.test.web.client.match.MockRestRequestMatchers.method;
@@ -107,8 +107,8 @@ void sendSpansShouldHandleHttpFailures(boolean async) {
107107
assertThat(callbackResult.error()).isNotNull().hasMessageContaining("500 Internal Server Error");
108108
}
109109
else {
110-
assertThatThrownBy(() -> makeSyncRequest(Collections.emptyList()))
111-
.hasMessageContaining("500 Internal Server Error");
110+
assertThatException().isThrownBy(() -> makeSyncRequest(Collections.emptyList()))
111+
.withMessageContaining("500 Internal Server Error");
112112
}
113113
}
114114

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/tracing/zipkin/ZipkinWebClientSenderTests.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
import org.springframework.web.reactive.function.client.WebClient;
3737

3838
import static org.assertj.core.api.Assertions.assertThat;
39-
import static org.assertj.core.api.Assertions.assertThatThrownBy;
39+
import static org.assertj.core.api.Assertions.assertThatException;
4040

4141
/**
4242
* Tests for {@link ZipkinWebClientSender}.
@@ -112,8 +112,8 @@ void sendSpansShouldHandleHttpFailures(boolean async) throws InterruptedExceptio
112112
assertThat(callbackResult.error()).isNotNull().hasMessageContaining("500 Internal Server Error");
113113
}
114114
else {
115-
assertThatThrownBy(() -> makeSyncRequest(Collections.emptyList()))
116-
.hasMessageContaining("500 Internal Server Error");
115+
assertThatException().isThrownBy(() -> makeSyncRequest(Collections.emptyList()))
116+
.withMessageContaining("500 Internal Server Error");
117117
}
118118

119119
requestAssertions((request) -> assertThat(request.getMethod()).isEqualTo("POST"));

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/wavefront/WavefrontPropertiesTests.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import org.springframework.boot.context.properties.source.InvalidConfigurationPropertyValueException;
2424

2525
import static org.assertj.core.api.Assertions.assertThat;
26-
import static org.assertj.core.api.Assertions.assertThatThrownBy;
26+
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
2727

2828
/**
2929
* Tests for {@link WavefrontProperties}.
@@ -47,8 +47,8 @@ void apiTokenIsMandatoryWhenNotUsingProxy() {
4747
sut.setUri(URI.create("http://localhost:2878"));
4848
sut.setApiToken(null);
4949
assertThat(sut.getEffectiveUri()).isEqualTo(URI.create("http://localhost:2878"));
50-
assertThatThrownBy(sut::getApiTokenOrThrow).isInstanceOf(InvalidConfigurationPropertyValueException.class)
51-
.hasMessageContaining("management.wavefront.api-token");
50+
assertThatExceptionOfType(InvalidConfigurationPropertyValueException.class).isThrownBy(sut::getApiTokenOrThrow)
51+
.withMessageContaining("management.wavefront.api-token");
5252
}
5353

5454
}

‎spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/amqp/RabbitPropertiesTests.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import org.springframework.boot.context.properties.source.InvalidConfigurationPropertyValueException;
2626

2727
import static org.assertj.core.api.Assertions.assertThat;
28-
import static org.assertj.core.api.Assertions.assertThatThrownBy;
28+
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
2929

3030
/**
3131
* Tests for {@link RabbitProperties}.
@@ -352,9 +352,9 @@ void determineUsernameWithoutPassword() {
352352
void hostPropertyMustBeSingleHost() {
353353
this.properties.setHost("my-rmq-host.net,my-rmq-host-2.net");
354354
assertThat(this.properties.getHost()).isEqualTo("my-rmq-host.net,my-rmq-host-2.net");
355-
assertThatThrownBy(this.properties::determineAddresses)
356-
.isInstanceOf(InvalidConfigurationPropertyValueException.class)
357-
.hasMessageContaining("spring.rabbitmq.host");
355+
assertThatExceptionOfType(InvalidConfigurationPropertyValueException.class)
356+
.isThrownBy(this.properties::determineAddresses)
357+
.withMessageContaining("spring.rabbitmq.host");
358358
}
359359

360360
}

‎spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cassandra/CassandraAutoConfigurationTests.java‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
import com.datastax.oss.driver.internal.core.session.throttling.RateLimitingRequestThrottler;
3333
import org.junit.jupiter.api.Test;
3434

35+
import org.springframework.beans.factory.BeanCreationException;
3536
import org.springframework.boot.autoconfigure.AutoConfigurations;
3637
import org.springframework.boot.autoconfigure.cassandra.CassandraAutoConfiguration.PropertiesCassandraConnectionDetails;
3738
import org.springframework.boot.autoconfigure.ssl.SslAutoConfiguration;
@@ -42,7 +43,7 @@
4243

4344
import static org.assertj.core.api.Assertions.assertThat;
4445
import static org.assertj.core.api.Assertions.assertThatException;
45-
import static org.assertj.core.api.Assertions.assertThatThrownBy;
46+
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
4647

4748
/**
4849
* Tests for {@link CassandraAutoConfiguration}
@@ -299,9 +300,10 @@ void driverConfigLoaderUsePassThroughLimitingRequestThrottlerByDefault() {
299300
@Test
300301
void driverConfigLoaderWithRateLimitingRequiresExtraConfiguration() {
301302
this.contextRunner.withPropertyValues("spring.cassandra.request.throttler.type=rate-limiting")
302-
.run((context) -> assertThatThrownBy(() -> context.getBean(CqlSession.class))
303-
.hasMessageContaining("Error instantiating class RateLimitingRequestThrottler")
304-
.hasMessageContaining("No configuration setting found for key"));
303+
.run((context) -> assertThatExceptionOfType(BeanCreationException.class)
304+
.isThrownBy(() -> context.getBean(CqlSession.class))
305+
.withMessageContaining("Error instantiating class RateLimitingRequestThrottler")
306+
.withMessageContaining("No configuration setting found for key"));
305307
}
306308

307309
@Test

0 commit comments

Comments
 (0)