Improve pgbouncer test (#1651)

* Reuse pgBouncer image across builds

This will speed up the test when running the test suite locally

Signed-off-by: Thomas Segismont <tsegismont@gmail.com>

* Increase PgBouncerTest timeout to 5 minutes

The test fails intermittently like this on CI:

2026-02-09T10:53:31.9241881Z [ERROR] io.vertx.pgclient.PgBouncerTest.testPreparedBatch -- Time elapsed: 132.0 s <<< ERROR!
2026-02-09T10:53:31.9243012Z java.util.concurrent.TimeoutException
2026-02-09T10:53:31.9243800Z 	at io.vertx.ext.unit.impl.TestContextImpl.lambda$run$1(TestContextImpl.java:79)
2026-02-09T10:53:31.9244627Z 	at java.base/java.lang.Thread.run(Thread.java:1474)

So let's give it a chance to complete in case the build of the container image and the startup take too long.

Signed-off-by: Thomas Segismont <tsegismont@gmail.com>

* Manage connections properly in PgBouncerTest

Setup connections before each test in setUp method.
Close them after each test in tearDown method.
Also, use Vert.x Future#await methods for readability.

Signed-off-by: Thomas Segismont <tsegismont@gmail.com>

---------

Signed-off-by: Thomas Segismont <tsegismont@gmail.com>

Author: tsegismont

vertx-pg-client/src/test/java/io/vertx/tests/pgclient/PgBouncerTest.java

@@ -1,27 +1,36 @@
+/*
+ * Copyright (c) 2011-2026 Contributors to the Eclipse Foundation
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+ * which is available at https://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
+ */
+
 package io.vertx.tests.pgclient;
 
 
 import io.vertx.core.CompositeFuture;
 import io.vertx.core.Future;
 import io.vertx.core.Vertx;
+import io.vertx.ext.unit.junit.Timeout;
 import io.vertx.ext.unit.junit.VertxUnitRunner;
 import io.vertx.pgclient.PgConnectOptions;
 import io.vertx.pgclient.PgConnection;
 import io.vertx.sqlclient.Cursor;
 import io.vertx.sqlclient.Tuple;
-import org.apache.commons.compress.utils.IOUtils;
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.testcontainers.Testcontainers;
 import org.testcontainers.containers.FixedHostPortGenericContainer;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.images.builder.ImageFromDockerfile;
-import org.testcontainers.images.builder.Transferable;
 
-import java.io.IOException;
-import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -34,13 +43,17 @@
 @RunWith(VertxUnitRunner.class)
 public class PgBouncerTest {
 
+  @Rule
+  public Timeout timeout = new Timeout(5, TimeUnit.MINUTES);
+
   private FixedHostPortGenericContainer<?> pgContainer;
   private GenericContainer<?> pgBouncerContainer;
   private Vertx vertx;
   private PgConnectOptions options;
+  private List<PgConnection> connections = new ArrayList<>();
 
   @Before
-  public void setUp() {
+  public void setUp() throws Exception {
     pgContainer = new FixedHostPortGenericContainer<>("postgres:10.10")
       .withFixedExposedPort(5432, 5432);
     pgContainer.withEnv("POSTGRES_PASSWORD", "postgres");
@@ -54,8 +67,8 @@ public void setUp() {
     Testcontainers.exposeHostPorts(pgPort);
 
     pgBouncerContainer = new GenericContainer<>(
-      new ImageFromDockerfile()
-        .withFileFromTransferable("Dockerfile", resourceTransferable("pgBouncer/Dockerfile")))
+      new ImageFromDockerfile("vertx-pgclient-pg-bouncer", false)
+        .withFileFromClasspath("Dockerfile", "pgBouncer/Dockerfile"))
       .withClasspathResourceMapping("pgBouncer/pgbouncer.ini", "/etc/pgbouncer/pgbouncer.ini", READ_ONLY)
       .withClasspathResourceMapping("pgBouncer/userlist.txt", "/etc/pgbouncer/userlist.txt", READ_ONLY)
       .withExposedPorts(6432);
@@ -73,68 +86,53 @@ public void setUp() {
       .setPipeliningLimit(1);
 
     vertx = Vertx.vertx();
-  }
 
-  private static Transferable resourceTransferable(String resourceName) {
-    try (InputStream stream = PgBouncerTest.class.getClassLoader().getResourceAsStream(resourceName)) {
-      assert stream != null;
-      return Transferable.of(IOUtils.toByteArray(stream));
-    } catch (IOException e) {
-      throw new RuntimeException(e);
+    // Initialize connections for tests
+    int numConn = 2;
+    for (int i = 0; i < numConn; i++) {
+      connections.add(PgConnection.connect(vertx, new PgConnectOptions(options).setUseLayer7Proxy(true)).await(20, TimeUnit.SECONDS));
     }
   }
 
   @After
   public void tearDown() throws Exception {
+    for (PgConnection conn : connections) {
+      conn.close().await(20, TimeUnit.SECONDS);
+    }
     Testcontainers.exposeHostPorts();
     pgBouncerContainer.stop();
     pgContainer.stop();
-    vertx.close().toCompletionStage().toCompletableFuture().get(20, TimeUnit.SECONDS);
+    vertx.close().await(20, TimeUnit.SECONDS);
   }
 
   @Test
   public void testPreparedQuery() throws Exception {
-    List<PgConnection> connections = new ArrayList<>();
-    int numConn = 2;
-    for (int i = 0;i < numConn;i++) {
-      connections.add(PgConnection.connect(vertx, new PgConnectOptions(options).setUseLayer7Proxy(true)).toCompletionStage().toCompletableFuture().get(20, TimeUnit.SECONDS));
-    }
     CompositeFuture cf = Future.join(connections.stream()
       .map(conn -> conn.preparedQuery("select 1").execute().map(rows -> rows.iterator().next().getInteger(0)))
       .collect(Collectors.toList()));
-    cf.toCompletionStage().toCompletableFuture().get(20, TimeUnit.SECONDS);
-    for (int i = 0;i < numConn;i++) {
+    cf.await(20, TimeUnit.SECONDS);
+    for (int i = 0; i < connections.size(); i++) {
       assertEquals(1, (cf.<Object>resultAt(i)));
     }
   }
 
   @Test
   public void testPreparedBatch() throws Exception {
-    List<PgConnection> connections = new ArrayList<>();
-    int numConn = 2;
-    for (int i = 0;i < numConn;i++) {
-      connections.add(PgConnection.connect(vertx, new PgConnectOptions(options).setUseLayer7Proxy(true)).toCompletionStage().toCompletableFuture().get(20, TimeUnit.SECONDS));
-    }
     CompositeFuture cf = Future.join(connections.stream()
       .map(conn -> conn.preparedQuery("select 1")
         .executeBatch(Arrays.asList(Tuple.tuple(), Tuple.tuple()))
         .map(rows -> rows.iterator().next().getInteger(0)))
       .collect(Collectors.toList()));
-    cf.toCompletionStage().toCompletableFuture().get(20, TimeUnit.SECONDS);
-    for (int i = 0;i < numConn;i++) {
+    cf.await(20, TimeUnit.SECONDS);
+    for (int i = 0; i < connections.size(); i++) {
       assertEquals(1, (cf.<Object>resultAt(i)));
     }
   }
 
   @Test
   public void testCursor() throws Exception {
-    List<PgConnection> connections = new ArrayList<>();
-    int numConn = 2;
-    for (int i = 0;i < numConn;i++) {
-      connections.add(PgConnection.connect(vertx, new PgConnectOptions(options).setUseLayer7Proxy(true)).toCompletionStage().toCompletableFuture().get(20, TimeUnit.SECONDS));
-    }
     List<Future<?>> list = new ArrayList<>();
-    for (int i = 0;i < numConn;i++) {
+    for (int i = 0; i < connections.size(); i++) {
       int val = i;
       PgConnection conn = connections.get(i);
       list.add(conn
@@ -151,8 +149,8 @@ public void testCursor() throws Exception {
       }).eventually(() -> tx.commit())));
     }
     CompositeFuture cf = Future.join(list);
-    cf.toCompletionStage().toCompletableFuture().get(20, TimeUnit.SECONDS);
-    for (int i = 0;i < numConn;i++) {
+    cf.await(20, TimeUnit.SECONDS);
+    for (int i = 0; i < connections.size(); i++) {
       assertEquals(i, (cf.<Object>resultAt(i)));
     }
   }