Precondition checks for constant wait, max attempts stop, and max delay stop (#14)

Author: joeyb

CHANGELOG.md

@@ -4,6 +4,9 @@
 ### Added
 - Constant Wait strategy
 
+### Changed
+- Precondition checks for constant wait, max attempts stop, and max delay since first attempt stop
+
 ## [1.0.0] - 2016-08-29
 ### Added
 - Initial implementation

src/main/java/org/joeyb/retry/ConstantWait.java

@@ -12,6 +12,10 @@ class ConstantWait<V> implements Wait<V> {
     private final long waitTime;
 
     ConstantWait(long waitTime) {
+        if (waitTime < 0) {
+            throw new IllegalArgumentException("waitTime must be greater than 0");
+        }
+
         this.waitTime = waitTime;
     }
 

src/main/java/org/joeyb/retry/MaxAttemptsStop.java

@@ -13,6 +13,10 @@ class MaxAttemptsStop<V> implements Stop<V> {
     private final long maxAttempts;
 
     MaxAttemptsStop(long maxAttempts) {
+        if (maxAttempts < 1) {
+            throw new IllegalArgumentException("maxAttempts must be greater than 1");
+        }
+
         this.maxAttempts = maxAttempts;
     }
 

src/main/java/org/joeyb/retry/MaxDelaySinceFirstAttemptStop.java

@@ -13,6 +13,10 @@ public class MaxDelaySinceFirstAttemptStop<V> implements Stop<V> {
     private final long maxDelaySinceFirstAttempt;
 
     MaxDelaySinceFirstAttemptStop(long maxDelay) {
+        if (maxDelay < 0) {
+            throw new IllegalArgumentException("maxDelay must be greater than 0");
+        }
+
         this.maxDelaySinceFirstAttempt = maxDelay;
     }
 

src/test/java/org/joeyb/retry/CompositeAndStopTests.java

@@ -13,7 +13,7 @@ public class CompositeAndStopTests {
     public void compositeAndStop() {
         Attempt<Long> attempt = Attempts.exception(
                 ThreadLocalRandom.current().nextLong(1, Long.MAX_VALUE),
-                ThreadLocalRandom.current().nextLong(),
+                ThreadLocalRandom.current().nextLong(Long.MAX_VALUE),
                 new RuntimeException());
         Stop<Long> falseStop = a -> false;
         Stop<Long> trueStop = a -> true;

src/test/java/org/joeyb/retry/CompositeOrStopTests.java

@@ -13,7 +13,7 @@ public class CompositeOrStopTests {
     public void compositeOrStop() {
         Attempt<Long> attempt = Attempts.exception(
                 ThreadLocalRandom.current().nextLong(1, Long.MAX_VALUE),
-                ThreadLocalRandom.current().nextLong(),
+                ThreadLocalRandom.current().nextLong(Long.MAX_VALUE),
                 new RuntimeException());
         Stop<Long> falseStop = a -> false;
         Stop<Long> trueStop = a -> true;

src/test/java/org/joeyb/retry/ConstantWaitTests.java

@@ -1,6 +1,7 @@
 package org.joeyb.retry;
 
 import static org.assertj.core.api.Java6Assertions.assertThat;
+import static org.assertj.core.api.Java6Assertions.assertThatThrownBy;
 
 import org.junit.Test;
 
@@ -10,15 +11,23 @@ public class ConstantWaitTests {
 
     @Test
     public void constantWait() {
-        long waitTime = ThreadLocalRandom.current().nextLong();
+        long waitTime = ThreadLocalRandom.current().nextLong(Long.MAX_VALUE);
 
         Attempt<Long> attempt = Attempts.exception(
                 ThreadLocalRandom.current().nextLong(1, Long.MAX_VALUE),
-                ThreadLocalRandom.current().nextLong(),
+                ThreadLocalRandom.current().nextLong(Long.MAX_VALUE),
                 new RuntimeException());
 
         Wait<Long> constantWait = new ConstantWait<>(waitTime);
 
         assertThat(constantWait.waitTime(attempt)).isEqualTo(waitTime);
     }
+
+    @Test
+    public void throwsIfWaitTimeIsLessThanZero() {
+        long waitTime = -ThreadLocalRandom.current().nextLong(Long.MAX_VALUE);
+
+        assertThatThrownBy(() -> new ConstantWait<>(waitTime))
+                .isInstanceOf(IllegalArgumentException.class);
+    }
 }

src/test/java/org/joeyb/retry/MaxAttemptsStopTests.java

@@ -1,6 +1,7 @@
 package org.joeyb.retry;
 
 import static org.assertj.core.api.Java6Assertions.assertThat;
+import static org.assertj.core.api.Java6Assertions.assertThatThrownBy;
 
 import org.junit.Test;
 
@@ -14,17 +15,17 @@ public void maxAttemptsStop() {
 
         Attempt<Long> attemptBeforeMax = Attempts.exception(
                 maxAttempts - 1,
-                ThreadLocalRandom.current().nextLong(),
+                ThreadLocalRandom.current().nextLong(Long.MAX_VALUE),
                 new RuntimeException());
 
         Attempt<Long> attemptAtMax = Attempts.exception(
                 maxAttempts,
-                ThreadLocalRandom.current().nextLong(),
+                ThreadLocalRandom.current().nextLong(Long.MAX_VALUE),
                 new RuntimeException());
 
         Attempt<Long> attemptAfterMax = Attempts.exception(
                 maxAttempts + 1,
-                ThreadLocalRandom.current().nextLong(),
+                ThreadLocalRandom.current().nextLong(Long.MAX_VALUE),
                 new RuntimeException());
 
         MaxAttemptsStop<Long> stop = new MaxAttemptsStop<>(maxAttempts);
@@ -34,4 +35,15 @@ public void maxAttemptsStop() {
         assertThat(stop.stop(attemptAfterMax)).isTrue();
         assertThat(stop.maxAttempts()).isEqualTo(maxAttempts);
     }
+
+    @Test
+    public void throwsIfMaxAttemptsIsLessThanOne() {
+        long maxAttempts = -ThreadLocalRandom.current().nextLong(1, Long.MAX_VALUE);
+
+        assertThatThrownBy(() -> new MaxAttemptsStop<>(maxAttempts))
+                .isInstanceOf(IllegalArgumentException.class);
+
+        assertThatThrownBy(() -> new MaxAttemptsStop<>(0))
+                .isInstanceOf(IllegalArgumentException.class);
+    }
 }

src/test/java/org/joeyb/retry/MaxDelaySinceFirstAttemptStopTests.java

@@ -1,6 +1,7 @@
 package org.joeyb.retry;
 
 import static org.assertj.core.api.Java6Assertions.assertThat;
+import static org.assertj.core.api.Java6Assertions.assertThatThrownBy;
 
 import org.junit.Test;
 
@@ -34,4 +35,12 @@ public void maxDelaySinceFirstAttemptStop() {
         assertThat(stop.stop(attemptAfterMax)).isTrue();
         assertThat(stop.maxDelaySinceFirstAttempt()).isEqualTo(maxDelay);
     }
+
+    @Test
+    public void throwsIfMaxDelayIsLessThanZero() {
+        long maxDelay = -ThreadLocalRandom.current().nextLong(Long.MAX_VALUE);
+
+        assertThatThrownBy(() -> new MaxDelaySinceFirstAttemptStop<>(maxDelay))
+                .isInstanceOf(IllegalArgumentException.class);
+    }
 }

src/test/java/org/joeyb/retry/NeverStopTests.java

@@ -12,7 +12,7 @@ public class NeverStopTests {
     public void neverStop() {
         Attempt<Long> attempt = Attempts.exception(
                 ThreadLocalRandom.current().nextLong(1, Long.MAX_VALUE),
-                ThreadLocalRandom.current().nextLong(),
+                ThreadLocalRandom.current().nextLong(Long.MAX_VALUE),
                 new RuntimeException());
 
         Stop<Long> stop = new NeverStop<>();

src/test/java/org/joeyb/retry/NoWaitTests.java

@@ -12,7 +12,7 @@ public class NoWaitTests {
     public void noWait() {
         Attempt<Long> attempt = Attempts.exception(
                 ThreadLocalRandom.current().nextLong(1, Long.MAX_VALUE),
-                ThreadLocalRandom.current().nextLong(),
+                ThreadLocalRandom.current().nextLong(Long.MAX_VALUE),
                 new RuntimeException());
 
         Wait<Long> noWait = new NoWait<>();

src/test/java/org/joeyb/retry/RetryTests.java

@@ -17,7 +17,7 @@ public class RetryTests {
     public void eventuallySuccessfulCallableRetriesExpectedNumberOfTimesBeforeSucceeding() {
         int attemptsBeforeSuccess = ThreadLocalRandom.current().nextInt(10, 100);
         long expectedResult = ThreadLocalRandom.current().nextLong();
-        long waitTime = ThreadLocalRandom.current().nextLong();
+        long waitTime = ThreadLocalRandom.current().nextLong(Long.MAX_VALUE);
 
         MemoizingAccept<Long> memoizingAccept = new MemoizingAccept<>(Accepts.any());
         MemoizingBlock memoizingBlock = new MemoizingBlock();
@@ -81,7 +81,7 @@ public void callableThatDoesNotSucceedBeforeStopThrowsRetryException() {
         int attemptsBeforeSuccess = ThreadLocalRandom.current().nextInt(10, 100);
         long expectedResult = ThreadLocalRandom.current().nextLong();
         long maxAttempts = attemptsBeforeSuccess - 1;
-        long waitTime = ThreadLocalRandom.current().nextLong();
+        long waitTime = ThreadLocalRandom.current().nextLong(Long.MAX_VALUE);
 
         MemoizingAccept<Long> memoizingAccept = new MemoizingAccept<>(Accepts.any());
         MemoizingBlock memoizingBlock = new MemoizingBlock();
@@ -129,7 +129,7 @@ public void builderBuildWithoutAdditionalConfig() {
     @Test
     public void builderAcceptBlockStopAndWaitMethodsSetGivenImplementations() {
         int attemptsBeforeSuccess = ThreadLocalRandom.current().nextInt(10, 100);
-        long waitTime = ThreadLocalRandom.current().nextLong();
+        long waitTime = ThreadLocalRandom.current().nextLong(Long.MAX_VALUE);
 
         MemoizingAccept<Long> memoizingAccept = new MemoizingAccept<>(Accepts.any());
         MemoizingBlock memoizingBlock = new MemoizingBlock();
@@ -169,7 +169,7 @@ public void builderAcceptNonNullResult() {
 
     @Test
     public void builderConstantWait() {
-        long waitTime = ThreadLocalRandom.current().nextLong();
+        long waitTime = ThreadLocalRandom.current().nextLong(Long.MAX_VALUE);
 
         Retry<Long> retry = Retry.<Long>newBuilder()
                 .constantWait(waitTime)

src/test/java/org/joeyb/retry/WaitsTests.java

@@ -16,7 +16,7 @@ public void waitsOnlyHasPrivateConstructor() {
 
     @Test
     public void constant() {
-        long waitTime = ThreadLocalRandom.current().nextLong();
+        long waitTime = ThreadLocalRandom.current().nextLong(Long.MAX_VALUE);
 
         Wait<Long> wait = Waits.constant(waitTime);