Skip to content

Commit 3ee96e2

Browse files
committed
[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
1 parent dd79a02 commit 3ee96e2

File tree

247 files changed

+6100
-6174
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

247 files changed

+6100
-6174
lines changed

flink-cdc-cli/src/test/java/org/apache/flink/cdc/cli/CliFrontendTest.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,14 +52,14 @@ void takeoverOutput() {
5252
@Test
5353
void testNoArgument() throws Exception {
5454
CliFrontend.main(new String[] {});
55-
assertThat(out.toString()).isEqualTo(HELP_MESSAGE);
55+
assertThat(out).hasToString(HELP_MESSAGE);
5656
assertThat(err.toString()).isEmpty();
5757
}
5858

5959
@Test
6060
void testGeneratingHelpMessage() throws Exception {
6161
CliFrontend.main(new String[] {"--help"});
62-
assertThat(out.toString()).isEqualTo(HELP_MESSAGE);
62+
assertThat(out).hasToString(HELP_MESSAGE);
6363
assertThat(err.toString()).isEmpty();
6464
}
6565

@@ -82,9 +82,9 @@ void testGlobalPipelineConfigParsing() throws Exception {
8282
flinkHome(),
8383
"--global-config",
8484
globalPipelineConfig());
85-
assertThat(executor.getGlobalPipelineConfig().toMap().get("parallelism")).isEqualTo("1");
86-
assertThat(executor.getGlobalPipelineConfig().toMap().get("schema.change.behavior"))
87-
.isEqualTo("ignore");
85+
assertThat(executor.getGlobalPipelineConfig().toMap())
86+
.containsEntry("parallelism", "1")
87+
.containsEntry("schema.change.behavior", "ignore");
8888
}
8989

9090
@Test

flink-cdc-cli/src/test/java/org/apache/flink/cdc/cli/utils/ConfigurationUtilsTest.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323

2424
import org.apache.flink.shaded.curator5.com.google.common.io.Resources;
2525

26+
import org.assertj.core.api.Assertions;
2627
import org.junit.jupiter.params.ParameterizedTest;
2728
import org.junit.jupiter.params.provider.ValueSource;
2829

@@ -32,9 +33,6 @@
3233
import java.util.HashMap;
3334
import java.util.Map;
3435

35-
import static org.junit.jupiter.api.Assertions.assertEquals;
36-
import static org.junit.jupiter.api.Assertions.assertTrue;
37-
3836
/** Unit test for {@link org.apache.flink.cdc.cli.utils.ConfigurationUtils}. */
3937
class ConfigurationUtilsTest {
4038

@@ -81,8 +79,9 @@ void loadConfigFile(String resourcePath) throws Exception {
8179
for (Map.Entry<ConfigOption<?>, Object> entry : CONFIG_OPTIONS.entrySet()) {
8280
String key = entry.getKey().key();
8381
Object expectedValue = entry.getValue();
84-
assertTrue(configMap.containsKey(key));
85-
assertEquals(expectedValue, configMap.get(key));
82+
Assertions.assertThat(configMap)
83+
.containsKey(key)
84+
.containsEntry(key, (String) expectedValue);
8685
}
8786
}
8887
}

flink-cdc-common/src/test/java/org/apache/flink/cdc/common/factories/FactoryHelperTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
import java.util.Set;
3434

3535
/** Tests for {@link FactoryHelper}. */
36-
public class FactoryHelperTests {
36+
class FactoryHelperTests {
3737

3838
private Factory getDummyFactory() {
3939

flink-cdc-common/src/test/java/org/apache/flink/cdc/common/schema/SelectorsTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
class SelectorsTest {
2828

2929
@Test
30-
public void testTableSelector() {
30+
void testTableSelector() {
3131

3232
// nameSpace, schemaName, tableName
3333
Selectors selectors =

flink-cdc-common/src/test/java/org/apache/flink/cdc/common/utils/ChangeEventUtilsTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@
3838
import static org.apache.flink.cdc.common.testutils.assertions.EventAssertions.assertThat;
3939

4040
/** A test for the {@link org.apache.flink.cdc.common.utils.ChangeEventUtils}. */
41-
public class ChangeEventUtilsTest {
41+
class ChangeEventUtilsTest {
4242
@Test
43-
public void testResolveSchemaEvolutionOptions() {
43+
void testResolveSchemaEvolutionOptions() {
4444

4545
List<String> allTags =
4646
Arrays.stream(SchemaChangeEventTypeFamily.ALL)
@@ -93,7 +93,7 @@ public void testResolveSchemaEvolutionOptions() {
9393
}
9494

9595
@Test
96-
public void testResolveSchemaEvolutionTag() {
96+
void testResolveSchemaEvolutionTag() {
9797
assertThat(ChangeEventUtils.resolveSchemaEvolutionTag("all"))
9898
.isEqualTo(
9999
Arrays.asList(

flink-cdc-common/src/test/java/org/apache/flink/cdc/common/utils/SchemaUtilsTest.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@
3737
import java.util.Map;
3838

3939
/** A test for the {@link org.apache.flink.cdc.common.utils.SchemaUtils}. */
40-
public class SchemaUtilsTest {
40+
class SchemaUtilsTest {
4141

4242
@Test
43-
public void testApplyColumnSchemaChangeEvent() {
43+
void testApplyColumnSchemaChangeEvent() {
4444
TableId tableId = TableId.parse("default.default.table1");
4545
Schema schema =
4646
Schema.newBuilder()
@@ -165,7 +165,7 @@ public void testApplyColumnSchemaChangeEvent() {
165165
}
166166

167167
@Test
168-
public void testGetNumericPrecision() {
168+
void testGetNumericPrecision() {
169169
Assertions.assertThat(SchemaUtils.getNumericPrecision(DataTypes.TINYINT())).isEqualTo(3);
170170
Assertions.assertThat(SchemaUtils.getNumericPrecision(DataTypes.SMALLINT())).isEqualTo(5);
171171
Assertions.assertThat(SchemaUtils.getNumericPrecision(DataTypes.INT())).isEqualTo(10);
@@ -180,7 +180,7 @@ public void testGetNumericPrecision() {
180180
}
181181

182182
@Test
183-
public void testInferWiderType() {
183+
void testInferWiderType() {
184184
Assertions.assertThat(
185185
SchemaUtils.inferWiderType(DataTypes.BINARY(17), DataTypes.BINARY(17)))
186186
.isEqualTo(DataTypes.BINARY(17));
@@ -353,7 +353,7 @@ public void testInferWiderType() {
353353
}
354354

355355
@Test
356-
public void testInferWiderColumn() {
356+
void testInferWiderColumn() {
357357
// Test normal merges
358358
Assertions.assertThat(
359359
SchemaUtils.inferWiderColumn(
@@ -385,7 +385,7 @@ public void testInferWiderColumn() {
385385
}
386386

387387
@Test
388-
public void testInferWiderSchema() {
388+
void testInferWiderSchema() {
389389
// Test normal merges
390390
Assertions.assertThat(
391391
SchemaUtils.inferWiderSchema(

flink-cdc-common/src/test/java/org/apache/flink/cdc/common/utils/StringUtilsTest.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@
1717

1818
package org.apache.flink.cdc.common.utils;
1919

20-
import org.junit.Assert;
21-
import org.junit.Test;
20+
import org.assertj.core.api.Assertions;
21+
import org.junit.jupiter.api.Test;
2222

2323
/** A test for the {@link StringUtils}. */
24-
public class StringUtilsTest {
24+
class StringUtilsTest {
2525
@Test
26-
public void testConvertToCamelCase() {
26+
void testConvertToCamelCase() {
2727
String str = "AA_BB CC";
2828
String camelCaseStr = StringUtils.convertToCamelCase(str);
29-
Assert.assertEquals("aaBbCc", camelCaseStr);
29+
Assertions.assertThat(camelCaseStr).isEqualTo("aaBbCc");
3030
}
3131
}

flink-cdc-composer/src/test/java/org/apache/flink/cdc/composer/flink/FlinkEnvironmentUtilsTest.java

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,31 +23,33 @@
2323

2424
import org.apache.flink.shaded.guava31.com.google.common.collect.Lists;
2525

26-
import org.junit.Assert;
27-
import org.junit.Test;
26+
import org.assertj.core.api.Assertions;
27+
import org.junit.jupiter.api.Test;
2828

2929
import java.net.URL;
3030
import java.util.Collections;
3131
import java.util.List;
3232

3333
/** Test for {@link FlinkEnvironmentUtils}. */
34-
public class FlinkEnvironmentUtilsTest {
34+
class FlinkEnvironmentUtilsTest {
3535

3636
@Test
37-
public void testAddJars() throws Exception {
37+
void testAddJars() throws Exception {
3838
Configuration configuration = new Configuration();
39-
configuration.set(PipelineOptions.JARS, Collections.EMPTY_LIST);
39+
configuration.set(PipelineOptions.JARS, Collections.emptyList());
4040
StreamExecutionEnvironment env =
4141
StreamExecutionEnvironment.createLocalEnvironment(configuration);
4242

4343
FlinkEnvironmentUtils.addJar(
4444
env, Lists.newArrayList(new URL("file://a.jar"), new URL("file://a.jar")));
4545
List<String> expectedJars = Lists.newArrayList("file://a.jar");
46-
Assert.assertEquals(expectedJars, env.getConfiguration().get(PipelineOptions.JARS));
46+
Assertions.assertThat(env.getConfiguration().get(PipelineOptions.JARS))
47+
.isEqualTo(expectedJars);
4748

4849
FlinkEnvironmentUtils.addJar(
4950
env, Lists.newArrayList(new URL("file://b.jar"), new URL("file://a.jar")));
5051
expectedJars.add("file://b.jar");
51-
Assert.assertEquals(expectedJars, env.getConfiguration().get(PipelineOptions.JARS));
52+
Assertions.assertThat(env.getConfiguration().get(PipelineOptions.JARS))
53+
.isEqualTo(expectedJars);
5254
}
5355
}

flink-cdc-composer/src/test/java/org/apache/flink/cdc/composer/flink/FlinkPipelineComposerITCase.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@ void testTransform(ValuesDataSink.SinkApi sinkApi) throws Exception {
337337
sourceDef,
338338
sinkDef,
339339
Collections.emptyList(),
340-
new ArrayList<>(Arrays.asList(transformDef)),
340+
new ArrayList<>(Collections.singletonList(transformDef)),
341341
Collections.emptyList(),
342342
pipelineConfig);
343343

flink-cdc-composer/src/test/java/org/apache/flink/cdc/composer/flink/FlinkPipelineComposerLenientITCase.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -381,7 +381,7 @@ void testTransform(ValuesDataSink.SinkApi sinkApi) throws Exception {
381381
sourceDef,
382382
sinkDef,
383383
Collections.emptyList(),
384-
new ArrayList<>(Arrays.asList(transformDef)),
384+
new ArrayList<>(Collections.singletonList(transformDef)),
385385
Collections.emptyList(),
386386
pipelineConfig);
387387

0 commit comments

Comments
 (0)