fix flaky integration tests

Author: tomix26

build.gradle

@@ -29,8 +29,7 @@ ext {
 
             [core: '5.0.7', test: '5.0.0'] // default version
     ]
-//    embeddedPostgresVersions = ['9.3.25', '9.4.20', '9.5.15', '9.6.11', '10.6.0', '11.1.0']
-    embeddedPostgresVersions = ['9.3.25', '9.4.20', '9.5.15', '9.6.11', '10.6.0'] // TODO: OpenTable and Yandex providers don't support Postgres11+ on Linux Platform
+    embeddedPostgresVersions = ['9.3.25', '9.4.20', '9.5.15', '9.6.11', '10.6.0', '11.1.0']
 
     flywayCoreVersion = flywayVersions.last().core
     flywayTestVersion = flywayVersions.last().test

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

@@ -26,6 +26,7 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.util.SocketUtils;
 
 import javax.sql.DataSource;
 import java.sql.SQLException;
@@ -43,16 +44,24 @@ public class OpenTableProviderWithConfigurationIntegrationTest {
     static class Config {
 
         @Bean
-        public Consumer<EmbeddedPostgres.Builder> embeddedPostgresCustomizer() {
-            return builder -> builder.setPort(44444);
+        public Integer randomPort() {
+            return SocketUtils.findAvailableTcpPort();
+        }
+
+        @Bean
+        public Consumer<EmbeddedPostgres.Builder> embeddedPostgresCustomizer(Integer randomPort) {
+            return builder -> builder.setPort(randomPort);
         }
     }
 
+    @Autowired
+    private Integer randomPort;
+
     @Autowired
     private DataSource dataSource;
 
     @Test
     public void testDataSource() throws SQLException {
-        assertThat(dataSource.unwrap(PGSimpleDataSource.class).getPortNumber()).isEqualTo(44444);
+        assertThat(dataSource.unwrap(PGSimpleDataSource.class).getPortNumber()).isEqualTo(randomPort);
     }
 }

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

@@ -26,6 +26,7 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.util.SocketUtils;
 
 import javax.sql.DataSource;
 import java.sql.SQLException;
@@ -43,16 +44,24 @@ public class ZonkyProviderWithConfigurationIntegrationTest {
     static class Config {
 
         @Bean
-        public Consumer<EmbeddedPostgres.Builder> embeddedPostgresCustomizer() {
-            return builder -> builder.setPort(33333);
+        public Integer randomPort() {
+            return SocketUtils.findAvailableTcpPort();
+        }
+
+        @Bean
+        public Consumer<EmbeddedPostgres.Builder> embeddedPostgresCustomizer(Integer randomPort) {
+            return builder -> builder.setPort(randomPort);
         }
     }
 
+    @Autowired
+    private Integer randomPort;
+
     @Autowired
     private DataSource dataSource;
 
     @Test
     public void testDataSource() throws SQLException {
-        assertThat(dataSource.unwrap(PGSimpleDataSource.class).getPortNumber()).isEqualTo(33333);
+        assertThat(dataSource.unwrap(PGSimpleDataSource.class).getPortNumber()).isEqualTo(randomPort);
     }
 }

embedded-database-spring-test/src/test/java/io/zonky/test/db/provider/impl/OpenTablePostgresDatabaseProviderTest.java

@@ -30,6 +30,7 @@
 import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.mock.env.MockEnvironment;
+import org.springframework.util.SocketUtils;
 
 import javax.sql.DataSource;
 import java.sql.SQLException;
@@ -105,13 +106,14 @@ public void testGetDatabase() throws SQLException {
 
     @Test
     public void testDatabaseCustomizers() throws SQLException {
-        when(databaseCustomizers.getIfAvailable()).thenReturn(Collections.singletonList(builder -> builder.setPort(44445)));
+        int randomPort = SocketUtils.findAvailableTcpPort();
+        when(databaseCustomizers.getIfAvailable()).thenReturn(Collections.singletonList(builder -> builder.setPort(randomPort)));
 
         DatabasePreparer preparer = dataSource -> {};
         OpenTablePostgresDatabaseProvider provider = new OpenTablePostgresDatabaseProvider(new MockEnvironment(), databaseCustomizers);
         DataSource dataSource = provider.getDatabase(preparer);
 
-        assertThat(dataSource.unwrap(PGSimpleDataSource.class).getPortNumber()).isEqualTo(44445);
+        assertThat(dataSource.unwrap(PGSimpleDataSource.class).getPortNumber()).isEqualTo(randomPort);
     }
 
     @Test

embedded-database-spring-test/src/test/java/io/zonky/test/db/provider/impl/PrefetchingDatabaseProviderTest.java

@@ -32,10 +32,10 @@
 
 import javax.sql.DataSource;
 import java.util.HashSet;
-import java.util.LinkedList;
 import java.util.List;
-import java.util.Queue;
 import java.util.Set;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.LinkedBlockingQueue;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -80,7 +80,7 @@ public void testPrefetching() throws Exception {
         List<DataSource> dataSources = Stream.generate(() -> mock(DataSource.class))
                 .limit(6).collect(Collectors.toList());
 
-        Queue<DataSource> providerReturns = new LinkedList<>(dataSources);
+        BlockingQueue<DataSource> providerReturns = new LinkedBlockingQueue<>(dataSources);
         doAnswer(i -> providerReturns.poll()).when(databaseProvider2).getDatabase(same(preparer));
 
         Set<DataSource> results = new HashSet<>();

embedded-database-spring-test/src/test/java/io/zonky/test/db/provider/impl/YandexPostgresDatabaseProviderTest.java

@@ -47,7 +47,6 @@ public void providerTypeShouldBeYandex() {
         assertThat(provider.getProviderType()).isEqualTo(ProviderType.YANDEX);
     }
 
-    @Ignore
     @Test
     public void testGetDatabase() throws SQLException {
         YandexPostgresDatabaseProvider provider = new YandexPostgresDatabaseProvider(new MockEnvironment());
@@ -86,7 +85,6 @@ public void testGetDatabase() throws SQLException {
         assertThat(jdbcTemplate3.queryForObject("select count(*) from prime_number", Integer.class)).isEqualTo(1);
     }
 
-    @Ignore
     @Test
     public void testConfigurationProperties() throws SQLException {
         MockEnvironment environment = new MockEnvironment();

embedded-database-spring-test/src/test/java/io/zonky/test/db/provider/impl/ZonkyPostgresDatabaseProviderTest.java

@@ -30,6 +30,7 @@
 import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.mock.env.MockEnvironment;
+import org.springframework.util.SocketUtils;
 
 import javax.sql.DataSource;
 import java.sql.SQLException;
@@ -131,13 +132,14 @@ public void testClusterPreparerIsolation() throws SQLException {
 
     @Test
     public void testDatabaseCustomizers() throws SQLException {
-        when(databaseCustomizers.getIfAvailable()).thenReturn(Collections.singletonList(builder -> builder.setPort(33334)));
+        int randomPort = SocketUtils.findAvailableTcpPort();
+        when(databaseCustomizers.getIfAvailable()).thenReturn(Collections.singletonList(builder -> builder.setPort(randomPort)));
 
         DatabasePreparer preparer = dataSource -> {};
         ZonkyPostgresDatabaseProvider provider = new ZonkyPostgresDatabaseProvider(new MockEnvironment(), databaseCustomizers);
         DataSource dataSource = provider.getDatabase(preparer);
 
-        assertThat(dataSource.unwrap(PGSimpleDataSource.class).getPortNumber()).isEqualTo(33334);
+        assertThat(dataSource.unwrap(PGSimpleDataSource.class).getPortNumber()).isEqualTo(randomPort);
     }
 
     @Test