This is an automated email from the ASF dual-hosted git repository.
tison pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/zookeeper.git
The following commit(s) were added to refs/heads/master by this push:
new 03a36d08e ZOOKEEPER-4738: Refactor assertFalse(equals()) with
assertNotEquals (#2055)
03a36d08e is described below
commit 03a36d08e257c43e8377e5549d5524805fc6b8bb
Author: Taher Ghaleb <[email protected]>
AuthorDate: Tue Aug 29 23:25:41 2023 -0400
ZOOKEEPER-4738: Refactor assertFalse(equals()) with assertNotEquals (#2055)
---
.../zookeeper/server/ReferenceCountedACLCacheTest.java | 14 +++++++-------
.../java/org/apache/zookeeper/server/util/AdHashTest.java | 4 ++--
.../test/java/org/apache/zookeeper/test/CreateTest.java | 4 ++--
.../java/org/apache/zookeeper/test/MultiOperationTest.java | 6 +++---
4 files changed, 14 insertions(+), 14 deletions(-)
diff --git
a/zookeeper-server/src/test/java/org/apache/zookeeper/server/ReferenceCountedACLCacheTest.java
b/zookeeper-server/src/test/java/org/apache/zookeeper/server/ReferenceCountedACLCacheTest.java
index e7bb38da9..83b1a1542 100644
---
a/zookeeper-server/src/test/java/org/apache/zookeeper/server/ReferenceCountedACLCacheTest.java
+++
b/zookeeper-server/src/test/java/org/apache/zookeeper/server/ReferenceCountedACLCacheTest.java
@@ -19,7 +19,7 @@
package org.apache.zookeeper.server;
import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
import static org.junit.jupiter.api.Assertions.fail;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -61,7 +61,7 @@ public class ReferenceCountedACLCacheTest {
testACL2.add(new ACL(ZooDefs.Perms.WRITE, new Id("scheme", "rw")));
testACL2.add(new ACL(ZooDefs.Perms.READ, new Id("scheme", "ro")));
- assertFalse(aclId.equals(cache.convertAcls(testACL2)));
+ assertNotEquals(aclId, cache.convertAcls(testACL2));
}
@Test
@@ -90,7 +90,7 @@ public class ReferenceCountedACLCacheTest {
List<ACL> testACL3 = createACL("differentId");
Long aclId3 = cache.convertAcls(testACL3);
- assertFalse(aclId3.equals(aclId));
+ assertNotEquals(aclId3, aclId);
assertEquals(2, cache.size());
}
@@ -126,7 +126,7 @@ public class ReferenceCountedACLCacheTest {
assertEquals(1, cache.size());
Long newId = cache.convertAcls(testACL);
- assertFalse(aclId.equals(newId));
+ assertNotEquals(aclId, newId);
}
@Test
@@ -255,9 +255,9 @@ public class ReferenceCountedACLCacheTest {
assertEquals(2, deserializedCache.size());
assertEquals(aclId1, deserializedCache.convertAcls(acl1));
assertEquals(aclId2, deserializedCache.convertAcls(acl2));
- assertFalse(acl3.equals(deserializedCache.convertAcls(acl3)));
- assertFalse(acl4.equals(deserializedCache.convertAcls(acl4)));
- assertFalse(acl5.equals(deserializedCache.convertAcls(acl5)));
+ assertNotEquals(acl3, deserializedCache.convertAcls(acl3));
+ assertNotEquals(acl4, deserializedCache.convertAcls(acl4));
+ assertNotEquals(acl5, deserializedCache.convertAcls(acl5));
}
private void callAddUsageNTimes(ReferenceCountedACLCache
deserializedCache, Long aclId, int num) {
diff --git
a/zookeeper-server/src/test/java/org/apache/zookeeper/server/util/AdHashTest.java
b/zookeeper-server/src/test/java/org/apache/zookeeper/server/util/AdHashTest.java
index 9a1a0cad5..866cf9546 100644
---
a/zookeeper-server/src/test/java/org/apache/zookeeper/server/util/AdHashTest.java
+++
b/zookeeper-server/src/test/java/org/apache/zookeeper/server/util/AdHashTest.java
@@ -19,7 +19,7 @@
package org.apache.zookeeper.server.util;
import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
import java.util.ArrayList;
import java.util.List;
import java.util.Random;
@@ -78,7 +78,7 @@ public class AdHashTest extends ZKTestCase {
addListOfDigests(hashall, bucket3);
addListOfDigests(hashall, bucket4);
addListOfDigests(hashall, bucket5);
- assertFalse(hashall.equals(hash21), "digest of different set not
different");
+ assertNotEquals(hashall, hash21, "digest of different set not
different");
removeListOfDigests(hashall, bucket4);
removeListOfDigests(hashall, bucket5);
addListOfDigests(hash21, bucket3);
diff --git
a/zookeeper-server/src/test/java/org/apache/zookeeper/test/CreateTest.java
b/zookeeper-server/src/test/java/org/apache/zookeeper/test/CreateTest.java
index eddcd1de0..953c17443 100644
--- a/zookeeper-server/src/test/java/org/apache/zookeeper/test/CreateTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/CreateTest.java
@@ -19,7 +19,7 @@
package org.apache.zookeeper.test;
import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
import java.io.IOException;
@@ -65,7 +65,7 @@ public class CreateTest extends ClientBase {
Stat stat = createWithStatVerifyResult("/foo");
Stat childStat = createWithStatVerifyResult("/foo/child");
// Don't expect to get the same stats for different creates.
- assertFalse(stat.equals(childStat));
+ assertNotEquals(stat, childStat);
}
@Test
diff --git
a/zookeeper-server/src/test/java/org/apache/zookeeper/test/MultiOperationTest.java
b/zookeeper-server/src/test/java/org/apache/zookeeper/test/MultiOperationTest.java
index fd7b8a02f..53b75ec32 100644
---
a/zookeeper-server/src/test/java/org/apache/zookeeper/test/MultiOperationTest.java
+++
b/zookeeper-server/src/test/java/org/apache/zookeeper/test/MultiOperationTest.java
@@ -667,9 +667,9 @@ public class MultiOperationTest extends ClientBase {
private void opEquals(OpResult expected, OpResult value, OpResult near) {
assertEquals(value, value);
- assertFalse(value.equals(new Object()));
- assertFalse(value.equals(near));
- assertFalse(value.equals(value instanceof CreateResult ? new
ErrorResult(1) : new CreateResult("nope2")));
+ assertNotEquals(value, new Object());
+ assertNotEquals(value, near);
+ assertNotEquals(value, (value instanceof CreateResult ? new
ErrorResult(1) : new CreateResult("nope2")));
assertTrue(value.equals(expected));
}
