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

Verify that @FlywayDataSource is preferred over any "normal" DataSource

This commit is contained in:
Andy Wilkinson 2016-08-12 13:17:09 +01:00
parent d41d732172
commit c542d87c61
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfigurationTests.java
View File

@ -41,6 +41,7 @@ import org.springframework.boot.test.util.EnvironmentTestUtils;
import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.AnnotationConfigApplicationContext;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Primary;
import org.springframework.core.Ordered; import org.springframework.core.Ordered;
import org.springframework.core.env.MapPropertySource; import org.springframework.core.env.MapPropertySource;
import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean; import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
@ -101,7 +102,8 @@ public class FlywayAutoConfigurationTests {
EmbeddedDataSourceConfiguration.class, FlywayAutoConfiguration.class, EmbeddedDataSourceConfiguration.class, FlywayAutoConfiguration.class,
PropertyPlaceholderAutoConfiguration.class); PropertyPlaceholderAutoConfiguration.class);
Flyway flyway = this.context.getBean(Flyway.class); Flyway flyway = this.context.getBean(Flyway.class);
assertThat(flyway.getDataSource()).isNotNull(); assertThat(flyway.getDataSource())
.isEqualTo(this.context.getBean("flywayDataSource"));
} }
@Test @Test
@ -241,6 +243,13 @@ public class FlywayAutoConfigurationTests {
@Configuration @Configuration
protected static class FlywayDataSourceConfiguration { protected static class FlywayDataSourceConfiguration {
@Bean
@Primary
public DataSource normalDataSource() {
return DataSourceBuilder.create().url("jdbc:hsqldb:mem:normal").username("sa")
.build();
}
@FlywayDataSource @FlywayDataSource
@Bean @Bean
public DataSource flywayDataSource() { public DataSource flywayDataSource() {