Merge pull request #63 from zonkyio/flyway-properties

#58 Fix problem with flyway datasource properties

Author: tomix26

embedded-database-spring-test/src/main/java/io/zonky/test/db/postgres/EmbeddedPostgresContextCustomizerFactory.java

@@ -143,6 +143,8 @@ public int hashCode() {
 
     protected static class EnvironmentPostProcessor implements BeanDefinitionRegistryPostProcessor {
 
+        private static final NullPlaceholder NULL = new NullPlaceholder();
+
         private final ConfigurableEnvironment environment;
 
         public EnvironmentPostProcessor(ConfigurableEnvironment environment) {
@@ -153,13 +155,32 @@ public EnvironmentPostProcessor(ConfigurableEnvironment environment) {
         public void postProcessBeanDefinitionRegistry(BeanDefinitionRegistry registry) throws BeansException {
             environment.getPropertySources().addFirst(new MapPropertySource(
                     PreloadableEmbeddedPostgresContextCustomizer.class.getSimpleName(),
-                    ImmutableMap.of("spring.test.database.replace", "NONE")));
+                    ImmutableMap.of(
+                            "spring.test.database.replace", "NONE",
+                            "spring.flyway.url", NULL,
+                            "spring.flyway.user", NULL,
+                            "flyway.url", NULL,
+                            "flyway.user", NULL
+                    )));
         }
 
         @Override
         public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException {
             // nothing to do
         }
+
+        protected static class NullPlaceholder {
+
+            // this method is required to hook up org.springframework.core.convert.support.FallbackObjectToStringConverter
+            public static NullPlaceholder valueOf(String value) {
+                throw new IllegalStateException("This method should never be called!");
+            }
+
+            @Override
+            public String toString() {
+                return null;
+            }
+        }
     }
 
     protected static class PreloadableEmbeddedPostgresRegistrar implements BeanDefinitionRegistryPostProcessor, EnvironmentAware {

embedded-database-spring-test/src/test/java/io/zonky/test/db/SpringBootFlywayPropertiesIntegrationTest.java

@@ -0,0 +1,40 @@
+package io.zonky.test.db;
+
+import org.flywaydb.core.Flyway;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.jdbc.JdbcTest;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.test.context.TestPropertySource;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import javax.sql.DataSource;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+@RunWith(SpringRunner.class)
+@AutoConfigureEmbeddedDatabase(beanName = "dataSource")
+@TestPropertySource(properties = {
+        "flyway.url=jdbc:postgresql://localhost:5432/test",
+        "flyway.user=flyway",
+        "flyway.password=password",
+        "flyway.schemas=test",
+})
+@JdbcTest
+public class SpringBootFlywayPropertiesIntegrationTest {
+
+    @Configuration
+    static class Config {}
+
+    @Autowired
+    private Flyway flyway;
+
+    @Autowired
+    private DataSource dataSource;
+
+    @Test
+    public void test() {
+        assertThat(flyway.getDataSource()).isSameAs(dataSource);
+    }
+}

embedded-database-spring-test/src/test/java/io/zonky/test/db/SpringBootIntegrationTest.java

@@ -16,44 +16,32 @@
 
 package io.zonky.test.db;
 
-import org.flywaydb.core.Flyway;
 import org.flywaydb.test.annotation.FlywayTest;
 import org.junit.Test;
-import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.jdbc.JdbcTest;
-import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.context.junit4.SpringRunner;
 
-import javax.sql.DataSource;
 import java.util.List;
 import java.util.Map;
 
-import io.zonky.test.category.FlywayIntegrationTests;
-import static io.zonky.test.util.FlywayTestUtils.createFlyway;
-
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.entry;
 
 @RunWith(SpringRunner.class)
-@Category(FlywayIntegrationTests.class)
 @AutoConfigureEmbeddedDatabase(beanName = "dataSource")
+@TestPropertySource(properties = "flyway.schemas=test")
 @JdbcTest
 public class SpringBootIntegrationTest {
 
     private static final String SQL_SELECT_PERSONS = "select * from test.person";
 
     @Configuration
-    static class Config {
-
-        @Bean(initMethod = "migrate")
-        public Flyway flyway(DataSource dataSource) throws Exception {
-            return createFlyway(dataSource, "test");
-        }
-    }
+    static class Config {}
 
     @Autowired
     private JdbcTemplate jdbcTemplate;