From f0dede19345435a77d740e808565a032d3a26c01 Mon Sep 17 00:00:00 2001 From: Leonard Xu Date: Wed, 22 Sep 2021 11:43:16 +0800 Subject: [PATCH] [tests] Correct the argument order of assertArrayEqualInOrder/assertArrayEqualAnyOrder --- .../reader/BinlogSplitReaderTest.java | 10 +++++----- .../reader/SnapshotSplitReaderTest.java | 10 +++++----- .../source/MySqlParallelSourceITCase.java | 6 +++--- .../source/MySqlParallelSourceTestBase.java | 16 +++++++-------- .../source/reader/MySqlSourceReaderTest.java | 4 ++-- .../mysql/table/MySqlConnectorITCase.java | 20 +++++++++---------- .../mysql/table/MysqlTimezoneITCase.java | 6 +++--- 7 files changed, 36 insertions(+), 36 deletions(-) diff --git a/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/debezium/reader/BinlogSplitReaderTest.java b/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/debezium/reader/BinlogSplitReaderTest.java index fd19379cf..3ae295286 100644 --- a/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/debezium/reader/BinlogSplitReaderTest.java +++ b/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/debezium/reader/BinlogSplitReaderTest.java @@ -113,7 +113,7 @@ public class BinlogSplitReaderTest extends MySqlParallelSourceTestBase { 1, expected.length, splits.get(splits.size() - 1).getTableId()); - assertEqualsInAnyOrder(actual, Arrays.asList(expected)); + assertEqualsInAnyOrder(Arrays.asList(expected), actual); } @Test @@ -176,7 +176,7 @@ public class BinlogSplitReaderTest extends MySqlParallelSourceTestBase { splits.size(), expected.length, splits.get(splits.size() - 1).getTableId()); - assertEqualsInAnyOrder(actual, Arrays.asList(expected)); + assertEqualsInAnyOrder(Arrays.asList(expected), actual); } @Test @@ -216,7 +216,7 @@ public class BinlogSplitReaderTest extends MySqlParallelSourceTestBase { splits.size(), expected.length, splits.get(splits.size() - 1).getTableId()); - assertEqualsInAnyOrder(actual, Arrays.asList(expected)); + assertEqualsInAnyOrder(Arrays.asList(expected), actual); } @Test @@ -278,7 +278,7 @@ public class BinlogSplitReaderTest extends MySqlParallelSourceTestBase { customerDatabase.getDatabaseName() + "." + "customer_card_single_line")); - assertEqualsInAnyOrder(actual, Arrays.asList(expected)); + assertEqualsInAnyOrder(Arrays.asList(expected), actual); } @Test @@ -310,7 +310,7 @@ public class BinlogSplitReaderTest extends MySqlParallelSourceTestBase { }; List actual = readBinlogSplitsFromLatestOffset(dataType, configuration, expected.length); - assertEqualsInOrder(actual, Arrays.asList(expected)); + assertEqualsInOrder(Arrays.asList(expected), actual); } private List readBinlogSplitsFromLatestOffset( diff --git a/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/debezium/reader/SnapshotSplitReaderTest.java b/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/debezium/reader/SnapshotSplitReaderTest.java index cf1a51102..a984629fc 100644 --- a/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/debezium/reader/SnapshotSplitReaderTest.java +++ b/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/debezium/reader/SnapshotSplitReaderTest.java @@ -87,7 +87,7 @@ public class SnapshotSplitReaderTest extends MySqlParallelSourceTestBase { "+I[123, user_9, Shanghai, 123567891234]" }; List actual = readTableSnapshotSplits(mySqlSplits, configuration, 1, dataType); - assertEqualsInAnyOrder(actual, Arrays.asList(expected)); + assertEqualsInAnyOrder(Arrays.asList(expected), actual); } @Test @@ -127,7 +127,7 @@ public class SnapshotSplitReaderTest extends MySqlParallelSourceTestBase { }; List actual = readTableSnapshotSplits(mySqlSplits, configuration, mySqlSplits.size(), dataType); - assertEqualsInAnyOrder(actual, Arrays.asList(expected)); + assertEqualsInAnyOrder(Arrays.asList(expected), actual); } @Test @@ -143,7 +143,7 @@ public class SnapshotSplitReaderTest extends MySqlParallelSourceTestBase { String[] expected = new String[] {"+I[20001, LEVEL_1, user_1, user with level 1]"}; List actual = readTableSnapshotSplits(mySqlSplits, configuration, mySqlSplits.size(), dataType); - assertEqualsInAnyOrder(actual, Arrays.asList(expected)); + assertEqualsInAnyOrder(Arrays.asList(expected), actual); } @Test @@ -179,11 +179,11 @@ public class SnapshotSplitReaderTest extends MySqlParallelSourceTestBase { "+I[40003, LEVEL_2, user_11, user with level 2]", "+I[50001, LEVEL_1, user_12, user with level 1]", "+I[50002, LEVEL_1, user_13, user with level 1]", - "+I[50003, LEVEL_1, user_14, user with level 1]", + "+I[50003, LEVEL_1, user_14, user with level 1]" }; List actual = readTableSnapshotSplits(mySqlSplits, configuration, mySqlSplits.size(), dataType); - assertEqualsInAnyOrder(actual, Arrays.asList(expected)); + assertEqualsInAnyOrder(Arrays.asList(expected), actual); } private List readTableSnapshotSplits( diff --git a/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/source/MySqlParallelSourceITCase.java b/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/source/MySqlParallelSourceITCase.java index 46a926185..6e8cf6d63 100644 --- a/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/source/MySqlParallelSourceITCase.java +++ b/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/source/MySqlParallelSourceITCase.java @@ -206,7 +206,7 @@ public class MySqlParallelSourceITCase extends MySqlParallelSourceTestBase { } assertEqualsInAnyOrder( - fetchRows(iterator, expectedSnapshotData.size()), expectedSnapshotData); + expectedSnapshotData, fetchRows(iterator, expectedSnapshotData.size())); // second step: check the binlog data for (String tableId : captureCustomerTables) { @@ -234,13 +234,13 @@ public class MySqlParallelSourceITCase extends MySqlParallelSourceTestBase { "+U[1010, user_11, Hangzhou, 123567891234]", "+I[2001, user_22, Shanghai, 123567891234]", "+I[2002, user_23, Shanghai, 123567891234]", - "+I[2003, user_24, Shanghai, 123567891234]", + "+I[2003, user_24, Shanghai, 123567891234]" }; List expectedBinlogData = new ArrayList<>(); for (int i = 0; i < captureCustomerTables.length; i++) { expectedBinlogData.addAll(Arrays.asList(binlogForSingleTable)); } - assertEqualsInAnyOrder(fetchRows(iterator, expectedBinlogData.size()), expectedBinlogData); + assertEqualsInAnyOrder(expectedBinlogData, fetchRows(iterator, expectedBinlogData.size())); tableResult.getJobClient().get().cancel().get(); } diff --git a/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/source/MySqlParallelSourceTestBase.java b/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/source/MySqlParallelSourceTestBase.java index 5e4c2835c..48d565edc 100644 --- a/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/source/MySqlParallelSourceTestBase.java +++ b/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/source/MySqlParallelSourceTestBase.java @@ -72,16 +72,16 @@ public abstract class MySqlParallelSourceTestBase extends TestLogger { LOG.info("Containers are started."); } - public static void assertEqualsInAnyOrder(List actual, List expected) { - assertTrue(actual != null && expected != null); + public static void assertEqualsInAnyOrder(List expected, List actual) { + assertTrue(expected != null && actual != null); assertEqualsInOrder( - actual.stream().sorted().collect(Collectors.toList()), - expected.stream().sorted().collect(Collectors.toList())); + expected.stream().sorted().collect(Collectors.toList()), + actual.stream().sorted().collect(Collectors.toList())); } - public static void assertEqualsInOrder(List actual, List expected) { - assertTrue(actual != null && expected != null); - assertEquals(actual.size(), expected.size()); - assertArrayEquals(actual.toArray(new String[0]), expected.toArray(new String[0])); + public static void assertEqualsInOrder(List expected, List actual) { + assertTrue(expected != null && actual != null); + assertEquals(expected.size(), actual.size()); + assertArrayEquals(expected.toArray(new String[0]), actual.toArray(new String[0])); } } diff --git a/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/source/reader/MySqlSourceReaderTest.java b/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/source/reader/MySqlSourceReaderTest.java index 17643695c..372611b2e 100644 --- a/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/source/reader/MySqlSourceReaderTest.java +++ b/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/source/reader/MySqlSourceReaderTest.java @@ -91,7 +91,7 @@ public class MySqlSourceReaderTest extends MySqlParallelSourceTestBase { }; // the 2 records are produced by 1 operations List actualRecords = consumeRecords(reader, dataType, 1); - assertEqualsInOrder(actualRecords, Arrays.asList(expectedRecords)); + assertEqualsInOrder(Arrays.asList(expectedRecords), actualRecords); List splitsState = reader.snapshotState(1L); // check the binlog split state assertEquals(1, splitsState.size()); @@ -112,7 +112,7 @@ public class MySqlSourceReaderTest extends MySqlParallelSourceTestBase { }; // the 4 records are produced by 3 operations List restRecords = consumeRecords(restartReader, dataType, 3); - assertEqualsInOrder(restRecords, Arrays.asList(expectedRestRecords)); + assertEqualsInOrder(Arrays.asList(expectedRestRecords), restRecords); restartReader.close(); } diff --git a/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/table/MySqlConnectorITCase.java b/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/table/MySqlConnectorITCase.java index d6ae29e57..73a0b21a4 100644 --- a/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/table/MySqlConnectorITCase.java +++ b/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/table/MySqlConnectorITCase.java @@ -207,7 +207,7 @@ public class MySqlConnectorITCase extends MySqlParallelSourceTestBase { }; List actual = TestValuesTableFactory.getResults("sink"); - assertEqualsInAnyOrder(actual, Arrays.asList(expected)); + assertEqualsInAnyOrder(Arrays.asList(expected), actual); result.getJobClient().get().cancel().get(); } @@ -270,7 +270,7 @@ public class MySqlConnectorITCase extends MySqlParallelSourceTestBase { "+I[109, spare tire, 24 inch spare tire, 22.200]" }; assertEqualsInAnyOrder( - fetchRows(iterator, expectedSnapshot.length), Arrays.asList(expectedSnapshot)); + Arrays.asList(expectedSnapshot), fetchRows(iterator, expectedSnapshot.length)); try (Connection connection = inventoryDatabase.getJdbcConnection(); Statement statement = connection.createStatement()) { @@ -296,7 +296,7 @@ public class MySqlConnectorITCase extends MySqlParallelSourceTestBase { "-D[111, scooter, Big 2-wheel scooter , 5.170]" }; assertEqualsInOrder( - fetchRows(iterator, expectedBinlog.length), Arrays.asList(expectedBinlog)); + Arrays.asList(expectedBinlog), fetchRows(iterator, expectedBinlog.length)); result.getJobClient().get().cancel().get(); } @@ -398,7 +398,7 @@ public class MySqlConnectorITCase extends MySqlParallelSourceTestBase { }; assertEqualsInAnyOrder( - fetchRows(result.collect(), expected.length), Arrays.asList(expected)); + Arrays.asList(expected), fetchRows(result.collect(), expected.length)); result.getJobClient().get().cancel().get(); } @@ -471,7 +471,7 @@ public class MySqlConnectorITCase extends MySqlParallelSourceTestBase { "-D[111, scooter, Big 2-wheel scooter , 5.170]" }; assertEqualsInAnyOrder( - fetchRows(result.collect(), expected.length), Arrays.asList(expected)); + Arrays.asList(expected), fetchRows(result.collect(), expected.length)); result.getJobClient().get().cancel().get(); } @@ -537,10 +537,10 @@ public class MySqlConnectorITCase extends MySqlParallelSourceTestBase { "+I[417022095255614379, China, Beijing, West Town address 3]", "-U[416927583791428523, China, Beijing, West Town address 2]", "+U[416927583791428523, China, Hangzhou, West Town address 2]", - "+I[418257940021724075, Germany, Berlin, West Town address 3]", + "+I[418257940021724075, Germany, Berlin, West Town address 3]" }; assertEqualsInAnyOrder( - fetchRows(result.collect(), expected.length), Arrays.asList(expected)); + Arrays.asList(expected), fetchRows(result.collect(), expected.length)); result.getJobClient().get().cancel().get(); } @@ -629,7 +629,7 @@ public class MySqlConnectorITCase extends MySqlParallelSourceTestBase { new String[] {"+I[110, jacket, new water resistent white wind breaker, 0.500]"}; List actual = TestValuesTableFactory.getResults("sink"); - assertEqualsInAnyOrder(actual, Arrays.asList(expected)); + assertEqualsInAnyOrder(Arrays.asList(expected), actual); result.getJobClient().get().cancel().get(); } @@ -714,7 +714,7 @@ public class MySqlConnectorITCase extends MySqlParallelSourceTestBase { }; List actual = TestValuesTableFactory.getResults("sink"); - assertEqualsInAnyOrder(actual, Arrays.asList(expected)); + assertEqualsInAnyOrder(Arrays.asList(expected), actual); result.getJobClient().get().cancel().get(); } @@ -789,7 +789,7 @@ public class MySqlConnectorITCase extends MySqlParallelSourceTestBase { new String[] {"+I[110, jacket, new water resistent white wind breaker, 0.500]"}; List actual = TestValuesTableFactory.getResults("sink"); - assertEqualsInAnyOrder(actual, Arrays.asList(expected)); + assertEqualsInAnyOrder(Arrays.asList(expected), actual); result.getJobClient().get().cancel().get(); } diff --git a/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/table/MysqlTimezoneITCase.java b/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/table/MysqlTimezoneITCase.java index ac8d72f71..5b13d8af9 100644 --- a/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/table/MysqlTimezoneITCase.java +++ b/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/table/MysqlTimezoneITCase.java @@ -188,10 +188,10 @@ public class MysqlTimezoneITCase { CloseableIterator iterator = result.collect(); String[] expectedSnapshot = new String[] { - "+I[2020-07-17, 18:00:22, 2020-07-17T18:00:22.123, 2020-07-17T18:00:22.123456, 2020-07-17T18:00:22]", + "+I[2020-07-17, 18:00:22, 2020-07-17T18:00:22.123, 2020-07-17T18:00:22.123456, 2020-07-17T18:00:22]" }; assertEqualsInAnyOrder( - fetchRows(iterator, expectedSnapshot.length), Arrays.asList(expectedSnapshot)); + Arrays.asList(expectedSnapshot), fetchRows(iterator, expectedSnapshot.length)); try (Connection connection = fullTypesDatabase.getJdbcConnection(); Statement statement = connection.createStatement()) { @@ -207,7 +207,7 @@ public class MysqlTimezoneITCase { }; assertEqualsInOrder( - fetchRows(iterator, expectedBinlog.length), Arrays.asList(expectedBinlog)); + Arrays.asList(expectedBinlog), fetchRows(iterator, expectedBinlog.length)); result.getJobClient().get().cancel().get(); }