root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 16 Packages Projects Releases Wiki Activity

Merge branch '1.4.x' into 1.5.x

This commit is contained in:
Phillip Webb 2017-01-19 12:33:42 -08:00
parent e73c6bb2e2 b05bdbfe4f
commit 655fa59db0
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/orm/jpa/TestDatabaseAutoConfigurationNoEmbeddedTests.java
View File

@ -75,8 +75,8 @@ public class TestDatabaseAutoConfigurationNoEmbeddedTests {
public void applyNoReplace() {
load(ExistingDataSourceConfiguration.class, "spring.test.database.replace=NONE");
assertThat(this.context.getBeansOfType(DataSource.class)).hasSize(1);
assertThat(this.context.getBean(DataSource.class)).isSameAs(
this.context.getBean("myCustomDataSource"));
assertThat(this.context.getBean(DataSource.class))
.isSameAs(this.context.getBean("myCustomDataSource"));
}
public void load(Class<?> config, String... environment) {