EquatableM delegates lazyZip to monad; loosening test timeout

jnape · jnape · commit fdd8092b54f3 · 2019-07-24T17:47:46.000-05:00
diff --git a/src/test/java/com/jnape/palatable/lambda/io/IOTest.java b/src/test/java/com/jnape/palatable/lambda/io/IOTest.java
@@ -45,6 +45,7 @@
 import static java.util.concurrent.Executors.newFixedThreadPool;
 import static java.util.concurrent.ForkJoinPool.commonPool;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static java.util.concurrent.TimeUnit.SECONDS;
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -364,7 +365,8 @@ public void monitorSync() throws InterruptedException {
             start();
         }};
 
-        finishLine.await(500, MILLISECONDS);
+        if (!finishLine.await(1, SECONDS))
+            fail("Expected threads to have completed by now");
         assertEquals(asList("one entered", "one exited", "two entered", "two exited"), accesses);
     }
 
diff --git a/src/test/java/testsupport/EquatableM.java b/src/test/java/testsupport/EquatableM.java
@@ -2,6 +2,7 @@
 
 import com.jnape.palatable.lambda.functions.Fn1;
 import com.jnape.palatable.lambda.functor.Applicative;
+import com.jnape.palatable.lambda.functor.builtin.Lazy;
 import com.jnape.palatable.lambda.monad.Monad;
 
 import java.util.Objects;
@@ -44,6 +45,13 @@ public <B> EquatableM<M, B> zip(Applicative<Fn1<? super A, ? extends B>, Equatab
         return new EquatableM<>(ma.zip(appFn.<EquatableM<M, Fn1<? super A, ? extends B>>>coerce().ma), equatable);
     }
 
+    @Override
+    public <B> Lazy<EquatableM<M, B>> lazyZip(
+            Lazy<? extends Applicative<Fn1<? super A, ? extends B>, EquatableM<M, ?>>> lazyAppFn) {
+        return ma.lazyZip(lazyAppFn.fmap(eqF -> eqF.<EquatableM<M, Fn1<? super A, ? extends B>>>coerce().ma))
+                .fmap(mb -> new EquatableM<>(mb, equatable));
+    }
+
     @Override
     public <B> EquatableM<M, B> discardL(Applicative<B, EquatableM<M, ?>> appB) {
         return new EquatableM<>(ma.discardL(appB.<EquatableM<M, B>>coerce().ma), equatable);
