test: use junit 5 in all test cases

oceanbase · Jan 23, 2025 · 38464f1 · 38464f1
1 parent 5f219c1
commit 38464f1
Show file tree

Hide file tree

Showing 13 changed files with 83 additions and 146 deletions.
diff --git a/...ctor-obkv-hbase/src/test/java/com/oceanbase/connector/flink/OBKVHBaseConnectorITCase.java b/...ctor-obkv-hbase/src/test/java/com/oceanbase/connector/flink/OBKVHBaseConnectorITCase.java
@@ -21,11 +21,11 @@
 import org.apache.flink.table.api.bridge.java.StreamTableEnvironment;
 
 import org.apache.hadoop.hbase.util.Bytes;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testcontainers.containers.GenericContainer;
@@ -42,7 +42,7 @@ public class OBKVHBaseConnectorITCase extends OceanBaseMySQLTestBase {
 
     private static final Logger LOG = LoggerFactory.getLogger(OBKVHBaseConnectorITCase.class);
 
-    @BeforeClass
+    @BeforeAll
     public static void setup() throws Exception {
         CONFIG_SERVER.withLogConsumer(new Slf4jLogConsumer(LOG)).start();
 
@@ -60,17 +60,17 @@ public static void setup() throws Exception {
                 .start();
     }
 
-    @AfterClass
+    @AfterAll
     public static void tearDown() {
         Stream.of(CONFIG_SERVER, CONTAINER, ODP).forEach(GenericContainer::stop);
     }
 
-    @Before
+    @BeforeEach
     public void before() throws Exception {
         initialize("sql/htable.sql");
     }
 
-    @After
+    @AfterEach
     public void after() throws Exception {
         dropTables("htable$family1", "htable$family2");
     }

diff --git a/...or-oceanbase-base/src/test/java/com/oceanbase/connector/flink/OceanBaseMySQLTestBase.java b/...or-oceanbase-base/src/test/java/com/oceanbase/connector/flink/OceanBaseMySQLTestBase.java
@@ -19,7 +19,6 @@
 import com.oceanbase.connector.flink.connection.OceanBaseUserInfo;
 
 import com.github.dockerjava.api.model.ContainerNetwork;
-import org.junit.ClassRule;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testcontainers.containers.GenericContainer;
@@ -48,7 +47,7 @@ public abstract class OceanBaseMySQLTestBase extends OceanBaseTestBase {
     private static final String SYS_PASSWORD = "123456";
     private static final String TEST_PASSWORD = "654321";
 
-    @ClassRule public static final Network NETWORK = Network.newNetwork();
+    public static final Network NETWORK = Network.newNetwork();
 
     @SuppressWarnings("resource")
     public static final GenericContainer<?> CONFIG_SERVER =

diff --git a/...nnector-oceanbase-base/src/test/java/com/oceanbase/connector/flink/OceanBaseTestBase.java b/...nnector-oceanbase-base/src/test/java/com/oceanbase/connector/flink/OceanBaseTestBase.java
@@ -16,6 +16,8 @@
 
 package com.oceanbase.connector.flink;
 
+import org.junit.jupiter.api.Assertions;
+
 import java.io.IOException;
 import java.net.URISyntaxException;
 import java.net.URL;
@@ -37,33 +39,29 @@
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
 public abstract class OceanBaseTestBase implements OceanBaseMetadata {
 
     private static final Pattern COMMENT_PATTERN = Pattern.compile("^(.*)--.*$");
 
     public static String getOptionsString(Map<String, String> options) {
-        assertNotNull(options);
+        Assertions.assertNotNull(options);
         return options.entrySet().stream()
                 .map(e -> String.format("'%s'='%s'", e.getKey(), e.getValue()))
                 .collect(Collectors.joining(","));
     }
 
     public static void assertEqualsInAnyOrder(List<String> expected, List<String> actual) {
-        assertTrue(expected != null && actual != null);
+        Assertions.assertTrue(expected != null && actual != null);
         assertEqualsInOrder(
                 expected.stream().sorted().collect(Collectors.toList()),
                 actual.stream().sorted().collect(Collectors.toList()));
     }
 
     public static void assertEqualsInOrder(List<String> expected, List<String> actual) {
-        assertTrue(expected != null && actual != null);
-        assertEquals(expected.size(), actual.size());
-        assertArrayEquals(expected.toArray(new String[0]), actual.toArray(new String[0]));
+        Assertions.assertTrue(expected != null && actual != null);
+        Assertions.assertEquals(expected.size(), actual.size());
+        Assertions.assertArrayEquals(
+                expected.toArray(new String[0]), actual.toArray(new String[0]));
     }
 
     public Map<String, String> getBaseOptions() {
@@ -90,7 +88,7 @@ public Connection getJdbcConnection() throws SQLException {
 
     public void initialize(String sqlFile) throws SQLException, IOException, URISyntaxException {
         final URL file = getClass().getClassLoader().getResource(sqlFile);
-        assertNotNull("Cannot locate " + sqlFile, file);
+        Assertions.assertNotNull(file, "Cannot locate " + sqlFile);
 
         try (Connection connection = getJdbcConnection();
                 Statement statement = connection.createStatement()) {
@@ -129,7 +127,7 @@ public void waitingAndAssertTableCount(String tableName, int expectedCount)
                 Thread.sleep(100);
             }
         }
-        assertEquals(expectedCount, tableRowsCount);
+        Assertions.assertEquals(expectedCount, tableRowsCount);
     }
 
     public int getTableRowsCount(String tableName) throws SQLException {

diff --git a/...nnector-oceanbase-cli/src/test/java/com/oceanbase/connector/flink/MysqlCdcSyncITCase.java b/...nnector-oceanbase-cli/src/test/java/com/oceanbase/connector/flink/MysqlCdcSyncITCase.java
@@ -23,9 +23,9 @@
 import org.apache.flink.configuration.Configuration;
 import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment;
 
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testcontainers.containers.GenericContainer;
@@ -50,19 +50,15 @@ public class MysqlCdcSyncITCase extends OceanBaseMySQLTestBase {
                     .withPassword("mysqlpw")
                     .withLogConsumer(new Slf4jLogConsumer(LOG));
 
-    @BeforeClass
+    @BeforeAll
     public static void setup() {
-        CONFIG_SERVER.withLogConsumer(new Slf4jLogConsumer(LOG)).start();
-        CONTAINER
-                .withEnv("OB_CONFIGSERVER_ADDRESS", getConfigServerAddress())
-                .withLogConsumer(new Slf4jLogConsumer(LOG))
-                .start();
+        CONTAINER.withLogConsumer(new Slf4jLogConsumer(LOG)).start();
         MYSQL_CONTAINER.start();
     }
 
-    @AfterClass
+    @AfterAll
     public static void tearDown() {
-        Stream.of(CONFIG_SERVER, CONTAINER, MYSQL_CONTAINER).forEach(GenericContainer::stop);
+        Stream.of(CONTAINER, MYSQL_CONTAINER).forEach(GenericContainer::stop);
     }
 
     @Test

diff --git a/...-oceanbase-directload/src/test/java/com/oceanbase/connector/flink/OBDirectLoadITCase.java b/...-oceanbase-directload/src/test/java/com/oceanbase/connector/flink/OBDirectLoadITCase.java
@@ -25,11 +25,11 @@
 
 import org.apache.flink.shaded.guava31.com.google.common.collect.ImmutableMap;
 
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testcontainers.containers.output.Slf4jLogConsumer;
@@ -41,22 +41,22 @@ public class OBDirectLoadITCase extends OceanBaseMySQLTestBase {
 
     private static final Logger LOG = LoggerFactory.getLogger(OBDirectLoadITCase.class);
 
-    @BeforeClass
+    @BeforeAll
     public static void setup() {
         CONTAINER.withLogConsumer(new Slf4jLogConsumer(LOG)).start();
     }
 
-    @AfterClass
+    @AfterAll
     public static void tearDown() {
         CONTAINER.stop();
     }
 
-    @Before
+    @BeforeEach
     public void before() throws Exception {
         initialize("sql/products.sql");
     }
 
-    @After
+    @AfterEach
     public void after() throws Exception {
         dropTables("products");
     }

diff --git a/...ceanbase-e2e-tests/src/test/java/com/oceanbase/connector/flink/OBDirectLoadE2eITCase.java b/...ceanbase-e2e-tests/src/test/java/com/oceanbase/connector/flink/OBDirectLoadE2eITCase.java
@@ -18,11 +18,11 @@
 
 import com.oceanbase.connector.flink.utils.FlinkContainerTestEnvironment;
 
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testcontainers.containers.output.Slf4jLogConsumer;
@@ -38,24 +38,24 @@ public class OBDirectLoadE2eITCase extends FlinkContainerTestEnvironment {
     private static final String SINK_CONNECTOR_NAME =
             "flink-sql-connector-oceanbase-directload.jar";
 
-    @BeforeClass
+    @BeforeAll
     public static void setup() {
         CONTAINER.withLogConsumer(new Slf4jLogConsumer(LOG)).start();
     }
 
-    @AfterClass
+    @AfterAll
     public static void tearDown() {
         CONTAINER.stop();
     }
 
-    @Before
+    @BeforeEach
     public void before() throws Exception {
         super.before();
 
         initialize("sql/products.sql");
     }
 
-    @After
+    @AfterEach
     public void after() throws Exception {
         super.after();
 

diff --git a/...r-oceanbase-e2e-tests/src/test/java/com/oceanbase/connector/flink/OBKVHBaseE2eITCase.java b/...r-oceanbase-e2e-tests/src/test/java/com/oceanbase/connector/flink/OBKVHBaseE2eITCase.java
@@ -18,11 +18,11 @@
 
 import com.oceanbase.connector.flink.utils.FlinkContainerTestEnvironment;
 
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testcontainers.containers.GenericContainer;
@@ -39,7 +39,7 @@ public class OBKVHBaseE2eITCase extends FlinkContainerTestEnvironment {
 
     private static final String SINK_CONNECTOR_NAME = "flink-sql-connector-obkv-hbase.jar";
 
-    @BeforeClass
+    @BeforeAll
     public static void setup() {
         CONFIG_SERVER.withLogConsumer(new Slf4jLogConsumer(LOG)).start();
 
@@ -49,7 +49,7 @@ public static void setup() {
                 .start();
     }
 
-    @AfterClass
+    @AfterAll
     public static void tearDown() {
         Stream.of(CONFIG_SERVER, CONTAINER).forEach(GenericContainer::stop);
     }
@@ -60,14 +60,14 @@ protected String getFlinkDockerImageTag() {
         return super.getFlinkDockerImageTag() + "-java8";
     }
 
-    @Before
+    @BeforeEach
     public void before() throws Exception {
         super.before();
 
         initialize("sql/htable.sql");
     }
 
-    @After
+    @AfterEach
     public void after() throws Exception {
         super.after();
 

diff --git a/...r-oceanbase-e2e-tests/src/test/java/com/oceanbase/connector/flink/OceanBaseE2eITCase.java b/...r-oceanbase-e2e-tests/src/test/java/com/oceanbase/connector/flink/OceanBaseE2eITCase.java
@@ -18,11 +18,11 @@
 
 import com.oceanbase.connector.flink.utils.FlinkContainerTestEnvironment;
 
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testcontainers.containers.output.Slf4jLogConsumer;
@@ -37,24 +37,24 @@ public class OceanBaseE2eITCase extends FlinkContainerTestEnvironment {
 
     private static final String SINK_CONNECTOR_NAME = "flink-sql-connector-oceanbase.jar";
 
-    @BeforeClass
+    @BeforeAll
     public static void setup() {
         CONTAINER.withLogConsumer(new Slf4jLogConsumer(LOG)).start();
     }
 
-    @AfterClass
+    @AfterAll
     public static void tearDown() {
         CONTAINER.stop();
     }
 
-    @Before
+    @BeforeEach
     public void before() throws Exception {
         super.before();
 
         initialize("sql/products.sql");
     }
 
-    @After
+    @AfterEach
     public void after() throws Exception {
         super.after();