Move YugabyteDB tests to JUnit Jupiter

Author: eddumelendez

modules/yugabytedb/build.gradle

@@ -2,9 +2,17 @@ description = "Testcontainers :: JDBC :: YugabyteDB"
 
 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')
     // YCQL driver
     testImplementation 'com.yugabyte:java-driver-core:4.19.0-yb-1'
     // YSQL driver
     testRuntimeOnly 'com.yugabyte:jdbc-yugabytedb:42.7.3-yb-4'
 }
+
+test {
+    useJUnitPlatform()
+}

modules/yugabytedb/src/test/java/org/testcontainers/jdbc/yugabytedb/YugabyteDBYSQLJDBCDriverTest.java

@@ -1,7 +1,5 @@
 package org.testcontainers.jdbc.yugabytedb;
 
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
 import org.testcontainers.jdbc.AbstractJDBCDriverTest;
 
 import java.util.Arrays;
@@ -10,10 +8,8 @@
 /**
  * YugabyteDB YSQL API JDBC connectivity driver test class
  */
-@RunWith(Parameterized.class)
-public class YugabyteDBYSQLJDBCDriverTest extends AbstractJDBCDriverTest {
+class YugabyteDBYSQLJDBCDriverTest extends AbstractJDBCDriverTest {
 
-    @Parameterized.Parameters(name = "{index} - {0}")
     public static Iterable<Object[]> data() {
         return Arrays.asList(
             new Object[][] {

modules/yugabytedb/src/test/java/org/testcontainers/junit/yugabytedb/YugabyteDBYCQLTest.java

@@ -2,7 +2,7 @@
 
 import com.datastax.oss.driver.api.core.CqlSession;
 import com.datastax.oss.driver.api.core.cql.ResultSet;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.containers.YugabyteDBYCQLContainer;
 import org.testcontainers.utility.DockerImageName;
 
@@ -11,7 +11,7 @@
 /**
  * YugabyteDB YCQL API unit test class
  */
-public class YugabyteDBYCQLTest {
+class YugabyteDBYCQLTest {
 
     private static final String IMAGE_NAME = "yugabytedb/yugabyte:2.14.4.0-b26";
 
@@ -20,7 +20,7 @@ public class YugabyteDBYCQLTest {
     private static final DockerImageName YBDB_TEST_IMAGE = DockerImageName.parse(IMAGE_NAME);
 
     @Test
-    public void testSmoke() {
+    void testSmoke() {
         try (
             // creatingYCQLContainer {
             final YugabyteDBYCQLContainer ycqlContainer = new YugabyteDBYCQLContainer(
@@ -38,7 +38,7 @@ public void testSmoke() {
     }
 
     @Test
-    public void testCustomKeyspace() {
+    void testCustomKeyspace() {
         String key = "random";
         try (
             final YugabyteDBYCQLContainer ycqlContainer = new YugabyteDBYCQLContainer(YBDB_TEST_IMAGE)
@@ -61,7 +61,7 @@ public void testCustomKeyspace() {
     }
 
     @Test
-    public void testAuthenticationEnabled() {
+    void testAuthenticationEnabled() {
         String role = "random";
         try (
             final YugabyteDBYCQLContainer ycqlContainer = new YugabyteDBYCQLContainer(YBDB_TEST_IMAGE)
@@ -80,7 +80,7 @@ public void testAuthenticationEnabled() {
     }
 
     @Test
-    public void testAuthenticationDisabled() {
+    void testAuthenticationDisabled() {
         try (
             final YugabyteDBYCQLContainer ycqlContainer = new YugabyteDBYCQLContainer(YBDB_TEST_IMAGE)
                 .withPassword("cassandra")
@@ -94,7 +94,7 @@ public void testAuthenticationDisabled() {
     }
 
     @Test
-    public void testInitScript() {
+    void testInitScript() {
         String key = "random";
         try (
             final YugabyteDBYCQLContainer ycqlContainer = new YugabyteDBYCQLContainer(YBDB_TEST_IMAGE)
@@ -111,7 +111,7 @@ public void testInitScript() {
     }
 
     @Test
-    public void shouldStartWhenContainerIpIsUsedInWaitStrategy() {
+    void shouldStartWhenContainerIpIsUsedInWaitStrategy() {
         try (
             final YugabyteDBYCQLContainer ycqlContainer = new YugabyteDBYCQLContainer(IMAGE_NAME_2_18)
                 .withUsername("cassandra")

modules/yugabytedb/src/test/java/org/testcontainers/junit/yugabytedb/YugabyteDBYSQLTest.java

@@ -1,6 +1,6 @@
 package org.testcontainers.junit.yugabytedb;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.containers.YugabyteDBYSQLContainer;
 import org.testcontainers.db.AbstractContainerDatabaseTest;
 import org.testcontainers.utility.DockerImageName;
@@ -12,14 +12,14 @@
 /**
  * YugabyteDB YSQL API unit test class
  */
-public class YugabyteDBYSQLTest extends AbstractContainerDatabaseTest {
+class YugabyteDBYSQLTest extends AbstractContainerDatabaseTest {
 
     private static final String IMAGE_NAME = "yugabytedb/yugabyte:2.14.4.0-b26";
 
     private static final DockerImageName YBDB_TEST_IMAGE = DockerImageName.parse(IMAGE_NAME);
 
     @Test
-    public void testSmoke() throws SQLException {
+    void testSmoke() throws SQLException {
         try (
             // creatingYSQLContainer {
             final YugabyteDBYSQLContainer ysqlContainer = new YugabyteDBYSQLContainer(
@@ -35,7 +35,7 @@ public void testSmoke() throws SQLException {
     }
 
     @Test
-    public void testCustomDatabase() throws SQLException {
+    void testCustomDatabase() throws SQLException {
         String key = "random";
         try (
             final YugabyteDBYSQLContainer ysqlContainer = new YugabyteDBYSQLContainer(YBDB_TEST_IMAGE)
@@ -49,7 +49,7 @@ public void testCustomDatabase() throws SQLException {
     }
 
     @Test
-    public void testInitScript() throws SQLException {
+    void testInitScript() throws SQLException {
         try (
             final YugabyteDBYSQLContainer ysqlContainer = new YugabyteDBYSQLContainer(YBDB_TEST_IMAGE)
                 .withInitScript("init/init_yql.sql")
@@ -62,7 +62,7 @@ public void testInitScript() throws SQLException {
     }
 
     @Test
-    public void testWithAdditionalUrlParamInJdbcUrl() {
+    void testWithAdditionalUrlParamInJdbcUrl() {
         try (
             final YugabyteDBYSQLContainer ysqlContainer = new YugabyteDBYSQLContainer(YBDB_TEST_IMAGE)
                 .withUrlParam("sslmode", "disable")
@@ -80,7 +80,7 @@ public void testWithAdditionalUrlParamInJdbcUrl() {
     }
 
     @Test
-    public void testWithCustomRole() throws SQLException {
+    void testWithCustomRole() throws SQLException {
         try (
             final YugabyteDBYSQLContainer ysqlContainer = new YugabyteDBYSQLContainer(YBDB_TEST_IMAGE)
                 .withDatabaseName("yugabyte")
@@ -95,7 +95,7 @@ public void testWithCustomRole() throws SQLException {
     }
 
     @Test
-    public void testWaitStrategy() throws SQLException {
+    void testWaitStrategy() throws SQLException {
         try (final YugabyteDBYSQLContainer ysqlContainer = new YugabyteDBYSQLContainer(YBDB_TEST_IMAGE)) {
             ysqlContainer.start();
             assertThat(performQuery(ysqlContainer, "SELECT 1").getInt(1))