fix

apache · Feb 5, 2024 · 826e43c · 826e43c
1 parent fbd3c23
commit 826e43c
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 16 deletions.
diff --git a/flink-doris-connector/src/test/java/org/apache/doris/flink/sink/DorisSinkITCase.java b/flink-doris-connector/src/test/java/org/apache/doris/flink/sink/DorisSinkITCase.java
@@ -27,12 +27,13 @@
 import org.apache.doris.flink.cfg.DorisOptions;
 import org.apache.doris.flink.cfg.DorisReadOptions;
 import org.apache.doris.flink.sink.writer.serializer.SimpleStringSerializer;
-import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.parallel.Execution;
 import org.junit.jupiter.api.parallel.ExecutionMode;
+import org.testcontainers.lifecycle.Startables;
 
 import java.sql.ResultSet;
 import java.sql.Statement;
@@ -44,9 +45,13 @@
 import java.util.Properties;
 import java.util.Set;
 import java.util.UUID;
+import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import static org.awaitility.Awaitility.given;
+import static org.awaitility.Durations.ONE_SECOND;
+
 /** DorisSink ITCase with csv and arrow format. */
 @Execution(ExecutionMode.SAME_THREAD)
 public class DorisSinkITCase extends DorisTestBase {
@@ -55,14 +60,23 @@ public class DorisSinkITCase extends DorisTestBase {
     static final String TABLE_JSON = "tbl_json";
     static final String TABLE_JSON_TBL = "tbl_json_tbl";
 
-    @BeforeEach
-    public void startContainers() {
-        super.startContainers();
+    @BeforeAll
+    public static void startDorisContainers() {
+        LOG.info("Starting doris containers...");
+        Startables.deepStart(Stream.of(DORIS_CONTAINER)).join();
+        given().ignoreExceptions()
+                .await()
+                .atMost(300, TimeUnit.SECONDS)
+                .pollInterval(ONE_SECOND)
+                .untilAsserted(DorisTestBase::initializeJdbcConnection);
+        LOG.info("Containers doris are started.");
     }
 
-    @AfterEach
-    public void stopContainers() {
-        super.stopContainers();
+    @AfterAll
+    public static void stopDorisContainers() {
+        LOG.info("Stopping doris containers...");
+        DORIS_CONTAINER.stop();
+        LOG.info("Containers doris are stopped.");
     }
 
     @Test

diff --git a/flink-doris-connector/src/test/java/org/apache/doris/flink/source/DorisSourceITCase.java b/flink-doris-connector/src/test/java/org/apache/doris/flink/source/DorisSourceITCase.java
@@ -29,17 +29,23 @@
 import org.apache.doris.flink.cfg.DorisOptions;
 import org.apache.doris.flink.cfg.DorisReadOptions;
 import org.apache.doris.flink.deserialization.SimpleListDeserializationSchema;
-import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.parallel.Execution;
 import org.junit.jupiter.api.parallel.ExecutionMode;
+import org.testcontainers.lifecycle.Startables;
 
 import java.sql.Statement;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Stream;
+
+import static org.awaitility.Awaitility.given;
+import static org.awaitility.Durations.ONE_SECOND;
 
 /** DorisSource ITCase. */
 @Execution(ExecutionMode.SAME_THREAD)
@@ -48,14 +54,23 @@ public class DorisSourceITCase extends DorisTestBase {
     static final String TABLE_READ = "tbl_read";
     static final String TABLE_READ_TBL = "tbl_read_tbl";
 
-    @BeforeEach
-    public void startContainers() {
-        super.startContainers();
+    @BeforeAll
+    public static void startDorisContainers() {
+        LOG.info("Starting doris containers...");
+        Startables.deepStart(Stream.of(DORIS_CONTAINER)).join();
+        given().ignoreExceptions()
+                .await()
+                .atMost(300, TimeUnit.SECONDS)
+                .pollInterval(ONE_SECOND)
+                .untilAsserted(DorisTestBase::initializeJdbcConnection);
+        LOG.info("Containers doris are started.");
     }
 
-    @AfterEach
-    public void stopContainers() {
-        super.stopContainers();
+    @AfterAll
+    public static void stopDorisContainers() {
+        LOG.info("Stopping doris containers...");
+        DORIS_CONTAINER.stop();
+        LOG.info("Containers doris are stopped.");
     }
 
     @Test