Skip to content

Commit d638bbb

Browse files
philwebbphilwebb
committed
Merge branch '3.1.x'
Closes gh-37967
2 parents e25886f + 1d456e0 commit d638bbb

File tree

32 files changed

+167
-159
lines changed

32 files changed

+167
-159
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: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
import org.springframework.core.annotation.Order;
5353

5454
import static org.assertj.core.api.Assertions.assertThat;
55-
import static org.assertj.core.api.Assertions.assertThatThrownBy;
55+
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
5656
import static org.mockito.Mockito.mock;
5757

5858
/**
@@ -198,8 +198,8 @@ void autoConfiguresObservationPredicates() {
198198
Observation.start("observation2", observationRegistry).stop();
199199
MeterRegistry meterRegistry = context.getBean(MeterRegistry.class);
200200
assertThat(meterRegistry.get("observation1").timer().count()).isOne();
201-
assertThatThrownBy(() -> meterRegistry.get("observation2").timer())
202-
.isInstanceOf(MeterNotFoundException.class);
201+
assertThatExceptionOfType(MeterNotFoundException.class)
202+
.isThrownBy(() -> meterRegistry.get("observation2").timer());
203203
});
204204
}
205205

@@ -329,8 +329,8 @@ void shouldDisableSpringSecurityObservationsIfPropertyIsSet() {
329329
ObservationRegistry observationRegistry = context.getBean(ObservationRegistry.class);
330330
Observation.start("spring.security.filterchains", observationRegistry).stop();
331331
MeterRegistry meterRegistry = context.getBean(MeterRegistry.class);
332-
assertThatThrownBy(() -> meterRegistry.get("spring.security.filterchains").timer())
333-
.isInstanceOf(MeterNotFoundException.class);
332+
assertThatExceptionOfType(MeterNotFoundException.class)
333+
.isThrownBy(() -> meterRegistry.get("spring.security.filterchains").timer());
334334
});
335335
}
336336

‎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
@@ -57,7 +57,7 @@
5757
import org.springframework.core.annotation.Order;
5858

5959
import static org.assertj.core.api.Assertions.assertThat;
60-
import static org.assertj.core.api.Assertions.assertThatThrownBy;
60+
import static org.assertj.core.api.Assertions.assertThatException;
6161
import static org.mockito.Mockito.mock;
6262

6363
/**
@@ -285,30 +285,33 @@ void shouldFailIfSupportJoinedSpansIsEnabledAndW3cIsChosenAsType() {
285285
this.contextRunner
286286
.withPropertyValues("management.tracing.propagation.type=W3C",
287287
"management.tracing.brave.span-joining-supported=true")
288-
.run((context) -> assertThatThrownBy(() -> context.getBean(Tracing.class)).rootCause()
288+
.run((context) -> assertThatException().isThrownBy(() -> context.getBean(Tracing.class))
289+
.havingRootCause()
289290
.isExactlyInstanceOf(IncompatibleConfigurationException.class)
290-
.hasMessage(
291-
"The following configuration properties have incompatible values: [management.tracing.propagation.type, management.tracing.brave.span-joining-supported]"));
291+
.withMessage("The following configuration properties have incompatible values: "
292+
+ "[management.tracing.propagation.type, management.tracing.brave.span-joining-supported]"));
292293
}
293294

294295
@Test
295296
void shouldFailIfSupportJoinedSpansIsEnabledAndW3cIsChosenAsConsume() {
296297
this.contextRunner.withPropertyValues("management.tracing.propagation.produce=B3",
297298
"management.tracing.propagation.consume=W3C", "management.tracing.brave.span-joining-supported=true")
298-
.run((context) -> assertThatThrownBy(() -> context.getBean(Tracing.class)).rootCause()
299+
.run((context) -> assertThatException().isThrownBy(() -> context.getBean(Tracing.class))
300+
.havingRootCause()
299301
.isExactlyInstanceOf(IncompatibleConfigurationException.class)
300-
.hasMessage(
301-
"The following configuration properties have incompatible values: [management.tracing.propagation.consume, management.tracing.brave.span-joining-supported]"));
302+
.withMessage("The following configuration properties have incompatible values: "
303+
+ "[management.tracing.propagation.consume, management.tracing.brave.span-joining-supported]"));
302304
}
303305

304306
@Test
305307
void shouldFailIfSupportJoinedSpansIsEnabledAndW3cIsChosenAsProduce() {
306308
this.contextRunner.withPropertyValues("management.tracing.propagation.consume=B3",
307309
"management.tracing.propagation.produce=W3C", "management.tracing.brave.span-joining-supported=true")
308-
.run((context) -> assertThatThrownBy(() -> context.getBean(Tracing.class)).rootCause()
310+
.run((context) -> assertThatException().isThrownBy(() -> context.getBean(Tracing.class))
311+
.havingRootCause()
309312
.isExactlyInstanceOf(IncompatibleConfigurationException.class)
310-
.hasMessage(
311-
"The following configuration properties have incompatible values: [management.tracing.propagation.produce, management.tracing.brave.span-joining-supported]"));
313+
.withMessage("The following configuration properties have incompatible values: "
314+
+ "[management.tracing.propagation.produce, management.tracing.brave.span-joining-supported]"));
312315
}
313316

314317
@Test

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

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

3535
import static org.assertj.core.api.Assertions.assertThat;
36-
import static org.assertj.core.api.Assertions.assertThatThrownBy;
36+
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
3737

3838
/**
3939
* Abstract base test class which is used for testing the different implementations of the
@@ -60,8 +60,8 @@ void afterEach() throws IOException {
6060
@Test
6161
void sendSpansShouldThrowIfCloseWasCalled() throws IOException {
6262
this.sender.close();
63-
assertThatThrownBy(() -> this.sender.sendSpans(Collections.emptyList()))
64-
.isInstanceOf(ClosedSenderException.class);
63+
assertThatExceptionOfType(ClosedSenderException.class)
64+
.isThrownBy(() -> this.sender.sendSpans(Collections.emptyList()));
6565
}
6666

6767
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;
@@ -109,8 +109,8 @@ void sendSpansShouldHandleHttpFailures(boolean async) {
109109
assertThat(callbackResult.error()).isNotNull().hasMessageContaining("500 Internal Server Error");
110110
}
111111
else {
112-
assertThatThrownBy(() -> makeSyncRequest(Collections.emptyList()))
113-
.hasMessageContaining("500 Internal Server Error");
112+
assertThatException().isThrownBy(() -> makeSyncRequest(Collections.emptyList()))
113+
.withMessageContaining("500 Internal Server Error");
114114
}
115115
}
116116

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
import org.springframework.web.reactive.function.client.WebClient;
4242

4343
import static org.assertj.core.api.Assertions.assertThat;
44-
import static org.assertj.core.api.Assertions.assertThatThrownBy;
44+
import static org.assertj.core.api.Assertions.assertThatException;
4545

4646
/**
4747
* Tests for {@link ZipkinWebClientSender}.
@@ -130,8 +130,8 @@ void sendSpansShouldHandleHttpFailures(boolean async) throws InterruptedExceptio
130130
assertThat(callbackResult.error()).isNotNull().hasMessageContaining("500 Internal Server Error");
131131
}
132132
else {
133-
assertThatThrownBy(() -> makeSyncRequest(Collections.emptyList()))
134-
.hasMessageContaining("500 Internal Server Error");
133+
assertThatException().isThrownBy(() -> makeSyncRequest(Collections.emptyList()))
134+
.withMessageContaining("500 Internal Server Error");
135135
}
136136
requestAssertions((request) -> assertThat(request.getMethod()).isEqualTo("POST"));
137137
}
@@ -165,8 +165,8 @@ void shouldTimeout(boolean async) {
165165
assertThat(callbackResult.error()).isNotNull().isInstanceOf(TimeoutException.class);
166166
}
167167
else {
168-
assertThatThrownBy(() -> makeSyncRequest(sender, Collections.emptyList()))
169-
.hasCauseInstanceOf(TimeoutException.class);
168+
assertThatException().isThrownBy(() -> makeSyncRequest(sender, Collections.emptyList()))
169+
.withCauseInstanceOf(TimeoutException.class);
170170
}
171171
}
172172

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

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

2929
import static org.assertj.core.api.Assertions.assertThat;
30-
import static org.assertj.core.api.Assertions.assertThatThrownBy;
30+
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
3131

3232
/**
3333
* Tests for {@link WavefrontProperties}.
@@ -51,9 +51,9 @@ void apiTokenIsMandatoryWhenNotUsingProxy() {
5151
properties.setUri(URI.create("http://localhost:2878"));
5252
properties.setApiToken(null);
5353
assertThat(properties.getEffectiveUri()).isEqualTo(URI.create("http://localhost:2878"));
54-
assertThatThrownBy(properties::getApiTokenOrThrow)
55-
.isInstanceOf(InvalidConfigurationPropertyValueException.class)
56-
.hasMessageContaining("management.wavefront.api-token");
54+
assertThatExceptionOfType(InvalidConfigurationPropertyValueException.class)
55+
.isThrownBy(properties::getApiTokenOrThrow)
56+
.withMessageContaining("management.wavefront.api-token");
5757
}
5858

5959
@Test

‎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
@@ -26,7 +26,7 @@
2626
import org.springframework.boot.context.properties.source.InvalidConfigurationPropertyValueException;
2727

2828
import static org.assertj.core.api.Assertions.assertThat;
29-
import static org.assertj.core.api.Assertions.assertThatThrownBy;
29+
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
3030

3131
/**
3232
* Tests for {@link RabbitProperties}.
@@ -369,9 +369,9 @@ void determineUsernameWithoutPassword() {
369369
void hostPropertyMustBeSingleHost() {
370370
this.properties.setHost("my-rmq-host.net,my-rmq-host-2.net");
371371
assertThat(this.properties.getHost()).isEqualTo("my-rmq-host.net,my-rmq-host-2.net");
372-
assertThatThrownBy(this.properties::determineAddresses)
373-
.isInstanceOf(InvalidConfigurationPropertyValueException.class)
374-
.hasMessageContaining("spring.rabbitmq.host");
372+
assertThatExceptionOfType(InvalidConfigurationPropertyValueException.class)
373+
.isThrownBy(this.properties::determineAddresses)
374+
.withMessageContaining("spring.rabbitmq.host");
375375
}
376376

377377
}

‎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)