Move PostgreSQL tests to JUnit Jupiter

eddumelendez · eddumelendez · commit 86d102f81df2 · 2025-09-11T10:28:19.000-06:00
diff --git a/modules/postgresql/build.gradle b/modules/postgresql/build.gradle
@@ -6,6 +6,9 @@ dependencies {
     compileOnly project(':testcontainers-r2dbc')
     compileOnly 'io.r2dbc:r2dbc-postgresql:0.8.13.RELEASE'
 
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
+
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testImplementation project(':testcontainers-jdbc-test')
     testRuntimeOnly 'org.postgresql:postgresql:42.7.7'
 
@@ -20,3 +23,7 @@ tasks.japicmp {
         "org.testcontainers.containers.PostgreSQLContainer"
     ]
 }
+
+test {
+    useJUnitPlatform()
+}
diff --git a/modules/postgresql/src/test/java/org/testcontainers/containers/CompatibleImageTest.java b/modules/postgresql/src/test/java/org/testcontainers/containers/CompatibleImageTest.java
@@ -1,6 +1,6 @@
 package org.testcontainers.containers;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.db.AbstractContainerDatabaseTest;
 import org.testcontainers.utility.DockerImageName;
 
@@ -9,10 +9,10 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class CompatibleImageTest extends AbstractContainerDatabaseTest {
+class CompatibleImageTest extends AbstractContainerDatabaseTest {
 
     @Test
-    public void pgvector() throws SQLException {
+    void pgvector() throws SQLException {
         try (
             // pgvectorContainer {
             PostgreSQLContainer<?> pgvector = new PostgreSQLContainer<>("pgvector/pgvector:pg16")
@@ -27,7 +27,7 @@ public void pgvector() throws SQLException {
     }
 
     @Test
-    public void postgis() throws SQLException {
+    void postgis() throws SQLException {
         try (
             // postgisContainer {
             PostgreSQLContainer<?> postgis = new PostgreSQLContainer<>(
@@ -44,7 +44,7 @@ public void postgis() throws SQLException {
     }
 
     @Test
-    public void timescaledb() throws SQLException {
+    void timescaledb() throws SQLException {
         try (
             // timescaledbContainer {
             PostgreSQLContainer<?> timescaledb = new PostgreSQLContainer<>(
diff --git a/modules/postgresql/src/test/java/org/testcontainers/containers/PostgreSQLConnectionURLTest.java b/modules/postgresql/src/test/java/org/testcontainers/containers/PostgreSQLConnectionURLTest.java
@@ -1,15 +1,15 @@
 package org.testcontainers.containers;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.PostgreSQLTestImages;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.catchThrowable;
 
-public class PostgreSQLConnectionURLTest {
+class PostgreSQLConnectionURLTest {
 
     @Test
-    public void shouldCorrectlyAppendQueryString() {
+    void shouldCorrectlyAppendQueryString() {
         PostgreSQLContainer<?> postgres = new FixedJdbcUrlPostgreSQLContainer();
         String connectionUrl = postgres.constructUrlForConnection("?stringtype=unspecified&stringtype=unspecified");
         String queryString = connectionUrl.substring(connectionUrl.indexOf('?'));
@@ -22,7 +22,7 @@ public void shouldCorrectlyAppendQueryString() {
     }
 
     @Test
-    public void shouldCorrectlyAppendQueryStringWhenNoBaseParams() {
+    void shouldCorrectlyAppendQueryStringWhenNoBaseParams() {
         PostgreSQLContainer<?> postgres = new NoParamsUrlPostgreSQLContainer();
         String connectionUrl = postgres.constructUrlForConnection("?stringtype=unspecified&stringtype=unspecified");
         String queryString = connectionUrl.substring(connectionUrl.indexOf('?'));
@@ -35,15 +35,15 @@ public void shouldCorrectlyAppendQueryStringWhenNoBaseParams() {
     }
 
     @Test
-    public void shouldReturnOriginalURLWhenEmptyQueryString() {
+    void shouldReturnOriginalURLWhenEmptyQueryString() {
         PostgreSQLContainer<?> postgres = new FixedJdbcUrlPostgreSQLContainer();
         String connectionUrl = postgres.constructUrlForConnection("");
 
         assertThat(postgres.getJdbcUrl()).as("Query String remains unchanged").isEqualTo(connectionUrl);
     }
 
     @Test
-    public void shouldRejectInvalidQueryString() {
+    void shouldRejectInvalidQueryString() {
         assertThat(
             catchThrowable(() -> {
                 new NoParamsUrlPostgreSQLContainer().constructUrlForConnection("stringtype=unspecified");
diff --git a/modules/postgresql/src/test/java/org/testcontainers/containers/TimescaleDBContainerTest.java b/modules/postgresql/src/test/java/org/testcontainers/containers/TimescaleDBContainerTest.java
@@ -1,17 +1,17 @@
 package org.testcontainers.containers;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.db.AbstractContainerDatabaseTest;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class TimescaleDBContainerTest extends AbstractContainerDatabaseTest {
+class TimescaleDBContainerTest extends AbstractContainerDatabaseTest {
 
     @Test
-    public void testSimple() throws SQLException {
+    void testSimple() throws SQLException {
         try (JdbcDatabaseContainer<?> postgres = new TimescaleDBContainerProvider().newInstance()) {
             postgres.start();
 
@@ -22,7 +22,7 @@ public void testSimple() throws SQLException {
     }
 
     @Test
-    public void testCommandOverride() throws SQLException {
+    void testCommandOverride() throws SQLException {
         try (
             GenericContainer<?> postgres = new TimescaleDBContainerProvider()
                 .newInstance()
@@ -40,7 +40,7 @@ public void testCommandOverride() throws SQLException {
     }
 
     @Test
-    public void testUnsetCommand() throws SQLException {
+    void testUnsetCommand() throws SQLException {
         try (
             GenericContainer<?> postgres = new TimescaleDBContainerProvider()
                 .newInstance()
@@ -59,7 +59,7 @@ public void testUnsetCommand() throws SQLException {
     }
 
     @Test
-    public void testExplicitInitScript() throws SQLException {
+    void testExplicitInitScript() throws SQLException {
         try (
             JdbcDatabaseContainer<?> postgres = new TimescaleDBContainerProvider()
                 .newInstance()
diff --git a/modules/postgresql/src/test/java/org/testcontainers/jdbc/DatabaseDriverShutdownTest.java b/modules/postgresql/src/test/java/org/testcontainers/jdbc/DatabaseDriverShutdownTest.java
@@ -1,7 +1,7 @@
 package org.testcontainers.jdbc;
 
-import org.junit.AfterClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.containers.JdbcDatabaseContainer;
 
 import java.sql.Connection;
@@ -16,15 +16,15 @@
  * the mysql module, to avoid circular dependencies.
  * TODO: Move to the jdbc module and either (a) implement a barebones {@link org.testcontainers.containers.JdbcDatabaseContainerProvider} for testing, or (b) refactor into a unit test.
  */
-public class DatabaseDriverShutdownTest {
+class DatabaseDriverShutdownTest {
 
-    @AfterClass
+    @BeforeAll
     public static void testCleanup() {
         ContainerDatabaseDriver.killContainers();
     }
 
     @Test
-    public void shouldStopContainerWhenAllConnectionsClosed() throws SQLException {
+    void shouldStopContainerWhenAllConnectionsClosed() throws SQLException {
         final String jdbcUrl = "jdbc:tc:postgresql:9.6.8://hostname/databasename";
 
         getConnectionAndClose(jdbcUrl);
@@ -34,7 +34,7 @@ public void shouldStopContainerWhenAllConnectionsClosed() throws SQLException {
     }
 
     @Test
-    public void shouldNotStopDaemonContainerWhenAllConnectionsClosed() throws SQLException {
+    void shouldNotStopDaemonContainerWhenAllConnectionsClosed() throws SQLException {
         final String jdbcUrl = "jdbc:tc:postgresql:9.6.8://hostname/databasename?TC_DAEMON=true";
 
         getConnectionAndClose(jdbcUrl);
diff --git a/modules/postgresql/src/test/java/org/testcontainers/jdbc/DatabaseDriverTmpfsTest.java b/modules/postgresql/src/test/java/org/testcontainers/jdbc/DatabaseDriverTmpfsTest.java
@@ -1,6 +1,6 @@
 package org.testcontainers.jdbc;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.containers.Container;
 import org.testcontainers.containers.JdbcDatabaseContainer;
 
@@ -15,10 +15,10 @@
  * the mysql module, to avoid circular dependencies.
  * TODO: Move to the jdbc module and either (a) implement a barebones {@link org.testcontainers.containers.JdbcDatabaseContainerProvider} for testing, or (b) refactor into a unit test.
  */
-public class DatabaseDriverTmpfsTest {
+class DatabaseDriverTmpfsTest {
 
     @Test
-    public void testDatabaseHasTmpFsViaConnectionString() throws Exception {
+    void testDatabaseHasTmpFsViaConnectionString() throws Exception {
         final String jdbcUrl = "jdbc:tc:postgresql:9.6.8://hostname/databasename?TC_TMPFS=/testtmpfs:rw";
         try (Connection ignored = DriverManager.getConnection(jdbcUrl)) {
             JdbcDatabaseContainer<?> container = ContainerDatabaseDriver.getContainer(jdbcUrl);
diff --git a/modules/postgresql/src/test/java/org/testcontainers/jdbc/pgvector/PgVectorJDBCDriverTest.java b/modules/postgresql/src/test/java/org/testcontainers/jdbc/pgvector/PgVectorJDBCDriverTest.java
@@ -1,16 +1,12 @@
 package org.testcontainers.jdbc.pgvector;
 
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
 import org.testcontainers.jdbc.AbstractJDBCDriverTest;
 
 import java.util.Arrays;
 import java.util.EnumSet;
 
-@RunWith(Parameterized.class)
-public class PgVectorJDBCDriverTest extends AbstractJDBCDriverTest {
+class PgVectorJDBCDriverTest extends AbstractJDBCDriverTest {
 
-    @Parameterized.Parameters(name = "{index} - {0}")
     public static Iterable<Object[]> data() {
         return Arrays.asList(
             new Object[][] {
diff --git a/modules/postgresql/src/test/java/org/testcontainers/jdbc/postgis/PostgisJDBCDriverTest.java b/modules/postgresql/src/test/java/org/testcontainers/jdbc/postgis/PostgisJDBCDriverTest.java
@@ -1,16 +1,12 @@
 package org.testcontainers.jdbc.postgis;
 
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
 import org.testcontainers.jdbc.AbstractJDBCDriverTest;
 
 import java.util.Arrays;
 import java.util.EnumSet;
 
-@RunWith(Parameterized.class)
-public class PostgisJDBCDriverTest extends AbstractJDBCDriverTest {
+class PostgisJDBCDriverTest extends AbstractJDBCDriverTest {
 
-    @Parameterized.Parameters(name = "{index} - {0}")
     public static Iterable<Object[]> data() {
         return Arrays.asList(
             new Object[][] {
diff --git a/modules/postgresql/src/test/java/org/testcontainers/jdbc/postgresql/PostgreSQLJDBCDriverTest.java b/modules/postgresql/src/test/java/org/testcontainers/jdbc/postgresql/PostgreSQLJDBCDriverTest.java
@@ -1,16 +1,12 @@
 package org.testcontainers.jdbc.postgresql;
 
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
 import org.testcontainers.jdbc.AbstractJDBCDriverTest;
 
 import java.util.Arrays;
 import java.util.EnumSet;
 
-@RunWith(Parameterized.class)
 public class PostgreSQLJDBCDriverTest extends AbstractJDBCDriverTest {
 
-    @Parameterized.Parameters(name = "{index} - {0}")
     public static Iterable<Object[]> data() {
         return Arrays.asList(
             new Object[][] {
diff --git a/modules/postgresql/src/test/java/org/testcontainers/jdbc/timescaledb/TimescaleDBJDBCDriverTest.java b/modules/postgresql/src/test/java/org/testcontainers/jdbc/timescaledb/TimescaleDBJDBCDriverTest.java
@@ -1,16 +1,12 @@
 package org.testcontainers.jdbc.timescaledb;
 
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
 import org.testcontainers.jdbc.AbstractJDBCDriverTest;
 
 import java.util.Arrays;
 import java.util.EnumSet;
 
-@RunWith(Parameterized.class)
 public class TimescaleDBJDBCDriverTest extends AbstractJDBCDriverTest {
 
-    @Parameterized.Parameters(name = "{index} - {0}")
     public static Iterable<Object[]> data() {
         return Arrays.asList(
             new Object[][] {
diff --git a/modules/postgresql/src/test/java/org/testcontainers/junit/postgresql/CustomizablePostgreSQLTest.java b/modules/postgresql/src/test/java/org/testcontainers/junit/postgresql/CustomizablePostgreSQLTest.java
@@ -1,6 +1,6 @@
 package org.testcontainers.junit.postgresql;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.PostgreSQLTestImages;
 import org.testcontainers.containers.PostgreSQLContainer;
 import org.testcontainers.db.AbstractContainerDatabaseTest;
@@ -10,7 +10,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class CustomizablePostgreSQLTest extends AbstractContainerDatabaseTest {
+class CustomizablePostgreSQLTest extends AbstractContainerDatabaseTest {
 
     private static final String DB_NAME = "foo";
 
@@ -19,7 +19,7 @@ public class CustomizablePostgreSQLTest extends AbstractContainerDatabaseTest {
     private static final String PWD = "baz";
 
     @Test
-    public void testSimple() throws SQLException {
+    void testSimple() throws SQLException {
         try (
             PostgreSQLContainer<?> postgres = new PostgreSQLContainer<>(PostgreSQLTestImages.POSTGRES_TEST_IMAGE)
                 .withDatabaseName(DB_NAME)
diff --git a/modules/postgresql/src/test/java/org/testcontainers/junit/postgresql/SimplePostgreSQLTest.java b/modules/postgresql/src/test/java/org/testcontainers/junit/postgresql/SimplePostgreSQLTest.java
@@ -1,6 +1,6 @@
 package org.testcontainers.junit.postgresql;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.PostgreSQLTestImages;
 import org.testcontainers.containers.PostgreSQLContainer;
 import org.testcontainers.db.AbstractContainerDatabaseTest;
@@ -13,14 +13,14 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatNoException;
 
-public class SimplePostgreSQLTest extends AbstractContainerDatabaseTest {
+class SimplePostgreSQLTest extends AbstractContainerDatabaseTest {
     static {
         // Postgres JDBC driver uses JUL; disable it to avoid annoying, irrelevant, stderr logs during connection testing
         LogManager.getLogManager().getLogger("").setLevel(Level.OFF);
     }
 
     @Test
-    public void testSimple() throws SQLException {
+    void testSimple() throws SQLException {
         try ( // container {
             PostgreSQLContainer<?> postgres = new PostgreSQLContainer<>("postgres:9.6.12")
             // }
@@ -35,7 +35,7 @@ public void testSimple() throws SQLException {
     }
 
     @Test
-    public void testCommandOverride() throws SQLException {
+    void testCommandOverride() throws SQLException {
         try (
             PostgreSQLContainer<?> postgres = new PostgreSQLContainer<>(PostgreSQLTestImages.POSTGRES_TEST_IMAGE)
                 .withCommand("postgres -c max_connections=42")
@@ -49,7 +49,7 @@ public void testCommandOverride() throws SQLException {
     }
 
     @Test
-    public void testUnsetCommand() throws SQLException {
+    void testUnsetCommand() throws SQLException {
         try (
             PostgreSQLContainer<?> postgres = new PostgreSQLContainer<>(PostgreSQLTestImages.POSTGRES_TEST_IMAGE)
                 .withCommand("postgres -c max_connections=42")
@@ -64,7 +64,7 @@ public void testUnsetCommand() throws SQLException {
     }
 
     @Test
-    public void testMissingInitScript() {
+    void testMissingInitScript() {
         try (
             PostgreSQLContainer<?> postgres = new PostgreSQLContainer<>(PostgreSQLTestImages.POSTGRES_TEST_IMAGE)
                 .withInitScript(null)
@@ -74,7 +74,7 @@ public void testMissingInitScript() {
     }
 
     @Test
-    public void testExplicitInitScript() throws SQLException {
+    void testExplicitInitScript() throws SQLException {
         try (
             PostgreSQLContainer<?> postgres = new PostgreSQLContainer<>(PostgreSQLTestImages.POSTGRES_TEST_IMAGE)
                 .withInitScript("somepath/init_postgresql.sql")
@@ -89,7 +89,7 @@ public void testExplicitInitScript() throws SQLException {
     }
 
     @Test
-    public void testExplicitInitScripts() throws SQLException {
+    void testExplicitInitScripts() throws SQLException {
         try (
             PostgreSQLContainer<?> postgres = new PostgreSQLContainer<>(PostgreSQLTestImages.POSTGRES_TEST_IMAGE)
                 .withInitScripts("somepath/init_postgresql.sql", "somepath/init_postgresql_2.sql")
@@ -110,7 +110,7 @@ public void testExplicitInitScripts() throws SQLException {
     }
 
     @Test
-    public void testWithAdditionalUrlParamInJdbcUrl() {
+    void testWithAdditionalUrlParamInJdbcUrl() {
         try (
             PostgreSQLContainer<?> postgres = new PostgreSQLContainer<>(PostgreSQLTestImages.POSTGRES_TEST_IMAGE)
                 .withUrlParam("charSet", "UNICODE")
