Added EitherMatcher in place of Left/RightMatcher

7h3kk1d · jnape · commit 4491f2ac3faa · 2020-07-30T14:32:21.000-05:00
diff --git a/src/test/java/com/jnape/palatable/lambda/adt/TryTest.java b/src/test/java/com/jnape/palatable/lambda/adt/TryTest.java
@@ -41,7 +41,7 @@
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 import static testsupport.assertion.MonadErrorAssert.assertLaws;
-import static testsupport.matchers.LeftMatcher.isLeftThat;
+import static testsupport.matchers.EitherMatcher.isLeftThat;
 
 @RunWith(Traits.class)
 public class TryTest {
diff --git a/src/test/java/com/jnape/palatable/lambda/functions/builtin/fn1/CoalesceTest.java b/src/test/java/com/jnape/palatable/lambda/functions/builtin/fn1/CoalesceTest.java
@@ -8,10 +8,10 @@
 import static java.util.Arrays.asList;
 import static java.util.Collections.emptyList;
 import static org.junit.Assert.assertThat;
+import static testsupport.matchers.EitherMatcher.isLeftThat;
+import static testsupport.matchers.EitherMatcher.isRightThat;
 import static testsupport.matchers.IterableMatcher.isEmpty;
 import static testsupport.matchers.IterableMatcher.iterates;
-import static testsupport.matchers.LeftMatcher.isLeftThat;
-import static testsupport.matchers.RightMatcher.isRightThat;
 
 public class CoalesceTest {
 
diff --git a/src/test/java/com/jnape/palatable/lambda/matchers/StateMatcherTest.java b/src/test/java/com/jnape/palatable/lambda/matchers/StateMatcherTest.java
@@ -7,8 +7,8 @@
 import static com.jnape.palatable.lambda.functor.builtin.State.state;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.IsEqual.equalTo;
-import static testsupport.matchers.LeftMatcher.isLeftThat;
-import static testsupport.matchers.RightMatcher.isRightThat;
+import static testsupport.matchers.EitherMatcher.isLeftThat;
+import static testsupport.matchers.EitherMatcher.isRightThat;
 import static testsupport.matchers.StateMatcher.whenEvaluatedWith;
 import static testsupport.matchers.StateMatcher.whenExecutedWith;
 import static testsupport.matchers.StateMatcher.whenRunWith;
diff --git a/src/test/java/com/jnape/palatable/lambda/matchers/StateTMatcherTest.java b/src/test/java/com/jnape/palatable/lambda/matchers/StateTMatcherTest.java
@@ -15,9 +15,9 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.IsEqual.equalTo;
 import static org.junit.Assert.assertEquals;
+import static testsupport.matchers.EitherMatcher.isLeftThat;
+import static testsupport.matchers.EitherMatcher.isRightThat;
 import static testsupport.matchers.IOMatcher.yieldsValue;
-import static testsupport.matchers.LeftMatcher.isLeftThat;
-import static testsupport.matchers.RightMatcher.isRightThat;
 import static testsupport.matchers.StateTMatcher.whenEvaluatedWith;
 import static testsupport.matchers.StateTMatcher.whenExecutedWith;
 import static testsupport.matchers.StateTMatcher.whenRunWith;
diff --git a/src/test/java/testsupport/matchers/EitherMatcher.java b/src/test/java/testsupport/matchers/EitherMatcher.java
@@ -0,0 +1,54 @@
+package testsupport.matchers;
+
+import com.jnape.palatable.lambda.adt.Either;
+import org.hamcrest.Description;
+import org.hamcrest.Matcher;
+import org.hamcrest.TypeSafeMatcher;
+
+import static com.jnape.palatable.lambda.adt.Either.left;
+import static com.jnape.palatable.lambda.adt.Either.right;
+import static com.jnape.palatable.lambda.functions.builtin.fn1.Constantly.constantly;
+import static com.jnape.palatable.lambda.io.IO.io;
+
+public final class EitherMatcher<L, R> extends TypeSafeMatcher<Either<L, R>> {
+    private final Either<Matcher<L>, Matcher<R>> matcher;
+
+    private EitherMatcher(Either<Matcher<L>, Matcher<R>> matcher) {
+        this.matcher = matcher;
+    }
+
+    @Override
+    protected void describeMismatchSafely(Either<L, R> item, Description mismatchDescription) {
+        mismatchDescription.appendText("was ");
+        item.match(l -> matcher.match(lMatcher -> io(() -> lMatcher.describeMismatch(l, mismatchDescription)),
+                                      rMatcher -> io(() -> mismatchDescription.appendValue(item))),
+                   r -> matcher.match(lMatcher -> io(() -> mismatchDescription.appendValue(item)),
+                                      lMatcher -> io(() -> lMatcher.describeMismatch(r, mismatchDescription))))
+            .unsafePerformIO();
+    }
+
+    @Override
+    protected boolean matchesSafely(Either<L, R> actual) {
+        return actual.match(l -> matcher.match(lMatcher -> lMatcher.matches(l),
+                                               constantly(false)),
+                            r -> matcher.match(constantly(false),
+                                               rMatcher -> rMatcher.matches(r)));
+    }
+
+    @Override
+    public void describeTo(Description description) {
+        matcher.match(l -> io(() -> description.appendText("Left value of "))
+                          .flatMap(constantly(io(() -> l.describeTo(description)))),
+                      r -> io(() -> description.appendText("Right value of "))
+                          .flatMap(constantly(io(() -> r.describeTo(description)))))
+            .unsafePerformIO();
+    }
+
+    public static <L, R> EitherMatcher<L, R> isLeftThat(Matcher<L> lMatcher) {
+        return new EitherMatcher<>(left(lMatcher));
+    }
+
+    public static <L, R> EitherMatcher<L, R> isRightThat(Matcher<R> rMatcher) {
+        return new EitherMatcher<>(right(rMatcher));
+    }
+}
diff --git a/src/test/java/testsupport/matchers/LeftMatcher.java b/src/test/java/testsupport/matchers/LeftMatcher.java
diff --git a/src/test/java/testsupport/matchers/RightMatcher.java b/src/test/java/testsupport/matchers/RightMatcher.java
