Xor extends ScalarEnvelope and returns false for empty iterable

Signed-off-by: kokodyn <kokodyn@gmail.com>
yegor256 · Jan 14, 2021 · 8c95275 · 8c95275
1 parent 5edeb4b
commit 8c95275
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 18 deletions.
diff --git a/src/main/java/org/cactoos/scalar/Xor.java b/src/main/java/org/cactoos/scalar/Xor.java
@@ -61,12 +61,7 @@
  * @see IoChecked
  * @since 0.49
  */
-public final class Xor implements Scalar<Boolean> {
-
-    /**
-     * The iterable.
-     */
-    private final Iterable<Scalar<Boolean>> origin;
+public final class Xor extends ScalarEnvelope<Boolean> {
 
     /**
      * Ctor.
@@ -82,15 +77,12 @@ public Xor(final Scalar<Boolean>... scalar) {
      * @param iterable The iterable.
      */
     public Xor(final Iterable<Scalar<Boolean>> iterable) {
-        this.origin = iterable;
-    }
-
-    @Override
-    public Boolean value() throws Exception {
-        return new Ternary<>(
-            new LengthOf(this.origin).value() > 0,
-            new Reduced<Boolean>((a, b) -> a ^ b, this.origin),
-            new True()
-        ).value();
+        super(
+            new Ternary<>(
+                () -> new LengthOf(iterable).value() > 0,
+                new Reduced<Boolean>((a, b) -> a ^ b, iterable),
+                new False()
+            )
+        );
     }
 }
diff --git a/src/test/java/org/cactoos/scalar/XorTest.java b/src/test/java/org/cactoos/scalar/XorTest.java
@@ -109,9 +109,9 @@ void singleFalse() throws Exception {
     @Test
     void emptyIterable() throws Exception {
         new Assertion<>(
-            "Empty iterable must be True",
+            "Empty iterable must be False",
             new Xor(new IterableOf<Scalar<Boolean>>()),
-            new ScalarHasValue<>(true)
+            new ScalarHasValue<>(false)
         ).affirm();
     }