You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by ki...@apache.org on 2020/04/18 23:40:11 UTC

[commons-collections] branch master updated: Simplify several assertions in ListUtilsTest.

This is an automated email from the ASF dual-hosted git repository.

kinow 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 e264482  Simplify several assertions in ListUtilsTest.
     new ff178a3  Merge pull request #151 from Isira-Seneviratne/Simplify_assertions_in_ListUtilsTest
e264482 is described below

commit e264482529c54dd2bc4a3495e6b218373fe9e9e0
Author: Isira Seneviratne <is...@gmail.com>
AuthorDate: Sat Apr 18 18:03:51 2020 +0530

    Simplify several assertions in ListUtilsTest.
---
 .../apache/commons/collections4/ListUtilsTest.java | 36 +++++++++++-----------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/test/java/org/apache/commons/collections4/ListUtilsTest.java b/src/test/java/org/apache/commons/collections4/ListUtilsTest.java
index 8d26760..1a375b1 100644
--- a/src/test/java/org/apache/commons/collections4/ListUtilsTest.java
+++ b/src/test/java/org/apache/commons/collections4/ListUtilsTest.java
@@ -203,13 +203,13 @@ public class ListUtilsTest {
         final List<String> a = new ArrayList<>( data );
         final List<String> b = new ArrayList<>( data );
 
-        assertEquals(true, a.equals(b));
-        assertEquals(true, ListUtils.isEqualList(a, b));
+        assertEquals(a, b);
+        assertTrue(ListUtils.isEqualList(a, b));
         a.clear();
-        assertEquals(false, ListUtils.isEqualList(a, b));
-        assertEquals(false, ListUtils.isEqualList(a, null));
-        assertEquals(false, ListUtils.isEqualList(null, b));
-        assertEquals(true, ListUtils.isEqualList(null, null));
+        assertFalse(ListUtils.isEqualList(a, b));
+        assertFalse(ListUtils.isEqualList(a, null));
+        assertFalse(ListUtils.isEqualList(null, b));
+        assertTrue(ListUtils.isEqualList(null, null));
     }
 
     @Test
@@ -219,12 +219,12 @@ public class ListUtilsTest {
         final List<String> a = new ArrayList<>(data);
         final List<String> b = new ArrayList<>(data);
 
-        assertEquals(true, a.hashCode() == b.hashCode());
-        assertEquals(true, a.hashCode() == ListUtils.hashCodeForList(a));
-        assertEquals(true, b.hashCode() == ListUtils.hashCodeForList(b));
-        assertEquals(true, ListUtils.hashCodeForList(a) == ListUtils.hashCodeForList(b));
+        assertEquals(a.hashCode(), b.hashCode());
+        assertEquals(a.hashCode(), ListUtils.hashCodeForList(a));
+        assertEquals(b.hashCode(), ListUtils.hashCodeForList(b));
+        assertEquals(ListUtils.hashCodeForList(a), ListUtils.hashCodeForList(b));
         a.clear();
-        assertEquals(false, ListUtils.hashCodeForList(a) == ListUtils.hashCodeForList(b));
+        assertNotEquals(ListUtils.hashCodeForList(a), ListUtils.hashCodeForList(b));
         assertEquals(0, ListUtils.hashCodeForList(null));
     }
 
@@ -236,11 +236,11 @@ public class ListUtilsTest {
         sub.add(x);
 
         final List<String> retained = ListUtils.retainAll(fullList, sub);
-        assertTrue(retained.size() == 2);
+        assertEquals(2, retained.size());
         sub.remove(x);
-        assertTrue(retained.equals(sub));
+        assertEquals(retained, sub);
         fullList.retainAll(sub);
-        assertTrue(retained.equals(fullList));
+        assertEquals(retained, fullList);
 
         try {
             ListUtils.retainAll(null, null);
@@ -256,9 +256,9 @@ public class ListUtilsTest {
         sub.add(x);
 
         final List<String> remainder = ListUtils.removeAll(fullList, sub);
-        assertTrue(remainder.size() == 3);
+        assertEquals(3, remainder.size());
         fullList.removeAll(sub);
-        assertTrue(remainder.equals(fullList));
+        assertEquals(remainder, fullList);
 
         try {
             ListUtils.removeAll(null, null);
@@ -278,7 +278,7 @@ public class ListUtilsTest {
         sub.add(a);
 
         final List<String> result = ListUtils.subtract(list, sub);
-        assertTrue(result.size() == 3);
+        assertEquals(3, result.size());
 
         final List<String> expected = new ArrayList<>();
         expected.add(b);
@@ -305,7 +305,7 @@ public class ListUtilsTest {
         sub.add(null);
 
         final List<String> result = ListUtils.subtract(list, sub);
-        assertTrue(result.size() == 3);
+        assertEquals(3, result.size());
 
         final List<String> expected = new ArrayList<>();
         expected.add(a);