Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-07-05 00:56:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade to AssertJ 3.23.1

Browse Source 
Closes gh-31331
This commit is contained in:
Andy Wilkinson 2022-06-10 12:58:00 +01:00
parent 228be786ca
commit d4be484d27
7 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/elastic/ElasticMetricsExportAutoConfigurationTests.java
View File

@ -96,7 +96,7 @@ class ElasticMetricsExportAutoConfigurationTests {
this.contextRunner.withUserConfiguration(BaseConfiguration.class)
.withPropertyValues("management.elastic.metrics.export.api-key-credentials:secret",
"management.elastic.metrics.export.user-name:alice")
.run((context) -> assertThat(context).hasFailed().getFailure().getRootCause()
.run((context) -> assertThat(context).hasFailed().getFailure().rootCause()
.isInstanceOf(MutuallyExclusiveConfigurationPropertiesException.class));
}
@ -105,7 +105,7 @@ class ElasticMetricsExportAutoConfigurationTests {
this.contextRunner.withUserConfiguration(BaseConfiguration.class)
.withPropertyValues("management.elastic.metrics.export.api-key-credentials:secret",
"management.elastic.metrics.export.password:secret")
.run((context) -> assertThat(context).hasFailed().getFailure().getRootCause()
.run((context) -> assertThat(context).hasFailed().getFailure().rootCause()
.isInstanceOf(MutuallyExclusiveConfigurationPropertiesException.class));
}

2
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/integration/IntegrationAutoConfigurationTests.java
View File

@ -433,7 +433,7 @@ class IntegrationAutoConfigurationTests {
"spring.integration.poller.fixed-delay=1s")
.run((context) -> assertThat(context).hasFailed().getFailure()
.hasRootCauseExactlyInstanceOf(MutuallyExclusiveConfigurationPropertiesException.class)
.getRootCause()
.rootCause()
.asInstanceOf(
InstanceOfAssertFactories.type(MutuallyExclusiveConfigurationPropertiesException.class))
.satisfies((ex) -> {

4
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/r2dbc/R2dbcAutoConfigurationTests.java
View File

@ -102,7 +102,7 @@ class R2dbcAutoConfigurationTests {
this.contextRunner
.withPropertyValues("spring.r2dbc.url:r2dbc:pool:h2:mem:///" + randomDatabaseName() + "?maxSize=12",
"spring.r2dbc.pool.max-size=15")
.run((context) -> assertThat(context).getFailure().getRootCause()
.run((context) -> assertThat(context).getFailure().rootCause()
.isInstanceOf(MultipleConnectionPoolConfigurationsException.class));
}
@ -111,7 +111,7 @@ class R2dbcAutoConfigurationTests {
this.contextRunner
.withPropertyValues("spring.r2dbc.url:r2dbc:pool:h2:mem:///" + randomDatabaseName() + "?maxSize=12",
"spring.r2dbc.pool.enabled=false")
.run((context) -> assertThat(context).getFailure().getRootCause()
.run((context) -> assertThat(context).getFailure().rootCause()
.isInstanceOf(MultipleConnectionPoolConfigurationsException.class));
}

6
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/r2dbc/R2dbcAutoConfigurationWithoutConnectionPoolTests.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2012-2021 the original author or authors.
* Copyright 2012-2022 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -63,7 +63,7 @@ class R2dbcAutoConfigurationWithoutConnectionPoolTests {
.withPropertyValues("spring.r2dbc.pool.enabled=true",
"spring.r2dbc.url:r2dbc:h2:mem:///" + randomDatabaseName()
+ "?options=DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE")
.run((context) -> assertThat(context).getFailure().getRootCause()
.run((context) -> assertThat(context).getFailure().rootCause()
.isInstanceOf(MissingR2dbcPoolDependencyException.class));
}
@ -72,7 +72,7 @@ class R2dbcAutoConfigurationWithoutConnectionPoolTests {
this.contextRunner
.withPropertyValues("spring.r2dbc.url:r2dbc:pool:h2:mem:///" + randomDatabaseName()
+ "?options=DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE")
.run((context) -> assertThat(context).getFailure().getRootCause()
.run((context) -> assertThat(context).getFailure().rootCause()
.isInstanceOf(MissingR2dbcPoolDependencyException.class));
}

2
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcAutoConfigurationTests.java
View File

@ -863,7 +863,7 @@ class WebMvcAutoConfigurationTests {
this.contextRunner
.withPropertyValues("spring.mvc.pathmatch.matching-strategy:path_pattern_parser",
"spring.mvc.pathmatch.use-suffix-pattern:true")
.run((context) -> assertThat(context.getStartupFailure()).getRootCause()
.run((context) -> assertThat(context.getStartupFailure()).rootCause()
.isInstanceOf(IncompatibleConfigurationException.class));
}

2
spring-boot-project/spring-boot-dependencies/build.gradle
View File

@ -51,7 +51,7 @@ bom {
]
}
}
library("AssertJ", "3.22.0") {
library("AssertJ", "3.23.1") {
group("org.assertj") {
modules = [
"assertj-core"

2
spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-liquibase/src/test/java/smoketest/liquibase/SampleLiquibaseApplicationTests.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2012-2021 the original author or authors.
* Copyright 2012-2022 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.