You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by ji...@apache.org on 2022/11/23 02:12:22 UTC
[shardingsphere] branch master updated: Use assertThat to instead of assertEquals. (#22347)
This is an automated email from the ASF dual-hosted git repository.
jianglongtao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new 20c1f8f082d Use assertThat to instead of assertEquals. (#22347)
20c1f8f082d is described below
commit 20c1f8f082d642543a8e8e678915f40d84092f62
Author: yx9o <ya...@163.com>
AuthorDate: Wed Nov 23 10:12:17 2022 +0800
Use assertThat to instead of assertEquals. (#22347)
---
.../algorithm/DataMatchCalculatedResultTest.java | 21 +++++++++++----------
...aMatchDataConsistencyCalculateAlgorithmTest.java | 5 ++---
2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/check/consistency/algorithm/DataMatchCalculatedResultTest.java b/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/check/consistency/algorithm/DataMatchCalculatedResultTest.java
index 7c34e83393d..066118ca30b 100644
--- a/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/check/consistency/algorithm/DataMatchCalculatedResultTest.java
+++ b/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/check/consistency/algorithm/DataMatchCalculatedResultTest.java
@@ -29,23 +29,24 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.List;
-import static org.junit.Assert.assertEquals;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertNotEquals;
public final class DataMatchCalculatedResultTest {
@Test
public void assertEmptyRecordsEquals() {
- CalculatedResult result1 = new CalculatedResult(0, 0, Collections.emptyList());
- CalculatedResult result2 = new CalculatedResult(0, 0, Collections.emptyList());
- assertEquals(result1, result2);
+ CalculatedResult actual = new CalculatedResult(0, 0, Collections.emptyList());
+ CalculatedResult expected = new CalculatedResult(0, 0, Collections.emptyList());
+ assertThat(actual, is(expected));
}
@Test
public void assertFullTypeRecordsEquals() {
- CalculatedResult result1 = new CalculatedResult(1000, 2, Arrays.asList(buildFixedFullTypeRecord(), buildFixedFullTypeRecord()));
- CalculatedResult result2 = new CalculatedResult(1000, 2, Arrays.asList(buildFixedFullTypeRecord(), buildFixedFullTypeRecord()));
- assertEquals(result1, result2);
+ CalculatedResult actual = new CalculatedResult(1000, 2, Arrays.asList(buildFixedFullTypeRecord(), buildFixedFullTypeRecord()));
+ CalculatedResult expected = new CalculatedResult(1000, 2, Arrays.asList(buildFixedFullTypeRecord(), buildFixedFullTypeRecord()));
+ assertThat(actual, is(expected));
}
private List<Object> buildFixedFullTypeRecord() {
@@ -55,7 +56,7 @@ public final class DataMatchCalculatedResultTest {
@Test
public void assertFullTypeRecordsEqualsWithDifferentDecimalScale() {
- CalculatedResult result1 = new CalculatedResult(1000, 1, Collections.singletonList(buildFixedFullTypeRecord()));
+ CalculatedResult expected = new CalculatedResult(1000, 1, Collections.singletonList(buildFixedFullTypeRecord()));
List<Object> record = buildFixedFullTypeRecord();
for (int index = 0; index < record.size(); index++) {
if (record.get(index) instanceof BigDecimal) {
@@ -63,8 +64,8 @@ public final class DataMatchCalculatedResultTest {
record.set(index, decimal.setScale(decimal.scale() + 1, RoundingMode.CEILING));
}
}
- CalculatedResult result2 = new CalculatedResult(1000, 1, Collections.singletonList(record));
- assertEquals(result1, result2);
+ CalculatedResult actual = new CalculatedResult(1000, 1, Collections.singletonList(record));
+ assertThat(actual, is(expected));
}
@Test
diff --git a/test/pipeline/src/test/java/org/apache/shardingsphere/data/pipeline/core/check/consistency/algorithm/DataMatchDataConsistencyCalculateAlgorithmTest.java b/test/pipeline/src/test/java/org/apache/shardingsphere/data/pipeline/core/check/consistency/algorithm/DataMatchDataConsistencyCalculateAlgorithmTest.java
index e784fb3ff66..00e1933fa1b 100644
--- a/test/pipeline/src/test/java/org/apache/shardingsphere/data/pipeline/core/check/consistency/algorithm/DataMatchDataConsistencyCalculateAlgorithmTest.java
+++ b/test/pipeline/src/test/java/org/apache/shardingsphere/data/pipeline/core/check/consistency/algorithm/DataMatchDataConsistencyCalculateAlgorithmTest.java
@@ -37,7 +37,6 @@ import java.util.Optional;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
public final class DataMatchDataConsistencyCalculateAlgorithmTest {
@@ -94,7 +93,7 @@ public final class DataMatchDataConsistencyCalculateAlgorithmTest {
assertTrue(targetCalculateResult.get().getMaxUniqueKeyValue().isPresent());
assertThat(sourceCalculateResult.get().getMaxUniqueKeyValue().get(), is(targetCalculateResult.get().getMaxUniqueKeyValue().get()));
assertThat(targetCalculateResult.get().getMaxUniqueKeyValue().get(), is(5L));
- assertEquals(sourceCalculateResult.get(), targetCalculateResult.get());
+ assertThat(sourceCalculateResult.get(), is(targetCalculateResult.get()));
}
@Test
@@ -111,7 +110,7 @@ public final class DataMatchDataConsistencyCalculateAlgorithmTest {
assertTrue(targetCalculateResult.get().getMaxUniqueKeyValue().isPresent());
assertThat(sourceCalculateResult.get().getMaxUniqueKeyValue().get(), is(targetCalculateResult.get().getMaxUniqueKeyValue().get()));
assertThat(targetCalculateResult.get().getMaxUniqueKeyValue().get(), is(10L));
- assertEquals(sourceCalculateResult.get(), targetCalculateResult.get());
+ assertThat(sourceCalculateResult.get(), is(targetCalculateResult.get()));
}
private DataConsistencyCalculateParameter generateParameter(final PipelineDataSourceWrapper dataSource, final String logicTableName, final Object dataCheckPositionValue) {