Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.2.x'

Browse Source 
Closes gh-18964
This commit is contained in:
Stephane Nicoll
2019-11-12 14:10:41 +01:00
parent ec5e407ce3 a5da441bc4
commit a1ee2134bc
1 changed files with 2 additions and 2 deletions
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/jdbc/DataSourceHealthContributorAutoConfigurationTests.java
View File

@@ -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));
}