some minor fixes and improvements

Author: tomix26

build.gradle

@@ -142,8 +142,8 @@ project(':embedded-database-spring-test') {
         runtime "io.zonky.test.postgres:embedded-postgres-binaries-linux-amd64-alpine:$postgresVersion"
 
         compile project(':embedded-database-spring-test-autoconfigure')
-        compile 'org.springframework:spring-context:4.3.10.RELEASE'
-        compile 'org.springframework:spring-test:4.3.10.RELEASE'
+        compile 'org.springframework:spring-context:4.3.18.RELEASE'
+        compile 'org.springframework:spring-test:4.3.18.RELEASE'
         compile "org.flywaydb:flyway-core:$flywayCoreVersion"
         compile "org.flywaydb.flyway-test-extensions:flyway-spring-test:$flywayTestVersion"
         compile 'com.google.guava:guava:23.0'
@@ -194,7 +194,8 @@ project(':embedded-database-spring-test') {
 
     configurations {
         flywayCoreVersions.init().each { version ->
-            "testRuntimeWithFlywayCore$version" {
+            def versionName = version.replaceAll('\\.', '_')
+            "testRuntimeWithFlywayCore_$versionName" {
                 extendsFrom testRuntime
                 resolutionStrategy {
                     eachDependency { details ->
@@ -207,7 +208,8 @@ project(':embedded-database-spring-test') {
         }
 
         flywayTestExtensionsVersions.init().each { version ->
-            "testRuntimeWithFlywayTestExtensions$version" {
+            def versionName = version.replaceAll('\\.', '_')
+            "testRuntimeWithFlywayTestExtensions_$versionName" {
                 extendsFrom testRuntime
                 resolutionStrategy {
                     eachDependency { details ->
@@ -220,7 +222,8 @@ project(':embedded-database-spring-test') {
         }
 
         embeddedPostgresVersions.init().each { version ->
-            "testRuntimeWithEmbeddedPostgres$version" {
+            def versionName = version.replaceAll('\\.', '_')
+            "testRuntimeWithEmbeddedPostgres_$versionName" {
                 extendsFrom testRuntime
                 resolutionStrategy {
                     eachDependency { details ->
@@ -234,26 +237,28 @@ project(':embedded-database-spring-test') {
     }
 
     flywayCoreVersions.init().each { version ->
-        task "testWithFlywayCore$version"(type: Test) {
+        def versionName = version.replaceAll('\\.', '_')
+        task "testWithFlywayCore_$versionName"(type: Test) {
             dependsOn jar
 
             classpath -= configurations.testRuntime
-            classpath += configurations."testRuntimeWithFlywayCore$version"
+            classpath += configurations."testRuntimeWithFlywayCore_$versionName"
 
             useJUnit {
                 includeCategories 'io.zonky.test.category.FlywayIntegrationTests'
                 includeCategories 'io.zonky.test.category.MultiFlywayIntegrationTests'
             }
         }
-        check.dependsOn("testWithFlywayCore$version")
+        check.dependsOn("testWithFlywayCore_$versionName")
     }
 
     flywayTestExtensionsVersions.init().each { version ->
-        task "testWithFlywayTestExtensions$version"(type: Test) {
+        def versionName = version.replaceAll('\\.', '_')
+        task "testWithFlywayTestExtensions_$versionName"(type: Test) {
             dependsOn jar
 
             classpath -= configurations.testRuntime
-            classpath += configurations."testRuntimeWithFlywayTestExtensions$version"
+            classpath += configurations."testRuntimeWithFlywayTestExtensions_$versionName"
 
             useJUnit {
                 includeCategories 'io.zonky.test.category.FlywayIntegrationTests'
@@ -263,17 +268,18 @@ project(':embedded-database-spring-test') {
                 }
             }
         }
-        check.dependsOn("testWithFlywayTestExtensions$version")
+        check.dependsOn("testWithFlywayTestExtensions_$versionName")
     }
 
     embeddedPostgresVersions.init().each { version ->
-        task "testWithEmbeddedPostgres$version"(type: Test) {
+        def versionName = version.replaceAll('\\.', '_')
+        task "testWithEmbeddedPostgres_$versionName"(type: Test) {
             dependsOn jar
 
             classpath -= configurations.testRuntime
-            classpath += configurations."testRuntimeWithEmbeddedPostgres$version"
+            classpath += configurations."testRuntimeWithEmbeddedPostgres_$versionName"
         }
-        check.dependsOn("testWithEmbeddedPostgres$version")
+        check.dependsOn("testWithEmbeddedPostgres_$versionName")
     }
 
     tasks.withType(Test) {

embedded-database-spring-test/src/main/java/io/zonky/test/db/flyway/DefaultFlywayDataSourceContext.java

@@ -61,11 +61,11 @@
 public class DefaultFlywayDataSourceContext implements FlywayDataSourceContext {
 
     protected static final int MAX_DATABASE_CONNECTIONS = 300;
-    protected static final int DEFAULT_MAX_RETRY_ATTEMPTS = 1;
+    protected static final int DEFAULT_MAX_RETRY_ATTEMPTS = 2;
 
     protected static final Consumer<Builder> DEFAULT_DATABASE_CONFIGURATION = builder -> {
         builder.setPgBinaryResolver(DefaultPostgresBinaryResolver.INSTANCE);
-        builder.setPGStartupWait(Duration.ofSeconds(30L));
+        builder.setPGStartupWait(Duration.ofSeconds(20L));
     };
 
     protected static final Consumer<Builder> FORCED_DATABASE_CONFIGURATION =
@@ -159,11 +159,8 @@ public synchronized ListenableFuture<DataSource> reload(Flyway flyway) {
      * Includes the initial attempt before the retries begin so, generally, will be {@code >= 1}.
      * For example setting this property to 3 means 3 attempts total (initial + 2 retries).
      *
-     * @deprecated This method is scheduled to be removed in version 2.0.0,
-     * use {@link Builder Consumer&lt;EmbeddedPostgres.Builder&gt;} customizer and increase startup waiting time instead.
      * @param maxAttempts the maximum number of attempts including the initial attempt.
      */
-    @Deprecated
     public void setMaxAttempts(int maxAttempts) {
         this.maxAttempts = maxAttempts;
     }

embedded-database-spring-test/src/main/java/io/zonky/test/db/flyway/FlywayClassUtils.java

@@ -32,7 +32,7 @@ public class FlywayClassUtils {
                 version = "30";
             }
         } catch (Exception e) {
-            LoggerFactory.getLogger(FlywayConfigSnapshot.class).error("Error resolving flyway version", e);
+            LoggerFactory.getLogger(FlywayConfigSnapshot.class).error("Unexpected error occurred while resolving flyway version", e);
             version = "0";
         }
         flywayVersion = Integer.valueOf(version);

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

@@ -49,7 +49,7 @@ public class EmptyEmbeddedPostgresDataSourceFactoryBean implements FactoryBean<D
 
     protected static final Consumer<Builder> DEFAULT_DATABASE_CONFIGURATION = builder -> {
         builder.setPgBinaryResolver(DefaultPostgresBinaryResolver.INSTANCE);
-        builder.setPGStartupWait(Duration.ofSeconds(30L));
+        builder.setPGStartupWait(Duration.ofSeconds(20L));
     };
 
     protected static final Consumer<Builder> FORCED_DATABASE_CONFIGURATION =

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

@@ -44,7 +44,6 @@
 
 @RunWith(SpringRunner.class)
 @Category(FlywayIntegrationTests.class)
-@FlywayTest
 @AutoConfigureEmbeddedDatabase(beanName = "dataSource")
 @ContextConfiguration
 public class AsyncFlywayInitializationIntegrationTest {
@@ -59,6 +58,7 @@ public Flyway flyway(DataSource dataSource) {
             Flyway flyway = new Flyway();
             flyway.setDataSource(dataSource);
             flyway.setSchemas("test");
+            flyway.setLocations("db/migration", "db/test_migration/slow");
             return flyway;
         }
 
@@ -91,7 +91,6 @@ public TaskExecutor bootstrapExecutor() {
     @Autowired
     private JdbcTemplate jdbcTemplate;
 
-    @FlywayTest
     @Test(timeout = 10000)
     public void loadDefaultMigrations() throws Exception {
         Duration duration = longTimeInitializingBean.getInitializationDuration();

embedded-database-spring-test/src/test/resources/db/test_migration/slow/V1000_1__sleep.sql

@@ -0,0 +1 @@
+select pg_sleep(1);

settings.gradle

@@ -1,4 +1,4 @@
-rootProject.name = 'embedded-database-spring-test-root'
+rootProject.name = 'embedded-database-spring-test-parent'
 
 include 'embedded-database-spring-test'
 include 'embedded-database-spring-test-autoconfigure'