This is an automated email from the ASF dual-hosted git repository.
garydgregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-collections.git
The following commit(s) were added to refs/heads/master by this push:
new 8b2f1e0f9 Better JUnit API usage
8b2f1e0f9 is described below
commit 8b2f1e0f94f36313a6763a5cd05ba6d098792262
Author: Gary Gregory <[email protected]>
AuthorDate: Mon Jul 27 14:58:04 2026 +0000
Better JUnit API usage
---
.../comparators/FixedOrderComparatorTest.java | 11 +++++-----
.../list/CursorableLinkedListTest.java | 25 +++++++++++-----------
.../commons/collections4/map/Flat3MapTest.java | 5 +++--
.../collections4/map/ReferenceIdentityMapTest.java | 3 ++-
.../multiset/AbstractMultiSetTest.java | 5 +++--
5 files changed, 27 insertions(+), 22 deletions(-)
diff --git
a/src/test/java/org/apache/commons/collections4/comparators/FixedOrderComparatorTest.java
b/src/test/java/org/apache/commons/collections4/comparators/FixedOrderComparatorTest.java
index d9a1b187e..2a8a92c70 100644
---
a/src/test/java/org/apache/commons/collections4/comparators/FixedOrderComparatorTest.java
+++
b/src/test/java/org/apache/commons/collections4/comparators/FixedOrderComparatorTest.java
@@ -18,6 +18,7 @@ package org.apache.commons.collections4.comparators;
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.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -43,7 +44,7 @@ class FixedOrderComparatorTest extends
AbstractComparatorTest<String> {
void expectFalseWhenBothComparatorsWithDifferentItems() {
final FixedOrderComparator<Integer> comparator1 = new
FixedOrderComparator<>(1, 2, 3);
final FixedOrderComparator<Integer> comparator2 = new
FixedOrderComparator<>(2, 3, 4);
- assertFalse(comparator1.equals(comparator2));
+ assertNotEquals(comparator1, comparator2);
}
@Test
@@ -52,13 +53,13 @@ class FixedOrderComparatorTest extends
AbstractComparatorTest<String> {
comparator1.setUnknownObjectBehavior(FixedOrderComparator.UnknownObjectBehavior.BEFORE);
final FixedOrderComparator<Integer> comparator2 = new
FixedOrderComparator<>();
comparator2.setUnknownObjectBehavior(FixedOrderComparator.UnknownObjectBehavior.AFTER);
- assertFalse(comparator1.equals(comparator2));
+ assertNotEquals(comparator1, comparator2);
}
@Test
void expectFalseWhenFixedOrderComparatorIsComparedWithNull() {
final FixedOrderComparator<Integer> comparator = new
FixedOrderComparator<>();
- assertFalse(comparator.equals(null));
+ assertNotEquals(comparator, null);
}
@Test
@@ -72,14 +73,14 @@ class FixedOrderComparatorTest extends
AbstractComparatorTest<String> {
final FixedOrderComparator<Integer> comparator1 = new
FixedOrderComparator<>(1, 2, 3);
final FixedOrderComparator<Integer> comparator2 = new
FixedOrderComparator<>(1, 2, 3);
comparator2.compare(1, 2);
- assertFalse(comparator1.equals(comparator2));
+ assertNotEquals(comparator1, comparator2);
}
@Test
void expectFalseWhenOneComparatorsWithDuplicateItems() {
final FixedOrderComparator<Integer> comparator1 = new
FixedOrderComparator<>(1, 2, 3);
final FixedOrderComparator<Integer> comparator2 = new
FixedOrderComparator<>(1, 2, 3, 3);
- assertFalse(comparator1.equals(comparator2));
+ assertNotEquals(comparator1, comparator2);
}
@Test
diff --git
a/src/test/java/org/apache/commons/collections4/list/CursorableLinkedListTest.java
b/src/test/java/org/apache/commons/collections4/list/CursorableLinkedListTest.java
index d8bcc695a..f8028a3f0 100644
---
a/src/test/java/org/apache/commons/collections4/list/CursorableLinkedListTest.java
+++
b/src/test/java/org/apache/commons/collections4/list/CursorableLinkedListTest.java
@@ -18,6 +18,7 @@ package org.apache.commons.collections4.list;
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.assertNotSame;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertSame;
@@ -469,12 +470,12 @@ public class CursorableLinkedListTest<E> extends
AbstractLinkedListTest<E> {
assertEquals(list.hashCode(), list.hashCode());
final CursorableLinkedList<E> list2 = new CursorableLinkedList<>();
- assertFalse(list.equals(list2));
- assertFalse(list2.equals(list));
+ assertNotEquals(list, list2);
+ assertNotEquals(list2, list);
final java.util.List<E> list3 = new java.util.LinkedList<>();
- assertFalse(list.equals(list3));
- assertFalse(list3.equals(list));
+ assertNotEquals(list, list3);
+ assertNotEquals(list3, list);
assertEquals(list2, list3);
assertEquals(list3, list2);
assertEquals(list2.hashCode(), list3.hashCode());
@@ -482,8 +483,8 @@ public class CursorableLinkedListTest<E> extends
AbstractLinkedListTest<E> {
list2.add((E) "A");
assertEquals(list, list2);
assertEquals(list2, list);
- assertFalse(list2.equals(list3));
- assertFalse(list3.equals(list2));
+ assertNotEquals(list2, list3);
+ assertNotEquals(list3, list2);
list3.add((E) "A");
assertEquals(list2, list3);
@@ -492,10 +493,10 @@ public class CursorableLinkedListTest<E> extends
AbstractLinkedListTest<E> {
list.add((E) "B");
assertEquals(list, list);
- assertFalse(list.equals(list2));
- assertFalse(list2.equals(list));
- assertFalse(list.equals(list3));
- assertFalse(list3.equals(list));
+ assertNotEquals(list, list2);
+ assertNotEquals(list2, list);
+ assertNotEquals(list, list3);
+ assertNotEquals(list3, list);
list2.add((E) "B");
list3.add((E) "B");
@@ -520,8 +521,8 @@ public class CursorableLinkedListTest<E> extends
AbstractLinkedListTest<E> {
list.add((E) "D");
list2.addFirst((E) "D");
assertEquals(list, list);
- assertFalse(list.equals(list2));
- assertFalse(list2.equals(list));
+ assertNotEquals(list, list2);
+ assertNotEquals(list2, list);
}
@Test
diff --git
a/src/test/java/org/apache/commons/collections4/map/Flat3MapTest.java
b/src/test/java/org/apache/commons/collections4/map/Flat3MapTest.java
index ee29b6a3f..cb04f02fb 100644
--- a/src/test/java/org/apache/commons/collections4/map/Flat3MapTest.java
+++ b/src/test/java/org/apache/commons/collections4/map/Flat3MapTest.java
@@ -18,6 +18,7 @@ package org.apache.commons.collections4.map;
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.assertNotSame;
import static org.junit.jupiter.api.Assertions.assertNull;
@@ -373,7 +374,7 @@ public class Flat3MapTest<K, V> extends
AbstractIterableMapTest<K, V> {
final Flat3Map<K, V> map2 = makeObject();
map2.put((K) "a", (V) "testB");
map2.put((K) "b", (V) "testA");
- assertFalse(map1.equals(map2));
+ assertNotEquals(map1, map2);
}
// void testCreate() throws Exception {
@@ -396,7 +397,7 @@ public class Flat3MapTest<K, V> extends
AbstractIterableMapTest<K, V> {
final Flat3Map<K, V> map2 = makeObject();
map2.put((K) "a", (V) "testB");
map2.put((K) "c", (V) "testA");
- assertFalse(map1.equals(map2));
+ assertNotEquals(map1, map2);
}
@Test
diff --git
a/src/test/java/org/apache/commons/collections4/map/ReferenceIdentityMapTest.java
b/src/test/java/org/apache/commons/collections4/map/ReferenceIdentityMapTest.java
index 1bbce8ab9..287c5ba56 100644
---
a/src/test/java/org/apache/commons/collections4/map/ReferenceIdentityMapTest.java
+++
b/src/test/java/org/apache/commons/collections4/map/ReferenceIdentityMapTest.java
@@ -18,6 +18,7 @@ package org.apache.commons.collections4.map;
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 static org.junit.jupiter.api.Assertions.assertSame;
@@ -299,7 +300,7 @@ public class ReferenceIdentityMapTest<K, V> extends
AbstractIterableMapTest<K, V
assertTrue(entry1.equals(entry2));
assertTrue(entry2.equals(entry1));
- assertFalse(entry1.equals(entry3));
+ assertNotEquals(entry1, entry3);
}
@Test
diff --git
a/src/test/java/org/apache/commons/collections4/multiset/AbstractMultiSetTest.java
b/src/test/java/org/apache/commons/collections4/multiset/AbstractMultiSetTest.java
index 39b65b181..170f0c4c0 100644
---
a/src/test/java/org/apache/commons/collections4/multiset/AbstractMultiSetTest.java
+++
b/src/test/java/org/apache/commons/collections4/multiset/AbstractMultiSetTest.java
@@ -18,6 +18,7 @@ package org.apache.commons.collections4.multiset;
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.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -373,7 +374,7 @@ public abstract class AbstractMultiSetTest<T> extends
AbstractCollectionTest<T>
final MultiSet<T> multiset2 = makeObject();
assertTrue(multiset.equals(multiset2));
multiset.add((T) "A");
- assertFalse(multiset.equals(multiset2));
+ assertNotEquals(multiset, multiset2);
multiset2.add((T) "A");
assertTrue(multiset.equals(multiset2));
multiset.add((T) "A");
@@ -398,7 +399,7 @@ public abstract class AbstractMultiSetTest<T> extends
AbstractCollectionTest<T>
final MultiSet<T> multiset2 = new HashMultiSet<>();
assertTrue(multiset.equals(multiset2));
multiset.add((T) "A");
- assertFalse(multiset.equals(multiset2));
+ assertNotEquals(multiset, multiset2);
multiset2.add((T) "A");
assertTrue(multiset.equals(multiset2));
multiset.add((T) "A");
