[FLINK-35490] Migrate to JUnit 5 + AssertJ

Signed-off-by: yuxiqian <34335406+yuxiqian@users.noreply.github.com> # Conflicts: # flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-elasticsearch/pom.xml # flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-starrocks/pom.xml # flink-cdc-connect/flink-cdc-source-connectors/flink-connector-db2-cdc/src/test/java/org/apache/flink/cdc/connectors/db2/table/Db2ConnectorITCase.java # flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/org/apache/flink/cdc/connectors/mongodb/table/MongoDBConnectorITCase.java # flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/org/apache/flink/cdc/connectors/mongodb/table/MongoDBRegexFilterITCase.java # flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/table/MySqlConnectorITCase.java # flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/test/java/org/apache/flink/cdc/connectors/oracle/table/OracleConnectorITCase.java # flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/org/apache/flink/cdc/connectors/postgres/table/PostgreSQLConnectorITCase.java # flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/org/apache/flink/cdc/connectors/postgres/table/PostgreSQLSavepointITCase.java # flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/test/java/org/apache/flink/cdc/connectors/sqlserver/table/SqlServerConnectorITCase.java # flink-cdc-e2e-tests/flink-cdc-pipeline-e2e-tests/pom.xml # flink-cdc-e2e-tests/flink-cdc-pipeline-e2e-tests/src/test/java/org/apache/flink/cdc/pipeline/tests/utils/PipelineTestEnvironment.java # flink-cdc-e2e-tests/flink-cdc-source-e2e-tests/src/test/java/org/apache/flink/cdc/connectors/tests/utils/FlinkContainerTestEnvironment.java # Conflicts: # flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/table/MySqlConnectorITCase.java
apache · Nov 20, 2024 · 7603a2d · 7603a2d
1 parent 01a1e5f
commit 7603a2d
Show file tree

Hide file tree

Showing 248 changed files with 6,119 additions and 6,206 deletions.
diff --git a/flink-cdc-cli/src/test/java/org/apache/flink/cdc/cli/CliFrontendTest.java b/flink-cdc-cli/src/test/java/org/apache/flink/cdc/cli/CliFrontendTest.java
@@ -52,14 +52,14 @@ void takeoverOutput() {
     @Test
     void testNoArgument() throws Exception {
         CliFrontend.main(new String[] {});
-        assertThat(out.toString()).isEqualTo(HELP_MESSAGE);
+        assertThat(out).hasToString(HELP_MESSAGE);
         assertThat(err.toString()).isEmpty();
     }
 
     @Test
     void testGeneratingHelpMessage() throws Exception {
         CliFrontend.main(new String[] {"--help"});
-        assertThat(out.toString()).isEqualTo(HELP_MESSAGE);
+        assertThat(out).hasToString(HELP_MESSAGE);
         assertThat(err.toString()).isEmpty();
     }
 
@@ -82,9 +82,9 @@ void testGlobalPipelineConfigParsing() throws Exception {
                         flinkHome(),
                         "--global-config",
                         globalPipelineConfig());
-        assertThat(executor.getGlobalPipelineConfig().toMap().get("parallelism")).isEqualTo("1");
-        assertThat(executor.getGlobalPipelineConfig().toMap().get("schema.change.behavior"))
-                .isEqualTo("ignore");
+        assertThat(executor.getGlobalPipelineConfig().toMap())
+                .containsEntry("parallelism", "1")
+                .containsEntry("schema.change.behavior", "ignore");
     }
 
     @Test

diff --git a/flink-cdc-cli/src/test/java/org/apache/flink/cdc/cli/utils/ConfigurationUtilsTest.java b/flink-cdc-cli/src/test/java/org/apache/flink/cdc/cli/utils/ConfigurationUtilsTest.java
@@ -23,6 +23,7 @@
 
 import org.apache.flink.shaded.curator5.com.google.common.io.Resources;
 
+import org.assertj.core.api.Assertions;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
 
@@ -32,9 +33,6 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
 /** Unit test for {@link org.apache.flink.cdc.cli.utils.ConfigurationUtils}. */
 class ConfigurationUtilsTest {
 
@@ -81,8 +79,9 @@ void loadConfigFile(String resourcePath) throws Exception {
         for (Map.Entry<ConfigOption<?>, Object> entry : CONFIG_OPTIONS.entrySet()) {
             String key = entry.getKey().key();
             Object expectedValue = entry.getValue();
-            assertTrue(configMap.containsKey(key));
-            assertEquals(expectedValue, configMap.get(key));
+            Assertions.assertThat(configMap)
+                    .containsKey(key)
+                    .containsEntry(key, (String) expectedValue);
         }
     }
 }
diff --git a/flink-cdc-common/src/test/java/org/apache/flink/cdc/common/factories/FactoryHelperTests.java b/flink-cdc-common/src/test/java/org/apache/flink/cdc/common/factories/FactoryHelperTests.java
@@ -33,7 +33,7 @@
 import java.util.Set;
 
 /** Tests for {@link FactoryHelper}. */
-public class FactoryHelperTests {
+class FactoryHelperTests {
 
     private Factory getDummyFactory() {
 

diff --git a/flink-cdc-common/src/test/java/org/apache/flink/cdc/common/schema/SelectorsTest.java b/flink-cdc-common/src/test/java/org/apache/flink/cdc/common/schema/SelectorsTest.java
@@ -27,7 +27,7 @@
 class SelectorsTest {
 
     @Test
-    public void testTableSelector() {
+    void testTableSelector() {
 
         // nameSpace, schemaName, tableName
         Selectors selectors =

diff --git a/flink-cdc-common/src/test/java/org/apache/flink/cdc/common/utils/ChangeEventUtilsTest.java b/flink-cdc-common/src/test/java/org/apache/flink/cdc/common/utils/ChangeEventUtilsTest.java
@@ -38,9 +38,9 @@
 import static org.apache.flink.cdc.common.testutils.assertions.EventAssertions.assertThat;
 
 /** A test for the {@link org.apache.flink.cdc.common.utils.ChangeEventUtils}. */
-public class ChangeEventUtilsTest {
+class ChangeEventUtilsTest {
     @Test
-    public void testResolveSchemaEvolutionOptions() {
+    void testResolveSchemaEvolutionOptions() {
 
         List<String> allTags =
                 Arrays.stream(SchemaChangeEventTypeFamily.ALL)
@@ -93,7 +93,7 @@ public void testResolveSchemaEvolutionOptions() {
     }
 
     @Test
-    public void testResolveSchemaEvolutionTag() {
+    void testResolveSchemaEvolutionTag() {
         assertThat(ChangeEventUtils.resolveSchemaEvolutionTag("all"))
                 .isEqualTo(
                         Arrays.asList(

diff --git a/flink-cdc-common/src/test/java/org/apache/flink/cdc/common/utils/SchemaUtilsTest.java b/flink-cdc-common/src/test/java/org/apache/flink/cdc/common/utils/SchemaUtilsTest.java
@@ -37,10 +37,10 @@
 import java.util.Map;
 
 /** A test for the {@link org.apache.flink.cdc.common.utils.SchemaUtils}. */
-public class SchemaUtilsTest {
+class SchemaUtilsTest {
 
     @Test
-    public void testApplyColumnSchemaChangeEvent() {
+    void testApplyColumnSchemaChangeEvent() {
         TableId tableId = TableId.parse("default.default.table1");
         Schema schema =
                 Schema.newBuilder()
@@ -165,7 +165,7 @@ public void testApplyColumnSchemaChangeEvent() {
     }
 
     @Test
-    public void testGetNumericPrecision() {
+    void testGetNumericPrecision() {
         Assertions.assertThat(SchemaUtils.getNumericPrecision(DataTypes.TINYINT())).isEqualTo(3);
         Assertions.assertThat(SchemaUtils.getNumericPrecision(DataTypes.SMALLINT())).isEqualTo(5);
         Assertions.assertThat(SchemaUtils.getNumericPrecision(DataTypes.INT())).isEqualTo(10);
@@ -180,7 +180,7 @@ public void testGetNumericPrecision() {
     }
 
     @Test
-    public void testInferWiderType() {
+    void testInferWiderType() {
         Assertions.assertThat(
                         SchemaUtils.inferWiderType(DataTypes.BINARY(17), DataTypes.BINARY(17)))
                 .isEqualTo(DataTypes.BINARY(17));
@@ -353,7 +353,7 @@ public void testInferWiderType() {
     }
 
     @Test
-    public void testInferWiderColumn() {
+    void testInferWiderColumn() {
         // Test normal merges
         Assertions.assertThat(
                         SchemaUtils.inferWiderColumn(
@@ -385,7 +385,7 @@ public void testInferWiderColumn() {
     }
 
     @Test
-    public void testInferWiderSchema() {
+    void testInferWiderSchema() {
         // Test normal merges
         Assertions.assertThat(
                         SchemaUtils.inferWiderSchema(

diff --git a/flink-cdc-common/src/test/java/org/apache/flink/cdc/common/utils/StringUtilsTest.java b/flink-cdc-common/src/test/java/org/apache/flink/cdc/common/utils/StringUtilsTest.java
@@ -17,15 +17,15 @@
 
 package org.apache.flink.cdc.common.utils;
 
-import org.junit.Assert;
-import org.junit.Test;
+import org.assertj.core.api.Assertions;
+import org.junit.jupiter.api.Test;
 
 /** A test for the {@link StringUtils}. */
-public class StringUtilsTest {
+class StringUtilsTest {
     @Test
-    public void testConvertToCamelCase() {
+    void testConvertToCamelCase() {
         String str = "AA_BB CC";
         String camelCaseStr = StringUtils.convertToCamelCase(str);
-        Assert.assertEquals("aaBbCc", camelCaseStr);
+        Assertions.assertThat(camelCaseStr).isEqualTo("aaBbCc");
     }
 }
diff --git a/...composer/src/test/java/org/apache/flink/cdc/composer/flink/FlinkEnvironmentUtilsTest.java b/...composer/src/test/java/org/apache/flink/cdc/composer/flink/FlinkEnvironmentUtilsTest.java
@@ -23,31 +23,33 @@
 
 import org.apache.flink.shaded.guava31.com.google.common.collect.Lists;
 
-import org.junit.Assert;
-import org.junit.Test;
+import org.assertj.core.api.Assertions;
+import org.junit.jupiter.api.Test;
 
 import java.net.URL;
 import java.util.Collections;
 import java.util.List;
 
 /** Test for {@link FlinkEnvironmentUtils}. */
-public class FlinkEnvironmentUtilsTest {
+class FlinkEnvironmentUtilsTest {
 
     @Test
-    public void testAddJars() throws Exception {
+    void testAddJars() throws Exception {
         Configuration configuration = new Configuration();
-        configuration.set(PipelineOptions.JARS, Collections.EMPTY_LIST);
+        configuration.set(PipelineOptions.JARS, Collections.emptyList());
         StreamExecutionEnvironment env =
                 StreamExecutionEnvironment.createLocalEnvironment(configuration);
 
         FlinkEnvironmentUtils.addJar(
                 env, Lists.newArrayList(new URL("file://a.jar"), new URL("file://a.jar")));
         List<String> expectedJars = Lists.newArrayList("file://a.jar");
-        Assert.assertEquals(expectedJars, env.getConfiguration().get(PipelineOptions.JARS));
+        Assertions.assertThat(env.getConfiguration().get(PipelineOptions.JARS))
+                .isEqualTo(expectedJars);
 
         FlinkEnvironmentUtils.addJar(
                 env, Lists.newArrayList(new URL("file://b.jar"), new URL("file://a.jar")));
         expectedJars.add("file://b.jar");
-        Assert.assertEquals(expectedJars, env.getConfiguration().get(PipelineOptions.JARS));
+        Assertions.assertThat(env.getConfiguration().get(PipelineOptions.JARS))
+                .isEqualTo(expectedJars);
     }
 }
diff --git a/...mposer/src/test/java/org/apache/flink/cdc/composer/flink/FlinkPipelineComposerITCase.java b/...mposer/src/test/java/org/apache/flink/cdc/composer/flink/FlinkPipelineComposerITCase.java
@@ -337,7 +337,7 @@ void testTransform(ValuesDataSink.SinkApi sinkApi) throws Exception {
                         sourceDef,
                         sinkDef,
                         Collections.emptyList(),
-                        new ArrayList<>(Arrays.asList(transformDef)),
+                        new ArrayList<>(Collections.singletonList(transformDef)),
                         Collections.emptyList(),
                         pipelineConfig);
 

diff --git a/...src/test/java/org/apache/flink/cdc/composer/flink/FlinkPipelineComposerLenientITCase.java b/...src/test/java/org/apache/flink/cdc/composer/flink/FlinkPipelineComposerLenientITCase.java
@@ -381,7 +381,7 @@ void testTransform(ValuesDataSink.SinkApi sinkApi) throws Exception {
                         sourceDef,
                         sinkDef,
                         Collections.emptyList(),
-                        new ArrayList<>(Arrays.asList(transformDef)),
+                        new ArrayList<>(Collections.singletonList(transformDef)),
                         Collections.emptyList(),
                         pipelineConfig);
 

diff --git a/...composer/src/test/java/org/apache/flink/cdc/composer/flink/FlinkPipelineComposerTest.java b/...composer/src/test/java/org/apache/flink/cdc/composer/flink/FlinkPipelineComposerTest.java
@@ -27,7 +27,7 @@
 
 import org.apache.flink.shaded.guava31.com.google.common.collect.ImmutableMap;
 
-import org.junit.jupiter.api.Assertions;
+import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
 
 /** A test for the {@link FlinkPipelineComposer}. */
@@ -55,7 +55,8 @@ void testCreateDataSinkFromSinkDef() {
                                 new Configuration(),
                                 Thread.currentThread().getContextClassLoader()));
 
-        Assertions.assertTrue(dataSink instanceof DataSinkFactory1.TestDataSink);
-        Assertions.assertEquals("0.0.0.0", ((DataSinkFactory1.TestDataSink) dataSink).getHost());
+        Assertions.assertThat(dataSink).isExactlyInstanceOf(DataSinkFactory1.TestDataSink.class);
+        Assertions.assertThat(((DataSinkFactory1.TestDataSink) dataSink).getHost())
+                .isEqualTo("0.0.0.0");
     }
 }
diff --git a/...dc-composer/src/test/java/org/apache/flink/cdc/composer/flink/FlinkPipelineUdfITCase.java b/...dc-composer/src/test/java/org/apache/flink/cdc/composer/flink/FlinkPipelineUdfITCase.java
@@ -53,7 +53,7 @@
 import static org.junit.jupiter.params.provider.Arguments.arguments;
 
 /** Integration test for UDFs. */
-public class FlinkPipelineUdfITCase {
+class FlinkPipelineUdfITCase {
     private static final int MAX_PARALLELISM = 4;
 
     // Always use parent-first classloader for CDC classes.

diff --git a/.../src/test/java/org/apache/flink/cdc/composer/flink/translator/DataSinkTranslatorTest.java b/.../src/test/java/org/apache/flink/cdc/composer/flink/translator/DataSinkTranslatorTest.java
@@ -29,7 +29,7 @@
 
 import org.apache.flink.shaded.guava31.com.google.common.collect.Lists;
 
-import org.junit.jupiter.api.Assertions;
+import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
@@ -60,7 +60,7 @@ void testPreWriteWithoutCommitSink() {
         OneInputTransformation<Event, Event> oneInputTransformation =
                 (OneInputTransformation) env.getTransformations().get(0);
         Transformation<?> reblanceTransformation = oneInputTransformation.getInputs().get(0);
-        Assertions.assertEquals(uid, reblanceTransformation.getUserProvidedNodeHash());
+        Assertions.assertThat(reblanceTransformation.getUserProvidedNodeHash()).isEqualTo(uid);
     }
 
     private static class EmptyEvent implements Event {}

diff --git a/...rc/test/java/org/apache/flink/cdc/composer/flink/translator/DataSourceTranslatorTest.java b/...rc/test/java/org/apache/flink/cdc/composer/flink/translator/DataSourceTranslatorTest.java
@@ -27,7 +27,7 @@
 
 import org.apache.flink.shaded.guava31.com.google.common.collect.ImmutableMap;
 
-import org.junit.jupiter.api.Assertions;
+import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
 
 /** A test for the {@link DataSourceTranslator}. */
@@ -55,8 +55,9 @@ void testCreateDataSourceFromSourceDef() {
                                 new Configuration(),
                                 Thread.currentThread().getContextClassLoader()));
 
-        Assertions.assertTrue(dataSource instanceof DataSourceFactory1.TestDataSource);
-        Assertions.assertEquals(
-                "0.0.0.0", ((DataSourceFactory1.TestDataSource) dataSource).getHost());
+        Assertions.assertThat(dataSource)
+                .isExactlyInstanceOf(DataSourceFactory1.TestDataSource.class);
+        Assertions.assertThat(((DataSourceFactory1.TestDataSource) dataSource).getHost())
+                .isEqualTo("0.0.0.0");
     }
 }
diff --git a/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-doris/pom.xml b/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-doris/pom.xml
@@ -40,9 +40,9 @@ limitations under the License.
 
         <dependency>
             <groupId>org.apache.flink</groupId>
-            <artifactId>flink-runtime</artifactId>
-            <version>${flink.version}</version>
-            <scope>provided</scope>
+            <artifactId>flink-connector-test-util</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
         </dependency>
 
         <dependency>
@@ -63,6 +63,14 @@ limitations under the License.
                 </exclusion>
             </exclusions>
         </dependency>
+
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <version>${testcontainers.version}</version>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.flink</groupId>
             <artifactId>flink-test-utils-junit</artifactId>
@@ -84,7 +92,7 @@ limitations under the License.
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>jdbc</artifactId>
-            <version>1.18.3</version>
+            <version>${testcontainers.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>