Switch to generic test containers (#1489)

For Postgres, we are still using DB specific test containers.
These containers require the corresponding JDBC driver.

With this change, we get rid of the JDBC drivers transitive test dependency.

Signed-off-by: Thomas Segismont <[email protected]>

Author: tsegismont

vertx-pg-client/pom.xml

@@ -85,7 +85,7 @@
 
   <dependency>
     <groupId>org.testcontainers</groupId>
-    <artifactId>postgresql</artifactId>
+    <artifactId>testcontainers</artifactId>
     <version>${testcontainers.version}</version>
     <scope>test</scope>
   </dependency>

vertx-pg-client/src/test/java/io/vertx/pgclient/junit/ContainerPgRule.java

@@ -20,10 +20,14 @@
 import io.vertx.sqlclient.PoolOptions;
 import org.junit.rules.ExternalResource;
 import org.testcontainers.containers.BindMode;
+import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.InternetProtocol;
-import org.testcontainers.containers.PostgreSQLContainer;
+import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
 
-import static org.testcontainers.containers.PostgreSQLContainer.POSTGRESQL_PORT;
+import java.time.Duration;
+import java.time.temporal.ChronoUnit;
+
+import static io.vertx.pgclient.PgConnectOptions.DEFAULT_PORT;
 
 /**
  * Postgresql test database based on https://www.testcontainers.org
@@ -73,9 +77,14 @@ public ContainerPgRule user(String user) {
 
   private void initServer(String version) throws Exception {
     server = new ServerContainer<>("postgres:" + version)
-      .withDatabaseName("postgres")
-      .withUsername(user)
-      .withPassword("postgres")
+      .withEnv("POSTGRES_DB", "postgres")
+      .withEnv("POSTGRES_USER", user)
+      .withEnv("POSTGRES_PASSWORD", "postgres")
+      .waitingFor(new LogMessageWaitStrategy()
+        .withRegEx(".*database system is ready to accept connections.*\\s")
+        .withTimes(2)
+        .withStartupTimeout(Duration.of(60, ChronoUnit.SECONDS)))
+      .withCommand("postgres", "-c", "fsync=off")
       .withClasspathResourceMapping("create-postgres.sql", "/docker-entrypoint-initdb.d/create-postgres.sql", BindMode.READ_ONLY);
     if (ssl) {
       server
@@ -89,9 +98,9 @@ private void initServer(String version) throws Exception {
         }
     }
     if (System.getProperties().containsKey("containerFixedPort")) {
-      server.withFixedExposedPort(POSTGRESQL_PORT, POSTGRESQL_PORT);
+      server.withFixedExposedPort(DEFAULT_PORT, DEFAULT_PORT);
     } else {
-      server.withExposedPorts(POSTGRESQL_PORT);
+      server.withExposedPorts(DEFAULT_PORT);
     }
   }
 
@@ -108,7 +117,7 @@ public synchronized PgConnectOptions startServer(String databaseVersion) throws
     server.start();
 
     return new PgConnectOptions()
-      .setPort(server.getMappedPort(POSTGRESQL_PORT))
+      .setPort(server.getMappedPort(DEFAULT_PORT))
       .setHost(server.getHost())
         .setDatabase("postgres")
         .setUser(user)
@@ -183,7 +192,7 @@ protected void after() {
     }
   }
 
-  private static class ServerContainer<SELF extends ServerContainer<SELF>> extends PostgreSQLContainer<SELF> {
+  private static class ServerContainer<SELF extends ServerContainer<SELF>> extends GenericContainer<SELF> {
 
     public ServerContainer(String dockerImageName) {
       super(dockerImageName);

vertx-sql-client-templates/pom.xml

@@ -52,7 +52,7 @@
     </dependency>
     <dependency>
       <groupId>org.testcontainers</groupId>
-      <artifactId>postgresql</artifactId>
+      <artifactId>testcontainers</artifactId>
       <version>${testcontainers.version}</version>
       <scope>test</scope>
     </dependency>

vertx-sql-client-templates/src/test/java/io/vertx/sqlclient/templates/PgTemplateTestBase.java

@@ -12,21 +12,32 @@
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.runner.RunWith;
-import org.testcontainers.containers.PostgreSQLContainer;
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
 
+import java.time.Duration;
+import java.time.temporal.ChronoUnit;
 import java.util.function.Function;
 
+import static io.vertx.pgclient.PgConnectOptions.DEFAULT_PORT;
+
 @RunWith(VertxUnitRunner.class)
 public abstract class PgTemplateTestBase {
 
-  private static PostgreSQLContainer server;
+  private static GenericContainer<?> server;
 
   @BeforeClass
   public static void startDatabase() {
-    server = new PostgreSQLContainer("postgres:" + "10.10")
-      .withDatabaseName("postgres")
-      .withUsername("postgres")
-      .withPassword("postgres");
+    server = new GenericContainer<>("postgres:" + "10.10")
+      .withEnv("POSTGRES_DB", "postgres")
+      .withEnv("POSTGRES_USER", "postgres")
+      .withEnv("POSTGRES_PASSWORD", "postgres")
+      .withExposedPorts(DEFAULT_PORT)
+      .waitingFor(new LogMessageWaitStrategy()
+        .withRegEx(".*database system is ready to accept connections.*\\s")
+        .withTimes(2)
+        .withStartupTimeout(Duration.of(60, ChronoUnit.SECONDS)))
+      .withCommand("postgres", "-c", "fsync=off");
     server.start();
   }
 
@@ -40,7 +51,7 @@ public static void stopDatabase() {
   }
 
   public static PgConnectOptions connectOptions() {
-    Integer port = server.getMappedPort(PostgreSQLContainer.POSTGRESQL_PORT);
+    Integer port = server.getMappedPort(DEFAULT_PORT);
     String ip = server.getHost();
     return new PgConnectOptions()
       .setPort(port)