Resolve conflicts

Signed-off-by: yuxiqian <34335406+yuxiqian@users.noreply.github.com>
apache · Dec 25, 2024 · 62c057b · 62c057b
1 parent d5fc08a
commit 62c057b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/...st/java/org/apache/flink/cdc/connectors/mysql/source/MySqlParallelizedPipelineITCase.java b/...st/java/org/apache/flink/cdc/connectors/mysql/source/MySqlParallelizedPipelineITCase.java
@@ -31,9 +31,9 @@
 import org.apache.flink.cdc.connectors.values.factory.ValuesDataFactory;
 import org.apache.flink.cdc.connectors.values.sink.ValuesDataSinkOptions;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;
@@ -79,15 +79,15 @@ public class MySqlParallelizedPipelineITCase extends MySqlSourceTestBase {
             new UniqueDatabase(
                     MYSQL_CONTAINER, "extreme_parallelism_test_database", TEST_USER, TEST_PASSWORD);
 
-    @Before
+    @BeforeEach
     public void init() {
         // Take over STDOUT as we need to check the output of values sink
         System.setOut(new PrintStream(outCaptor));
         // Initialize in-memory database
         ValuesDatabase.clear();
     }
 
-    @After
+    @AfterEach
     public void cleanup() {
         System.setOut(standardOut);
     }

diff --git a/...c/test/java/org/apache/flink/cdc/runtime/operators/schema/regular/SchemaOperatorTest.java b/...c/test/java/org/apache/flink/cdc/runtime/operators/schema/regular/SchemaOperatorTest.java
@@ -33,7 +33,6 @@
 import org.apache.flink.streaming.runtime.streamrecord.StreamRecord;
 import org.apache.flink.streaming.util.OneInputStreamOperatorTestHarness;
 
-import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
 
 import java.time.Duration;