This is an automated email from the ASF dual-hosted git repository.
chengzhang 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 5e6575b1762 Use assertThat instead of assertNotEquals (#29858)
5e6575b1762 is described below
commit 5e6575b176243be256b28f753ae15051fb49a216
Author: Liang Zhang <[email protected]>
AuthorDate: Thu Jan 25 20:33:58 2024 +0800
Use assertThat instead of assertNotEquals (#29858)
---
.../binder/context/segment/select/orderby/OrderByItemTest.java | 5 +++--
.../org/apache/shardingsphere/infra/datanode/DataNodeTest.java | 5 +++--
.../pool/props/domain/DataSourcePoolPropertiesTest.java | 5 +++--
.../result/RecordSingleTableInventoryCalculatedResultTest.java | 8 ++++----
.../table/calculator/TableDataConsistencyCheckerFactoryTest.java | 5 +++--
5 files changed, 16 insertions(+), 12 deletions(-)
diff --git
a/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/context/segment/select/orderby/OrderByItemTest.java
b/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/context/segment/select/orderby/OrderByItemTest.java
index b38c5bd4427..45473410113 100644
---
a/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/context/segment/select/orderby/OrderByItemTest.java
+++
b/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/context/segment/select/orderby/OrderByItemTest.java
@@ -20,13 +20,14 @@ package
org.apache.shardingsphere.infra.binder.context.segment.select.orderby;
import
org.apache.shardingsphere.sql.parser.sql.common.segment.dml.order.item.OrderByItemSegment;
import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.mockito.Mockito.mock;
class OrderByItemTest {
+ @SuppressWarnings({"SimplifiableAssertion", "ConstantValue"})
@Test
void assertEqualsWhenObjIsNull() {
- assertNotEquals(null, new OrderByItem(mock(OrderByItemSegment.class)));
+ assertFalse(new
OrderByItem(mock(OrderByItemSegment.class)).equals(null));
}
}
diff --git
a/infra/common/src/test/java/org/apache/shardingsphere/infra/datanode/DataNodeTest.java
b/infra/common/src/test/java/org/apache/shardingsphere/infra/datanode/DataNodeTest.java
index e876e1be61c..55fd5113faa 100644
---
a/infra/common/src/test/java/org/apache/shardingsphere/infra/datanode/DataNodeTest.java
+++
b/infra/common/src/test/java/org/apache/shardingsphere/infra/datanode/DataNodeTest.java
@@ -23,7 +23,7 @@ import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertThrows;
class DataNodeTest {
@@ -50,13 +50,14 @@ class DataNodeTest {
assertThrows(InvalidDataNodesFormatException.class, () -> new
DataNode("ds_0,tbl_0"));
}
+ @SuppressWarnings({"SimplifiableAssertion", "ConstantValue"})
@Test
void assertEquals() {
DataNode dataNode = new DataNode("ds_0.tbl_0");
assertThat(dataNode, is(new DataNode("ds_0.tbl_0")));
assertThat(dataNode, is(dataNode));
assertThat(dataNode, not(new DataNode("ds_0.tbl_1")));
- assertNotEquals(null, dataNode);
+ assertFalse(dataNode.equals(null));
}
@Test
diff --git
a/infra/data-source-pool/core/src/test/java/org/apache/shardingsphere/infra/datasource/pool/props/domain/DataSourcePoolPropertiesTest.java
b/infra/data-source-pool/core/src/test/java/org/apache/shardingsphere/infra/datasource/pool/props/domain/DataSourcePoolPropertiesTest.java
index a61b94d56ab..6913942ecb2 100644
---
a/infra/data-source-pool/core/src/test/java/org/apache/shardingsphere/infra/datasource/pool/props/domain/DataSourcePoolPropertiesTest.java
+++
b/infra/data-source-pool/core/src/test/java/org/apache/shardingsphere/infra/datasource/pool/props/domain/DataSourcePoolPropertiesTest.java
@@ -32,7 +32,7 @@ import static org.hamcrest.CoreMatchers.instanceOf;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -98,9 +98,10 @@ class DataSourcePoolPropertiesTest {
is(new
DataSourcePoolProperties(MockedDataSource.class.getName(),
createUserProperties("root"))));
}
+ @SuppressWarnings({"SimplifiableAssertion", "ConstantValue"})
@Test
void assertNotEqualsWithNullValue() {
- assertNotEquals(null, new
DataSourcePoolProperties(MockedDataSource.class.getName(), new HashMap<>()));
+ assertFalse(new
DataSourcePoolProperties(MockedDataSource.class.getName(), new
HashMap<>()).equals(null));
}
@Test
diff --git
a/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/consistencycheck/result/RecordSingleTableInventoryCalculatedResultTest.java
b/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/consistencycheck/result/RecordSingleTableInventoryCalculatedResultTest.java
index 7603b8de762..15e7f4a09f6 100644
---
a/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/consistencycheck/result/RecordSingleTableInventoryCalculatedResultTest.java
+++
b/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/consistencycheck/result/RecordSingleTableInventoryCalculatedResultTest.java
@@ -27,8 +27,8 @@ import java.util.Collections;
import java.util.Map;
import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.jupiter.api.Assertions.assertNotEquals;
class RecordSingleTableInventoryCalculatedResultTest {
@@ -64,14 +64,14 @@ class RecordSingleTableInventoryCalculatedResultTest {
void assertRecordsCountNotEquals() {
RecordSingleTableInventoryCalculatedResult result1 = new
RecordSingleTableInventoryCalculatedResult(1000,
Collections.singletonList(buildFixedFullTypeRecord()));
RecordSingleTableInventoryCalculatedResult result2 = new
RecordSingleTableInventoryCalculatedResult(1000, Collections.emptyList());
- assertNotEquals(result1, result2);
+ assertThat(result1, not(result2));
}
@Test
void assertMaxUniqueKeyValueNotEquals() {
RecordSingleTableInventoryCalculatedResult result1 = new
RecordSingleTableInventoryCalculatedResult(1000,
Collections.singletonList(buildFixedFullTypeRecord()));
RecordSingleTableInventoryCalculatedResult result2 = new
RecordSingleTableInventoryCalculatedResult(1001,
Collections.singletonList(buildFixedFullTypeRecord()));
- assertNotEquals(result1, result2);
+ assertThat(result1, not(result2));
}
@Test
@@ -81,7 +81,7 @@ class RecordSingleTableInventoryCalculatedResultTest {
record.forEach((key, value) -> {
RecordSingleTableInventoryCalculatedResult result2 = new
RecordSingleTableInventoryCalculatedResult(1000,
Collections.singletonList(modifyColumnValueRandomly(buildFixedFullTypeRecord(),
key)));
- assertNotEquals(result1, result2);
+ assertThat(result1, not(result2));
});
}
diff --git
a/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/consistencycheck/table/calculator/TableDataConsistencyCheckerFactoryTest.java
b/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/consistencycheck/table/calculator/TableDataConsistencyCheckerFactoryTest.java
index 0db13255e7f..fa169faef96 100644
---
a/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/consistencycheck/table/calculator/TableDataConsistencyCheckerFactoryTest.java
+++
b/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/consistencycheck/table/calculator/TableDataConsistencyCheckerFactoryTest.java
@@ -25,8 +25,9 @@ import org.junit.jupiter.api.Test;
import java.util.Properties;
+import static org.hamcrest.CoreMatchers.not;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.assertInstanceOf;
-import static org.junit.jupiter.api.Assertions.assertNotEquals;
class TableDataConsistencyCheckerFactoryTest {
@@ -41,6 +42,6 @@ class TableDataConsistencyCheckerFactoryTest {
void assertNewInstancesDifferent() {
TableDataConsistencyChecker actual1 =
TableDataConsistencyCheckerFactory.newInstance("DATA_MATCH", new Properties());
TableDataConsistencyChecker actual2 =
TableDataConsistencyCheckerFactory.newInstance("DATA_MATCH", new Properties());
- assertNotEquals(actual1, actual2);
+ assertThat(actual1, not(actual2));
}
}
