Merge branch '__rultor'

yegor256 · Apr 12, 2018 · b4223ce · b4223ce
2 parents f08a43d + 8dce6a3
commit b4223ce
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 0 deletions.
diff --git a/src/main/java/org/cactoos/scalar/Or.java b/src/main/java/org/cactoos/scalar/Or.java
@@ -42,6 +42,7 @@
  * use {@link UncheckedScalar} or {@link IoCheckedScalar} decorators.</p>
  *
  * @author Vseslav Sekorin (vssekorin@gmail.com)
+ * @author Mehmet Yildirim (memoyil@gmail.com)
  * @version $Id$
  * @since 0.8
  */
@@ -121,6 +122,22 @@ public <X> Or(final Func<X, Boolean> func, final Iterable<X> src) {
         );
     }
 
+    /**
+     * Ctor.
+     * @param subject The subject
+     * @param conditions Funcs to map
+     * @param <X> Type of items in the iterable
+     */
+    @SafeVarargs
+    public <X> Or(final X subject, final Func<X, Boolean>... conditions) {
+        this(
+            new Mapped<>(
+                item -> (Scalar<Boolean>) () -> item.apply(subject),
+                new IterableOf<>(conditions)
+            )
+        );
+    }
+
     /**
      * Ctor.
      * @param scalar The Scalar.

diff --git a/src/test/java/org/cactoos/scalar/OrTest.java b/src/test/java/org/cactoos/scalar/OrTest.java
@@ -38,6 +38,7 @@
  * Test case for {@link Or}.
  *
  * @author Vseslav Sekorin (vssekorin@gmail.com)
+ * @author Mehmet Yildirim (memoyil@gmail.com)
  * @version $Id$
  * @since 0.8
  * @checkstyle JavadocMethodCheck (500 lines)
@@ -144,4 +145,31 @@ public void testFuncVarargs() throws Exception {
             new ScalarHasValue<>(false)
         );
     }
+
+    @Test
+    public void testMultipleFuncConditionTrue() throws Exception {
+        MatcherAssert.assertThat(
+            "Can't compare subject with true conditions",
+            new Or(
+                3,
+                input -> input > 0,
+                input -> input > 5,
+                input -> input > 4
+            ),
+            new ScalarHasValue<>(true)
+        );
+    }
+
+    @Test
+    public void testMultipleFuncConditionFalse() throws Exception {
+        MatcherAssert.assertThat(
+            "Can't compare subject with false conditions",
+            new Or(
+                "cactoos",
+                input -> input.contains("singleton"),
+                input -> input.contains("static")
+            ),
+            new ScalarHasValue<>(false)
+        );
+    }
 }