Fixed wait strategy

Author: Fameing

embedded-db2/src/main/java/com/playtika/testcontainer/db2/EmbeddedDb2BootstrapConfiguration.java

@@ -73,7 +73,7 @@ public Db2Container db2(ConfigurableEnvironment environment,
         if (StringUtils.hasLength(startupLogCheckRegex)) {
             WaitStrategy waitStrategy = new LogMessageWaitStrategy()
                     .withRegEx(startupLogCheckRegex);
-            db2Container.setWaitStrategy(waitStrategy);
+            db2Container.waitingFor(waitStrategy);
         }
 
         if (properties.isAcceptLicence()) {

embedded-mssqlserver/src/main/java/com/playtika/testcontainer/mssqlserver/EmbeddedMSSQLServerBootstrapConfiguration.java

@@ -72,7 +72,7 @@ public EmbeddedMSSQLServerContainer mssqlserver(ConfigurableEnvironment environm
         if (StringUtils.hasLength(startupLogCheckRegex)) {
             WaitStrategy waitStrategy = new LogMessageWaitStrategy()
                     .withRegEx(startupLogCheckRegex);
-            mssqlServerContainer.setWaitStrategy(waitStrategy);
+            mssqlServerContainer.waitingFor(waitStrategy);
         }
 
         if (properties.isAcceptLicence()) {

embedded-postgresql/src/main/java/com/playtika/testcontainer/postgresql/EmbeddedPostgreSQLBootstrapConfiguration.java

@@ -18,14 +18,18 @@
 import org.testcontainers.containers.PostgreSQLContainer;
 import org.testcontainers.containers.ToxiproxyContainer;
 import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
+import org.testcontainers.containers.wait.strategy.ShellStrategy;
 import org.testcontainers.containers.wait.strategy.WaitStrategy;
 
+import java.time.Duration;
+import java.time.temporal.ChronoUnit;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Optional;
 
 import static com.playtika.testcontainer.common.utils.ContainerUtils.configureCommonsAndStart;
 import static com.playtika.testcontainer.postgresql.PostgreSQLProperties.BEAN_NAME_EMBEDDED_POSTGRESQL;
+import static java.lang.String.format;
 
 @Slf4j
 @Configuration
@@ -71,11 +75,15 @@ public PostgreSQLContainer postgresql(ConfigurableEnvironment environment,
 
         network.ifPresent(postgresql::withNetwork);
 
+        postgresql.waitingFor(new ShellStrategy()
+                .withCommand(format("pg_isready -U %s -d %s", properties.getUser(), properties.getDatabase()))
+                .withStartupTimeout(Duration.of(60, ChronoUnit.SECONDS)));
+
         String startupLogCheckRegex = properties.getStartupLogCheckRegex();
         if (StringUtils.hasLength(startupLogCheckRegex)) {
             WaitStrategy waitStrategy = new LogMessageWaitStrategy()
                     .withRegEx(startupLogCheckRegex);
-            postgresql.setWaitStrategy(waitStrategy);
+            postgresql.waitingFor(waitStrategy);
         }
 
         postgresql = (PostgreSQLContainer) configureCommonsAndStart(postgresql, properties, log);

embedded-selenium/src/main/java/com/playtika/testcontainer/selenium/EmbeddedSeleniumBootstrapConfiguration.java

@@ -88,7 +88,7 @@ public BrowserWebDriverContainer selenium(ConfigurableEnvironment environment,
                 ? new BrowserWebDriverContainer<>(ContainerUtils.getDockerImageName(properties))
                 : new BrowserWebDriverContainer<>();
 
-        container.setWaitStrategy(getWaitStrategy());
+        container.waitingFor(getWaitStrategy());
         container.withCapabilities(capabilities);
         container.withRecordingFileFactory(getRecordingFileFactory());
         container.withNetworkAliases(SELENIUM_NETWORK_ALIAS);

embedded-spicedb/src/test/java/com/playtika/testcontainer/spicedb/EmbeddedSpiceDbBootstrapConfigurationTest.java

@@ -60,13 +60,9 @@ void shouldConnect() throws InterruptedException {
                 .setSchema(schema)
                 .build();
 
-        SchemaServiceOuterClass.WriteSchemaResponse response;
-        try {
-            response = schemaService.writeSchema(request);
-            response.getWrittenAt().getToken();
-        } catch (Exception e) {
-            log.error(e.getMessage(), e);
-        }
+        SchemaServiceOuterClass.WriteSchemaResponse response = schemaService.writeSchema(request);
+
+        assertThat(response.getWrittenAt().getToken()).isNotEmpty();
     }
 
     @Test