Removed nulls from Retry (#886)

src/main/java/org/cactoos/func/IoCheckedBiProc.java

@@ -35,6 +35,11 @@
  * @param <X> Type of input
  * @param <Y> Type of input
  * @since 0.22
+ * @todo #886:30min Avoid usage of null value in exec(first, second),
+ *  which is against our design principles.
+ *  This look like a duplication of functionality from IoCheckedBiFunc.
+ *  Perhaphs, we do not need this class?
+ *  Please take a look on #918 for more details.
  */
 public final class IoCheckedBiProc<X, Y> implements BiProc<X, Y> {
 

src/main/java/org/cactoos/func/Retry.java

@@ -24,7 +24,6 @@
 package org.cactoos.func;
 
 import org.cactoos.Func;
-import org.cactoos.Proc;
 
 /**
  * Func that will try a few times before throwing an exception.
@@ -34,11 +33,6 @@
  * @param <X> Type of input
  * @param <Y> Type of output
  * @since 0.8
- * @todo #861:30min Avoid usage of null value in ctor(Proc),
- *  ctor(Proc, int), ctor(Proc, Func(Integer, Boolean)) which is against
- *  design principles.
- *  Perhaps in creating RetryProc?
- *  Please take a look on #551 and #843 for more details.
  */
 public final class Retry<X, Y> implements Func<X, Y> {
 
@@ -52,35 +46,6 @@ public final class Retry<X, Y> implements Func<X, Y> {
      */
     private final Func<Integer, Boolean> exit;
 
-    /**
-     * Ctor.
-     * @param proc Func original
-     * @since 0.12
-     */
-    public Retry(final Proc<X> proc) {
-        this(new FuncOf<>(proc, null));
-    }
-
-    /**
-     * Ctor.
-     * @param proc Func original
-     * @param attempts Maximum number of attempts
-     * @since 0.12
-     */
-    public Retry(final Proc<X> proc, final int attempts) {
-        this(new FuncOf<>(proc, null), attempts);
-    }
-
-    /**
-     * Ctor.
-     * @param proc Func original
-     * @param ext Exit condition, returns TRUE if there is no more reason to try
-     * @since 0.12
-     */
-    public Retry(final Proc<X> proc, final Func<Integer, Boolean> ext) {
-        this(new FuncOf<>(proc, null), ext);
-    }
-
     /**
      * Ctor.
      * @param fnc Func original

src/test/java/org/cactoos/func/RetryTest.java

@@ -24,10 +24,9 @@
 package org.cactoos.func;
 
 import java.security.SecureRandom;
-import java.util.concurrent.atomic.AtomicBoolean;
-import org.hamcrest.MatcherAssert;
-import org.hamcrest.Matchers;
 import org.junit.Test;
+import org.llorllale.cactoos.matchers.Assertion;
+import org.llorllale.cactoos.matchers.FuncApplies;
 
 /**
  * Test case for {@link Retry}.
@@ -40,63 +39,36 @@
 public final class RetryTest {
 
     @Test
-    public void runsFuncMultipleTimes() throws Exception {
-        MatcherAssert.assertThat(
-            new Retry<>(
+    public void runsFuncMultipleTimes() {
+        new Assertion<>(
+            "Didn't run multiple times",
+            () -> new Retry<>(
                 input -> {
                     if (new SecureRandom().nextDouble() > 0.3d) {
                         throw new IllegalArgumentException("May happen");
                     }
                     return 0;
                 },
                 Integer.MAX_VALUE
-            ).apply(true),
-            Matchers.equalTo(0)
-        );
+            ),
+            new FuncApplies<>(true, 0)
+        ).affirm();
     }
 
     @Test
-    public void runsProcMultipleTimes() throws Exception {
-        MatcherAssert.assertThat(
-            new Retry<>(
-                input -> {
-                    if (new SecureRandom().nextDouble() > 0.3d) {
-                        throw new IllegalArgumentException("May happen");
-                    }
-                },
-                Integer.MAX_VALUE
-            ).apply(true),
-            Matchers.nullValue()
-        );
-    }
-
-    @Test
-    public void runsProcDefaultMultipleTimes() throws Exception {
-        final AtomicBoolean fail = new AtomicBoolean(true);
-        MatcherAssert.assertThat(
-            new Retry<>(
-                input -> {
-                    if (fail.getAndSet(false)) {
-                        throw new IllegalArgumentException("May happen");
-                    }
-                }
-            ).apply(true),
-            Matchers.nullValue()
-        );
-    }
-
-    @Test
-    public void runsProcConditionMultipleTimes() throws Exception {
-        MatcherAssert.assertThat(
-            new Retry<>(
+    public void runsFuncConditionMultipleTimes() {
+        new Assertion<>(
+            "Didn't check condition multiple times",
+            () -> new Retry<>(
                 input -> {
                     if (new SecureRandom().nextDouble() > 0.3d) {
                         throw new IllegalArgumentException("May happen");
                     }
+                    return true;
                 },
                 count -> count == Integer.MAX_VALUE
-            ).apply(true),
-            Matchers.nullValue()
-        );
+            ),
+            new FuncApplies<>(true, true)
+        ).affirm();
     }
 }