[tests] Correct the argument order of assertArrayEqualInOrder/assertArrayEqualAnyOrder

pull/459/head
Leonard Xu 3 years ago
parent 669b0916f7
commit e5eca5066d

@ -113,7 +113,7 @@ public class BinlogSplitReaderTest extends MySqlParallelSourceTestBase {
1, 1,
expected.length, expected.length,
splits.get(splits.size() - 1).getTableId()); splits.get(splits.size() - 1).getTableId());
assertEqualsInAnyOrder(actual, Arrays.asList(expected)); assertEqualsInAnyOrder(Arrays.asList(expected), actual);
} }
@Test @Test
@ -176,7 +176,7 @@ public class BinlogSplitReaderTest extends MySqlParallelSourceTestBase {
splits.size(), splits.size(),
expected.length, expected.length,
splits.get(splits.size() - 1).getTableId()); splits.get(splits.size() - 1).getTableId());
assertEqualsInAnyOrder(actual, Arrays.asList(expected)); assertEqualsInAnyOrder(Arrays.asList(expected), actual);
} }
@Test @Test
@ -216,7 +216,7 @@ public class BinlogSplitReaderTest extends MySqlParallelSourceTestBase {
splits.size(), splits.size(),
expected.length, expected.length,
splits.get(splits.size() - 1).getTableId()); splits.get(splits.size() - 1).getTableId());
assertEqualsInAnyOrder(actual, Arrays.asList(expected)); assertEqualsInAnyOrder(Arrays.asList(expected), actual);
} }
@Test @Test
@ -278,7 +278,7 @@ public class BinlogSplitReaderTest extends MySqlParallelSourceTestBase {
customerDatabase.getDatabaseName() customerDatabase.getDatabaseName()
+ "." + "."
+ "customer_card_single_line")); + "customer_card_single_line"));
assertEqualsInAnyOrder(actual, Arrays.asList(expected)); assertEqualsInAnyOrder(Arrays.asList(expected), actual);
} }
@Test @Test
@ -310,7 +310,7 @@ public class BinlogSplitReaderTest extends MySqlParallelSourceTestBase {
}; };
List<String> actual = List<String> actual =
readBinlogSplitsFromLatestOffset(dataType, configuration, expected.length); readBinlogSplitsFromLatestOffset(dataType, configuration, expected.length);
assertEqualsInOrder(actual, Arrays.asList(expected)); assertEqualsInOrder(Arrays.asList(expected), actual);
} }
private List<String> readBinlogSplitsFromLatestOffset( private List<String> readBinlogSplitsFromLatestOffset(

@ -87,7 +87,7 @@ public class SnapshotSplitReaderTest extends MySqlParallelSourceTestBase {
"+I[123, user_9, Shanghai, 123567891234]" "+I[123, user_9, Shanghai, 123567891234]"
}; };
List<String> actual = readTableSnapshotSplits(mySqlSplits, configuration, 1, dataType); List<String> actual = readTableSnapshotSplits(mySqlSplits, configuration, 1, dataType);
assertEqualsInAnyOrder(actual, Arrays.asList(expected)); assertEqualsInAnyOrder(Arrays.asList(expected), actual);
} }
@Test @Test
@ -127,7 +127,7 @@ public class SnapshotSplitReaderTest extends MySqlParallelSourceTestBase {
}; };
List<String> actual = List<String> actual =
readTableSnapshotSplits(mySqlSplits, configuration, mySqlSplits.size(), dataType); readTableSnapshotSplits(mySqlSplits, configuration, mySqlSplits.size(), dataType);
assertEqualsInAnyOrder(actual, Arrays.asList(expected)); assertEqualsInAnyOrder(Arrays.asList(expected), actual);
} }
@Test @Test
@ -143,7 +143,7 @@ public class SnapshotSplitReaderTest extends MySqlParallelSourceTestBase {
String[] expected = new String[] {"+I[20001, LEVEL_1, user_1, user with level 1]"}; String[] expected = new String[] {"+I[20001, LEVEL_1, user_1, user with level 1]"};
List<String> actual = List<String> actual =
readTableSnapshotSplits(mySqlSplits, configuration, mySqlSplits.size(), dataType); readTableSnapshotSplits(mySqlSplits, configuration, mySqlSplits.size(), dataType);
assertEqualsInAnyOrder(actual, Arrays.asList(expected)); assertEqualsInAnyOrder(Arrays.asList(expected), actual);
} }
@Test @Test
@ -179,11 +179,11 @@ public class SnapshotSplitReaderTest extends MySqlParallelSourceTestBase {
"+I[40003, LEVEL_2, user_11, user with level 2]", "+I[40003, LEVEL_2, user_11, user with level 2]",
"+I[50001, LEVEL_1, user_12, user with level 1]", "+I[50001, LEVEL_1, user_12, user with level 1]",
"+I[50002, LEVEL_1, user_13, 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<String> actual = List<String> actual =
readTableSnapshotSplits(mySqlSplits, configuration, mySqlSplits.size(), dataType); readTableSnapshotSplits(mySqlSplits, configuration, mySqlSplits.size(), dataType);
assertEqualsInAnyOrder(actual, Arrays.asList(expected)); assertEqualsInAnyOrder(Arrays.asList(expected), actual);
} }
private List<String> readTableSnapshotSplits( private List<String> readTableSnapshotSplits(

@ -206,7 +206,7 @@ public class MySqlParallelSourceITCase extends MySqlParallelSourceTestBase {
} }
assertEqualsInAnyOrder( assertEqualsInAnyOrder(
fetchRows(iterator, expectedSnapshotData.size()), expectedSnapshotData); expectedSnapshotData, fetchRows(iterator, expectedSnapshotData.size()));
// second step: check the binlog data // second step: check the binlog data
for (String tableId : captureCustomerTables) { for (String tableId : captureCustomerTables) {
@ -234,13 +234,13 @@ public class MySqlParallelSourceITCase extends MySqlParallelSourceTestBase {
"+U[1010, user_11, Hangzhou, 123567891234]", "+U[1010, user_11, Hangzhou, 123567891234]",
"+I[2001, user_22, Shanghai, 123567891234]", "+I[2001, user_22, Shanghai, 123567891234]",
"+I[2002, user_23, Shanghai, 123567891234]", "+I[2002, user_23, Shanghai, 123567891234]",
"+I[2003, user_24, Shanghai, 123567891234]", "+I[2003, user_24, Shanghai, 123567891234]"
}; };
List<String> expectedBinlogData = new ArrayList<>(); List<String> expectedBinlogData = new ArrayList<>();
for (int i = 0; i < captureCustomerTables.length; i++) { for (int i = 0; i < captureCustomerTables.length; i++) {
expectedBinlogData.addAll(Arrays.asList(binlogForSingleTable)); expectedBinlogData.addAll(Arrays.asList(binlogForSingleTable));
} }
assertEqualsInAnyOrder(fetchRows(iterator, expectedBinlogData.size()), expectedBinlogData); assertEqualsInAnyOrder(expectedBinlogData, fetchRows(iterator, expectedBinlogData.size()));
tableResult.getJobClient().get().cancel().get(); tableResult.getJobClient().get().cancel().get();
} }

@ -72,16 +72,16 @@ public abstract class MySqlParallelSourceTestBase extends TestLogger {
LOG.info("Containers are started."); LOG.info("Containers are started.");
} }
public static void assertEqualsInAnyOrder(List<String> actual, List<String> expected) { public static void assertEqualsInAnyOrder(List<String> expected, List<String> actual) {
assertTrue(actual != null && expected != null); assertTrue(expected != null && actual != null);
assertEqualsInOrder( 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<String> actual, List<String> expected) { public static void assertEqualsInOrder(List<String> expected, List<String> actual) {
assertTrue(actual != null && expected != null); assertTrue(expected != null && actual != null);
assertEquals(actual.size(), expected.size()); assertEquals(expected.size(), actual.size());
assertArrayEquals(actual.toArray(new String[0]), expected.toArray(new String[0])); assertArrayEquals(expected.toArray(new String[0]), actual.toArray(new String[0]));
} }
} }

@ -91,7 +91,7 @@ public class MySqlSourceReaderTest extends MySqlParallelSourceTestBase {
}; };
// the 2 records are produced by 1 operations // the 2 records are produced by 1 operations
List<String> actualRecords = consumeRecords(reader, dataType, 1); List<String> actualRecords = consumeRecords(reader, dataType, 1);
assertEqualsInOrder(actualRecords, Arrays.asList(expectedRecords)); assertEqualsInOrder(Arrays.asList(expectedRecords), actualRecords);
List<MySqlSplit> splitsState = reader.snapshotState(1L); List<MySqlSplit> splitsState = reader.snapshotState(1L);
// check the binlog split state // check the binlog split state
assertEquals(1, splitsState.size()); assertEquals(1, splitsState.size());
@ -112,7 +112,7 @@ public class MySqlSourceReaderTest extends MySqlParallelSourceTestBase {
}; };
// the 4 records are produced by 3 operations // the 4 records are produced by 3 operations
List<String> restRecords = consumeRecords(restartReader, dataType, 3); List<String> restRecords = consumeRecords(restartReader, dataType, 3);
assertEqualsInOrder(restRecords, Arrays.asList(expectedRestRecords)); assertEqualsInOrder(Arrays.asList(expectedRestRecords), restRecords);
restartReader.close(); restartReader.close();
} }

@ -207,7 +207,7 @@ public class MySqlConnectorITCase extends MySqlParallelSourceTestBase {
}; };
List<String> actual = TestValuesTableFactory.getResults("sink"); List<String> actual = TestValuesTableFactory.getResults("sink");
assertEqualsInAnyOrder(actual, Arrays.asList(expected)); assertEqualsInAnyOrder(Arrays.asList(expected), actual);
result.getJobClient().get().cancel().get(); result.getJobClient().get().cancel().get();
} }
@ -270,7 +270,7 @@ public class MySqlConnectorITCase extends MySqlParallelSourceTestBase {
"+I[109, spare tire, 24 inch spare tire, 22.200]" "+I[109, spare tire, 24 inch spare tire, 22.200]"
}; };
assertEqualsInAnyOrder( assertEqualsInAnyOrder(
fetchRows(iterator, expectedSnapshot.length), Arrays.asList(expectedSnapshot)); Arrays.asList(expectedSnapshot), fetchRows(iterator, expectedSnapshot.length));
try (Connection connection = inventoryDatabase.getJdbcConnection(); try (Connection connection = inventoryDatabase.getJdbcConnection();
Statement statement = connection.createStatement()) { Statement statement = connection.createStatement()) {
@ -296,7 +296,7 @@ public class MySqlConnectorITCase extends MySqlParallelSourceTestBase {
"-D[111, scooter, Big 2-wheel scooter , 5.170]" "-D[111, scooter, Big 2-wheel scooter , 5.170]"
}; };
assertEqualsInOrder( assertEqualsInOrder(
fetchRows(iterator, expectedBinlog.length), Arrays.asList(expectedBinlog)); Arrays.asList(expectedBinlog), fetchRows(iterator, expectedBinlog.length));
result.getJobClient().get().cancel().get(); result.getJobClient().get().cancel().get();
} }
@ -398,7 +398,7 @@ public class MySqlConnectorITCase extends MySqlParallelSourceTestBase {
}; };
assertEqualsInAnyOrder( assertEqualsInAnyOrder(
fetchRows(result.collect(), expected.length), Arrays.asList(expected)); Arrays.asList(expected), fetchRows(result.collect(), expected.length));
result.getJobClient().get().cancel().get(); result.getJobClient().get().cancel().get();
} }
@ -471,7 +471,7 @@ public class MySqlConnectorITCase extends MySqlParallelSourceTestBase {
"-D[111, scooter, Big 2-wheel scooter , 5.170]" "-D[111, scooter, Big 2-wheel scooter , 5.170]"
}; };
assertEqualsInAnyOrder( assertEqualsInAnyOrder(
fetchRows(result.collect(), expected.length), Arrays.asList(expected)); Arrays.asList(expected), fetchRows(result.collect(), expected.length));
result.getJobClient().get().cancel().get(); result.getJobClient().get().cancel().get();
} }
@ -537,10 +537,10 @@ public class MySqlConnectorITCase extends MySqlParallelSourceTestBase {
"+I[417022095255614379, China, Beijing, West Town address 3]", "+I[417022095255614379, China, Beijing, West Town address 3]",
"-U[416927583791428523, China, Beijing, West Town address 2]", "-U[416927583791428523, China, Beijing, West Town address 2]",
"+U[416927583791428523, China, Hangzhou, 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( assertEqualsInAnyOrder(
fetchRows(result.collect(), expected.length), Arrays.asList(expected)); Arrays.asList(expected), fetchRows(result.collect(), expected.length));
result.getJobClient().get().cancel().get(); 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]"}; new String[] {"+I[110, jacket, new water resistent white wind breaker, 0.500]"};
List<String> actual = TestValuesTableFactory.getResults("sink"); List<String> actual = TestValuesTableFactory.getResults("sink");
assertEqualsInAnyOrder(actual, Arrays.asList(expected)); assertEqualsInAnyOrder(Arrays.asList(expected), actual);
result.getJobClient().get().cancel().get(); result.getJobClient().get().cancel().get();
} }
@ -714,7 +714,7 @@ public class MySqlConnectorITCase extends MySqlParallelSourceTestBase {
}; };
List<String> actual = TestValuesTableFactory.getResults("sink"); List<String> actual = TestValuesTableFactory.getResults("sink");
assertEqualsInAnyOrder(actual, Arrays.asList(expected)); assertEqualsInAnyOrder(Arrays.asList(expected), actual);
result.getJobClient().get().cancel().get(); 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]"}; new String[] {"+I[110, jacket, new water resistent white wind breaker, 0.500]"};
List<String> actual = TestValuesTableFactory.getResults("sink"); List<String> actual = TestValuesTableFactory.getResults("sink");
assertEqualsInAnyOrder(actual, Arrays.asList(expected)); assertEqualsInAnyOrder(Arrays.asList(expected), actual);
result.getJobClient().get().cancel().get(); result.getJobClient().get().cancel().get();
} }

@ -188,10 +188,10 @@ public class MysqlTimezoneITCase {
CloseableIterator<Row> iterator = result.collect(); CloseableIterator<Row> iterator = result.collect();
String[] expectedSnapshot = String[] expectedSnapshot =
new String[] { 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( assertEqualsInAnyOrder(
fetchRows(iterator, expectedSnapshot.length), Arrays.asList(expectedSnapshot)); Arrays.asList(expectedSnapshot), fetchRows(iterator, expectedSnapshot.length));
try (Connection connection = fullTypesDatabase.getJdbcConnection(); try (Connection connection = fullTypesDatabase.getJdbcConnection();
Statement statement = connection.createStatement()) { Statement statement = connection.createStatement()) {
@ -207,7 +207,7 @@ public class MysqlTimezoneITCase {
}; };
assertEqualsInOrder( assertEqualsInOrder(
fetchRows(iterator, expectedBinlog.length), Arrays.asList(expectedBinlog)); Arrays.asList(expectedBinlog), fetchRows(iterator, expectedBinlog.length));
result.getJobClient().get().cancel().get(); result.getJobClient().get().cancel().get();
} }

Loading…
Cancel
Save