Upgrade to AssertJ 3.23.1
Closes gh-31331
This commit is contained in:
@@ -96,7 +96,7 @@ class ElasticMetricsExportAutoConfigurationTests {
|
|||||||
this.contextRunner.withUserConfiguration(BaseConfiguration.class)
|
this.contextRunner.withUserConfiguration(BaseConfiguration.class)
|
||||||
.withPropertyValues("management.elastic.metrics.export.api-key-credentials:secret",
|
.withPropertyValues("management.elastic.metrics.export.api-key-credentials:secret",
|
||||||
"management.elastic.metrics.export.user-name:alice")
|
"management.elastic.metrics.export.user-name:alice")
|
||||||
.run((context) -> assertThat(context).hasFailed().getFailure().getRootCause()
|
.run((context) -> assertThat(context).hasFailed().getFailure().rootCause()
|
||||||
.isInstanceOf(MutuallyExclusiveConfigurationPropertiesException.class));
|
.isInstanceOf(MutuallyExclusiveConfigurationPropertiesException.class));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -105,7 +105,7 @@ class ElasticMetricsExportAutoConfigurationTests {
|
|||||||
this.contextRunner.withUserConfiguration(BaseConfiguration.class)
|
this.contextRunner.withUserConfiguration(BaseConfiguration.class)
|
||||||
.withPropertyValues("management.elastic.metrics.export.api-key-credentials:secret",
|
.withPropertyValues("management.elastic.metrics.export.api-key-credentials:secret",
|
||||||
"management.elastic.metrics.export.password:secret")
|
"management.elastic.metrics.export.password:secret")
|
||||||
.run((context) -> assertThat(context).hasFailed().getFailure().getRootCause()
|
.run((context) -> assertThat(context).hasFailed().getFailure().rootCause()
|
||||||
.isInstanceOf(MutuallyExclusiveConfigurationPropertiesException.class));
|
.isInstanceOf(MutuallyExclusiveConfigurationPropertiesException.class));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -433,7 +433,7 @@ class IntegrationAutoConfigurationTests {
|
|||||||
"spring.integration.poller.fixed-delay=1s")
|
"spring.integration.poller.fixed-delay=1s")
|
||||||
.run((context) -> assertThat(context).hasFailed().getFailure()
|
.run((context) -> assertThat(context).hasFailed().getFailure()
|
||||||
.hasRootCauseExactlyInstanceOf(MutuallyExclusiveConfigurationPropertiesException.class)
|
.hasRootCauseExactlyInstanceOf(MutuallyExclusiveConfigurationPropertiesException.class)
|
||||||
.getRootCause()
|
.rootCause()
|
||||||
.asInstanceOf(
|
.asInstanceOf(
|
||||||
InstanceOfAssertFactories.type(MutuallyExclusiveConfigurationPropertiesException.class))
|
InstanceOfAssertFactories.type(MutuallyExclusiveConfigurationPropertiesException.class))
|
||||||
.satisfies((ex) -> {
|
.satisfies((ex) -> {
|
||||||
|
|||||||
@@ -102,7 +102,7 @@ class R2dbcAutoConfigurationTests {
|
|||||||
this.contextRunner
|
this.contextRunner
|
||||||
.withPropertyValues("spring.r2dbc.url:r2dbc:pool:h2:mem:///" + randomDatabaseName() + "?maxSize=12",
|
.withPropertyValues("spring.r2dbc.url:r2dbc:pool:h2:mem:///" + randomDatabaseName() + "?maxSize=12",
|
||||||
"spring.r2dbc.pool.max-size=15")
|
"spring.r2dbc.pool.max-size=15")
|
||||||
.run((context) -> assertThat(context).getFailure().getRootCause()
|
.run((context) -> assertThat(context).getFailure().rootCause()
|
||||||
.isInstanceOf(MultipleConnectionPoolConfigurationsException.class));
|
.isInstanceOf(MultipleConnectionPoolConfigurationsException.class));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -111,7 +111,7 @@ class R2dbcAutoConfigurationTests {
|
|||||||
this.contextRunner
|
this.contextRunner
|
||||||
.withPropertyValues("spring.r2dbc.url:r2dbc:pool:h2:mem:///" + randomDatabaseName() + "?maxSize=12",
|
.withPropertyValues("spring.r2dbc.url:r2dbc:pool:h2:mem:///" + randomDatabaseName() + "?maxSize=12",
|
||||||
"spring.r2dbc.pool.enabled=false")
|
"spring.r2dbc.pool.enabled=false")
|
||||||
.run((context) -> assertThat(context).getFailure().getRootCause()
|
.run((context) -> assertThat(context).getFailure().rootCause()
|
||||||
.isInstanceOf(MultipleConnectionPoolConfigurationsException.class));
|
.isInstanceOf(MultipleConnectionPoolConfigurationsException.class));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -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");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@@ -63,7 +63,7 @@ class R2dbcAutoConfigurationWithoutConnectionPoolTests {
|
|||||||
.withPropertyValues("spring.r2dbc.pool.enabled=true",
|
.withPropertyValues("spring.r2dbc.pool.enabled=true",
|
||||||
"spring.r2dbc.url:r2dbc:h2:mem:///" + randomDatabaseName()
|
"spring.r2dbc.url:r2dbc:h2:mem:///" + randomDatabaseName()
|
||||||
+ "?options=DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE")
|
+ "?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));
|
.isInstanceOf(MissingR2dbcPoolDependencyException.class));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -72,7 +72,7 @@ class R2dbcAutoConfigurationWithoutConnectionPoolTests {
|
|||||||
this.contextRunner
|
this.contextRunner
|
||||||
.withPropertyValues("spring.r2dbc.url:r2dbc:pool:h2:mem:///" + randomDatabaseName()
|
.withPropertyValues("spring.r2dbc.url:r2dbc:pool:h2:mem:///" + randomDatabaseName()
|
||||||
+ "?options=DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE")
|
+ "?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));
|
.isInstanceOf(MissingR2dbcPoolDependencyException.class));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -863,7 +863,7 @@ class WebMvcAutoConfigurationTests {
|
|||||||
this.contextRunner
|
this.contextRunner
|
||||||
.withPropertyValues("spring.mvc.pathmatch.matching-strategy:path_pattern_parser",
|
.withPropertyValues("spring.mvc.pathmatch.matching-strategy:path_pattern_parser",
|
||||||
"spring.mvc.pathmatch.use-suffix-pattern:true")
|
"spring.mvc.pathmatch.use-suffix-pattern:true")
|
||||||
.run((context) -> assertThat(context.getStartupFailure()).getRootCause()
|
.run((context) -> assertThat(context.getStartupFailure()).rootCause()
|
||||||
.isInstanceOf(IncompatibleConfigurationException.class));
|
.isInstanceOf(IncompatibleConfigurationException.class));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -51,7 +51,7 @@ bom {
|
|||||||
]
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
library("AssertJ", "3.22.0") {
|
library("AssertJ", "3.23.1") {
|
||||||
group("org.assertj") {
|
group("org.assertj") {
|
||||||
modules = [
|
modules = [
|
||||||
"assertj-core"
|
"assertj-core"
|
||||||
|
|||||||
@@ -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");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
|
|||||||
Reference in New Issue
Block a user