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

Author: wilkinsona

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

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