mirror of
https://github.com/spring-projects/spring-boot.git
synced 2026-09-29 21:59:02 +00:00
Merge branch '2.2.x'
Closes gh-18964
This commit is contained in:
+2
-2
@@ -72,7 +72,7 @@ class DataSourceHealthContributorAutoConfigurationTests {
|
||||
}
|
||||
|
||||
@Test
|
||||
void runWithRoutingAndEmbeddedDataSourceShouldFilterRoutingDataSource() {
|
||||
void runWithRoutingAndEmbeddedDataSourceShouldIncludeRoutingDataSource() {
|
||||
this.contextRunner.withUserConfiguration(EmbeddedDataSourceConfiguration.class, RoutingDatasourceConfig.class)
|
||||
.run((context) -> {
|
||||
CompositeHealthContributor composite = context.getBean(CompositeHealthContributor.class);
|
||||
@@ -83,7 +83,7 @@ class DataSourceHealthContributorAutoConfigurationTests {
|
||||
}
|
||||
|
||||
@Test
|
||||
void runWithOnlyRoutingDataSourceShouldFilterRoutingDataSource() {
|
||||
void runWithOnlyRoutingDataSourceShouldIncludeRoutingDataSource() {
|
||||
this.contextRunner.withUserConfiguration(RoutingDatasourceConfig.class)
|
||||
.run((context) -> assertThat(context).hasSingleBean(RoutingDataSourceHealthIndicator.class));
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user