Add isNotEmpty method in CollectionUtils (and tests)

perwendel · Apr 4, 2018 · 9c5cab7 · 9c5cab7
1 parent 030e9d0
commit 9c5cab7
Show file tree

Hide file tree

Showing 2 changed files with 54 additions and 4 deletions.
diff --git a/src/main/java/spark/utils/CollectionUtils.java b/src/main/java/spark/utils/CollectionUtils.java
@@ -42,4 +42,15 @@ public static boolean isEmpty(Collection<?> collection) {
         return (collection == null || collection.isEmpty());
     }
 
+    /**
+     * Return {@code true} if the supplied Collection is not {@code null} and not empty.
+     * Otherwise, return {@code false}.
+     *
+     * @param collection the Collection to check
+     * @return whether the given Collection is not empty
+     */
+    public static boolean isNotEmpty(Collection<?> collection) {
+        return !isEmpty(collection);
+    }
+
 }
diff --git a/src/test/java/spark/utils/CollectionUtilsTest.java b/src/test/java/spark/utils/CollectionUtilsTest.java
@@ -10,21 +10,60 @@
 public class CollectionUtilsTest {
 
     @Test
-    public void testIsEmpty_whenCollectionIsEmpty_thenReturnTrue() throws Exception {
+    public void testIsEmpty_whenCollectionIsEmpty_thenReturnTrue() {
 
         Collection<Object> testCollection = new ArrayList<>();
 
         assertTrue("Should return true because collection is empty", CollectionUtils.isEmpty(testCollection));
+
     }
 
     @Test
-    public void testIsEmpty_whenCollectionIsNotEmpty_thenReturnFalse() throws Exception {
+    public void testIsEmpty_whenCollectionIsNotEmpty_thenReturnFalse() {
 
         Collection<Integer> testCollection = new ArrayList<>();
         testCollection.add(1);
         testCollection.add(2);
 
-        assertFalse("Should return false because collection is empty", CollectionUtils.isEmpty(testCollection));
+        assertFalse("Should return false because collection is not empty", CollectionUtils.isEmpty(testCollection));
+
+    }
+
+    @Test
+    public void testIsEmpty_whenCollectionIsNull_thenReturnTrue() {
+
+        Collection<Integer> testCollection = null;
+
+        assertTrue("Should return true because collection is null", CollectionUtils.isEmpty(testCollection));
+
+    }
+
+    @Test
+    public void testIsNotEmpty_whenCollectionIsEmpty_thenReturnFalse() {
+
+        Collection<Object> testCollection = new ArrayList<>();
+
+        assertFalse("Should return false because collection is empty", CollectionUtils.isNotEmpty(testCollection));
+
+    }
+
+    @Test
+    public void testIsNotEmpty_whenCollectionIsNotEmpty_thenReturnTrue() {
+
+        Collection<Integer> testCollection = new ArrayList<>();
+        testCollection.add(1);
+        testCollection.add(2);
+
+        assertTrue("Should return true because collection is not empty", CollectionUtils.isNotEmpty(testCollection));
+
+    }
+
+    @Test
+    public void testIsNotEmpty_whenCollectionIsNull_thenReturnFalse() {
+
+        Collection<Object> testCollection = null;
+
+        assertFalse("Should return false because collection is null", CollectionUtils.isNotEmpty(testCollection));
 
     }
-}
+}