Use assertThat instead of assertNotEquals (apache#29858)

hunkier · Jan 25, 2024 · 5e6575b · 5e6575b
1 parent 2691ec9
commit 5e6575b
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 12 deletions.
diff --git a/...rg/apache/shardingsphere/infra/binder/context/segment/select/orderby/OrderByItemTest.java b/...rg/apache/shardingsphere/infra/binder/context/segment/select/orderby/OrderByItemTest.java
@@ -20,13 +20,14 @@
 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
@@ -23,7 +23,7 @@
 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 @@ void assertNewValidDataNodeWithInvalidDelimiter() {
         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/...pache/shardingsphere/infra/datasource/pool/props/domain/DataSourcePoolPropertiesTest.java b/...pache/shardingsphere/infra/datasource/pool/props/domain/DataSourcePoolPropertiesTest.java
@@ -32,7 +32,7 @@
 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 @@ void assertEquals() {
                 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/...pipeline/core/consistencycheck/result/RecordSingleTableInventoryCalculatedResultTest.java b/...pipeline/core/consistencycheck/result/RecordSingleTableInventoryCalculatedResultTest.java
@@ -27,8 +27,8 @@
 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 @@ void assertFullTypeRecordsEqualsWithDifferentDecimalScale() {
     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 @@ void assertRandomColumnValueNotEquals() {
         record.forEach((key, value) -> {
             RecordSingleTableInventoryCalculatedResult result2 = new RecordSingleTableInventoryCalculatedResult(1000,
                     Collections.singletonList(modifyColumnValueRandomly(buildFixedFullTypeRecord(), key)));
-            assertNotEquals(result1, result2);
+            assertThat(result1, not(result2));
         });
     }
 

diff --git a/...peline/core/consistencycheck/table/calculator/TableDataConsistencyCheckerFactoryTest.java b/...peline/core/consistencycheck/table/calculator/TableDataConsistencyCheckerFactoryTest.java
@@ -25,8 +25,9 @@
 
 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 @@ void assertNewInstanceTypeMatched() {
     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));
     }
 }