Add object methods support every(), all(), some() and any().

Author: javadev

src/main/java/com/github/underscore/$.java

@@ -334,18 +334,34 @@ public Boolean apply(E arg) {
         }).isPresent();
     }
 
+    public boolean every(final Predicate<T> pred) {
+        return every(iterable, pred);
+    }
+
     public static <E> boolean all(final Iterable<E> iterable, final Predicate<E> pred) {
         return every(iterable, pred);
     }
 
+    public boolean all(final Predicate<T> pred) {
+        return every(iterable, pred);
+    }
+
     public static <E> boolean some(final Iterable<E> iterable, final Predicate<E> pred) {
         return find(iterable, pred).isPresent();
     }
 
+    public boolean some(final Predicate<T> pred) {
+        return some(iterable, pred);
+    }
+
     public static <E> boolean any(final Iterable<E> iterable, final Predicate<E> pred) {
         return some(iterable, pred);
     }
 
+    public boolean any(final Predicate<T> pred) {
+        return some(iterable, pred);
+    }
+
     public static <E> boolean contains(final Iterable<E> iterable, final E elem) {
         return some(iterable, new Predicate<E>() {
             @Override

src/test/java/com/github/underscore/CollectionsTest.java

@@ -440,26 +440,80 @@ public Boolean apply(Integer item) {
         assertEquals("[1, 3, 5]", resultSet.toString());
     }
 
+/*
+_.every([1, 2, 3, 4], function(num) { return num % 2 === 0; }); // false
+_.every([1, 2, 3, 4], function(num) { return num < 5; }); // true
+*/
+    @Test
+    public void every() {
+        final boolean result1 = $.every(asList(1, 2, 3, 4),
+            new Predicate<Integer>() {
+            public Boolean apply(Integer item) {
+                return item % 2 == 0;
+            }
+        });
+        final boolean result1obj = new $(asList(1, 2, 3, 4))
+            .every(
+            new Predicate<Integer>() {
+            public Boolean apply(Integer item) {
+                return item % 2 == 0;
+            }
+        });
+        final boolean result2 = $.every(asList(1, 2, 3, 4),
+            new Predicate<Integer>() {
+            public Boolean apply(Integer item) {
+                return item < 5;
+            }
+        });
+        final boolean result2obj = new $(asList(1, 2, 3, 4))
+            .every(
+            new Predicate<Integer>() {
+            public Boolean apply(Integer item) {
+                return item < 5;
+            }
+        });
+        assertFalse(result1);
+        assertFalse(result1obj);
+        assertTrue(result2);
+        assertTrue(result2obj);
+    }
+
 /*
 _.all([1, 2, 3, 4], function(num) { return num % 2 === 0; }); // false
 _.all([1, 2, 3, 4], function(num) { return num < 5; }); // true
 */
     @Test
     public void all() {
-        final Boolean result1 = $.all(asList(1, 2, 3, 4),
+        final boolean result1 = $.all(asList(1, 2, 3, 4),
+            new Predicate<Integer>() {
+            public Boolean apply(Integer item) {
+                return item % 2 == 0;
+            }
+        });
+        final boolean result1obj = new $(asList(1, 2, 3, 4))
+            .all(
             new Predicate<Integer>() {
             public Boolean apply(Integer item) {
                 return item % 2 == 0;
             }
         });
-        final Boolean result2 = $.all(asList(1, 2, 3, 4),
+        final boolean result2 = $.all(asList(1, 2, 3, 4),
+            new Predicate<Integer>() {
+            public Boolean apply(Integer item) {
+                return item < 5;
+            }
+        });
+        final boolean result2obj = new $(asList(1, 2, 3, 4))
+            .all(
             new Predicate<Integer>() {
             public Boolean apply(Integer item) {
                 return item < 5;
             }
         });
         assertFalse(result1);
+        assertFalse(result1obj);
         assertTrue(result2);
+        assertTrue(result2obj);
     }
 
 /*
@@ -468,20 +522,36 @@ public Boolean apply(Integer item) {
 */
     @Test
     public void any() {
-        final Boolean result1 = $.any(asList(1, 2, 3, 4),
+        final boolean result1 = $.any(asList(1, 2, 3, 4),
+            new Predicate<Integer>() {
+            public Boolean apply(Integer item) {
+                return item % 2 == 0;
+            }
+        });
+        final boolean result1obj = new $(asList(1, 2, 3, 4))
+            .any(
             new Predicate<Integer>() {
             public Boolean apply(Integer item) {
                 return item % 2 == 0;
             }
         });
-        final Boolean result2 = $.any(asList(1, 2, 3, 4),
+        final boolean result2 = $.any(asList(1, 2, 3, 4),
+            new Predicate<Integer>() {
+            public Boolean apply(Integer item) {
+                return item == 5;
+            }
+        });
+        final boolean result2obj = new $(asList(1, 2, 3, 4))
+            .any(
             new Predicate<Integer>() {
             public Boolean apply(Integer item) {
                 return item == 5;
             }
         });
         assertTrue(result1);
+        assertTrue(result1obj);
         assertFalse(result2);
+        assertFalse(result2obj);
     }
 
 /*

src/test/java/com/github/underscore/FunctionsTest.java

@@ -146,7 +146,7 @@ public void once() throws Exception {
         Function<Void> onceIncr = $.once(incr);
         onceIncr.apply();
         onceIncr.apply();
-        Thread.sleep(48);
+        Thread.sleep(60);
         assertEquals("incr was called only once", 1, counter[0]);
     }