Move database tests to JUnit Jupiter

modules/clickhouse/build.gradle

@@ -10,8 +10,15 @@ dependencies {
     testImplementation project(':testcontainers-jdbc-test')
     testRuntimeOnly(group: 'com.clickhouse', name: 'clickhouse-jdbc', version: '0.9.1', classifier: 'all')
 
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
+
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testImplementation 'org.assertj:assertj-core:3.27.4'
     testImplementation 'com.clickhouse:client-v2:0.9.1'
     testImplementation testFixtures(project(':testcontainers-r2dbc'))
     testRuntimeOnly(group: 'com.clickhouse', name: 'clickhouse-r2dbc', version: '0.9.1', classifier: 'http')
 }
+
+test {
+    useJUnitPlatform()
+}

modules/clickhouse/src/test/java/org/testcontainers/clickhouse/ClickHouseContainerTest.java

@@ -3,7 +3,7 @@
 import com.clickhouse.client.api.Client;
 import com.clickhouse.client.api.data_formats.ClickHouseBinaryFormatReader;
 import com.clickhouse.client.api.query.QueryResponse;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.ClickhouseTestImages;
 import org.testcontainers.db.AbstractContainerDatabaseTest;
 
@@ -16,10 +16,10 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.fail;
 
-public class ClickHouseContainerTest extends AbstractContainerDatabaseTest {
+class ClickHouseContainerTest extends AbstractContainerDatabaseTest {
 
     @Test
-    public void testSimple() throws SQLException {
+    void testSimple() throws SQLException {
         try ( // container {
             ClickHouseContainer clickhouse = new ClickHouseContainer("clickhouse/clickhouse-server:21.11-alpine")
             // }
@@ -34,7 +34,7 @@ public void testSimple() throws SQLException {
     }
 
     @Test
-    public void customCredentialsWithUrlParams() throws SQLException {
+    void customCredentialsWithUrlParams() throws SQLException {
         try (
             ClickHouseContainer clickhouse = new ClickHouseContainer("clickhouse/clickhouse-server:21.11.2-alpine")
                 .withUsername("default")
@@ -56,7 +56,7 @@ public void customCredentialsWithUrlParams() throws SQLException {
     }
 
     @Test
-    public void testNewAuth() throws SQLException {
+    void testNewAuth() throws SQLException {
         try (ClickHouseContainer clickhouse = new ClickHouseContainer(ClickhouseTestImages.CLICKHOUSE_24_12_IMAGE)) {
             clickhouse.start();
 
@@ -68,7 +68,7 @@ public void testNewAuth() throws SQLException {
     }
 
     @Test
-    public void testGetHttpMethodWithHttpClient() {
+    void testGetHttpMethodWithHttpClient() {
         ClickHouseContainer clickhouse = new ClickHouseContainer(ClickhouseTestImages.CLICKHOUSE_24_12_IMAGE);
         clickhouse.start();
         Client client = new Client.Builder()

modules/clickhouse/src/test/java/org/testcontainers/jdbc/clickhouse/ClickhouseJDBCDriverTest.java

@@ -1,16 +1,12 @@
 package org.testcontainers.jdbc.clickhouse;
 
-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 ClickhouseJDBCDriverTest extends AbstractJDBCDriverTest {
+class ClickhouseJDBCDriverTest extends AbstractJDBCDriverTest {
 
-    @Parameterized.Parameters(name = "{index} - {0}")
     public static Iterable<Object[]> data() {
         return Arrays.asList(
             new Object[][] { //

modules/clickhouse/src/test/java/org/testcontainers/junit/clickhouse/SimpleClickhouseTest.java

@@ -1,37 +1,20 @@
 package org.testcontainers.junit.clickhouse;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.ClickhouseTestImages;
 import org.testcontainers.containers.ClickHouseContainer;
 import org.testcontainers.db.AbstractContainerDatabaseTest;
-import org.testcontainers.utility.DockerImageName;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-@RunWith(Parameterized.class)
-public class SimpleClickhouseTest extends AbstractContainerDatabaseTest {
-
-    private final DockerImageName imageName;
-
-    public SimpleClickhouseTest(DockerImageName imageName) {
-        this.imageName = imageName;
-    }
-
-    @Parameterized.Parameters(name = "{0}")
-    public static Object[][] data() {
-        return new Object[][] { //
-            { ClickhouseTestImages.CLICKHOUSE_IMAGE },
-        };
-    }
+class SimpleClickhouseTest extends AbstractContainerDatabaseTest {
 
     @Test
     public void testSimple() throws SQLException {
-        try (ClickHouseContainer clickhouse = new ClickHouseContainer(this.imageName)) {
+        try (ClickHouseContainer clickhouse = new ClickHouseContainer(ClickhouseTestImages.CLICKHOUSE_IMAGE)) {
             clickhouse.start();
 
             ResultSet resultSet = performQuery(clickhouse, "SELECT 1");

modules/cockroachdb/build.gradle

@@ -3,8 +3,11 @@ description = "Testcontainers :: JDBC :: CockroachDB"
 dependencies {
     api project(':testcontainers-jdbc')
 
-    testImplementation project(':testcontainers-jdbc-test')
     testRuntimeOnly 'org.postgresql:postgresql:42.7.7'
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
+
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
+    testImplementation project(':testcontainers-jdbc-test')
     testImplementation 'org.assertj:assertj-core:3.27.4'
 }
 
@@ -13,3 +16,7 @@ tasks.japicmp {
         "org.testcontainers.containers.CockroachContainer"
     ]
 }
+
+test {
+    useJUnitPlatform()
+}

modules/cockroachdb/src/test/java/org/testcontainers/jdbc/cockroachdb/CockroachDBJDBCDriverTest.java

@@ -1,16 +1,12 @@
 package org.testcontainers.jdbc.cockroachdb;
 
-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 CockroachDBJDBCDriverTest extends AbstractJDBCDriverTest {
+class CockroachDBJDBCDriverTest extends AbstractJDBCDriverTest {
 
-    @Parameterized.Parameters(name = "{index} - {0}")
     public static Iterable<Object[]> data() {
         return Arrays.asList(
             new Object[][] { //

modules/cockroachdb/src/test/java/org/testcontainers/junit/cockroachdb/SimpleCockroachDBTest.java

@@ -1,6 +1,6 @@
 package org.testcontainers.junit.cockroachdb;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.CockroachDBTestImages;
 import org.testcontainers.containers.CockroachContainer;
 import org.testcontainers.db.AbstractContainerDatabaseTest;
@@ -14,14 +14,14 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-public class SimpleCockroachDBTest extends AbstractContainerDatabaseTest {
+class SimpleCockroachDBTest 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 {
             CockroachContainer cockroach = new CockroachContainer("cockroachdb/cockroach:v22.2.3")
             // }
@@ -36,7 +36,7 @@ public void testSimple() throws SQLException {
     }
 
     @Test
-    public void testExplicitInitScript() throws SQLException {
+    void testExplicitInitScript() throws SQLException {
         try (
             CockroachContainer cockroach = new CockroachContainer(CockroachDBTestImages.COCKROACHDB_IMAGE)
                 .withInitScript("somepath/init_postgresql.sql")
@@ -51,7 +51,7 @@ public void testExplicitInitScript() throws SQLException {
     }
 
     @Test
-    public void testWithAdditionalUrlParamInJdbcUrl() {
+    void testWithAdditionalUrlParamInJdbcUrl() {
         CockroachContainer cockroach = new CockroachContainer(CockroachDBTestImages.COCKROACHDB_IMAGE)
             .withUrlParam("sslmode", "disable")
             .withUrlParam("application_name", "cockroach");
@@ -70,7 +70,7 @@ public void testWithAdditionalUrlParamInJdbcUrl() {
     }
 
     @Test
-    public void testWithUsernamePasswordDatabase() throws SQLException {
+    void testWithUsernamePasswordDatabase() throws SQLException {
         try (
             CockroachContainer cockroach = new CockroachContainer(
                 CockroachDBTestImages.FIRST_COCKROACHDB_IMAGE_WITH_ENV_VARS_SUPPORT
@@ -92,7 +92,7 @@ public void testWithUsernamePasswordDatabase() throws SQLException {
     }
 
     @Test
-    public void testAnExceptionIsThrownWhenImageDoesNotSupportEnvVars() {
+    void testAnExceptionIsThrownWhenImageDoesNotSupportEnvVars() {
         CockroachContainer cockroachContainer = new CockroachContainer(
             CockroachDBTestImages.COCKROACHDB_IMAGE_WITH_ENV_VARS_UNSUPPORTED
         );
@@ -111,7 +111,7 @@ public void testAnExceptionIsThrownWhenImageDoesNotSupportEnvVars() {
     }
 
     @Test
-    public void testInitializationScript() throws SQLException {
+    void testInitializationScript() throws SQLException {
         String sql =
             "USE postgres; \n" +
             "CREATE TABLE bar (foo VARCHAR(255)); \n" +

modules/cratedb/build.gradle

@@ -3,8 +3,15 @@ description = "Testcontainers :: JDBC :: CrateDB"
 dependencies {
     api project(':testcontainers-jdbc')
 
-    testImplementation project(':testcontainers-jdbc-test')
     testRuntimeOnly 'org.postgresql:postgresql:42.7.7'
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
+
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
+    testImplementation project(':testcontainers-jdbc-test')
 
     compileOnly 'org.jetbrains:annotations:26.0.2'
 }
+
+test {
+    useJUnitPlatform()
+}

modules/cratedb/src/test/java/org/testcontainers/jdbc/cratedb/CrateDBJDBCDriverTest.java

@@ -1,16 +1,12 @@
 package org.testcontainers.jdbc.cratedb;
 
-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 CrateDBJDBCDriverTest extends AbstractJDBCDriverTest {
+class CrateDBJDBCDriverTest extends AbstractJDBCDriverTest {
 
-    @Parameterized.Parameters(name = "{index} - {0}")
     public static Iterable<Object[]> data() {
         return Arrays.asList(
             new Object[][] {

modules/cratedb/src/test/java/org/testcontainers/junit/cratedb/SimpleCrateDBTest.java

@@ -1,6 +1,6 @@
 package org.testcontainers.junit.cratedb;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.CrateDBTestImages;
 import org.testcontainers.cratedb.CrateDBContainer;
 import org.testcontainers.db.AbstractContainerDatabaseTest;
@@ -12,14 +12,14 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class SimpleCrateDBTest extends AbstractContainerDatabaseTest {
+class SimpleCrateDBTest 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 {
             CrateDBContainer cratedb = new CrateDBContainer("crate:5.2.5")
             // }
@@ -34,7 +34,7 @@ public void testSimple() throws SQLException {
     }
 
     @Test
-    public void testCommandOverride() throws SQLException {
+    void testCommandOverride() throws SQLException {
         try (
             CrateDBContainer cratedb = new CrateDBContainer(CrateDBTestImages.CRATEDB_TEST_IMAGE)
                 .withCommand("crate -C discovery.type=single-node -C cluster.name=testcontainers")
@@ -48,7 +48,7 @@ public void testCommandOverride() throws SQLException {
     }
 
     @Test
-    public void testExplicitInitScript() throws SQLException {
+    void testExplicitInitScript() throws SQLException {
         try (
             CrateDBContainer cratedb = new CrateDBContainer(CrateDBTestImages.CRATEDB_TEST_IMAGE)
                 .withInitScript("somepath/init_cratedb.sql")

modules/databend/build.gradle

@@ -5,5 +5,12 @@ dependencies {
 
     testImplementation project(':testcontainers-jdbc-test')
     testRuntimeOnly 'com.databend:databend-jdbc:0.4.0'
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
+
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testImplementation 'org.assertj:assertj-core:3.27.4'
 }
+
+test {
+    useJUnitPlatform()
+}

modules/databend/src/test/java/org/testcontainers/databend/DatabendContainerTest.java

@@ -1,17 +1,17 @@
 package org.testcontainers.databend;
 
-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 DatabendContainerTest extends AbstractContainerDatabaseTest {
+class DatabendContainerTest extends AbstractContainerDatabaseTest {
 
     @Test
-    public void testSimple() throws SQLException {
+    void testSimple() throws SQLException {
         try ( // container {
             DatabendContainer databend = new DatabendContainer("datafuselabs/databend:v1.2.615")
             // }
@@ -26,7 +26,7 @@ public void testSimple() throws SQLException {
     }
 
     @Test
-    public void customCredentialsWithUrlParams() throws SQLException {
+    void customCredentialsWithUrlParams() throws SQLException {
         try (
             DatabendContainer databend = new DatabendContainer("datafuselabs/databend:v1.2.615")
                 .withUsername("test")

modules/databend/src/test/java/org/testcontainers/databend/DatabendJDBCDriverTest.java

@@ -1,16 +1,12 @@
 package org.testcontainers.databend;
 
-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 DatabendJDBCDriverTest extends AbstractJDBCDriverTest {
+class DatabendJDBCDriverTest extends AbstractJDBCDriverTest {
 
-    @Parameterized.Parameters(name = "{index} - {0}")
     public static Iterable<Object[]> data() {
         return Arrays.asList(
             new Object[][] { //

modules/db2/build.gradle

@@ -3,6 +3,9 @@ description = "Testcontainers :: JDBC :: DB2"
 dependencies {
     api project(':testcontainers-jdbc')
 
+    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 'com.ibm.db2:jcc:12.1.2.0'
     testImplementation 'org.assertj:assertj-core:3.27.4'
@@ -13,3 +16,7 @@ tasks.japicmp {
         "org.testcontainers.containers.Db2Container"
     ]
 }
+
+test {
+    useJUnitPlatform()
+}