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 index 426de1196..4bdf1a168 100644 --- 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 @@ -20,7 +20,7 @@ package org.apache.flink.cdc.cli; import org.apache.flink.cdc.composer.PipelineComposer; import org.apache.flink.cdc.composer.PipelineExecution; import org.apache.flink.cdc.composer.definition.PipelineDef; -import org.apache.flink.runtime.jobgraph.RestoreMode; +import org.apache.flink.core.execution.RestoreMode; import org.apache.flink.shaded.guava31.com.google.common.io.Resources; diff --git a/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-starrocks/pom.xml b/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-starrocks/pom.xml index db198c973..2848a010d 100644 --- a/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-starrocks/pom.xml +++ b/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-starrocks/pom.xml @@ -28,7 +28,8 @@ limitations under the License. flink-cdc-pipeline-connector-starrocks - 1.2.10_flink-${flink.major.version} + + 1.2.10_flink-1.19 @@ -108,4 +109,4 @@ limitations under the License. - \ No newline at end of file + diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/org/apache/flink/cdc/connectors/mongodb/LegacyMongoDBTestBase.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/org/apache/flink/cdc/connectors/mongodb/LegacyMongoDBTestBase.java index 9e95779d5..b5c6523b0 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/org/apache/flink/cdc/connectors/mongodb/LegacyMongoDBTestBase.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/org/apache/flink/cdc/connectors/mongodb/LegacyMongoDBTestBase.java @@ -17,7 +17,7 @@ package org.apache.flink.cdc.connectors.mongodb; -import org.apache.flink.test.util.AbstractTestBase; +import org.apache.flink.test.util.AbstractTestBaseJUnit4; import com.mongodb.ConnectionString; import com.mongodb.MongoClientSettings; @@ -41,7 +41,7 @@ import static org.apache.flink.cdc.connectors.mongodb.LegacyMongoDBContainer.MON * Basic class for testing MongoDB source, this contains a MongoDB container which enables change * streams. */ -public class LegacyMongoDBTestBase extends AbstractTestBase { +public class LegacyMongoDBTestBase extends AbstractTestBaseJUnit4 { private static final Logger LOG = LoggerFactory.getLogger(LegacyMongoDBTestBase.class); diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/LegacyMySqlTestBase.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/LegacyMySqlTestBase.java index 08377c1d7..5885d820f 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/LegacyMySqlTestBase.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/LegacyMySqlTestBase.java @@ -18,7 +18,7 @@ package org.apache.flink.cdc.connectors.mysql; import org.apache.flink.cdc.connectors.mysql.testutils.MySqlContainer; -import org.apache.flink.test.util.AbstractTestBase; +import org.apache.flink.test.util.AbstractTestBaseJUnit4; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -33,7 +33,7 @@ import java.util.stream.Stream; * Basic class for testing MySQL binlog source, this contains a MySQL container which enables * binlog. */ -public abstract class LegacyMySqlTestBase extends AbstractTestBase { +public abstract class LegacyMySqlTestBase extends AbstractTestBaseJUnit4 { private static final Logger LOG = LoggerFactory.getLogger(LegacyMySqlTestBase.class); diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/polardbx/PolardbxSourceTestBase.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/polardbx/PolardbxSourceTestBase.java index 65149c883..ff6b95ebd 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/polardbx/PolardbxSourceTestBase.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/polardbx/PolardbxSourceTestBase.java @@ -19,7 +19,7 @@ package org.apache.flink.cdc.connectors.polardbx; import org.apache.flink.cdc.common.utils.TestCaseUtils; import org.apache.flink.table.planner.factories.TestValuesTableFactory; -import org.apache.flink.test.util.AbstractTestBase; +import org.apache.flink.test.util.AbstractTestBaseJUnit4; import org.apache.flink.types.Row; import org.apache.commons.lang3.StringUtils; @@ -59,7 +59,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; /** Basic class for testing Database Polardbx which supported the mysql protocol. */ -public abstract class PolardbxSourceTestBase extends AbstractTestBase { +public abstract class PolardbxSourceTestBase extends AbstractTestBaseJUnit4 { private static final Logger LOG = LoggerFactory.getLogger(PolardbxSourceTestBase.class); private static final Pattern COMMENT_PATTERN = Pattern.compile("^(.*)--.*$"); diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/test/java/org/apache/flink/cdc/connectors/oceanbase/OceanBaseTestBase.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/test/java/org/apache/flink/cdc/connectors/oceanbase/OceanBaseTestBase.java index 9766da916..ca97e1a18 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/test/java/org/apache/flink/cdc/connectors/oceanbase/OceanBaseTestBase.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/test/java/org/apache/flink/cdc/connectors/oceanbase/OceanBaseTestBase.java @@ -20,7 +20,7 @@ package org.apache.flink.cdc.connectors.oceanbase; import org.apache.flink.cdc.connectors.oceanbase.testutils.OceanBaseCdcMetadata; import org.apache.flink.table.planner.factories.TestValuesTableFactory; import org.apache.flink.table.utils.LegacyRowResource; -import org.apache.flink.test.util.AbstractTestBase; +import org.apache.flink.test.util.AbstractTestBaseJUnit4; import org.junit.ClassRule; @@ -43,7 +43,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; /** Basic class for testing OceanBase source. */ -public abstract class OceanBaseTestBase extends AbstractTestBase { +public abstract class OceanBaseTestBase extends AbstractTestBaseJUnit4 { private static final Pattern COMMENT_PATTERN = Pattern.compile("^(.*)--.*$"); diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/org/apache/flink/cdc/connectors/postgres/PostgresTestBase.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/org/apache/flink/cdc/connectors/postgres/PostgresTestBase.java index c63dec1e7..aa72c3643 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/org/apache/flink/cdc/connectors/postgres/PostgresTestBase.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/org/apache/flink/cdc/connectors/postgres/PostgresTestBase.java @@ -21,7 +21,7 @@ import org.apache.flink.cdc.connectors.postgres.source.PostgresConnectionPoolFac import org.apache.flink.cdc.connectors.postgres.source.config.PostgresSourceConfigFactory; import org.apache.flink.cdc.connectors.postgres.testutils.UniqueDatabase; import org.apache.flink.table.planner.factories.TestValuesTableFactory; -import org.apache.flink.test.util.AbstractTestBase; +import org.apache.flink.test.util.AbstractTestBaseJUnit4; import org.apache.flink.types.Row; import io.debezium.config.Configuration; @@ -63,7 +63,7 @@ import static org.junit.Assert.assertTrue; * Basic class for testing PostgreSQL source, this contains a PostgreSQL container which enables wal * log. */ -public abstract class PostgresTestBase extends AbstractTestBase { +public abstract class PostgresTestBase extends AbstractTestBaseJUnit4 { private static final Logger LOG = LoggerFactory.getLogger(PostgresTestBase.class); public static final Pattern COMMENT_PATTERN = Pattern.compile("^(.*)--.*$"); public static final String DEFAULT_DB = "postgres"; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/test/java/org/apache/flink/cdc/connectors/sqlserver/SqlServerTestBase.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/test/java/org/apache/flink/cdc/connectors/sqlserver/SqlServerTestBase.java index d107ea5f4..66bf9ddac 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/test/java/org/apache/flink/cdc/connectors/sqlserver/SqlServerTestBase.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/test/java/org/apache/flink/cdc/connectors/sqlserver/SqlServerTestBase.java @@ -18,7 +18,7 @@ package org.apache.flink.cdc.connectors.sqlserver; import org.apache.flink.table.planner.factories.TestValuesTableFactory; -import org.apache.flink.test.util.AbstractTestBase; +import org.apache.flink.test.util.AbstractTestBaseJUnit4; import org.awaitility.Awaitility; import org.awaitility.core.ConditionTimeoutException; @@ -49,7 +49,7 @@ import java.util.stream.Stream; import static org.junit.Assert.assertNotNull; /** Utility class for sqlserver tests. */ -public class SqlServerTestBase extends AbstractTestBase { +public class SqlServerTestBase extends AbstractTestBaseJUnit4 { private static final Logger LOG = LoggerFactory.getLogger(SqlServerTestBase.class); private static final Pattern COMMENT_PATTERN = Pattern.compile("^(.*)--.*$"); diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/test/java/org/apache/flink/cdc/connectors/tidb/TiDBTestBase.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/test/java/org/apache/flink/cdc/connectors/tidb/TiDBTestBase.java index 7c32539e4..584143eb3 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/test/java/org/apache/flink/cdc/connectors/tidb/TiDBTestBase.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/test/java/org/apache/flink/cdc/connectors/tidb/TiDBTestBase.java @@ -17,7 +17,7 @@ package org.apache.flink.cdc.connectors.tidb; -import org.apache.flink.test.util.AbstractTestBase; +import org.apache.flink.test.util.AbstractTestBaseJUnit4; import com.alibaba.dcm.DnsCacheManipulator; import org.apache.commons.lang3.RandomUtils; @@ -53,7 +53,7 @@ import java.util.stream.Stream; import static org.junit.Assert.assertNotNull; /** Utility class for tidb tests. */ -public class TiDBTestBase extends AbstractTestBase { +public class TiDBTestBase extends AbstractTestBaseJUnit4 { private static final Logger LOG = LoggerFactory.getLogger(TiDBTestBase.class); private static final Pattern COMMENT_PATTERN = Pattern.compile("^(.*)--.*$"); diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-vitess-cdc/src/test/java/org/apache/flink/cdc/connectors/vitess/VitessTestBase.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-vitess-cdc/src/test/java/org/apache/flink/cdc/connectors/vitess/VitessTestBase.java index 494c77987..38aa7bb79 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-vitess-cdc/src/test/java/org/apache/flink/cdc/connectors/vitess/VitessTestBase.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-vitess-cdc/src/test/java/org/apache/flink/cdc/connectors/vitess/VitessTestBase.java @@ -18,7 +18,7 @@ package org.apache.flink.cdc.connectors.vitess; import org.apache.flink.cdc.connectors.vitess.container.VitessContainer; -import org.apache.flink.test.util.AbstractTestBase; +import org.apache.flink.test.util.AbstractTestBaseJUnit4; import org.junit.BeforeClass; import org.slf4j.Logger; @@ -43,7 +43,7 @@ import java.util.stream.Stream; import static org.junit.Assert.assertNotNull; /** Basic class for testing Vitess source, this contains a Vitess container. */ -public abstract class VitessTestBase extends AbstractTestBase { +public abstract class VitessTestBase extends AbstractTestBaseJUnit4 { private static final Logger LOG = LoggerFactory.getLogger(VitessTestBase.class); private static final Pattern COMMENT_PATTERN = Pattern.compile("^(.*)--.*$"); diff --git a/flink-cdc-e2e-tests/flink-cdc-pipeline-e2e-tests/pom.xml b/flink-cdc-e2e-tests/flink-cdc-pipeline-e2e-tests/pom.xml index ebbc41b25..0f68dcc69 100644 --- a/flink-cdc-e2e-tests/flink-cdc-pipeline-e2e-tests/pom.xml +++ b/flink-cdc-e2e-tests/flink-cdc-pipeline-e2e-tests/pom.xml @@ -33,7 +33,8 @@ limitations under the License. 1.19 1.20 8.0.27 - 1.2.10_flink-${flink.major.version} + + 1.2.10_flink-${flink-major-1.19} 0.9.0 diff --git a/flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/SerializerTestBase.java b/flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/SerializerTestBase.java index db91c4a8c..43f6e7ea6 100644 --- a/flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/SerializerTestBase.java +++ b/flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/SerializerTestBase.java @@ -50,9 +50,9 @@ import java.util.ArrayList; import java.util.List; import java.util.concurrent.CyclicBarrier; +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; @@ -486,7 +486,9 @@ public abstract class SerializerTestBase { // -------------------------------------------------------------------------------------------- private void deepEquals(String message, T should, T is) { - assertThat(message, is, CustomEqualityMatcher.deeplyEquals(should).withChecker(checker)); + assertThat(is) + .as(message) + .matches(CustomEqualityMatcher.deeplyEquals(should).withChecker(checker)); } // -------------------------------------------------------------------------------------------- @@ -580,11 +582,12 @@ public abstract class SerializerTestBase { T serdeTestItem = serializer.deserialize(dataInputDeserializer); T copySerdeTestItem = serializer.copy(serdeTestItem); dataOutputSerializer.clear(); - - assertThat( - "Serialization/Deserialization cycle resulted in an object that are not equal to the original.", - copySerdeTestItem, - CustomEqualityMatcher.deeplyEquals(testItem).withChecker(checker)); + assertThat(copySerdeTestItem) + .as( + "Serialization/Deserialization cycle resulted in an object that are not equal to the original.") + .matches( + CustomEqualityMatcher.deeplyEquals(testItem) + .withChecker(checker)); // try to enforce some upper bound to the test time if (System.nanoTime() >= endTimeNanos) { diff --git a/pom.xml b/pom.xml index 20c6bcdef..99fdb5760 100644 --- a/pom.xml +++ b/pom.xml @@ -67,8 +67,8 @@ limitations under the License. true - 1.19.1 - 1.19 + 1.20.0 + 1.20 17.0 1.9.8.Final 3.2.0