Improve test utils

Author: jhalterman

src/test/java/net/jodah/failsafe/Testing.java

@@ -285,82 +285,121 @@ public static CircuitBreakerInternals getInternals(CircuitBreaker circuitBreaker
     }
   }
 
+  public static <T> void testSyncAndAsyncSuccess(FailsafeExecutor<T> failsafe, Runnable given, CheckedRunnable when,
+    Consumer<ExecutionCompletedEvent<T>> then, T expectedResult) {
+    CheckedSupplier<T> supplier = () -> {
+      when.run();
+      return null;
+    };
+    testSyncAndAsyncInternal(failsafe, given, supplier, then, expectedResult);
+  }
+
+  public static <T> void testSyncAndAsyncSuccess(FailsafeExecutor<T> failsafe, Runnable given, CheckedSupplier<T> when,
+    Consumer<ExecutionCompletedEvent<T>> then, T expectedResult) {
+    testSyncAndAsyncInternal(failsafe, given, when, then, expectedResult);
+  }
+
+  @SafeVarargs
+  public static <T> void testSyncAndAsyncFailure(FailsafeExecutor<T> failsafe, Runnable given, CheckedRunnable when,
+    Consumer<ExecutionCompletedEvent<T>> then, Class<? extends Throwable>... expectedExceptions) {
+    CheckedSupplier<T> supplier = () -> {
+      when.run();
+      return null;
+    };
+    testSyncAndAsyncInternal(failsafe, given, supplier, then, null, expectedExceptions);
+  }
+
+  @SafeVarargs
+  public static <T> void testSyncAndAsyncFailure(FailsafeExecutor<T> failsafe, Runnable given, CheckedSupplier<T> when,
+    Consumer<ExecutionCompletedEvent<T>> then, Class<? extends Throwable>... expectedExceptions) {
+    testSyncAndAsyncInternal(failsafe, given, when, then, null, expectedExceptions);
+  }
+
   /**
    * Does a .run and .runAsync against the failsafe, performing pre-test setup and post-test assertion checks. {@code
    * expectedExceptions} are verified against thrown exceptions _and_ the ExecutionCompletedEvent's failure.
    * <p>
    * This method helps ensure behavior is identical between sync and async executions.
    */
   @SafeVarargs
-  public static void testSyncAndAsync(FailsafeExecutor<?> failsafe, Runnable given, CheckedRunnable when,
-    Consumer<ExecutionCompletedEvent<?>> then, Class<? extends Throwable>... expectedExceptions) {
-    AtomicReference<ExecutionCompletedEvent<?>> completedEventRef = new AtomicReference<>();
-    CheckedConsumer<ExecutionCompletedEvent<?>> setCompletedEventFn = completedEventRef::set;
+  private static <T> void testSyncAndAsyncInternal(FailsafeExecutor<T> failsafe, Runnable given,
+    CheckedSupplier<T> when, Consumer<ExecutionCompletedEvent<T>> then, T expectedResult,
+    Class<? extends Throwable>... expectedExceptions) {
+    AtomicReference<ExecutionCompletedEvent<T>> completedEventRef = new AtomicReference<>();
+    CheckedConsumer<ExecutionCompletedEvent<T>> setCompletedEventFn = completedEventRef::set;
     List<Class<? extends Throwable>> expected = new LinkedList<>();
     Collections.addAll(expected, expectedExceptions);
 
     Runnable postTestFn = () -> {
+      ExecutionCompletedEvent<T> completedEvent = completedEventRef.get();
       if (expectedExceptions.length > 0)
-        Asserts.assertMatches(completedEventRef.get().getFailure(), Arrays.asList(expectedExceptions));
+        Asserts.assertMatches(completedEvent.getFailure(), Arrays.asList(expectedExceptions));
+      else
+        assertEquals(completedEvent.getResult(), expectedResult);
       then.accept(completedEventRef.get());
     };
 
     // Sync test
     System.out.println("\nRunning sync test");
     given.run();
-    if (expectedExceptions.length == 0)
-      Testing.unwrapRunnableExceptions(() -> failsafe.onComplete(setCompletedEventFn::accept).run(when));
-    else
-      Asserts.assertThrows(() -> failsafe.onComplete(setCompletedEventFn::accept).run(when), expectedExceptions);
+    if (expectedExceptions.length == 0) {
+      T result = Testing.unwrapExceptions(() -> failsafe.onComplete(setCompletedEventFn::accept).get(when));
+      assertEquals(result, expectedResult);
+    } else
+      Asserts.assertThrows(() -> failsafe.onComplete(setCompletedEventFn::accept).get(when), expectedExceptions);
     postTestFn.run();
 
     // Async test
     System.out.println("\nRunning async test");
     given.run();
     if (expectedExceptions.length == 0) {
-      Testing.unwrapExceptions(() -> failsafe.onComplete(setCompletedEventFn::accept).runAsync(when).get());
+      T result = Testing.unwrapExceptions(() -> failsafe.onComplete(setCompletedEventFn::accept).getAsync(when).get());
+      assertEquals(result, expectedResult);
     } else {
       expected.add(0, ExecutionException.class);
-      Asserts.assertThrows(() -> failsafe.onComplete(setCompletedEventFn::accept).runAsync(when).get(), expected);
+      Asserts.assertThrows(() -> failsafe.onComplete(setCompletedEventFn::accept).getAsync(when).get(), expected);
     }
     postTestFn.run();
   }
 
-  @SafeVarargs
-  public static void testAsyncExecution(FailsafeExecutor<?> failsafe, AsyncRunnable when,
-    Consumer<ExecutionCompletedEvent<?>> then, Class<? extends Throwable>... expectedExceptions) {
+  public static <T> void testAsyncExecutionSuccess(FailsafeExecutor<T> failsafe, AsyncRunnable when,
+    Consumer<ExecutionCompletedEvent<T>> then, T expectedResult) {
     AsyncSupplier supplier = ex -> {
       when.run(ex);
       return null;
     };
-    testAsyncExecution(failsafe, supplier, then, null, expectedExceptions);
+    testAsyncExecutionInternal(failsafe, supplier, then, expectedResult);
+  }
+
+  public static <T> void testAsyncExecutionSuccess(FailsafeExecutor<T> failsafe, AsyncSupplier<T> when,
+    Consumer<ExecutionCompletedEvent<T>> then, T expectedResult) {
+    testAsyncExecutionInternal(failsafe, when, then, expectedResult);
   }
 
   @SafeVarargs
-  public static void testAsyncExecution(FailsafeExecutor<?> failsafe, AsyncRunnable when,
-    Consumer<ExecutionCompletedEvent<?>> then, Object expectedResult,
-    Class<? extends Throwable>... expectedExceptions) {
+  public static <T> void testAsyncExecutionFailure(FailsafeExecutor<T> failsafe, AsyncRunnable when,
+    Consumer<ExecutionCompletedEvent<T>> then, Class<? extends Throwable>... expectedExceptions) {
     AsyncSupplier supplier = ex -> {
       when.run(ex);
       return null;
     };
-    testAsyncExecution(failsafe, supplier, then, expectedResult, expectedExceptions);
+    testAsyncExecutionInternal(failsafe, supplier, then, null, expectedExceptions);
   }
 
   @SafeVarargs
-  public static <T> void testAsyncExecution(FailsafeExecutor<T> failsafe, AsyncSupplier<T> when,
-    Consumer<ExecutionCompletedEvent<?>> then, Class<? extends Throwable>... expectedExceptions) {
-    testAsyncExecution(failsafe, when, then, null, expectedExceptions);
+  public static <T> void testAsyncExecutionFailure(FailsafeExecutor<T> failsafe, AsyncSupplier<T> when,
+    Consumer<ExecutionCompletedEvent<T>> then, Class<? extends Throwable>... expectedExceptions) {
+    testAsyncExecutionInternal(failsafe, when, then, null, expectedExceptions);
   }
 
   @SafeVarargs
-  public static <T> void testAsyncExecution(FailsafeExecutor<T> failsafe, AsyncSupplier<T> when,
-    Consumer<ExecutionCompletedEvent<?>> then, Object expectedResult,
-    Class<? extends Throwable>... expectedExceptions) {
-    AtomicReference<ExecutionCompletedEvent<?>> completedEventRef = new AtomicReference<>();
-    CheckedConsumer<ExecutionCompletedEvent<?>> setCompletedEventFn = completedEventRef::set;
+  private static <T> void testAsyncExecutionInternal(FailsafeExecutor<T> failsafe, AsyncSupplier<T> when,
+    Consumer<ExecutionCompletedEvent<T>> then, T expectedResult, Class<? extends Throwable>... expectedExceptions) {
+
+    AtomicReference<ExecutionCompletedEvent<T>> completedEventRef = new AtomicReference<>();
+    CheckedConsumer<ExecutionCompletedEvent<T>> setCompletedEventFn = completedEventRef::set;
     Runnable postTestFn = () -> {
-      ExecutionCompletedEvent<?> completedEvent = completedEventRef.get();
+      ExecutionCompletedEvent<T> completedEvent = completedEventRef.get();
       if (expectedExceptions.length > 0)
         Asserts.assertMatches(completedEvent.getFailure(), Arrays.asList(expectedExceptions));
       else
@@ -371,7 +410,7 @@ public static <T> void testAsyncExecution(FailsafeExecutor<T> failsafe, AsyncSup
     // Async test
     System.out.println("\nRunning async execution test");
     if (expectedExceptions.length == 0) {
-      Object result = Testing.unwrapExceptions(
+      T result = Testing.unwrapExceptions(
         () -> failsafe.onComplete(setCompletedEventFn::accept).getAsyncExecution(when).get());
       assertEquals(result, expectedResult);
     } else {

src/test/java/net/jodah/failsafe/functional/AlternativeResultTest.java

@@ -34,7 +34,7 @@ public void testRejectedSyncAndAsync() {
     RetryPolicy<Object> rp = withStats(new RetryPolicy<>().withMaxAttempts(7), rpStats, true);
     CircuitBreaker<Object> cb = withStats(new CircuitBreaker<>().withFailureThreshold(3), cbStats, true);
 
-    testSyncAndAsync(Failsafe.with(rp, cb), () -> {
+    testSyncAndAsyncFailure(Failsafe.with(rp, cb), () -> {
       rpStats.reset();
       cbStats.reset();
       cb.close();
@@ -58,7 +58,7 @@ public void testRejectedAsyncExecutionWithRetry() {
     CircuitBreaker<Object> cb = withStats(new CircuitBreaker<>().withFailureThreshold(3), cbStats, true);
 
     // Test with retryOn()
-    testAsyncExecution(Failsafe.with(rp, cb), ex -> {
+    testAsyncExecutionFailure(Failsafe.with(rp, cb), ex -> {
       runAsync(() -> {
         System.out.println("Executing");
         ex.retryOn(new IllegalStateException());
@@ -84,7 +84,7 @@ public void testRejectedAsyncExecutionWithCompleteAndRetry() {
     rpStats.reset();
     cbStats.reset();
     cb.close();
-    testAsyncExecution(Failsafe.with(rp, cb), ex -> {
+    testAsyncExecutionFailure(Failsafe.with(rp, cb), ex -> {
       runAsync(() -> {
         System.out.println("Executing");
         if (!ex.complete(null, new IllegalStateException())) {

src/test/java/net/jodah/failsafe/functional/AsyncExecutionTest.java

@@ -39,7 +39,7 @@ public void testAsyncExecWithPassthroughPolicies() {
     Timeout<Object> timeout = Timeout.of(Duration.ofMinutes(1));
     AtomicInteger counter = new AtomicInteger();
 
-    Consumer<FailsafeExecutor<Object>> test = failsafe -> testAsyncExecution(failsafe, ex -> {
+    Consumer<FailsafeExecutor<Object>> test = failsafe -> testAsyncExecutionSuccess(failsafe, ex -> {
       runAsync(() -> {
         System.out.println("Executing");
         if (counter.getAndIncrement() < 3)

src/test/java/net/jodah/failsafe/functional/TimeoutTest.java

@@ -21,7 +21,7 @@
 import java.time.Duration;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import static net.jodah.failsafe.Testing.testSyncAndAsync;
+import static net.jodah.failsafe.Testing.testSyncAndAsyncFailure;
 import static org.testng.Assert.assertEquals;
 
 /**
@@ -45,7 +45,7 @@ public void testTimeoutThenRetryWithBlockedSupplier() {
       System.out.println("Retrying");
     });
 
-    Runnable test = () -> testSyncAndAsync(Failsafe.with(retryPolicy, timeout), () -> {
+    Runnable test = () -> testSyncAndAsyncFailure(Failsafe.with(retryPolicy, timeout), () -> {
       timeoutCounter.set(0);
       retryPolicyCounter.set(0);
     }, () -> {
@@ -85,7 +85,7 @@ public void testTimeoutThenRetryWithPendingRetry() {
       System.out.println("Retrying");
     });
 
-    Runnable test = () -> testSyncAndAsync(Failsafe.with(retryPolicy, timeout), () -> {
+    Runnable test = () -> testSyncAndAsyncFailure(Failsafe.with(retryPolicy, timeout), () -> {
       executionCounter.set(0);
       timeoutSuccessCounter.set(0);
     }, () -> {
@@ -125,7 +125,7 @@ public void testRetryThenTimeoutWithBlockedSupplier() {
       System.out.println("Retrying");
     });
 
-    Runnable test = () -> testSyncAndAsync(Failsafe.with(timeout, retryPolicy), () -> {
+    Runnable test = () -> testSyncAndAsyncFailure(Failsafe.with(timeout, retryPolicy), () -> {
       executionCounter.set(0);
       timeoutCounter.set(0);
     }, () -> {
@@ -170,7 +170,7 @@ public void testRetryThenTimeoutWithPendingRetry() {
       System.out.println("Retrying");
     });
 
-    Runnable test = () -> testSyncAndAsync(Failsafe.with(timeout, retryPolicy), () -> {
+    Runnable test = () -> testSyncAndAsyncFailure(Failsafe.with(timeout, retryPolicy), () -> {
       executionCounter.set(0);
       timeoutCounter.set(0);
       failedAttemptCounter.set(0);
@@ -211,7 +211,7 @@ public void testTimeoutThenFallbackWithBlockedSupplier() {
       throw new IllegalStateException();
     });
 
-    Runnable test = () -> testSyncAndAsync(Failsafe.with(fallback, timeout), () -> {
+    Runnable test = () -> testSyncAndAsyncFailure(Failsafe.with(fallback, timeout), () -> {
       timeoutCounter.set(0);
       fallbackCounter.set(0);
     }, () -> {
@@ -251,7 +251,7 @@ public void testTimeoutThenFallback() {
       throw new IllegalStateException();
     });
 
-    Runnable test = () -> testSyncAndAsync(Failsafe.with(fallback, timeout), () -> {
+    Runnable test = () -> testSyncAndAsyncFailure(Failsafe.with(fallback, timeout), () -> {
       fallbackCounter.set(0);
     }, () -> {
       System.out.println("Executing");
@@ -288,7 +288,7 @@ public void testFallbackThenTimeoutWithBlockedSupplier() {
       throw new IllegalStateException();
     });
 
-    Runnable test = () -> testSyncAndAsync(Failsafe.with(timeout, fallback), () -> {
+    Runnable test = () -> testSyncAndAsyncFailure(Failsafe.with(timeout, fallback), () -> {
       timeoutCounter.set(0);
       fallbackCounter.set(0);
     }, () -> {
@@ -328,7 +328,7 @@ public void testFallbackThenTimeoutWithBlockedFallback() {
       throw new IllegalStateException();
     });
 
-    Runnable test = () -> testSyncAndAsync(Failsafe.with(timeout, fallback), () -> {
+    Runnable test = () -> testSyncAndAsyncFailure(Failsafe.with(timeout, fallback), () -> {
       timeoutCounter.set(0);
       fallbackCounter.set(0);
     }, () -> {