--- jsr166/src/test/tck/CompletableFutureTest.java	2014/06/02 06:07:34	1.45
+++ jsr166/src/test/tck/CompletableFutureTest.java	2014/06/02 22:48:50	1.57
@@ -17,6 +17,8 @@ import java.util.concurrent.Future;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionException;
 import java.util.concurrent.CompletionStage;
+import java.util.concurrent.ForkJoinPool;
+import java.util.concurrent.ForkJoinTask;
 import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicInteger;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
@@ -247,6 +249,8 @@ public class CompletableFutureTest exten
         f = new CompletableFuture<>();
         f.obtrudeValue(three);
         checkCompletedNormally(f, three);
+        f.obtrudeValue(null);
+        checkCompletedNormally(f, null);
         f = new CompletableFuture<>();
         f.completeExceptionally(new CFException());
         f.obtrudeValue(four);
@@ -279,16 +283,16 @@ public class CompletableFutureTest exten
      */
     public void testGetNumberOfDependents() {
         CompletableFuture<Integer> f = new CompletableFuture<>();
-        assertEquals(f.getNumberOfDependents(), 0);
-        CompletableFuture g = f.thenRun(new Noop());
-        assertEquals(f.getNumberOfDependents(), 1);
-        assertEquals(g.getNumberOfDependents(), 0);
-        CompletableFuture h = f.thenRun(new Noop());
-        assertEquals(f.getNumberOfDependents(), 2);
+        assertEquals(0, f.getNumberOfDependents());
+        CompletableFuture g = f.thenRun(new Noop(ExecutionMode.DEFAULT));
+        assertEquals(1, f.getNumberOfDependents());
+        assertEquals(0, g.getNumberOfDependents());
+        CompletableFuture h = f.thenRun(new Noop(ExecutionMode.DEFAULT));
+        assertEquals(2, f.getNumberOfDependents());
         f.complete(1);
         checkCompletedNormally(g, null);
-        assertEquals(f.getNumberOfDependents(), 0);
-        assertEquals(g.getNumberOfDependents(), 0);
+        assertEquals(0, f.getNumberOfDependents());
+        assertEquals(0, g.getNumberOfDependents());
     }
 
     /**
@@ -345,76 +349,106 @@ public class CompletableFutureTest exten
         }
     }
     static final class IncFunction implements Function<Integer,Integer> {
+        final ExecutionMode m;
         int invocationCount = 0;
         Integer value;
+        IncFunction(ExecutionMode m) { this.m = m; }
         public Integer apply(Integer x) {
+            m.checkExecutionMode();
             invocationCount++;
             return value = inc(x);
         }
     }
     static final class SubtractAction implements BiConsumer<Integer, Integer> {
+        final ExecutionMode m;
         int invocationCount = 0;
         Integer value;
         // Check this action was invoked exactly once when result is computed.
+        SubtractAction(ExecutionMode m) { this.m = m; }
         public void accept(Integer x, Integer y) {
+            m.checkExecutionMode();
             invocationCount++;
             value = subtract(x, y);
         }
     }
     static final class SubtractFunction implements BiFunction<Integer, Integer, Integer> {
+        final ExecutionMode m;
         int invocationCount = 0;
         Integer value;
         // Check this action was invoked exactly once when result is computed.
+        SubtractFunction(ExecutionMode m) { this.m = m; }
         public Integer apply(Integer x, Integer y) {
+            m.checkExecutionMode();
             invocationCount++;
             return value = subtract(x, y);
         }
     }
     static final class Noop implements Runnable {
+        final ExecutionMode m;
         int invocationCount = 0;
+        Noop(ExecutionMode m) { this.m = m; }
         public void run() {
+            m.checkExecutionMode();
             invocationCount++;
         }
     }
 
     static final class FailingSupplier implements Supplier<Integer> {
+        final ExecutionMode m;
         int invocationCount = 0;
+        FailingSupplier(ExecutionMode m) { this.m = m; }
         public Integer get() {
+            m.checkExecutionMode();
             invocationCount++;
             throw new CFException();
         }
     }
     static final class FailingConsumer implements Consumer<Integer> {
+        final ExecutionMode m;
         int invocationCount = 0;
+        FailingConsumer(ExecutionMode m) { this.m = m; }
         public void accept(Integer x) {
+            m.checkExecutionMode();
             invocationCount++;
             throw new CFException();
         }
     }
     static final class FailingBiConsumer implements BiConsumer<Integer, Integer> {
+        final ExecutionMode m;
         int invocationCount = 0;
+        FailingBiConsumer(ExecutionMode m) { this.m = m; }
         public void accept(Integer x, Integer y) {
+            m.checkExecutionMode();
             invocationCount++;
             throw new CFException();
         }
     }
     static final class FailingFunction implements Function<Integer, Integer> {
+        final ExecutionMode m;
         int invocationCount = 0;
+        FailingFunction(ExecutionMode m) { this.m = m; }
         public Integer apply(Integer x) {
+            m.checkExecutionMode();
             invocationCount++;
             throw new CFException();
         }
     }
     static final class FailingBiFunction implements BiFunction<Integer, Integer, Integer> {
+        final ExecutionMode m;
         int invocationCount = 0;
+        FailingBiFunction(ExecutionMode m) { this.m = m; }
         public Integer apply(Integer x, Integer y) {
+            m.checkExecutionMode();
             invocationCount++;
             throw new CFException();
         }
     }
-    static final class FailingNoop implements Runnable {
+    static final class FailingRunnable implements Runnable {
+        final ExecutionMode m;
         int invocationCount = 0;
+        FailingRunnable(ExecutionMode m) { this.m = m; }
         public void run() {
+            m.checkExecutionMode();
             invocationCount++;
             throw new CFException();
         }
@@ -422,8 +456,11 @@ public class CompletableFutureTest exten
 
     static final class CompletableFutureInc
         implements Function<Integer, CompletableFuture<Integer>> {
+        final ExecutionMode m;
         int invocationCount = 0;
+        CompletableFutureInc(ExecutionMode m) { this.m = m; }
         public CompletableFuture<Integer> apply(Integer x) {
+            m.checkExecutionMode();
             invocationCount++;
             CompletableFuture<Integer> f = new CompletableFuture<>();
             f.complete(inc(x));
@@ -433,8 +470,11 @@ public class CompletableFutureTest exten
 
     static final class FailingCompletableFutureFunction
         implements Function<Integer, CompletableFuture<Integer>> {
+        final ExecutionMode m;
         int invocationCount = 0;
+        FailingCompletableFutureFunction(ExecutionMode m) { this.m = m; }
         public CompletableFuture<Integer> apply(Integer x) {
+            m.checkExecutionMode();
             invocationCount++;
             throw new CFException();
         }
@@ -442,23 +482,15 @@ public class CompletableFutureTest exten
 
     // Used for explicit executor tests
     static final class ThreadExecutor implements Executor {
-        AtomicInteger count = new AtomicInteger(0);
+        final AtomicInteger count = new AtomicInteger(0);
+        static final ThreadGroup tg = new ThreadGroup("ThreadExecutor");
+        static boolean startedCurrentThread() {
+            return Thread.currentThread().getThreadGroup() == tg;
+        }
 
         public void execute(Runnable r) {
             count.getAndIncrement();
-            new Thread(r).start();
-        }
-    }
-
-    static final class ExceptionToInteger implements Function<Throwable, Integer> {
-        public Integer apply(Throwable x) { return Integer.valueOf(3); }
-    }
-
-    static final class IntegerHandler implements BiFunction<Integer, Throwable, Integer> {
-        int invocationCount = 0;
-        public Integer apply(Integer x, Throwable t) {
-            invocationCount++;
-            return (t == null) ? two : three;
+            new Thread(tg, r).start();
         }
     }
 
@@ -468,6 +500,39 @@ public class CompletableFutureTest exten
      */
     enum ExecutionMode {
         DEFAULT {
+            public void checkExecutionMode() {
+                assertNull(ForkJoinTask.getPool());
+            }
+            public CompletableFuture<Void> runAsync(Runnable a) {
+                throw new UnsupportedOperationException();
+            }
+            public <T> CompletableFuture<Void> thenRun
+                (CompletableFuture<T> f, Runnable a) {
+                return f.thenRun(a);
+            }
+            public <T> CompletableFuture<Void> thenAccept
+                (CompletableFuture<T> f, Consumer<? super T> a) {
+                return f.thenAccept(a);
+            }
+            public <T,U> CompletableFuture<U> thenApply
+                (CompletableFuture<T> f, Function<? super T,U> a) {
+                return f.thenApply(a);
+            }
+            public <T,U> CompletableFuture<U> thenCompose
+                (CompletableFuture<T> f,
+                 Function<? super T,? extends CompletionStage<U>> a) {
+                return f.thenCompose(a);
+            }
+            public <T,U> CompletableFuture<U> handle
+                (CompletableFuture<T> f,
+                 BiFunction<? super T,Throwable,? extends U> a) {
+                return f.handle(a);
+            }
+            public <T> CompletableFuture<T> whenComplete
+                (CompletableFuture<T> f,
+                 BiConsumer<? super T,? super Throwable> a) {
+                return f.whenComplete(a);
+            }
             public <T,U> CompletableFuture<Void> runAfterBoth
                 (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
                 return f.runAfterBoth(g, a);
@@ -484,11 +549,11 @@ public class CompletableFutureTest exten
                  BiFunction<? super T,? super U,? extends V> a) {
                 return f.thenCombine(g, a);
             }
-            public <T,U> CompletableFuture<U> applyToEither
+            public <T> CompletableFuture<Void> runAfterEither
                 (CompletableFuture<T> f,
-                 CompletionStage<? extends T> g,
-                 Function<? super T,U> a) {
-                return f.applyToEither(g, a);
+                 CompletionStage<?> g,
+                 java.lang.Runnable a) {
+                return f.runAfterEither(g, a);
             }
             public <T> CompletableFuture<Void> acceptEither
                 (CompletableFuture<T> f,
@@ -496,25 +561,49 @@ public class CompletableFutureTest exten
                  Consumer<? super T> a) {
                 return f.acceptEither(g, a);
             }
-            public <T> CompletableFuture<Void> runAfterEither
+            public <T,U> CompletableFuture<U> applyToEither
                 (CompletableFuture<T> f,
-                 CompletionStage<?> g,
-                 java.lang.Runnable a) {
-                return f.runAfterEither(g, a);
+                 CompletionStage<? extends T> g,
+                 Function<? super T,U> a) {
+                return f.applyToEither(g, a);
+            }
+        },
+
+        ASYNC {
+            public void checkExecutionMode() {
+                assertSame(ForkJoinPool.commonPool(),
+                           ForkJoinTask.getPool());
+            }
+            public CompletableFuture<Void> runAsync(Runnable a) {
+                return CompletableFuture.runAsync(a);
+            }
+            public <T> CompletableFuture<Void> thenRun
+                (CompletableFuture<T> f, Runnable a) {
+                return f.thenRunAsync(a);
+            }
+            public <T> CompletableFuture<Void> thenAccept
+                (CompletableFuture<T> f, Consumer<? super T> a) {
+                return f.thenAcceptAsync(a);
+            }
+            public <T,U> CompletableFuture<U> thenApply
+                (CompletableFuture<T> f, Function<? super T,U> a) {
+                return f.thenApplyAsync(a);
             }
             public <T,U> CompletableFuture<U> thenCompose
                 (CompletableFuture<T> f,
                  Function<? super T,? extends CompletionStage<U>> a) {
-                return f.thenCompose(a);
+                return f.thenComposeAsync(a);
+            }
+            public <T,U> CompletableFuture<U> handle
+                (CompletableFuture<T> f,
+                 BiFunction<? super T,Throwable,? extends U> a) {
+                return f.handleAsync(a);
             }
             public <T> CompletableFuture<T> whenComplete
                 (CompletableFuture<T> f,
                  BiConsumer<? super T,? super Throwable> a) {
-                return f.whenComplete(a);
+                return f.whenCompleteAsync(a);
             }
-        },
-
-        DEFAULT_ASYNC {
             public <T,U> CompletableFuture<Void> runAfterBoth
                 (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
                 return f.runAfterBothAsync(g, a);
@@ -531,11 +620,11 @@ public class CompletableFutureTest exten
                  BiFunction<? super T,? super U,? extends V> a) {
                 return f.thenCombineAsync(g, a);
             }
-            public <T,U> CompletableFuture<U> applyToEither
+            public <T> CompletableFuture<Void> runAfterEither
                 (CompletableFuture<T> f,
-                 CompletionStage<? extends T> g,
-                 Function<? super T,U> a) {
-                return f.applyToEitherAsync(g, a);
+                 CompletionStage<?> g,
+                 java.lang.Runnable a) {
+                return f.runAfterEitherAsync(g, a);
             }
             public <T> CompletableFuture<Void> acceptEither
                 (CompletableFuture<T> f,
@@ -543,25 +632,48 @@ public class CompletableFutureTest exten
                  Consumer<? super T> a) {
                 return f.acceptEitherAsync(g, a);
             }
-            public <T> CompletableFuture<Void> runAfterEither
+            public <T,U> CompletableFuture<U> applyToEither
                 (CompletableFuture<T> f,
-                 CompletionStage<?> g,
-                 java.lang.Runnable a) {
-                return f.runAfterEitherAsync(g, a);
+                 CompletionStage<? extends T> g,
+                 Function<? super T,U> a) {
+                return f.applyToEitherAsync(g, a);
+            }
+        },
+
+        EXECUTOR {
+            public void checkExecutionMode() {
+                assertTrue(ThreadExecutor.startedCurrentThread());
+            }
+            public CompletableFuture<Void> runAsync(Runnable a) {
+                return CompletableFuture.runAsync(a, new ThreadExecutor());
+            }
+            public <T> CompletableFuture<Void> thenRun
+                (CompletableFuture<T> f, Runnable a) {
+                return f.thenRunAsync(a, new ThreadExecutor());
+            }
+            public <T> CompletableFuture<Void> thenAccept
+                (CompletableFuture<T> f, Consumer<? super T> a) {
+                return f.thenAcceptAsync(a, new ThreadExecutor());
+            }
+            public <T,U> CompletableFuture<U> thenApply
+                (CompletableFuture<T> f, Function<? super T,U> a) {
+                return f.thenApplyAsync(a, new ThreadExecutor());
             }
             public <T,U> CompletableFuture<U> thenCompose
                 (CompletableFuture<T> f,
                  Function<? super T,? extends CompletionStage<U>> a) {
-                return f.thenComposeAsync(a);
+                return f.thenComposeAsync(a, new ThreadExecutor());
+            }
+            public <T,U> CompletableFuture<U> handle
+                (CompletableFuture<T> f,
+                 BiFunction<? super T,Throwable,? extends U> a) {
+                return f.handleAsync(a, new ThreadExecutor());
             }
             public <T> CompletableFuture<T> whenComplete
                 (CompletableFuture<T> f,
                  BiConsumer<? super T,? super Throwable> a) {
-                return f.whenCompleteAsync(a);
+                return f.whenCompleteAsync(a, new ThreadExecutor());
             }
-        },
-
-        EXECUTOR {
             public <T,U> CompletableFuture<Void> runAfterBoth
                 (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
                 return f.runAfterBothAsync(g, a, new ThreadExecutor());
@@ -578,36 +690,43 @@ public class CompletableFutureTest exten
                  BiFunction<? super T,? super U,? extends V> a) {
                 return f.thenCombineAsync(g, a, new ThreadExecutor());
             }
-            public <T,U> CompletableFuture<U> applyToEither
-                (CompletableFuture<T> f,
-                 CompletionStage<? extends T> g,
-                 Function<? super T,U> a) {
-                return f.applyToEitherAsync(g, a, new ThreadExecutor());
-            }
-            public <T> CompletableFuture<Void> acceptEither
-                (CompletableFuture<T> f,
-                 CompletionStage<? extends T> g,
-                 Consumer<? super T> a) {
-                return f.acceptEitherAsync(g, a, new ThreadExecutor());
-            }
             public <T> CompletableFuture<Void> runAfterEither
                 (CompletableFuture<T> f,
                  CompletionStage<?> g,
                  java.lang.Runnable a) {
                 return f.runAfterEitherAsync(g, a, new ThreadExecutor());
             }
-            public <T,U> CompletableFuture<U> thenCompose
+            public <T> CompletableFuture<Void> acceptEither
                 (CompletableFuture<T> f,
-                 Function<? super T,? extends CompletionStage<U>> a) {
-                return f.thenComposeAsync(a, new ThreadExecutor());
+                 CompletionStage<? extends T> g,
+                 Consumer<? super T> a) {
+                return f.acceptEitherAsync(g, a, new ThreadExecutor());
             }
-            public <T> CompletableFuture<T> whenComplete
+            public <T,U> CompletableFuture<U> applyToEither
                 (CompletableFuture<T> f,
-                 BiConsumer<? super T,? super Throwable> a) {
-                return f.whenCompleteAsync(a, new ThreadExecutor());
+                 CompletionStage<? extends T> g,
+                 Function<? super T,U> a) {
+                return f.applyToEitherAsync(g, a, new ThreadExecutor());
             }
         };
 
+        public abstract void checkExecutionMode();
+        public abstract CompletableFuture<Void> runAsync(Runnable a);
+        public abstract <T> CompletableFuture<Void> thenRun
+            (CompletableFuture<T> f, Runnable a);
+        public abstract <T> CompletableFuture<Void> thenAccept
+            (CompletableFuture<T> f, Consumer<? super T> a);
+        public abstract <T,U> CompletableFuture<U> thenApply
+            (CompletableFuture<T> f, Function<? super T,U> a);
+        public abstract <T,U> CompletableFuture<U> thenCompose
+            (CompletableFuture<T> f,
+             Function<? super T,? extends CompletionStage<U>> a);
+        public abstract <T,U> CompletableFuture<U> handle
+            (CompletableFuture<T> f,
+             BiFunction<? super T,Throwable,? extends U> a);
+        public abstract <T> CompletableFuture<T> whenComplete
+            (CompletableFuture<T> f,
+             BiConsumer<? super T,? super Throwable> a);
         public abstract <T,U> CompletableFuture<Void> runAfterBoth
             (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a);
         public abstract <T,U> CompletableFuture<Void> thenAcceptBoth
@@ -618,115 +737,263 @@ public class CompletableFutureTest exten
             (CompletableFuture<T> f,
              CompletionStage<? extends U> g,
              BiFunction<? super T,? super U,? extends V> a);
-        public abstract <T,U> CompletableFuture<U> applyToEither
-            (CompletableFuture<T> f,
-             CompletionStage<? extends T> g,
-             Function<? super T,U> a);
-        public abstract <T> CompletableFuture<Void> acceptEither
-            (CompletableFuture<T> f,
-             CompletionStage<? extends T> g,
-             Consumer<? super T> a);
         public abstract <T> CompletableFuture<Void> runAfterEither
             (CompletableFuture<T> f,
              CompletionStage<?> g,
              java.lang.Runnable a);
-        public abstract <T,U> CompletableFuture<U> thenCompose
+        public abstract <T> CompletableFuture<Void> acceptEither
             (CompletableFuture<T> f,
-             Function<? super T,? extends CompletionStage<U>> a);
-        public abstract <T> CompletableFuture<T> whenComplete
+             CompletionStage<? extends T> g,
+             Consumer<? super T> a);
+        public abstract <T,U> CompletableFuture<U> applyToEither
             (CompletableFuture<T> f,
-             BiConsumer<? super T,? super Throwable> a);
+             CompletionStage<? extends T> g,
+             Function<? super T,U> a);
+    }
+
+    /**
+     * exceptionally action is not invoked when source completes
+     * normally, and source result is propagated
+     */
+    public void testExceptionally_normalCompletion() {
+        for (boolean createIncomplete : new boolean[] { true, false })
+        for (Integer v1 : new Integer[] { 1, null })
+    {
+        final AtomicInteger a = new AtomicInteger(0);
+        final CompletableFuture<Integer> f = new CompletableFuture<>();
+        if (!createIncomplete) f.complete(v1);
+        final CompletableFuture<Integer> g = f.exceptionally
+            ((Throwable t) -> {
+                // Should not be called
+                a.getAndIncrement();
+                throw new AssertionError();
+            });
+        if (createIncomplete) f.complete(v1);
 
+        checkCompletedNormally(g, v1);
+        checkCompletedNormally(f, v1);
+        assertEquals(0, a.get());
+    }}
 
-    }
 
     /**
      * exceptionally action completes with function value on source
-     * exception; otherwise with source value
+     * exception
      */
-    public void testExceptionally() {
-        CompletableFuture<Integer> f = new CompletableFuture<>();
-        ExceptionToInteger r = new ExceptionToInteger();
-        CompletableFuture<Integer> g = f.exceptionally(r);
-        f.completeExceptionally(new CFException());
-        checkCompletedNormally(g, three);
+    public void testExceptionally_exceptionalCompletion() {
+        for (boolean createIncomplete : new boolean[] { true, false })
+        for (Integer v1 : new Integer[] { 1, null })
+    {
+        final AtomicInteger a = new AtomicInteger(0);
+        final CFException ex = new CFException();
+        final CompletableFuture<Integer> f = new CompletableFuture<>();
+        if (!createIncomplete) f.completeExceptionally(ex);
+        final CompletableFuture<Integer> g = f.exceptionally
+            ((Throwable t) -> {
+                ExecutionMode.DEFAULT.checkExecutionMode();
+                threadAssertSame(t, ex);
+                a.getAndIncrement();
+                return v1;
+            });
+        if (createIncomplete) f.completeExceptionally(ex);
 
-        f = new CompletableFuture<>();
-        r = new ExceptionToInteger();
-        g = f.exceptionally(r);
-        f.complete(one);
-        checkCompletedNormally(g, one);
-    }
+        checkCompletedNormally(g, v1);
+        assertEquals(1, a.get());
+    }}
+
+    public void testExceptionally_exceptionalCompletionActionFailed() {
+        for (boolean createIncomplete : new boolean[] { true, false })
+        for (Integer v1 : new Integer[] { 1, null })
+    {
+        final AtomicInteger a = new AtomicInteger(0);
+        final CFException ex1 = new CFException();
+        final CFException ex2 = new CFException();
+        final CompletableFuture<Integer> f = new CompletableFuture<>();
+        if (!createIncomplete) f.completeExceptionally(ex1);
+        final CompletableFuture<Integer> g = f.exceptionally
+            ((Throwable t) -> {
+                ExecutionMode.DEFAULT.checkExecutionMode();
+                threadAssertSame(t, ex1);
+                a.getAndIncrement();
+                throw ex2;
+            });
+        if (createIncomplete) f.completeExceptionally(ex1);
+
+        checkCompletedWithWrappedCFException(g, ex2);
+        assertEquals(1, a.get());
+    }}
 
     /**
-     * handle action completes normally with function value on either
-     * normal or exceptional completion of source
+     * handle action completes normally with function value on normal
+     * completion of source
      */
-    public void testHandle() {
-        CompletableFuture<Integer> f, g;
-        IntegerHandler r;
+    public void testHandle_normalCompletion() {
+        for (ExecutionMode m : ExecutionMode.values())
+        for (boolean createIncomplete : new boolean[] { true, false })
+        for (Integer v1 : new Integer[] { 1, null })
+    {
+        final CompletableFuture<Integer> f = new CompletableFuture<>();
+        final AtomicInteger a = new AtomicInteger(0);
+        if (!createIncomplete) f.complete(v1);
+        final CompletableFuture<Integer> g = m.handle
+            (f,
+             (Integer x, Throwable t) -> {
+                m.checkExecutionMode();
+                threadAssertSame(x, v1);
+                threadAssertNull(t);
+                a.getAndIncrement();
+                return inc(v1);
+            });
+        if (createIncomplete) f.complete(v1);
 
-        f = new CompletableFuture<>();
-        f.completeExceptionally(new CFException());
-        g = f.handle(r = new IntegerHandler());
-        assertEquals(1, r.invocationCount);
-        assertEquals(1, r.invocationCount);
-        checkCompletedNormally(g, three);
+        checkCompletedNormally(g, inc(v1));
+        checkCompletedNormally(f, v1);
+        assertEquals(1, a.get());
+    }}
 
-        f = new CompletableFuture<>();
-        g = f.handle(r = new IntegerHandler());
-        assertEquals(0, r.invocationCount);
-        f.completeExceptionally(new CFException());
-        checkCompletedNormally(g, three);
-        assertEquals(1, r.invocationCount);
+    /**
+     * handle action completes normally with function value on
+     * exceptional completion of source
+     */
+    public void testHandle_exceptionalCompletion() {
+        for (ExecutionMode m : ExecutionMode.values())
+        for (boolean createIncomplete : new boolean[] { true, false })
+        for (Integer v1 : new Integer[] { 1, null })
+    {
+        final CompletableFuture<Integer> f = new CompletableFuture<>();
+        final AtomicInteger a = new AtomicInteger(0);
+        final CFException ex = new CFException();
+        if (!createIncomplete) f.completeExceptionally(ex);
+        final CompletableFuture<Integer> g = m.handle
+            (f,
+             (Integer x, Throwable t) -> {
+                m.checkExecutionMode();
+                threadAssertNull(x);
+                threadAssertSame(t, ex);
+                a.getAndIncrement();
+                return v1;
+            });
+        if (createIncomplete) f.completeExceptionally(ex);
 
-        f = new CompletableFuture<>();
-        f.complete(one);
-        g = f.handle(r = new IntegerHandler());
-        assertEquals(1, r.invocationCount);
-        checkCompletedNormally(g, two);
+        checkCompletedNormally(g, v1);
+        checkCompletedWithWrappedCFException(f, ex);
+        assertEquals(1, a.get());
+    }}
 
-        f = new CompletableFuture<>();
-        g = f.handle(r = new IntegerHandler());
-        assertEquals(0, r.invocationCount);
-        f.complete(one);
-        assertEquals(1, r.invocationCount);
-        checkCompletedNormally(g, two);
-    }
+    /**
+     * handle action completes normally with function value on
+     * cancelled source
+     */
+    public void testHandle_sourceCancelled() {
+        for (ExecutionMode m : ExecutionMode.values())
+        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
+        for (boolean createIncomplete : new boolean[] { true, false })
+        for (Integer v1 : new Integer[] { 1, null })
+    {
+        final CompletableFuture<Integer> f = new CompletableFuture<>();
+        final AtomicInteger a = new AtomicInteger(0);
+        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
+        final CompletableFuture<Integer> g = m.handle
+            (f,
+             (Integer x, Throwable t) -> {
+                m.checkExecutionMode();
+                threadAssertNull(x);
+                threadAssertTrue(t instanceof CancellationException);
+                a.getAndIncrement();
+                return v1;
+            });
+        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
+
+        checkCompletedNormally(g, v1);
+        checkCancelled(f);
+        assertEquals(1, a.get());
+    }}
 
     /**
-     * runAsync completes after running Runnable
+     * handle result completes exceptionally if action does
      */
-    public void testRunAsync() {
-        Noop r = new Noop();
-        CompletableFuture<Void> f = CompletableFuture.runAsync(r);
-        assertNull(f.join());
-        assertEquals(1, r.invocationCount);
-        checkCompletedNormally(f, null);
-    }
+    public void testHandle_sourceFailedActionFailed() {
+        for (ExecutionMode m : ExecutionMode.values())
+        for (boolean createIncomplete : new boolean[] { true, false })
+    {
+        final CompletableFuture<Integer> f = new CompletableFuture<>();
+        final AtomicInteger a = new AtomicInteger(0);
+        final CFException ex1 = new CFException();
+        final CFException ex2 = new CFException();
+        if (!createIncomplete) f.completeExceptionally(ex1);
+        final CompletableFuture<Integer> g = m.handle
+            (f,
+             (Integer x, Throwable t) -> {
+                m.checkExecutionMode();
+                threadAssertNull(x);
+                threadAssertSame(ex1, t);
+                a.getAndIncrement();
+                throw ex2;
+            });
+        if (createIncomplete) f.completeExceptionally(ex1);
+
+        checkCompletedWithWrappedCFException(g, ex2);
+        checkCompletedWithWrappedCFException(f, ex1);
+        assertEquals(1, a.get());
+    }}
+
+    public void testHandle_sourceCompletedNormallyActionFailed() {
+        for (ExecutionMode m : ExecutionMode.values())
+        for (boolean createIncomplete : new boolean[] { true, false })
+        for (Integer v1 : new Integer[] { 1, null })
+    {
+        final CompletableFuture<Integer> f = new CompletableFuture<>();
+        final AtomicInteger a = new AtomicInteger(0);
+        final CFException ex = new CFException();
+        if (!createIncomplete) f.complete(v1);
+        final CompletableFuture<Integer> g = m.handle
+            (f,
+             (Integer x, Throwable t) -> {
+                m.checkExecutionMode();
+                threadAssertSame(x, v1);
+                threadAssertNull(t);
+                a.getAndIncrement();
+                throw ex;
+            });
+        if (createIncomplete) f.complete(v1);
+
+        checkCompletedWithWrappedCFException(g, ex);
+        checkCompletedNormally(f, v1);
+        assertEquals(1, a.get());
+    }}
 
     /**
-     * runAsync with executor completes after running Runnable
+     * runAsync completes after running Runnable
      */
-    public void testRunAsync2() {
-        Noop r = new Noop();
-        ThreadExecutor exec = new ThreadExecutor();
-        CompletableFuture<Void> f = CompletableFuture.runAsync(r, exec);
+    public void testRunAsync_normalCompletion() {
+        ExecutionMode[] executionModes = {
+            ExecutionMode.ASYNC,
+            ExecutionMode.EXECUTOR,
+        };
+        for (ExecutionMode m : executionModes)
+    {
+        final Noop r = new Noop(m);
+        final CompletableFuture<Void> f = m.runAsync(r);
         assertNull(f.join());
-        assertEquals(1, r.invocationCount);
         checkCompletedNormally(f, null);
-        assertEquals(1, exec.count.get());
-    }
+        assertEquals(1, r.invocationCount);
+    }}
 
     /**
      * failing runAsync completes exceptionally after running Runnable
      */
-    public void testRunAsync3() {
-        FailingNoop r = new FailingNoop();
-        CompletableFuture<Void> f = CompletableFuture.runAsync(r);
+    public void testRunAsync_exceptionalCompletion() {
+        ExecutionMode[] executionModes = {
+            ExecutionMode.ASYNC,
+            ExecutionMode.EXECUTOR,
+        };
+        for (ExecutionMode m : executionModes)
+    {
+        final FailingRunnable r = new FailingRunnable(m);
+        final CompletableFuture<Void> f = m.runAsync(r);
         checkCompletedWithWrappedCFException(f);
         assertEquals(1, r.invocationCount);
-    }
+    }}
 
     /**
      * supplyAsync completes with result of supplier
@@ -752,7 +1019,7 @@ public class CompletableFutureTest exten
      * Failing supplyAsync completes exceptionally
      */
     public void testSupplyAsync3() {
-        FailingSupplier r = new FailingSupplier();
+        FailingSupplier r = new FailingSupplier(ExecutionMode.ASYNC);
         CompletableFuture<Integer> f = CompletableFuture.supplyAsync(r);
         checkCompletedWithWrappedCFException(f);
         assertEquals(1, r.invocationCount);
@@ -763,1080 +1030,671 @@ public class CompletableFutureTest exten
     /**
      * thenRun result completes normally after normal completion of source
      */
-    public void testThenRun() {
-        CompletableFuture<Integer> f;
-        CompletableFuture<Void> g;
-        Noop r;
-
-        f = new CompletableFuture<>();
-        g = f.thenRun(r = new Noop());
-        f.complete(null);
-        checkCompletedNormally(g, null);
-        assertEquals(1, r.invocationCount);
+    public void testThenRun_normalCompletion() {
+        for (ExecutionMode m : ExecutionMode.values())
+        for (boolean createIncomplete : new boolean[] { true, false })
+        for (Integer v1 : new Integer[] { 1, null })
+    {
+        final CompletableFuture<Integer> f = new CompletableFuture<>();
+        final Noop r = new Noop(m);
+        if (!createIncomplete) f.complete(v1);
+        final CompletableFuture<Void> g = m.thenRun(f, r);
+        if (createIncomplete) {
+            checkIncomplete(g);
+            f.complete(v1);
+        }
 
-        f = new CompletableFuture<>();
-        f.complete(null);
-        g = f.thenRun(r = new Noop());
         checkCompletedNormally(g, null);
+        checkCompletedNormally(f, v1);
         assertEquals(1, r.invocationCount);
-    }
+    }}
 
     /**
      * thenRun result completes exceptionally after exceptional
      * completion of source
      */
-    public void testThenRun2() {
-        CompletableFuture<Integer> f;
-        CompletableFuture<Void> g;
-        Noop r;
-
-        f = new CompletableFuture<>();
-        g = f.thenRun(r = new Noop());
-        f.completeExceptionally(new CFException());
-        checkCompletedWithWrappedCFException(g);
-        assertEquals(0, r.invocationCount);
+    public void testThenRun_exceptionalCompletion() {
+        for (ExecutionMode m : ExecutionMode.values())
+        for (boolean createIncomplete : new boolean[] { true, false })
+    {
+        final CFException ex = new CFException();
+        final CompletableFuture<Integer> f = new CompletableFuture<>();
+        final Noop r = new Noop(m);
+        if (!createIncomplete) f.completeExceptionally(ex);
+        final CompletableFuture<Void> g = m.thenRun(f, r);
+        if (createIncomplete) {
+            checkIncomplete(g);
+            f.completeExceptionally(ex);
+        }
 
-        f = new CompletableFuture<>();
-        f.completeExceptionally(new CFException());
-        g = f.thenRun(r = new Noop());
-        checkCompletedWithWrappedCFException(g);
+        checkCompletedWithWrappedCFException(g, ex);
+        checkCompletedWithWrappedCFException(f, ex);
         assertEquals(0, r.invocationCount);
-    }
+    }}
 
     /**
-     * thenRun result completes exceptionally if action does
+     * thenRun result completes exceptionally if source cancelled
      */
-    public void testThenRun3() {
-        CompletableFuture<Integer> f;
-        CompletableFuture<Void> g;
-        FailingNoop r;
-
-        f = new CompletableFuture<>();
-        g = f.thenRun(r = new FailingNoop());
-        f.complete(null);
-        checkCompletedWithWrappedCFException(g);
+    public void testThenRun_sourceCancelled() {
+        for (ExecutionMode m : ExecutionMode.values())
+        for (boolean createIncomplete : new boolean[] { true, false })
+        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
+    {
+        final CompletableFuture<Integer> f = new CompletableFuture<>();
+        final Noop r = new Noop(m);
+        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
+        final CompletableFuture<Void> g = m.thenRun(f, r);
+        if (createIncomplete) {
+            checkIncomplete(g);
+            assertTrue(f.cancel(mayInterruptIfRunning));
+        }
 
-        f = new CompletableFuture<>();
-        f.complete(null);
-        g = f.thenRun(r = new FailingNoop());
-        checkCompletedWithWrappedCFException(g);
-    }
+        checkCompletedWithWrappedCancellationException(g);
+        checkCancelled(f);
+        assertEquals(0, r.invocationCount);
+    }}
 
     /**
-     * thenRun result completes exceptionally if source cancelled
+     * thenRun result completes exceptionally if action does
      */
-    public void testThenRun4() {
-        CompletableFuture<Integer> f;
-        CompletableFuture<Void> g;
-        Noop r;
-
-        f = new CompletableFuture<>();
-        g = f.thenRun(r = new Noop());
-        assertTrue(f.cancel(true));
-        checkCompletedWithWrappedCancellationException(g);
+    public void testThenRun_actionFailed() {
+        for (ExecutionMode m : ExecutionMode.values())
+        for (boolean createIncomplete : new boolean[] { true, false })
+        for (Integer v1 : new Integer[] { 1, null })
+    {
+        final CompletableFuture<Integer> f = new CompletableFuture<>();
+        final FailingRunnable r = new FailingRunnable(m);
+        if (!createIncomplete) f.complete(v1);
+        final CompletableFuture<Void> g = m.thenRun(f, r);
+        if (createIncomplete) {
+            checkIncomplete(g);
+            f.complete(v1);
+        }
 
-        f = new CompletableFuture<>();
-        assertTrue(f.cancel(true));
-        g = f.thenRun(r = new Noop());
-        checkCompletedWithWrappedCancellationException(g);
-    }
+        checkCompletedWithWrappedCFException(g);
+        checkCompletedNormally(f, v1);
+    }}
 
     /**
      * thenApply result completes normally after normal completion of source
      */
-    public void testThenApply() {
-        CompletableFuture<Integer> f = new CompletableFuture<>();
-        CompletableFuture<Integer> g = f.thenApply(inc);
-        f.complete(one);
-        checkCompletedNormally(g, two);
-    }
+    public void testThenApply_normalCompletion() {
+        for (ExecutionMode m : ExecutionMode.values())
+        for (boolean createIncomplete : new boolean[] { true, false })
+        for (Integer v1 : new Integer[] { 1, null })
+    {
+        final CompletableFuture<Integer> f = new CompletableFuture<>();
+        final IncFunction r = new IncFunction(m);
+        if (!createIncomplete) f.complete(v1);
+        final CompletableFuture<Integer> g = m.thenApply(f, r);
+        if (createIncomplete) {
+            checkIncomplete(g);
+            f.complete(v1);
+        }
+
+        checkCompletedNormally(g, inc(v1));
+        checkCompletedNormally(f, v1);
+        assertEquals(1, r.invocationCount);
+    }}
 
     /**
      * thenApply result completes exceptionally after exceptional
      * completion of source
      */
-    public void testThenApply2() {
-        CompletableFuture<Integer> f = new CompletableFuture<>();
-        CompletableFuture<Integer> g = f.thenApply(inc);
-        f.completeExceptionally(new CFException());
-        checkCompletedWithWrappedCFException(g);
-    }
+    public void testThenApply_exceptionalCompletion() {
+        for (ExecutionMode m : ExecutionMode.values())
+        for (boolean createIncomplete : new boolean[] { true, false })
+    {
+        final CFException ex = new CFException();
+        final CompletableFuture<Integer> f = new CompletableFuture<>();
+        final IncFunction r = new IncFunction(m);
+        if (!createIncomplete) f.completeExceptionally(ex);
+        final CompletableFuture<Integer> g = m.thenApply(f, r);
+        if (createIncomplete) {
+            checkIncomplete(g);
+            f.completeExceptionally(ex);
+        }
 
-    /**
-     * thenApply result completes exceptionally if action does
-     */
-    public void testThenApply3() {
-        CompletableFuture<Integer> f = new CompletableFuture<>();
-        CompletableFuture<Integer> g = f.thenApply(new FailingFunction());
-        f.complete(one);
-        checkCompletedWithWrappedCFException(g);
-    }
+        checkCompletedWithWrappedCFException(g, ex);
+        checkCompletedWithWrappedCFException(f, ex);
+        assertEquals(0, r.invocationCount);
+    }}
 
     /**
      * thenApply result completes exceptionally if source cancelled
      */
-    public void testThenApply4() {
-        CompletableFuture<Integer> f = new CompletableFuture<>();
-        CompletableFuture<Integer> g = f.thenApply(inc);
-        assertTrue(f.cancel(true));
+    public void testThenApply_sourceCancelled() {
+        for (ExecutionMode m : ExecutionMode.values())
+        for (boolean createIncomplete : new boolean[] { true, false })
+        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
+    {
+        final CompletableFuture<Integer> f = new CompletableFuture<>();
+        final IncFunction r = new IncFunction(m);
+        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
+        final CompletableFuture<Integer> g = m.thenApply(f, r);
+        if (createIncomplete) {
+            checkIncomplete(g);
+            assertTrue(f.cancel(mayInterruptIfRunning));
+        }
+
         checkCompletedWithWrappedCancellationException(g);
-    }
+        checkCancelled(f);
+        assertEquals(0, r.invocationCount);
+    }}
+
+    /**
+     * thenApply result completes exceptionally if action does
+     */
+    public void testThenApply_actionFailed() {
+        for (ExecutionMode m : ExecutionMode.values())
+        for (boolean createIncomplete : new boolean[] { true, false })
+        for (Integer v1 : new Integer[] { 1, null })
+    {
+        final CompletableFuture<Integer> f = new CompletableFuture<>();
+        final FailingFunction r = new FailingFunction(m);
+        if (!createIncomplete) f.complete(v1);
+        final CompletableFuture<Integer> g = m.thenApply(f, r);
+        if (createIncomplete) {
+            checkIncomplete(g);
+            f.complete(v1);
+        }
+
+        checkCompletedWithWrappedCFException(g);
+        checkCompletedNormally(f, v1);
+    }}
 
     /**
      * thenAccept result completes normally after normal completion of source
      */
-    public void testThenAccept() {
-        CompletableFuture<Integer> f = new CompletableFuture<>();
-        IncAction r = new IncAction();
-        CompletableFuture<Void> g = f.thenAccept(r);
-        f.complete(one);
+    public void testThenAccept_normalCompletion() {
+        for (ExecutionMode m : ExecutionMode.values())
+        for (boolean createIncomplete : new boolean[] { true, false })
+        for (Integer v1 : new Integer[] { 1, null })
+    {
+        final CompletableFuture<Integer> f = new CompletableFuture<>();
+        final IncAction r = new IncAction();
+        if (!createIncomplete) f.complete(v1);
+        final CompletableFuture<Void> g = m.thenAccept(f, r);
+        if (createIncomplete) {
+            checkIncomplete(g);
+            f.complete(v1);
+        }
+
         checkCompletedNormally(g, null);
-        assertEquals(r.value, (Integer) 2);
-    }
+        checkCompletedNormally(f, v1);
+        assertEquals(1, r.invocationCount);
+        assertEquals(inc(v1), r.value);
+    }}
 
     /**
      * thenAccept result completes exceptionally after exceptional
      * completion of source
      */
-    public void testThenAccept2() {
-        CompletableFuture<Integer> f = new CompletableFuture<>();
-        IncAction r = new IncAction();
-        CompletableFuture<Void> g = f.thenAccept(r);
-        f.completeExceptionally(new CFException());
-        checkCompletedWithWrappedCFException(g);
-    }
+    public void testThenAccept_exceptionalCompletion() {
+        for (ExecutionMode m : ExecutionMode.values())
+        for (boolean createIncomplete : new boolean[] { true, false })
+    {
+        final CFException ex = new CFException();
+        final CompletableFuture<Integer> f = new CompletableFuture<>();
+        final IncAction r = new IncAction();
+        if (!createIncomplete) f.completeExceptionally(ex);
+        final CompletableFuture<Void> g = m.thenAccept(f, r);
+        if (createIncomplete) {
+            checkIncomplete(g);
+            f.completeExceptionally(ex);
+        }
+
+        checkCompletedWithWrappedCFException(g, ex);
+        checkCompletedWithWrappedCFException(f, ex);
+        assertEquals(0, r.invocationCount);
+    }}
 
     /**
      * thenAccept result completes exceptionally if action does
      */
-    public void testThenAccept3() {
-        CompletableFuture<Integer> f = new CompletableFuture<>();
-        FailingConsumer r = new FailingConsumer();
-        CompletableFuture<Void> g = f.thenAccept(r);
-        f.complete(one);
+    public void testThenAccept_actionFailed() {
+        for (ExecutionMode m : ExecutionMode.values())
+        for (boolean createIncomplete : new boolean[] { true, false })
+        for (Integer v1 : new Integer[] { 1, null })
+    {
+        final CompletableFuture<Integer> f = new CompletableFuture<>();
+        final FailingConsumer r = new FailingConsumer(m);
+        if (!createIncomplete) f.complete(v1);
+        final CompletableFuture<Void> g = m.thenAccept(f, r);
+        if (createIncomplete) {
+            checkIncomplete(g);
+            f.complete(v1);
+        }
+
         checkCompletedWithWrappedCFException(g);
-        assertEquals(1, r.invocationCount);
-    }
+        checkCompletedNormally(f, v1);
+    }}
 
     /**
      * thenAccept result completes exceptionally if source cancelled
      */
-    public void testThenAccept4() {
-        CompletableFuture<Integer> f = new CompletableFuture<>();
-        IncAction r = new IncAction();
-        CompletableFuture<Void> g = f.thenAccept(r);
-        assertTrue(f.cancel(true));
+    public void testThenAccept_sourceCancelled() {
+        for (ExecutionMode m : ExecutionMode.values())
+        for (boolean createIncomplete : new boolean[] { true, false })
+        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
+    {
+        final CompletableFuture<Integer> f = new CompletableFuture<>();
+        final IncAction r = new IncAction();
+        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
+        final CompletableFuture<Void> g = m.thenAccept(f, r);
+        if (createIncomplete) {
+            checkIncomplete(g);
+            assertTrue(f.cancel(mayInterruptIfRunning));
+        }
+
         checkCompletedWithWrappedCancellationException(g);
-    }
+        checkCancelled(f);
+        assertEquals(0, r.invocationCount);
+    }}
 
     /**
      * thenCombine result completes normally after normal completion
      * of sources
      */
-    public void testThenCombine_normalCompletion1() {
+    public void testThenCombine_normalCompletion() {
+        for (ExecutionMode m : ExecutionMode.values())
         for (boolean createIncomplete : new boolean[] { true, false })
         for (boolean fFirst : new boolean[] { true, false })
-        for (ExecutionMode m : ExecutionMode.values())
         for (Integer v1 : new Integer[] { 1, null })
-        for (Integer v2 : new Integer[] { 2, null }) {
-
+        for (Integer v2 : new Integer[] { 2, null })
+    {
         final CompletableFuture<Integer> f = new CompletableFuture<>();
         final CompletableFuture<Integer> g = new CompletableFuture<>();
-        final SubtractFunction r = new SubtractFunction();
-        CompletableFuture<Integer> h = null;
-        if (createIncomplete) h = m.thenCombine(f, g, r);
+        final SubtractFunction r = new SubtractFunction(m);
 
-        if (fFirst)
-            f.complete(v1);
-        else
-            g.complete(v2);
-        if (createIncomplete) checkIncomplete(h);
-        assertEquals(0, r.invocationCount);
-        if (!fFirst)
-            f.complete(v1);
-        else
-            g.complete(v2);
-        if (!createIncomplete) h = m.thenCombine(f, g, r);
+        if (fFirst) f.complete(v1); else g.complete(v2);
+        if (!createIncomplete)
+            if (!fFirst) f.complete(v1); else g.complete(v2);
+        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
+        if (createIncomplete) {
+            checkIncomplete(h);
+            assertEquals(0, r.invocationCount);
+            if (!fFirst) f.complete(v1); else g.complete(v2);
+        }
 
         checkCompletedNormally(h, subtract(v1, v2));
         checkCompletedNormally(f, v1);
         checkCompletedNormally(g, v2);
         assertEquals(1, r.invocationCount);
-        }
-    }
+    }}
 
     /**
      * thenCombine result completes exceptionally after exceptional
      * completion of either source
      */
-    public void testThenCombine_exceptionalCompletion1() {
+    public void testThenCombine_exceptionalCompletion() {
         for (ExecutionMode m : ExecutionMode.values())
-        for (Integer v1 : new Integer[] { 1, null }) {
-
+        for (boolean createIncomplete : new boolean[] { true, false })
+        for (boolean fFirst : new boolean[] { true, false })
+        for (Integer v1 : new Integer[] { 1, null })
+    {
         final CompletableFuture<Integer> f = new CompletableFuture<>();
         final CompletableFuture<Integer> g = new CompletableFuture<>();
-        final SubtractFunction r = new SubtractFunction();
-        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
         final CFException ex = new CFException();
+        final SubtractFunction r = new SubtractFunction(m);
 
-        f.completeExceptionally(ex);
-        checkIncomplete(h);
-        g.complete(v1);
-
-        checkCompletedWithWrappedCFException(h, ex);
-        checkCompletedWithWrappedCFException(f, ex);
-        assertEquals(0, r.invocationCount);
-        checkCompletedNormally(g, v1);
-        }
-    }
-
-    public void testThenCombine_exceptionalCompletion2() {
-        for (ExecutionMode m : ExecutionMode.values())
-        for (Integer v1 : new Integer[] { 1, null }) {
-
-        final CompletableFuture<Integer> f = new CompletableFuture<>();
-        final CompletableFuture<Integer> g = new CompletableFuture<>();
-        final SubtractFunction r = new SubtractFunction();
+        (fFirst ? f : g).complete(v1);
+        if (!createIncomplete)
+            (!fFirst ? f : g).completeExceptionally(ex);
         final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
-        final CFException ex = new CFException();
-
-        g.completeExceptionally(ex);
-        checkIncomplete(h);
-        f.complete(v1);
-
-        checkCompletedWithWrappedCFException(h, ex);
-        checkCompletedWithWrappedCFException(g, ex);
-        assertEquals(0, r.invocationCount);
-        checkCompletedNormally(f, v1);
+        if (createIncomplete) {
+            checkIncomplete(h);
+            (!fFirst ? f : g).completeExceptionally(ex);
         }
-    }
-
-    public void testThenCombine_exceptionalCompletion3() {
-        for (ExecutionMode m : ExecutionMode.values())
-        for (Integer v1 : new Integer[] { 1, null }) {
-
-        final CompletableFuture<Integer> f = new CompletableFuture<>();
-        final CompletableFuture<Integer> g = new CompletableFuture<>();
-        final SubtractFunction r = new SubtractFunction();
-        final CFException ex = new CFException();
-
-        g.completeExceptionally(ex);
-        f.complete(v1);
-        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
-
-        checkCompletedWithWrappedCFException(h, ex);
-        checkCompletedWithWrappedCFException(g, ex);
-        assertEquals(0, r.invocationCount);
-        checkCompletedNormally(f, v1);
-        }
-    }
-
-    public void testThenCombine_exceptionalCompletion4() {
-        for (ExecutionMode m : ExecutionMode.values())
-        for (Integer v1 : new Integer[] { 1, null }) {
-
-        final CompletableFuture<Integer> f = new CompletableFuture<>();
-        final CompletableFuture<Integer> g = new CompletableFuture<>();
-        final SubtractFunction r = new SubtractFunction();
-        final CFException ex = new CFException();
-
-        f.completeExceptionally(ex);
-        g.complete(v1);
-        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
 
         checkCompletedWithWrappedCFException(h, ex);
-        checkCompletedWithWrappedCFException(f, ex);
         assertEquals(0, r.invocationCount);
-        checkCompletedNormally(g, v1);
-        }
-    }
+        checkCompletedNormally(fFirst ? f : g, v1);
+        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
+    }}
 
     /**
      * thenCombine result completes exceptionally if action does
      */
-    public void testThenCombine_actionFailed1() {
+    public void testThenCombine_actionFailed() {
         for (ExecutionMode m : ExecutionMode.values())
+        for (boolean fFirst : new boolean[] { true, false })
         for (Integer v1 : new Integer[] { 1, null })
-        for (Integer v2 : new Integer[] { 2, null }) {
-
+        for (Integer v2 : new Integer[] { 2, null })
+    {
         final CompletableFuture<Integer> f = new CompletableFuture<>();
         final CompletableFuture<Integer> g = new CompletableFuture<>();
-        final FailingBiFunction r = new FailingBiFunction();
+        final FailingBiFunction r = new FailingBiFunction(m);
         final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
 
-        f.complete(v1);
-        checkIncomplete(h);
-        g.complete(v2);
-
-        checkCompletedWithWrappedCFException(h);
-        checkCompletedNormally(f, v1);
-        checkCompletedNormally(g, v2);
+        if (fFirst) {
+            f.complete(v1);
+            g.complete(v2);
+        } else {
+            g.complete(v2);
+            f.complete(v1);
         }
-    }
-
-    public void testThenCombine_actionFailed2() {
-        for (ExecutionMode m : ExecutionMode.values())
-        for (Integer v1 : new Integer[] { 1, null })
-        for (Integer v2 : new Integer[] { 2, null }) {
-
-        final CompletableFuture<Integer> f = new CompletableFuture<>();
-        final CompletableFuture<Integer> g = new CompletableFuture<>();
-        final FailingBiFunction r = new FailingBiFunction();
-        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
-
-        g.complete(v2);
-        checkIncomplete(h);
-        f.complete(v1);
 
         checkCompletedWithWrappedCFException(h);
         checkCompletedNormally(f, v1);
         checkCompletedNormally(g, v2);
-        }
-    }
+    }}
 
     /**
      * thenCombine result completes exceptionally if either source cancelled
      */
-    public void testThenCombine_sourceCancelled1() {
+    public void testThenCombine_sourceCancelled() {
         for (ExecutionMode m : ExecutionMode.values())
         for (boolean mayInterruptIfRunning : new boolean[] { true, false })
-        for (Integer v1 : new Integer[] { 1, null }) {
-
-        final CompletableFuture<Integer> f = new CompletableFuture<>();
-        final CompletableFuture<Integer> g = new CompletableFuture<>();
-        final SubtractFunction r = new SubtractFunction();
-        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
-
-        assertTrue(f.cancel(mayInterruptIfRunning));
-        checkIncomplete(h);
-        g.complete(v1);
-
-        checkCompletedWithWrappedCancellationException(h);
-        checkCancelled(f);
-        assertEquals(0, r.invocationCount);
-        checkCompletedNormally(g, v1);
-        }
-    }
-
-    public void testThenCombine_sourceCancelled2() {
-        for (ExecutionMode m : ExecutionMode.values())
-        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
-        for (Integer v1 : new Integer[] { 1, null }) {
-
-        final CompletableFuture<Integer> f = new CompletableFuture<>();
-        final CompletableFuture<Integer> g = new CompletableFuture<>();
-        final SubtractFunction r = new SubtractFunction();
-        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
-
-        assertTrue(g.cancel(mayInterruptIfRunning));
-        checkIncomplete(h);
-        f.complete(v1);
-
-        checkCompletedWithWrappedCancellationException(h);
-        checkCancelled(g);
-        assertEquals(0, r.invocationCount);
-        checkCompletedNormally(f, v1);
-        }
-    }
-
-    public void testThenCombine_sourceCancelled3() {
-        for (ExecutionMode m : ExecutionMode.values())
-        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
-        for (Integer v1 : new Integer[] { 1, null }) {
-
+        for (boolean createIncomplete : new boolean[] { true, false })
+        for (boolean fFirst : new boolean[] { true, false })
+        for (Integer v1 : new Integer[] { 1, null })
+    {
         final CompletableFuture<Integer> f = new CompletableFuture<>();
         final CompletableFuture<Integer> g = new CompletableFuture<>();
-        final SubtractFunction r = new SubtractFunction();
+        final SubtractFunction r = new SubtractFunction(m);
 
-        assertTrue(g.cancel(mayInterruptIfRunning));
-        f.complete(v1);
+        (fFirst ? f : g).complete(v1);
+        if (!createIncomplete)
+            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
         final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
-
-        checkCompletedWithWrappedCancellationException(h);
-        checkCancelled(g);
-        assertEquals(0, r.invocationCount);
-        checkCompletedNormally(f, v1);
+        if (createIncomplete) {
+            checkIncomplete(h);
+            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
         }
-    }
-
-    public void testThenCombine_sourceCancelled4() {
-        for (ExecutionMode m : ExecutionMode.values())
-        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
-        for (Integer v1 : new Integer[] { 1, null }) {
-
-        final CompletableFuture<Integer> f = new CompletableFuture<>();
-        final CompletableFuture<Integer> g = new CompletableFuture<>();
-        final SubtractFunction r = new SubtractFunction();
-
-        assertTrue(f.cancel(mayInterruptIfRunning));
-        g.complete(v1);
-        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
 
         checkCompletedWithWrappedCancellationException(h);
-        checkCancelled(f);
+        checkCancelled(!fFirst ? f : g);
         assertEquals(0, r.invocationCount);
-        checkCompletedNormally(g, v1);
-        }
-    }
+        checkCompletedNormally(fFirst ? f : g, v1);
+    }}
 
     /**
      * thenAcceptBoth result completes normally after normal
      * completion of sources
      */
-    public void testThenAcceptBoth_normalCompletion1() {
-        for (ExecutionMode m : ExecutionMode.values())
-        for (Integer v1 : new Integer[] { 1, null })
-        for (Integer v2 : new Integer[] { 2, null }) {
-
-        final CompletableFuture<Integer> f = new CompletableFuture<>();
-        final CompletableFuture<Integer> g = new CompletableFuture<>();
-        final SubtractAction r = new SubtractAction();
-        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
-
-        f.complete(v1);
-        checkIncomplete(h);
-        assertEquals(0, r.invocationCount);
-        g.complete(v2);
-
-        checkCompletedNormally(h, null);
-        assertEquals(r.value, subtract(v1, v2));
-        checkCompletedNormally(f, v1);
-        checkCompletedNormally(g, v2);
-        }
-    }
-
-    public void testThenAcceptBoth_normalCompletion2() {
-        for (ExecutionMode m : ExecutionMode.values())
-        for (Integer v1 : new Integer[] { 1, null })
-        for (Integer v2 : new Integer[] { 2, null }) {
-
-        final CompletableFuture<Integer> f = new CompletableFuture<>();
-        final CompletableFuture<Integer> g = new CompletableFuture<>();
-        final SubtractAction r = new SubtractAction();
-        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
-
-        g.complete(v2);
-        checkIncomplete(h);
-        assertEquals(0, r.invocationCount);
-        f.complete(v1);
-
-        checkCompletedNormally(h, null);
-        assertEquals(r.value, subtract(v1, v2));
-        checkCompletedNormally(f, v1);
-        checkCompletedNormally(g, v2);
-        }
-    }
-
-    public void testThenAcceptBoth_normalCompletion3() {
+    public void testThenAcceptBoth_normalCompletion() {
         for (ExecutionMode m : ExecutionMode.values())
+        for (boolean createIncomplete : new boolean[] { true, false })
+        for (boolean fFirst : new boolean[] { true, false })
         for (Integer v1 : new Integer[] { 1, null })
-        for (Integer v2 : new Integer[] { 2, null }) {
-
+        for (Integer v2 : new Integer[] { 2, null })
+    {
         final CompletableFuture<Integer> f = new CompletableFuture<>();
         final CompletableFuture<Integer> g = new CompletableFuture<>();
-        final SubtractAction r = new SubtractAction();
+        final SubtractAction r = new SubtractAction(m);
 
-        g.complete(v2);
-        f.complete(v1);
+        if (fFirst) f.complete(v1); else g.complete(v2);
+        if (!createIncomplete)
+            if (!fFirst) f.complete(v1); else g.complete(v2);
         final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
-
-        checkCompletedNormally(h, null);
-        assertEquals(r.value, subtract(v1, v2));
-        checkCompletedNormally(f, v1);
-        checkCompletedNormally(g, v2);
+        if (createIncomplete) {
+            checkIncomplete(h);
+            assertEquals(0, r.invocationCount);
+            if (!fFirst) f.complete(v1); else g.complete(v2);
         }
-    }
-
-    public void testThenAcceptBoth_normalCompletion4() {
-        for (ExecutionMode m : ExecutionMode.values())
-        for (Integer v1 : new Integer[] { 1, null })
-        for (Integer v2 : new Integer[] { 2, null }) {
-
-        final CompletableFuture<Integer> f = new CompletableFuture<>();
-        final CompletableFuture<Integer> g = new CompletableFuture<>();
-        final SubtractAction r = new SubtractAction();
-
-        f.complete(v1);
-        g.complete(v2);
-        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
 
         checkCompletedNormally(h, null);
-        assertEquals(r.value, subtract(v1, v2));
+        assertEquals(subtract(v1, v2), r.value);
         checkCompletedNormally(f, v1);
         checkCompletedNormally(g, v2);
-        }
-    }
+    }}
 
     /**
      * thenAcceptBoth result completes exceptionally after exceptional
      * completion of either source
      */
-    public void testThenAcceptBoth_exceptionalCompletion1() {
+    public void testThenAcceptBoth_exceptionalCompletion() {
         for (ExecutionMode m : ExecutionMode.values())
-        for (Integer v1 : new Integer[] { 1, null }) {
-
+        for (boolean createIncomplete : new boolean[] { true, false })
+        for (boolean fFirst : new boolean[] { true, false })
+        for (Integer v1 : new Integer[] { 1, null })
+    {
         final CompletableFuture<Integer> f = new CompletableFuture<>();
         final CompletableFuture<Integer> g = new CompletableFuture<>();
-        final SubtractAction r = new SubtractAction();
-        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
         final CFException ex = new CFException();
+        final SubtractAction r = new SubtractAction(m);
 
-        f.completeExceptionally(ex);
-        checkIncomplete(h);
-        g.complete(v1);
-
-        checkCompletedWithWrappedCFException(h, ex);
-        checkCompletedWithWrappedCFException(f, ex);
-        assertEquals(0, r.invocationCount);
-        checkCompletedNormally(g, v1);
-        }
-    }
-
-    public void testThenAcceptBoth_exceptionalCompletion2() {
-        for (ExecutionMode m : ExecutionMode.values())
-        for (Integer v1 : new Integer[] { 1, null }) {
-
-        final CompletableFuture<Integer> f = new CompletableFuture<>();
-        final CompletableFuture<Integer> g = new CompletableFuture<>();
-        final SubtractAction r = new SubtractAction();
+        (fFirst ? f : g).complete(v1);
+        if (!createIncomplete)
+            (!fFirst ? f : g).completeExceptionally(ex);
         final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
-        final CFException ex = new CFException();
-
-        g.completeExceptionally(ex);
-        checkIncomplete(h);
-        f.complete(v1);
-
-        checkCompletedWithWrappedCFException(h, ex);
-        checkCompletedWithWrappedCFException(g, ex);
-        assertEquals(0, r.invocationCount);
-        checkCompletedNormally(f, v1);
+        if (createIncomplete) {
+            checkIncomplete(h);
+            (!fFirst ? f : g).completeExceptionally(ex);
         }
-    }
-
-    public void testThenAcceptBoth_exceptionalCompletion3() {
-        for (ExecutionMode m : ExecutionMode.values())
-        for (Integer v1 : new Integer[] { 1, null }) {
-
-        final CompletableFuture<Integer> f = new CompletableFuture<>();
-        final CompletableFuture<Integer> g = new CompletableFuture<>();
-        final SubtractAction r = new SubtractAction();
-        final CFException ex = new CFException();
-
-        g.completeExceptionally(ex);
-        f.complete(v1);
-        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
 
         checkCompletedWithWrappedCFException(h, ex);
-        checkCompletedWithWrappedCFException(g, ex);
         assertEquals(0, r.invocationCount);
-        checkCompletedNormally(f, v1);
-        }
-    }
-
-    public void testThenAcceptBoth_exceptionalCompletion4() {
-        for (ExecutionMode m : ExecutionMode.values())
-        for (Integer v1 : new Integer[] { 1, null }) {
-
-        final CompletableFuture<Integer> f = new CompletableFuture<>();
-        final CompletableFuture<Integer> g = new CompletableFuture<>();
-        final SubtractAction r = new SubtractAction();
-        final CFException ex = new CFException();
-
-        f.completeExceptionally(ex);
-        g.complete(v1);
-        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
-
-        checkCompletedWithWrappedCFException(h, ex);
-        checkCompletedWithWrappedCFException(f, ex);
-        assertEquals(0, r.invocationCount);
-        checkCompletedNormally(g, v1);
-        }
-    }
+        checkCompletedNormally(fFirst ? f : g, v1);
+        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
+    }}
 
     /**
      * thenAcceptBoth result completes exceptionally if action does
      */
-    public void testThenAcceptBoth_actionFailed1() {
+    public void testThenAcceptBoth_actionFailed() {
         for (ExecutionMode m : ExecutionMode.values())
+        for (boolean fFirst : new boolean[] { true, false })
         for (Integer v1 : new Integer[] { 1, null })
-        for (Integer v2 : new Integer[] { 2, null }) {
-
+        for (Integer v2 : new Integer[] { 2, null })
+    {
         final CompletableFuture<Integer> f = new CompletableFuture<>();
         final CompletableFuture<Integer> g = new CompletableFuture<>();
-        final FailingBiConsumer r = new FailingBiConsumer();
+        final FailingBiConsumer r = new FailingBiConsumer(m);
         final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
 
-        f.complete(v1);
-        checkIncomplete(h);
-        g.complete(v2);
-
-        checkCompletedWithWrappedCFException(h);
-        checkCompletedNormally(f, v1);
-        checkCompletedNormally(g, v2);
+        if (fFirst) {
+            f.complete(v1);
+            g.complete(v2);
+        } else {
+            g.complete(v2);
+            f.complete(v1);
         }
-    }
-
-    public void testThenAcceptBoth_actionFailed2() {
-        for (ExecutionMode m : ExecutionMode.values())
-        for (Integer v1 : new Integer[] { 1, null })
-        for (Integer v2 : new Integer[] { 2, null }) {
-
-        final CompletableFuture<Integer> f = new CompletableFuture<>();
-        final CompletableFuture<Integer> g = new CompletableFuture<>();
-        final FailingBiConsumer r = new FailingBiConsumer();
-        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
-
-        g.complete(v2);
-        checkIncomplete(h);
-        f.complete(v1);
 
         checkCompletedWithWrappedCFException(h);
         checkCompletedNormally(f, v1);
         checkCompletedNormally(g, v2);
-        }
-    }
+    }}
 
     /**
      * thenAcceptBoth result completes exceptionally if either source cancelled
      */
-    public void testThenAcceptBoth_sourceCancelled1() {
+    public void testThenAcceptBoth_sourceCancelled() {
         for (ExecutionMode m : ExecutionMode.values())
         for (boolean mayInterruptIfRunning : new boolean[] { true, false })
-        for (Integer v1 : new Integer[] { 1, null }) {
-
-        final CompletableFuture<Integer> f = new CompletableFuture<>();
-        final CompletableFuture<Integer> g = new CompletableFuture<>();
-        final SubtractAction r = new SubtractAction();
-        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
-
-        assertTrue(f.cancel(mayInterruptIfRunning));
-        checkIncomplete(h);
-        g.complete(v1);
-
-        checkCompletedWithWrappedCancellationException(h);
-        checkCancelled(f);
-        assertEquals(0, r.invocationCount);
-        checkCompletedNormally(g, v1);
-        }
-    }
-
-    public void testThenAcceptBoth_sourceCancelled2() {
-        for (ExecutionMode m : ExecutionMode.values())
-        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
-        for (Integer v1 : new Integer[] { 1, null }) {
-
-        final CompletableFuture<Integer> f = new CompletableFuture<>();
-        final CompletableFuture<Integer> g = new CompletableFuture<>();
-        final SubtractAction r = new SubtractAction();
-        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
-
-        assertTrue(g.cancel(mayInterruptIfRunning));
-        checkIncomplete(h);
-        f.complete(v1);
-
-        checkCompletedWithWrappedCancellationException(h);
-        checkCancelled(g);
-        assertEquals(0, r.invocationCount);
-        checkCompletedNormally(f, v1);
-        }
-    }
-
-    public void testThenAcceptBoth_sourceCancelled3() {
-        for (ExecutionMode m : ExecutionMode.values())
-        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
-        for (Integer v1 : new Integer[] { 1, null }) {
-
+        for (boolean createIncomplete : new boolean[] { true, false })
+        for (boolean fFirst : new boolean[] { true, false })
+        for (Integer v1 : new Integer[] { 1, null })
+    {
         final CompletableFuture<Integer> f = new CompletableFuture<>();
         final CompletableFuture<Integer> g = new CompletableFuture<>();
-        final SubtractAction r = new SubtractAction();
+        final SubtractAction r = new SubtractAction(m);
 
-        assertTrue(g.cancel(mayInterruptIfRunning));
-        f.complete(v1);
+        (fFirst ? f : g).complete(v1);
+        if (!createIncomplete)
+            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
         final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
-
-        checkCompletedWithWrappedCancellationException(h);
-        checkCancelled(g);
-        assertEquals(0, r.invocationCount);
-        checkCompletedNormally(f, v1);
+        if (createIncomplete) {
+            checkIncomplete(h);
+            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
         }
-    }
-
-    public void testThenAcceptBoth_sourceCancelled4() {
-        for (ExecutionMode m : ExecutionMode.values())
-        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
-        for (Integer v1 : new Integer[] { 1, null }) {
-
-        final CompletableFuture<Integer> f = new CompletableFuture<>();
-        final CompletableFuture<Integer> g = new CompletableFuture<>();
-        final SubtractAction r = new SubtractAction();
-
-        assertTrue(f.cancel(mayInterruptIfRunning));
-        g.complete(v1);
-        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
 
         checkCompletedWithWrappedCancellationException(h);
-        checkCancelled(f);
+        checkCancelled(!fFirst ? f : g);
         assertEquals(0, r.invocationCount);
-        checkCompletedNormally(g, v1);
-        }
-    }
+        checkCompletedNormally(fFirst ? f : g, v1);
+    }}
 
     /**
      * runAfterBoth result completes normally after normal
      * completion of sources
      */
-    public void testRunAfterBoth_normalCompletion1() {
-        for (ExecutionMode m : ExecutionMode.values())
-        for (Integer v1 : new Integer[] { 1, null })
-        for (Integer v2 : new Integer[] { 2, null }) {
-
-        final CompletableFuture<Integer> f = new CompletableFuture<>();
-        final CompletableFuture<Integer> g = new CompletableFuture<>();
-        final Noop r = new Noop();
-        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
-
-        f.complete(v1);
-        checkIncomplete(h);
-        assertEquals(0, r.invocationCount);
-        g.complete(v2);
-
-        checkCompletedNormally(h, null);
-        assertEquals(1, r.invocationCount);
-        checkCompletedNormally(f, v1);
-        checkCompletedNormally(g, v2);
-        }
-    }
-
-    public void testRunAfterBoth_normalCompletion2() {
-        for (ExecutionMode m : ExecutionMode.values())
-        for (Integer v1 : new Integer[] { 1, null })
-        for (Integer v2 : new Integer[] { 2, null }) {
-
-        final CompletableFuture<Integer> f = new CompletableFuture<>();
-        final CompletableFuture<Integer> g = new CompletableFuture<>();
-        final Noop r = new Noop();
-        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
-
-        g.complete(v2);
-        checkIncomplete(h);
-        assertEquals(0, r.invocationCount);
-        f.complete(v1);
-
-        checkCompletedNormally(h, null);
-        assertEquals(1, r.invocationCount);
-        checkCompletedNormally(f, v1);
-        checkCompletedNormally(g, v2);
-        }
-    }
-
-    public void testRunAfterBoth_normalCompletion3() {
+    public void testRunAfterBoth_normalCompletion() {
         for (ExecutionMode m : ExecutionMode.values())
+        for (boolean createIncomplete : new boolean[] { true, false })
+        for (boolean fFirst : new boolean[] { true, false })
         for (Integer v1 : new Integer[] { 1, null })
-        for (Integer v2 : new Integer[] { 2, null }) {
-
+        for (Integer v2 : new Integer[] { 2, null })
+    {
         final CompletableFuture<Integer> f = new CompletableFuture<>();
         final CompletableFuture<Integer> g = new CompletableFuture<>();
-        final Noop r = new Noop();
+        final Noop r = new Noop(m);
 
-        g.complete(v2);
-        f.complete(v1);
+        if (fFirst) f.complete(v1); else g.complete(v2);
+        if (!createIncomplete)
+            if (!fFirst) f.complete(v1); else g.complete(v2);
         final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
-
-        checkCompletedNormally(h, null);
-        assertEquals(1, r.invocationCount);
-        checkCompletedNormally(f, v1);
-        checkCompletedNormally(g, v2);
+        if (createIncomplete) {
+            checkIncomplete(h);
+            assertEquals(0, r.invocationCount);
+            if (!fFirst) f.complete(v1); else g.complete(v2);
         }
-    }
-
-    public void testRunAfterBoth_normalCompletion4() {
-        for (ExecutionMode m : ExecutionMode.values())
-        for (Integer v1 : new Integer[] { 1, null })
-        for (Integer v2 : new Integer[] { 2, null }) {
-
-        final CompletableFuture<Integer> f = new CompletableFuture<>();
-        final CompletableFuture<Integer> g = new CompletableFuture<>();
-        final Noop r = new Noop();
-
-        f.complete(v1);
-        g.complete(v2);
-        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
 
         checkCompletedNormally(h, null);
         assertEquals(1, r.invocationCount);
         checkCompletedNormally(f, v1);
         checkCompletedNormally(g, v2);
-        }
-    }
+    }}
 
     /**
      * runAfterBoth result completes exceptionally after exceptional
      * completion of either source
      */
-    public void testRunAfterBoth_exceptionalCompletion1() {
+    public void testRunAfterBoth_exceptionalCompletion() {
         for (ExecutionMode m : ExecutionMode.values())
-        for (Integer v1 : new Integer[] { 1, null }) {
-
+        for (boolean createIncomplete : new boolean[] { true, false })
+        for (boolean fFirst : new boolean[] { true, false })
+        for (Integer v1 : new Integer[] { 1, null })
+    {
         final CompletableFuture<Integer> f = new CompletableFuture<>();
         final CompletableFuture<Integer> g = new CompletableFuture<>();
-        final Noop r = new Noop();
-        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
         final CFException ex = new CFException();
+        final Noop r = new Noop(m);
 
-        f.completeExceptionally(ex);
-        checkIncomplete(h);
-        g.complete(v1);
-
-        checkCompletedWithWrappedCFException(h, ex);
-        checkCompletedWithWrappedCFException(f, ex);
-        assertEquals(0, r.invocationCount);
-        checkCompletedNormally(g, v1);
-        }
-    }
-
-    public void testRunAfterBoth_exceptionalCompletion2() {
-        for (ExecutionMode m : ExecutionMode.values())
-        for (Integer v1 : new Integer[] { 1, null }) {
-
-        final CompletableFuture<Integer> f = new CompletableFuture<>();
-        final CompletableFuture<Integer> g = new CompletableFuture<>();
-        final Noop r = new Noop();
+        (fFirst ? f : g).complete(v1);
+        if (!createIncomplete)
+            (!fFirst ? f : g).completeExceptionally(ex);
         final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
-        final CFException ex = new CFException();
-
-        g.completeExceptionally(ex);
-        checkIncomplete(h);
-        f.complete(v1);
-
-        checkCompletedWithWrappedCFException(h, ex);
-        checkCompletedWithWrappedCFException(g, ex);
-        assertEquals(0, r.invocationCount);
-        checkCompletedNormally(f, v1);
+        if (createIncomplete) {
+            checkIncomplete(h);
+            (!fFirst ? f : g).completeExceptionally(ex);
         }
-    }
-
-    public void testRunAfterBoth_exceptionalCompletion3() {
-        for (ExecutionMode m : ExecutionMode.values())
-        for (Integer v1 : new Integer[] { 1, null }) {
-
-        final CompletableFuture<Integer> f = new CompletableFuture<>();
-        final CompletableFuture<Integer> g = new CompletableFuture<>();
-        final Noop r = new Noop();
-        final CFException ex = new CFException();
-
-        g.completeExceptionally(ex);
-        f.complete(v1);
-        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
 
         checkCompletedWithWrappedCFException(h, ex);
-        checkCompletedWithWrappedCFException(g, ex);
         assertEquals(0, r.invocationCount);
-        checkCompletedNormally(f, v1);
-        }
-    }
-
-    public void testRunAfterBoth_exceptionalCompletion4() {
-        for (ExecutionMode m : ExecutionMode.values())
-        for (Integer v1 : new Integer[] { 1, null }) {
-
-        final CompletableFuture<Integer> f = new CompletableFuture<>();
-        final CompletableFuture<Integer> g = new CompletableFuture<>();
-        final Noop r = new Noop();
-        final CFException ex = new CFException();
-
-        f.completeExceptionally(ex);
-        g.complete(v1);
-        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
-
-        checkCompletedWithWrappedCFException(h, ex);
-        checkCompletedWithWrappedCFException(f, ex);
-        assertEquals(0, r.invocationCount);
-        checkCompletedNormally(g, v1);
-        }
-    }
+        checkCompletedNormally(fFirst ? f : g, v1);
+        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
+    }}
 
     /**
      * runAfterBoth result completes exceptionally if action does
      */
-    public void testRunAfterBoth_actionFailed1() {
+    public void testRunAfterBoth_actionFailed() {
         for (ExecutionMode m : ExecutionMode.values())
+        for (boolean fFirst : new boolean[] { true, false })
         for (Integer v1 : new Integer[] { 1, null })
-        for (Integer v2 : new Integer[] { 2, null }) {
-
+        for (Integer v2 : new Integer[] { 2, null })
+    {
         final CompletableFuture<Integer> f = new CompletableFuture<>();
         final CompletableFuture<Integer> g = new CompletableFuture<>();
-        final FailingNoop r = new FailingNoop();
-        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
+        final FailingRunnable r = new FailingRunnable(m);
 
-        f.complete(v1);
-        checkIncomplete(h);
-        g.complete(v2);
-
-        checkCompletedWithWrappedCFException(h);
-        checkCompletedNormally(f, v1);
-        checkCompletedNormally(g, v2);
+        CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r);
+        if (fFirst) {
+            f.complete(v1);
+            g.complete(v2);
+        } else {
+            g.complete(v2);
+            f.complete(v1);
         }
-    }
-
-    public void testRunAfterBoth_actionFailed2() {
-        for (ExecutionMode m : ExecutionMode.values())
-        for (Integer v1 : new Integer[] { 1, null })
-        for (Integer v2 : new Integer[] { 2, null }) {
-
-        final CompletableFuture<Integer> f = new CompletableFuture<>();
-        final CompletableFuture<Integer> g = new CompletableFuture<>();
-        final FailingNoop r = new FailingNoop();
-        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
-
-        g.complete(v2);
-        checkIncomplete(h);
-        f.complete(v1);
+        CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r);
 
-        checkCompletedWithWrappedCFException(h);
+        checkCompletedWithWrappedCFException(h1);
+        checkCompletedWithWrappedCFException(h2);
         checkCompletedNormally(f, v1);
         checkCompletedNormally(g, v2);
-        }
-    }
+    }}
 
     /**
      * runAfterBoth result completes exceptionally if either source cancelled
      */
-    public void testRunAfterBoth_sourceCancelled1() {
+    public void testRunAfterBoth_sourceCancelled() {
         for (ExecutionMode m : ExecutionMode.values())
         for (boolean mayInterruptIfRunning : new boolean[] { true, false })
-        for (Integer v1 : new Integer[] { 1, null }) {
-
-        final CompletableFuture<Integer> f = new CompletableFuture<>();
-        final CompletableFuture<Integer> g = new CompletableFuture<>();
-        final Noop r = new Noop();
-        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
-
-        assertTrue(f.cancel(mayInterruptIfRunning));
-        checkIncomplete(h);
-        g.complete(v1);
-
-        checkCompletedWithWrappedCancellationException(h);
-        checkCancelled(f);
-        assertEquals(0, r.invocationCount);
-        checkCompletedNormally(g, v1);
-        }
-    }
-
-    public void testRunAfterBoth_sourceCancelled2() {
-        for (ExecutionMode m : ExecutionMode.values())
-        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
-        for (Integer v1 : new Integer[] { 1, null }) {
-
+        for (boolean createIncomplete : new boolean[] { true, false })
+        for (boolean fFirst : new boolean[] { true, false })
+        for (Integer v1 : new Integer[] { 1, null })
+    {
         final CompletableFuture<Integer> f = new CompletableFuture<>();
         final CompletableFuture<Integer> g = new CompletableFuture<>();
-        final Noop r = new Noop();
-        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
-
-        assertTrue(g.cancel(mayInterruptIfRunning));
-        checkIncomplete(h);
-        f.complete(v1);
+        final Noop r = new Noop(m);
 
-        checkCompletedWithWrappedCancellationException(h);
-        checkCancelled(g);
-        assertEquals(0, r.invocationCount);
-        checkCompletedNormally(f, v1);
-        }
-    }
-
-    public void testRunAfterBoth_sourceCancelled3() {
-        for (ExecutionMode m : ExecutionMode.values())
-        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
-        for (Integer v1 : new Integer[] { 1, null }) {
 
-        final CompletableFuture<Integer> f = new CompletableFuture<>();
-        final CompletableFuture<Integer> g = new CompletableFuture<>();
-        final Noop r = new Noop();
-
-        assertTrue(g.cancel(mayInterruptIfRunning));
-        f.complete(v1);
+        (fFirst ? f : g).complete(v1);
+        if (!createIncomplete)
+            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
         final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
-
-        checkCompletedWithWrappedCancellationException(h);
-        checkCancelled(g);
-        assertEquals(0, r.invocationCount);
-        checkCompletedNormally(f, v1);
+        if (createIncomplete) {
+            checkIncomplete(h);
+            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
         }
-    }
-
-    public void testRunAfterBoth_sourceCancelled4() {
-        for (ExecutionMode m : ExecutionMode.values())
-        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
-        for (Integer v1 : new Integer[] { 1, null }) {
-
-        final CompletableFuture<Integer> f = new CompletableFuture<>();
-        final CompletableFuture<Integer> g = new CompletableFuture<>();
-        final Noop r = new Noop();
-
-        assertTrue(f.cancel(mayInterruptIfRunning));
-        g.complete(v1);
-        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
 
         checkCompletedWithWrappedCancellationException(h);
-        checkCancelled(f);
+        checkCancelled(!fFirst ? f : g);
         assertEquals(0, r.invocationCount);
-        checkCompletedNormally(g, v1);
-        }
-    }
+        checkCompletedNormally(fFirst ? f : g, v1);
+    }}
 
     /**
      * applyToEither result completes normally after normal completion
      * of either source
      */
-    public void testApplyToEither_normalCompletion1() {
+    public void testApplyToEither_normalCompletion() {
         for (ExecutionMode m : ExecutionMode.values())
+        for (boolean createIncomplete : new boolean[] { true, false })
+        for (boolean fFirst : new boolean[] { true, false })
         for (Integer v1 : new Integer[] { 1, null })
-        for (Integer v2 : new Integer[] { 2, null }) {
-
+        for (Integer v2 : new Integer[] { 2, null })
+    {
         final CompletableFuture<Integer> f = new CompletableFuture<>();
         final CompletableFuture<Integer> g = new CompletableFuture<>();
-        final IncFunction r = new IncFunction();
-        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
+        final IncFunction r = new IncFunction(m);
 
-        f.complete(v1);
-        checkCompletedNormally(h, inc(v1));
-        g.complete(v2);
+        if (!createIncomplete)
+            if (fFirst) f.complete(v1); else g.complete(v2);
+        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
+        if (createIncomplete) {
+            checkIncomplete(h);
+            assertEquals(0, r.invocationCount);
+            if (fFirst) f.complete(v1); else g.complete(v2);
+        }
+        checkCompletedNormally(h, inc(fFirst ? v1 : v2));
+        if (!fFirst) f.complete(v1); else g.complete(v2);
 
         checkCompletedNormally(f, v1);
         checkCompletedNormally(g, v2);
-        checkCompletedNormally(h, inc(v1));
-        }
-    }
+        checkCompletedNormally(h, inc(fFirst ? v1 : v2));
+    }}
 
-    public void testApplyToEither_normalCompletion2() {
+    public void testApplyToEither_normalCompletionBothAvailable() {
         for (ExecutionMode m : ExecutionMode.values())
+        for (boolean fFirst : new boolean[] { true, false })
         for (Integer v1 : new Integer[] { 1, null })
-        for (Integer v2 : new Integer[] { 2, null }) {
-
+        for (Integer v2 : new Integer[] { 2, null })
+    {
         final CompletableFuture<Integer> f = new CompletableFuture<>();
         final CompletableFuture<Integer> g = new CompletableFuture<>();
-        final IncFunction r = new IncFunction();
-        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
-
-        g.complete(v2);
-        checkCompletedNormally(h, inc(v2));
-        f.complete(v1);
+        final IncFunction r = new IncFunction(m);
 
-        checkCompletedNormally(f, v1);
-        checkCompletedNormally(g, v2);
-        checkCompletedNormally(h, inc(v2));
+        if (fFirst) {
+            f.complete(v1);
+            g.complete(v2);
+        } else {
+            g.complete(v2);
+            f.complete(v1);
         }
-    }
-    public void testApplyToEither_normalCompletion3() {
-        for (ExecutionMode m : ExecutionMode.values())
-        for (Integer v1 : new Integer[] { 1, null })
-        for (Integer v2 : new Integer[] { 2, null }) {
-
-        final CompletableFuture<Integer> f = new CompletableFuture<>();
-        final CompletableFuture<Integer> g = new CompletableFuture<>();
-        final IncFunction r = new IncFunction();
 
-        f.complete(v1);
-        g.complete(v2);
         final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
 
         checkCompletedNormally(f, v1);
@@ -1846,8 +1704,7 @@ public class CompletableFutureTest exten
         assertTrue(Objects.equals(h.join(), inc(v1)) ||
                    Objects.equals(h.join(), inc(v2)));
         assertEquals(1, r.invocationCount);
-        }
-    }
+    }}
 
     /**
      * applyToEither result completes exceptionally after exceptional
@@ -1855,101 +1712,75 @@ public class CompletableFutureTest exten
      */
     public void testApplyToEither_exceptionalCompletion1() {
         for (ExecutionMode m : ExecutionMode.values())
-        for (Integer v1 : new Integer[] { 1, null }) {
-
+        for (boolean createIncomplete : new boolean[] { true, false })
+        for (boolean fFirst : new boolean[] { true, false })
+        for (Integer v1 : new Integer[] { 1, null })
+    {
         final CompletableFuture<Integer> f = new CompletableFuture<>();
         final CompletableFuture<Integer> g = new CompletableFuture<>();
-        final IncFunction r = new IncFunction();
-        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
         final CFException ex = new CFException();
+        final IncFunction r = new IncFunction(m);
 
-        f.completeExceptionally(ex);
-        checkCompletedWithWrappedCFException(h, ex);
-        g.complete(v1);
-
-        assertEquals(0, r.invocationCount);
-        checkCompletedNormally(g, v1);
-        checkCompletedWithWrappedCFException(f, ex);
-        checkCompletedWithWrappedCFException(h, ex);
-        }
-    }
-
-    public void testApplyToEither_exceptionalCompletion2() {
-        for (ExecutionMode m : ExecutionMode.values())
-        for (Integer v1 : new Integer[] { 1, null }) {
-
-        final CompletableFuture<Integer> f = new CompletableFuture<>();
-        final CompletableFuture<Integer> g = new CompletableFuture<>();
-        final IncFunction r = new IncFunction();
+        if (!createIncomplete) (fFirst ? f : g).completeExceptionally(ex);
         final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
-        final CFException ex = new CFException();
+        if (createIncomplete) {
+            checkIncomplete(h);
+            assertEquals(0, r.invocationCount);
+            (fFirst ? f : g).completeExceptionally(ex);
+        }
 
-        g.completeExceptionally(ex);
         checkCompletedWithWrappedCFException(h, ex);
-        f.complete(v1);
+        (!fFirst ? f : g).complete(v1);
 
         assertEquals(0, r.invocationCount);
-        checkCompletedNormally(f, v1);
-        checkCompletedWithWrappedCFException(g, ex);
+        checkCompletedNormally(!fFirst ? f : g, v1);
+        checkCompletedWithWrappedCFException(fFirst ? f : g, ex);
         checkCompletedWithWrappedCFException(h, ex);
-        }
-    }
+    }}
 
-    public void testApplyToEither_exceptionalCompletion3() {
+    public void testApplyToEither_exceptionalCompletion2() {
         for (ExecutionMode m : ExecutionMode.values())
-        for (Integer v1 : new Integer[] { 1, null }) {
-
+        for (boolean reverseArgs : new boolean[] { true, false })
+        for (boolean fFirst : new boolean[] { true, false })
+        for (Integer v1 : new Integer[] { 1, null })
+    {
         final CompletableFuture<Integer> f = new CompletableFuture<>();
         final CompletableFuture<Integer> g = new CompletableFuture<>();
-        final IncFunction r = new IncFunction();
+        final IncFunction r1 = new IncFunction(m);
+        final IncFunction r2 = new IncFunction(m);
         final CFException ex = new CFException();
-
-        g.completeExceptionally(ex);
-        f.complete(v1);
-        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
+        final CompletableFuture<Integer> j = (reverseArgs ? g : f);
+        final CompletableFuture<Integer> k = (reverseArgs ? f : g);
+        final CompletableFuture<Integer> h1 = m.applyToEither(j, k, r1);
+        if (fFirst) {
+            f.complete(v1);
+            g.completeExceptionally(ex);
+        } else {
+            g.completeExceptionally(ex);
+            f.complete(v1);
+        }
+        final CompletableFuture<Integer> h2 = m.applyToEither(j, k, r2);
 
         // unspecified behavior
-        Integer v;
         try {
-            assertEquals(h.join(), inc(v1));
-            assertEquals(1, r.invocationCount);
+            assertEquals(inc(v1), h1.join());
+            assertEquals(1, r1.invocationCount);
         } catch (CompletionException ok) {
-            checkCompletedWithWrappedCFException(h, ex);
-            assertEquals(0, r.invocationCount);
-        }
-
-        checkCompletedWithWrappedCFException(g, ex);
-        checkCompletedNormally(f, v1);
+            checkCompletedWithWrappedCFException(h1, ex);
+            assertEquals(0, r1.invocationCount);
         }
-    }
-
-    public void testApplyToEither_exceptionalCompletion4() {
-        for (ExecutionMode m : ExecutionMode.values())
-        for (Integer v1 : new Integer[] { 1, null }) {
-
-        final CompletableFuture<Integer> f = new CompletableFuture<>();
-        final CompletableFuture<Integer> g = new CompletableFuture<>();
-        final IncFunction r = new IncFunction();
-        final CFException ex = new CFException();
-
-        f.completeExceptionally(ex);
-        g.complete(v1);
-        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
 
-        // unspecified behavior
-        Integer v;
         try {
-            assertEquals(h.join(), inc(v1));
-            assertEquals(1, r.invocationCount);
+            assertEquals(inc(v1), h2.join());
+            assertEquals(1, r2.invocationCount);
         } catch (CompletionException ok) {
-            checkCompletedWithWrappedCFException(h, ex);
-            assertEquals(0, r.invocationCount);
+            checkCompletedWithWrappedCFException(h2, ex);
+            assertEquals(0, r2.invocationCount);
         }
 
-        checkCompletedWithWrappedCFException(f, ex);
-        checkCompletedNormally(g, v1);
-        }
-    }
+        checkCompletedWithWrappedCFException(g, ex);
+        checkCompletedNormally(f, v1);
+    }}
 
     /**
      * applyToEither result completes exceptionally if action does
@@ -1957,11 +1788,11 @@ public class CompletableFutureTest exten
     public void testApplyToEither_actionFailed1() {
         for (ExecutionMode m : ExecutionMode.values())
         for (Integer v1 : new Integer[] { 1, null })
-        for (Integer v2 : new Integer[] { 2, null }) {
-
+        for (Integer v2 : new Integer[] { 2, null })
+    {
         final CompletableFuture<Integer> f = new CompletableFuture<>();
         final CompletableFuture<Integer> g = new CompletableFuture<>();
-        final FailingFunction r = new FailingFunction();
+        final FailingFunction r = new FailingFunction(m);
         final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
 
         f.complete(v1);
@@ -1969,17 +1800,16 @@ public class CompletableFutureTest exten
         g.complete(v2);
         checkCompletedNormally(f, v1);
         checkCompletedNormally(g, v2);
-        }
-    }
+    }}
 
     public void testApplyToEither_actionFailed2() {
         for (ExecutionMode m : ExecutionMode.values())
         for (Integer v1 : new Integer[] { 1, null })
-        for (Integer v2 : new Integer[] { 2, null }) {
-
+        for (Integer v2 : new Integer[] { 2, null })
+    {
         final CompletableFuture<Integer> f = new CompletableFuture<>();
         final CompletableFuture<Integer> g = new CompletableFuture<>();
-        final FailingFunction r = new FailingFunction();
+        final FailingFunction r = new FailingFunction(m);
         final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
 
         g.complete(v2);
@@ -1987,8 +1817,7 @@ public class CompletableFutureTest exten
         f.complete(v1);
         checkCompletedNormally(f, v1);
         checkCompletedNormally(g, v2);
-        }
-    }
+    }}
 
     /**
      * applyToEither result completes exceptionally if either source cancelled
@@ -1996,100 +1825,76 @@ public class CompletableFutureTest exten
     public void testApplyToEither_sourceCancelled1() {
         for (ExecutionMode m : ExecutionMode.values())
         for (boolean mayInterruptIfRunning : new boolean[] { true, false })
-        for (Integer v1 : new Integer[] { 1, null }) {
-
+        for (boolean createIncomplete : new boolean[] { true, false })
+        for (boolean fFirst : new boolean[] { true, false })
+        for (Integer v1 : new Integer[] { 1, null })
+    {
         final CompletableFuture<Integer> f = new CompletableFuture<>();
         final CompletableFuture<Integer> g = new CompletableFuture<>();
-        final IncFunction r = new IncFunction();
+        final IncFunction r = new IncFunction(m);
+
+        if (!createIncomplete) assertTrue((fFirst ? f : g).cancel(mayInterruptIfRunning));
         final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
+        if (createIncomplete) {
+            checkIncomplete(h);
+            assertEquals(0, r.invocationCount);
+            assertTrue((fFirst ? f : g).cancel(mayInterruptIfRunning));
+        }
 
-        assertTrue(f.cancel(mayInterruptIfRunning));
         checkCompletedWithWrappedCancellationException(h);
-        g.complete(v1);
+        (!fFirst ? f : g).complete(v1);
 
-        checkCancelled(f);
         assertEquals(0, r.invocationCount);
-        checkCompletedNormally(g, v1);
+        checkCompletedNormally(!fFirst ? f : g, v1);
+        checkCancelled(fFirst ? f : g);
         checkCompletedWithWrappedCancellationException(h);
-        }
-    }
+    }}
 
     public void testApplyToEither_sourceCancelled2() {
         for (ExecutionMode m : ExecutionMode.values())
         for (boolean mayInterruptIfRunning : new boolean[] { true, false })
-        for (Integer v1 : new Integer[] { 1, null }) {
-
+        for (boolean reverseArgs : new boolean[] { true, false })
+        for (boolean fFirst : new boolean[] { true, false })
+        for (Integer v1 : new Integer[] { 1, null })
+    {
         final CompletableFuture<Integer> f = new CompletableFuture<>();
         final CompletableFuture<Integer> g = new CompletableFuture<>();
-        final IncFunction r = new IncFunction();
-        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
-
-        assertTrue(g.cancel(mayInterruptIfRunning));
-        checkCompletedWithWrappedCancellationException(h);
-        f.complete(v1);
+        final IncFunction r1 = new IncFunction(m);
+        final IncFunction r2 = new IncFunction(m);
+        final CFException ex = new CFException();
+        final CompletableFuture<Integer> j = (reverseArgs ? g : f);
+        final CompletableFuture<Integer> k = (reverseArgs ? f : g);
 
-        checkCancelled(g);
-        assertEquals(0, r.invocationCount);
-        checkCompletedNormally(f, v1);
-        checkCompletedWithWrappedCancellationException(h);
+        final CompletableFuture<Integer> h1 = m.applyToEither(j, k, r1);
+        if (fFirst) {
+            f.complete(v1);
+            assertTrue(g.cancel(mayInterruptIfRunning));
+        } else {
+            assertTrue(g.cancel(mayInterruptIfRunning));
+            f.complete(v1);
         }
-    }
-
-    public void testApplyToEither_sourceCancelled3() {
-        for (ExecutionMode m : ExecutionMode.values())
-        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
-        for (Integer v1 : new Integer[] { 1, null }) {
-
-        final CompletableFuture<Integer> f = new CompletableFuture<>();
-        final CompletableFuture<Integer> g = new CompletableFuture<>();
-        final IncFunction r = new IncFunction();
-
-        assertTrue(g.cancel(mayInterruptIfRunning));
-        f.complete(v1);
-        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
+        final CompletableFuture<Integer> h2 = m.applyToEither(j, k, r2);
 
         // unspecified behavior
-        Integer v;
         try {
-            assertEquals(h.join(), inc(v1));
-            assertEquals(1, r.invocationCount);
+            assertEquals(inc(v1), h1.join());
+            assertEquals(1, r1.invocationCount);
         } catch (CompletionException ok) {
-            checkCompletedWithWrappedCancellationException(h);
-            assertEquals(0, r.invocationCount);
-        }
-
-        checkCancelled(g);
-        checkCompletedNormally(f, v1);
+            checkCompletedWithWrappedCancellationException(h1);
+            assertEquals(0, r1.invocationCount);
         }
-    }
 
-    public void testApplyToEither_sourceCancelled4() {
-        for (ExecutionMode m : ExecutionMode.values())
-        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
-        for (Integer v1 : new Integer[] { 1, null }) {
-
-        final CompletableFuture<Integer> f = new CompletableFuture<>();
-        final CompletableFuture<Integer> g = new CompletableFuture<>();
-        final IncFunction r = new IncFunction();
-
-        assertTrue(f.cancel(mayInterruptIfRunning));
-        g.complete(v1);
-        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
-
-        // unspecified behavior
-        Integer v;
         try {
-            assertEquals(h.join(), inc(v1));
-            assertEquals(1, r.invocationCount);
+            assertEquals(inc(v1), h2.join());
+            assertEquals(1, r2.invocationCount);
         } catch (CompletionException ok) {
-            checkCompletedWithWrappedCancellationException(h);
-            assertEquals(0, r.invocationCount);
+            checkCompletedWithWrappedCancellationException(h2);
+            assertEquals(0, r2.invocationCount);
         }
 
-        checkCancelled(f);
-        checkCompletedNormally(g, v1);
-        }
-    }
+        checkCancelled(g);
+        checkCompletedNormally(f, v1);
+    }}
 
     /**
      * acceptEither result completes normally after normal completion
@@ -2098,8 +1903,8 @@ public class CompletableFutureTest exten
     public void testAcceptEither_normalCompletion1() {
         for (ExecutionMode m : ExecutionMode.values())
         for (Integer v1 : new Integer[] { 1, null })
-        for (Integer v2 : new Integer[] { 2, null }) {
-
+        for (Integer v2 : new Integer[] { 2, null })
+    {
         final CompletableFuture<Integer> f = new CompletableFuture<>();
         final CompletableFuture<Integer> g = new CompletableFuture<>();
         final IncAction r = new IncAction();
@@ -2107,20 +1912,19 @@ public class CompletableFutureTest exten
 
         f.complete(v1);
         checkCompletedNormally(h, null);
-        assertEquals(r.value, inc(v1));
+        assertEquals(inc(v1), r.value);
         g.complete(v2);
 
         checkCompletedNormally(f, v1);
         checkCompletedNormally(g, v2);
         checkCompletedNormally(h, null);
-        }
-    }
+    }}
 
     public void testAcceptEither_normalCompletion2() {
         for (ExecutionMode m : ExecutionMode.values())
         for (Integer v1 : new Integer[] { 1, null })
-        for (Integer v2 : new Integer[] { 2, null }) {
-
+        for (Integer v2 : new Integer[] { 2, null })
+    {
         final CompletableFuture<Integer> f = new CompletableFuture<>();
         final CompletableFuture<Integer> g = new CompletableFuture<>();
         final IncAction r = new IncAction();
@@ -2128,19 +1932,19 @@ public class CompletableFutureTest exten
 
         g.complete(v2);
         checkCompletedNormally(h, null);
-        assertEquals(r.value, inc(v2));
+        assertEquals(inc(v2), r.value);
         f.complete(v1);
 
         checkCompletedNormally(f, v1);
         checkCompletedNormally(g, v2);
         checkCompletedNormally(h, null);
-        }
-    }
+    }}
+
     public void testAcceptEither_normalCompletion3() {
         for (ExecutionMode m : ExecutionMode.values())
         for (Integer v1 : new Integer[] { 1, null })
-        for (Integer v2 : new Integer[] { 2, null }) {
-
+        for (Integer v2 : new Integer[] { 2, null })
+    {
         final CompletableFuture<Integer> f = new CompletableFuture<>();
         final CompletableFuture<Integer> g = new CompletableFuture<>();
         final IncAction r = new IncAction();
@@ -2156,8 +1960,7 @@ public class CompletableFutureTest exten
         // unspecified behavior
         assertTrue(Objects.equals(r.value, inc(v1)) ||
                    Objects.equals(r.value, inc(v2)));
-        }
-    }
+    }}
 
     /**
      * acceptEither result completes exceptionally after exceptional
@@ -2165,8 +1968,8 @@ public class CompletableFutureTest exten
      */
     public void testAcceptEither_exceptionalCompletion1() {
         for (ExecutionMode m : ExecutionMode.values())
-        for (Integer v1 : new Integer[] { 1, null }) {
-
+        for (Integer v1 : new Integer[] { 1, null })
+    {
         final CompletableFuture<Integer> f = new CompletableFuture<>();
         final CompletableFuture<Integer> g = new CompletableFuture<>();
         final IncAction r = new IncAction();
@@ -2181,13 +1984,12 @@ public class CompletableFutureTest exten
         checkCompletedNormally(g, v1);
         checkCompletedWithWrappedCFException(f, ex);
         checkCompletedWithWrappedCFException(h, ex);
-        }
-    }
+    }}
 
     public void testAcceptEither_exceptionalCompletion2() {
         for (ExecutionMode m : ExecutionMode.values())
-        for (Integer v1 : new Integer[] { 1, null }) {
-
+        for (Integer v1 : new Integer[] { 1, null })
+    {
         final CompletableFuture<Integer> f = new CompletableFuture<>();
         final CompletableFuture<Integer> g = new CompletableFuture<>();
         final IncAction r = new IncAction();
@@ -2202,13 +2004,12 @@ public class CompletableFutureTest exten
         checkCompletedNormally(f, v1);
         checkCompletedWithWrappedCFException(g, ex);
         checkCompletedWithWrappedCFException(h, ex);
-        }
-    }
+    }}
 
     public void testAcceptEither_exceptionalCompletion3() {
         for (ExecutionMode m : ExecutionMode.values())
-        for (Integer v1 : new Integer[] { 1, null }) {
-
+        for (Integer v1 : new Integer[] { 1, null })
+    {
         final CompletableFuture<Integer> f = new CompletableFuture<>();
         final CompletableFuture<Integer> g = new CompletableFuture<>();
         final IncAction r = new IncAction();
@@ -2221,7 +2022,7 @@ public class CompletableFutureTest exten
         // unspecified behavior
         Integer v;
         try {
-            assertEquals(h.join(), null);
+            assertNull(h.join());
             assertEquals(1, r.invocationCount);
             assertEquals(inc(v1), r.value);
         } catch (CompletionException ok) {
@@ -2231,13 +2032,12 @@ public class CompletableFutureTest exten
 
         checkCompletedWithWrappedCFException(g, ex);
         checkCompletedNormally(f, v1);
-        }
-    }
+    }}
 
     public void testAcceptEither_exceptionalCompletion4() {
         for (ExecutionMode m : ExecutionMode.values())
-        for (Integer v1 : new Integer[] { 1, null }) {
-
+        for (Integer v1 : new Integer[] { 1, null })
+    {
         final CompletableFuture<Integer> f = new CompletableFuture<>();
         final CompletableFuture<Integer> g = new CompletableFuture<>();
         final IncAction r = new IncAction();
@@ -2250,7 +2050,7 @@ public class CompletableFutureTest exten
         // unspecified behavior
         Integer v;
         try {
-            assertEquals(h.join(), null);
+            assertNull(h.join());
             assertEquals(1, r.invocationCount);
             assertEquals(inc(v1), r.value);
         } catch (CompletionException ok) {
@@ -2260,8 +2060,7 @@ public class CompletableFutureTest exten
 
         checkCompletedWithWrappedCFException(f, ex);
         checkCompletedNormally(g, v1);
-        }
-    }
+    }}
 
     /**
      * acceptEither result completes exceptionally if action does
@@ -2269,11 +2068,11 @@ public class CompletableFutureTest exten
     public void testAcceptEither_actionFailed1() {
         for (ExecutionMode m : ExecutionMode.values())
         for (Integer v1 : new Integer[] { 1, null })
-        for (Integer v2 : new Integer[] { 2, null }) {
-
+        for (Integer v2 : new Integer[] { 2, null })
+    {
         final CompletableFuture<Integer> f = new CompletableFuture<>();
         final CompletableFuture<Integer> g = new CompletableFuture<>();
-        final FailingConsumer r = new FailingConsumer();
+        final FailingConsumer r = new FailingConsumer(m);
         final CompletableFuture<Void> h = m.acceptEither(f, g, r);
 
         f.complete(v1);
@@ -2281,17 +2080,16 @@ public class CompletableFutureTest exten
         g.complete(v2);
         checkCompletedNormally(f, v1);
         checkCompletedNormally(g, v2);
-        }
-    }
+    }}
 
     public void testAcceptEither_actionFailed2() {
         for (ExecutionMode m : ExecutionMode.values())
         for (Integer v1 : new Integer[] { 1, null })
-        for (Integer v2 : new Integer[] { 2, null }) {
-
+        for (Integer v2 : new Integer[] { 2, null })
+    {
         final CompletableFuture<Integer> f = new CompletableFuture<>();
         final CompletableFuture<Integer> g = new CompletableFuture<>();
-        final FailingConsumer r = new FailingConsumer();
+        final FailingConsumer r = new FailingConsumer(m);
         final CompletableFuture<Void> h = m.acceptEither(f, g, r);
 
         g.complete(v2);
@@ -2299,8 +2097,7 @@ public class CompletableFutureTest exten
         f.complete(v1);
         checkCompletedNormally(f, v1);
         checkCompletedNormally(g, v2);
-        }
-    }
+    }}
 
     /**
      * acceptEither result completes exceptionally if either source cancelled
@@ -2308,8 +2105,8 @@ public class CompletableFutureTest exten
     public void testAcceptEither_sourceCancelled1() {
         for (ExecutionMode m : ExecutionMode.values())
         for (boolean mayInterruptIfRunning : new boolean[] { true, false })
-        for (Integer v1 : new Integer[] { 1, null }) {
-
+        for (Integer v1 : new Integer[] { 1, null })
+    {
         final CompletableFuture<Integer> f = new CompletableFuture<>();
         final CompletableFuture<Integer> g = new CompletableFuture<>();
         final IncAction r = new IncAction();
@@ -2323,14 +2120,13 @@ public class CompletableFutureTest exten
         assertEquals(0, r.invocationCount);
         checkCompletedNormally(g, v1);
         checkCompletedWithWrappedCancellationException(h);
-        }
-    }
+    }}
 
     public void testAcceptEither_sourceCancelled2() {
         for (ExecutionMode m : ExecutionMode.values())
         for (boolean mayInterruptIfRunning : new boolean[] { true, false })
-        for (Integer v1 : new Integer[] { 1, null }) {
-
+        for (Integer v1 : new Integer[] { 1, null })
+    {
         final CompletableFuture<Integer> f = new CompletableFuture<>();
         final CompletableFuture<Integer> g = new CompletableFuture<>();
         final IncAction r = new IncAction();
@@ -2344,14 +2140,13 @@ public class CompletableFutureTest exten
         assertEquals(0, r.invocationCount);
         checkCompletedNormally(f, v1);
         checkCompletedWithWrappedCancellationException(h);
-        }
-    }
+    }}
 
     public void testAcceptEither_sourceCancelled3() {
         for (ExecutionMode m : ExecutionMode.values())
         for (boolean mayInterruptIfRunning : new boolean[] { true, false })
-        for (Integer v1 : new Integer[] { 1, null }) {
-
+        for (Integer v1 : new Integer[] { 1, null })
+    {
         final CompletableFuture<Integer> f = new CompletableFuture<>();
         final CompletableFuture<Integer> g = new CompletableFuture<>();
         final IncAction r = new IncAction();
@@ -2363,7 +2158,7 @@ public class CompletableFutureTest exten
         // unspecified behavior
         Integer v;
         try {
-            assertEquals(h.join(), null);
+            assertNull(h.join());
             assertEquals(1, r.invocationCount);
             assertEquals(inc(v1), r.value);
         } catch (CompletionException ok) {
@@ -2373,14 +2168,13 @@ public class CompletableFutureTest exten
 
         checkCancelled(g);
         checkCompletedNormally(f, v1);
-        }
-    }
+    }}
 
     public void testAcceptEither_sourceCancelled4() {
         for (ExecutionMode m : ExecutionMode.values())
         for (boolean mayInterruptIfRunning : new boolean[] { true, false })
-        for (Integer v1 : new Integer[] { 1, null }) {
-
+        for (Integer v1 : new Integer[] { 1, null })
+    {
         final CompletableFuture<Integer> f = new CompletableFuture<>();
         final CompletableFuture<Integer> g = new CompletableFuture<>();
         final IncAction r = new IncAction();
@@ -2392,7 +2186,7 @@ public class CompletableFutureTest exten
         // unspecified behavior
         Integer v;
         try {
-            assertEquals(h.join(), null);
+            assertNull(h.join());
             assertEquals(1, r.invocationCount);
             assertEquals(inc(v1), r.value);
         } catch (CompletionException ok) {
@@ -2402,8 +2196,7 @@ public class CompletableFutureTest exten
 
         checkCancelled(f);
         checkCompletedNormally(g, v1);
-        }
-    }
+    }}
 
     /**
      * runAfterEither result completes normally after normal completion
@@ -2412,11 +2205,11 @@ public class CompletableFutureTest exten
     public void testRunAfterEither_normalCompletion1() {
         for (ExecutionMode m : ExecutionMode.values())
         for (Integer v1 : new Integer[] { 1, null })
-        for (Integer v2 : new Integer[] { 2, null }) {
-
+        for (Integer v2 : new Integer[] { 2, null })
+    {
         final CompletableFuture<Integer> f = new CompletableFuture<>();
         final CompletableFuture<Integer> g = new CompletableFuture<>();
-        final Noop r = new Noop();
+        final Noop r = new Noop(m);
         final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
 
         f.complete(v1);
@@ -2428,17 +2221,16 @@ public class CompletableFutureTest exten
         checkCompletedNormally(g, v2);
         checkCompletedNormally(h, null);
         assertEquals(1, r.invocationCount);
-        }
-    }
+    }}
 
     public void testRunAfterEither_normalCompletion2() {
         for (ExecutionMode m : ExecutionMode.values())
         for (Integer v1 : new Integer[] { 1, null })
-        for (Integer v2 : new Integer[] { 2, null }) {
-
+        for (Integer v2 : new Integer[] { 2, null })
+    {
         final CompletableFuture<Integer> f = new CompletableFuture<>();
         final CompletableFuture<Integer> g = new CompletableFuture<>();
-        final Noop r = new Noop();
+        final Noop r = new Noop(m);
         final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
 
         g.complete(v2);
@@ -2450,16 +2242,16 @@ public class CompletableFutureTest exten
         checkCompletedNormally(g, v2);
         checkCompletedNormally(h, null);
         assertEquals(1, r.invocationCount);
-        }
-    }
+        }}
+
     public void testRunAfterEither_normalCompletion3() {
         for (ExecutionMode m : ExecutionMode.values())
         for (Integer v1 : new Integer[] { 1, null })
-        for (Integer v2 : new Integer[] { 2, null }) {
-
+        for (Integer v2 : new Integer[] { 2, null })
+    {
         final CompletableFuture<Integer> f = new CompletableFuture<>();
         final CompletableFuture<Integer> g = new CompletableFuture<>();
-        final Noop r = new Noop();
+        final Noop r = new Noop(m);
 
         f.complete(v1);
         g.complete(v2);
@@ -2469,8 +2261,7 @@ public class CompletableFutureTest exten
         checkCompletedNormally(f, v1);
         checkCompletedNormally(g, v2);
         assertEquals(1, r.invocationCount);
-        }
-    }
+    }}
 
     /**
      * runAfterEither result completes exceptionally after exceptional
@@ -2478,11 +2269,11 @@ public class CompletableFutureTest exten
      */
     public void testRunAfterEither_exceptionalCompletion1() {
         for (ExecutionMode m : ExecutionMode.values())
-        for (Integer v1 : new Integer[] { 1, null }) {
-
+        for (Integer v1 : new Integer[] { 1, null })
+    {
         final CompletableFuture<Integer> f = new CompletableFuture<>();
         final CompletableFuture<Integer> g = new CompletableFuture<>();
-        final Noop r = new Noop();
+        final Noop r = new Noop(m);
         final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
         final CFException ex = new CFException();
 
@@ -2494,16 +2285,15 @@ public class CompletableFutureTest exten
         checkCompletedNormally(g, v1);
         checkCompletedWithWrappedCFException(f, ex);
         checkCompletedWithWrappedCFException(h, ex);
-        }
-    }
+    }}
 
     public void testRunAfterEither_exceptionalCompletion2() {
         for (ExecutionMode m : ExecutionMode.values())
-        for (Integer v1 : new Integer[] { 1, null }) {
-
+        for (Integer v1 : new Integer[] { 1, null })
+    {
         final CompletableFuture<Integer> f = new CompletableFuture<>();
         final CompletableFuture<Integer> g = new CompletableFuture<>();
-        final Noop r = new Noop();
+        final Noop r = new Noop(m);
         final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
         final CFException ex = new CFException();
 
@@ -2515,16 +2305,15 @@ public class CompletableFutureTest exten
         checkCompletedNormally(f, v1);
         checkCompletedWithWrappedCFException(g, ex);
         checkCompletedWithWrappedCFException(h, ex);
-        }
-    }
+    }}
 
     public void testRunAfterEither_exceptionalCompletion3() {
         for (ExecutionMode m : ExecutionMode.values())
-        for (Integer v1 : new Integer[] { 1, null }) {
-
+        for (Integer v1 : new Integer[] { 1, null })
+    {
         final CompletableFuture<Integer> f = new CompletableFuture<>();
         final CompletableFuture<Integer> g = new CompletableFuture<>();
-        final Noop r = new Noop();
+        final Noop r = new Noop(m);
         final CFException ex = new CFException();
 
         g.completeExceptionally(ex);
@@ -2534,7 +2323,7 @@ public class CompletableFutureTest exten
         // unspecified behavior
         Integer v;
         try {
-            assertEquals(h.join(), null);
+            assertNull(h.join());
             assertEquals(1, r.invocationCount);
         } catch (CompletionException ok) {
             checkCompletedWithWrappedCFException(h, ex);
@@ -2543,16 +2332,15 @@ public class CompletableFutureTest exten
 
         checkCompletedWithWrappedCFException(g, ex);
         checkCompletedNormally(f, v1);
-        }
-    }
+    }}
 
     public void testRunAfterEither_exceptionalCompletion4() {
         for (ExecutionMode m : ExecutionMode.values())
-        for (Integer v1 : new Integer[] { 1, null }) {
-
+        for (Integer v1 : new Integer[] { 1, null })
+    {
         final CompletableFuture<Integer> f = new CompletableFuture<>();
         final CompletableFuture<Integer> g = new CompletableFuture<>();
-        final Noop r = new Noop();
+        final Noop r = new Noop(m);
         final CFException ex = new CFException();
 
         f.completeExceptionally(ex);
@@ -2562,7 +2350,7 @@ public class CompletableFutureTest exten
         // unspecified behavior
         Integer v;
         try {
-            assertEquals(h.join(), null);
+            assertNull(h.join());
             assertEquals(1, r.invocationCount);
         } catch (CompletionException ok) {
             checkCompletedWithWrappedCFException(h, ex);
@@ -2571,8 +2359,7 @@ public class CompletableFutureTest exten
 
         checkCompletedWithWrappedCFException(f, ex);
         checkCompletedNormally(g, v1);
-        }
-    }
+    }}
 
     /**
      * runAfterEither result completes exceptionally if action does
@@ -2580,11 +2367,11 @@ public class CompletableFutureTest exten
     public void testRunAfterEither_actionFailed1() {
         for (ExecutionMode m : ExecutionMode.values())
         for (Integer v1 : new Integer[] { 1, null })
-        for (Integer v2 : new Integer[] { 2, null }) {
-
+        for (Integer v2 : new Integer[] { 2, null })
+    {
         final CompletableFuture<Integer> f = new CompletableFuture<>();
         final CompletableFuture<Integer> g = new CompletableFuture<>();
-        final FailingNoop r = new FailingNoop();
+        final FailingRunnable r = new FailingRunnable(m);
         final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
 
         f.complete(v1);
@@ -2592,17 +2379,16 @@ public class CompletableFutureTest exten
         g.complete(v2);
         checkCompletedNormally(f, v1);
         checkCompletedNormally(g, v2);
-        }
-    }
+    }}
 
     public void testRunAfterEither_actionFailed2() {
         for (ExecutionMode m : ExecutionMode.values())
         for (Integer v1 : new Integer[] { 1, null })
-        for (Integer v2 : new Integer[] { 2, null }) {
-
+        for (Integer v2 : new Integer[] { 2, null })
+    {
         final CompletableFuture<Integer> f = new CompletableFuture<>();
         final CompletableFuture<Integer> g = new CompletableFuture<>();
-        final FailingNoop r = new FailingNoop();
+        final FailingRunnable r = new FailingRunnable(m);
         final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
 
         g.complete(v2);
@@ -2610,8 +2396,7 @@ public class CompletableFutureTest exten
         f.complete(v1);
         checkCompletedNormally(f, v1);
         checkCompletedNormally(g, v2);
-        }
-    }
+    }}
 
     /**
      * runAfterEither result completes exceptionally if either source cancelled
@@ -2619,11 +2404,11 @@ public class CompletableFutureTest exten
     public void testRunAfterEither_sourceCancelled1() {
         for (ExecutionMode m : ExecutionMode.values())
         for (boolean mayInterruptIfRunning : new boolean[] { true, false })
-        for (Integer v1 : new Integer[] { 1, null }) {
-
+        for (Integer v1 : new Integer[] { 1, null })
+    {
         final CompletableFuture<Integer> f = new CompletableFuture<>();
         final CompletableFuture<Integer> g = new CompletableFuture<>();
-        final Noop r = new Noop();
+        final Noop r = new Noop(m);
         final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
 
         assertTrue(f.cancel(mayInterruptIfRunning));
@@ -2634,17 +2419,16 @@ public class CompletableFutureTest exten
         assertEquals(0, r.invocationCount);
         checkCompletedNormally(g, v1);
         checkCompletedWithWrappedCancellationException(h);
-        }
-    }
+    }}
 
     public void testRunAfterEither_sourceCancelled2() {
         for (ExecutionMode m : ExecutionMode.values())
         for (boolean mayInterruptIfRunning : new boolean[] { true, false })
-        for (Integer v1 : new Integer[] { 1, null }) {
-
+        for (Integer v1 : new Integer[] { 1, null })
+    {
         final CompletableFuture<Integer> f = new CompletableFuture<>();
         final CompletableFuture<Integer> g = new CompletableFuture<>();
-        final Noop r = new Noop();
+        final Noop r = new Noop(m);
         final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
 
         assertTrue(g.cancel(mayInterruptIfRunning));
@@ -2655,17 +2439,16 @@ public class CompletableFutureTest exten
         assertEquals(0, r.invocationCount);
         checkCompletedNormally(f, v1);
         checkCompletedWithWrappedCancellationException(h);
-        }
-    }
+    }}
 
     public void testRunAfterEither_sourceCancelled3() {
         for (ExecutionMode m : ExecutionMode.values())
         for (boolean mayInterruptIfRunning : new boolean[] { true, false })
-        for (Integer v1 : new Integer[] { 1, null }) {
-
+        for (Integer v1 : new Integer[] { 1, null })
+    {
         final CompletableFuture<Integer> f = new CompletableFuture<>();
         final CompletableFuture<Integer> g = new CompletableFuture<>();
-        final Noop r = new Noop();
+        final Noop r = new Noop(m);
 
         assertTrue(g.cancel(mayInterruptIfRunning));
         f.complete(v1);
@@ -2674,7 +2457,7 @@ public class CompletableFutureTest exten
         // unspecified behavior
         Integer v;
         try {
-            assertEquals(h.join(), null);
+            assertNull(h.join());
             assertEquals(1, r.invocationCount);
         } catch (CompletionException ok) {
             checkCompletedWithWrappedCancellationException(h);
@@ -2683,17 +2466,16 @@ public class CompletableFutureTest exten
 
         checkCancelled(g);
         checkCompletedNormally(f, v1);
-        }
-    }
+    }}
 
     public void testRunAfterEither_sourceCancelled4() {
         for (ExecutionMode m : ExecutionMode.values())
         for (boolean mayInterruptIfRunning : new boolean[] { true, false })
-        for (Integer v1 : new Integer[] { 1, null }) {
-
+        for (Integer v1 : new Integer[] { 1, null })
+    {
         final CompletableFuture<Integer> f = new CompletableFuture<>();
         final CompletableFuture<Integer> g = new CompletableFuture<>();
-        final Noop r = new Noop();
+        final Noop r = new Noop(m);
 
         assertTrue(f.cancel(mayInterruptIfRunning));
         g.complete(v1);
@@ -2702,7 +2484,7 @@ public class CompletableFutureTest exten
         // unspecified behavior
         Integer v;
         try {
-            assertEquals(h.join(), null);
+            assertNull(h.join());
             assertEquals(1, r.invocationCount);
         } catch (CompletionException ok) {
             checkCompletedWithWrappedCancellationException(h);
@@ -2711,423 +2493,86 @@ public class CompletableFutureTest exten
 
         checkCancelled(f);
         checkCompletedNormally(g, v1);
-        }
-    }
+    }}
 
     /**
      * thenCompose result completes normally after normal completion of source
      */
-    public void testThenCompose_normalCompletion1() {
+    public void testThenCompose_normalCompletion() {
         for (ExecutionMode m : ExecutionMode.values())
-        for (Integer v1 : new Integer[] { 1, null }) {
-
+        for (boolean createIncomplete : new boolean[] { true, false })
+        for (Integer v1 : new Integer[] { 1, null })
+    {
         final CompletableFuture<Integer> f = new CompletableFuture<>();
-        final CompletableFutureInc r = new CompletableFutureInc();
-        final CompletableFuture<Integer> g = f.thenCompose(r);
-        f.complete(v1);
-        checkCompletedNormally(g, inc(v1));
-        checkCompletedNormally(f, v1);
-        assertEquals(1, r.invocationCount);
-        }
-    }
-
-    public void testThenCompose_normalCompletion2() {
-        for (ExecutionMode m : ExecutionMode.values())
-        for (Integer v1 : new Integer[] { 1, null }) {
+        final CompletableFutureInc r = new CompletableFutureInc(m);
+        if (!createIncomplete) f.complete(v1);
+        final CompletableFuture<Integer> g = m.thenCompose(f, r);
+        if (createIncomplete) f.complete(v1);
 
-        final CompletableFuture<Integer> f = new CompletableFuture<>();
-        final CompletableFutureInc r = new CompletableFutureInc();
-        f.complete(v1);
-        final CompletableFuture<Integer> g = f.thenCompose(r);
         checkCompletedNormally(g, inc(v1));
         checkCompletedNormally(f, v1);
         assertEquals(1, r.invocationCount);
-        }
-    }
+    }}
 
     /**
      * thenCompose result completes exceptionally after exceptional
      * completion of source
      */
-    public void testThenCompose_exceptionalCompletion1() {
-        for (ExecutionMode m : ExecutionMode.values()) {
-
+    public void testThenCompose_exceptionalCompletion() {
+        for (ExecutionMode m : ExecutionMode.values())
+        for (boolean createIncomplete : new boolean[] { true, false })
+    {
         final CFException ex = new CFException();
-        final CompletableFutureInc r = new CompletableFutureInc();
+        final CompletableFutureInc r = new CompletableFutureInc(m);
         final CompletableFuture<Integer> f = new CompletableFuture<>();
-        final CompletableFuture<Integer> g = f.thenCompose(r);
-        f.completeExceptionally(ex);
-        checkCompletedWithWrappedCFException(g, ex);
-        checkCompletedWithWrappedCFException(f, ex);
-        }
-    }
-
-    public void testThenCompose_exceptionalCompletion2() {
-        for (ExecutionMode m : ExecutionMode.values()) {
+        if (!createIncomplete) f.completeExceptionally(ex);
+        final CompletableFuture<Integer> g = m.thenCompose(f, r);
+        if (createIncomplete) f.completeExceptionally(ex);
 
-        final CFException ex = new CFException();
-        final CompletableFuture<Integer> f = new CompletableFuture<>();
-        f.completeExceptionally(ex);
-        final CompletableFutureInc r = new CompletableFutureInc();
-        final CompletableFuture<Integer> g = f.thenCompose(r);
         checkCompletedWithWrappedCFException(g, ex);
         checkCompletedWithWrappedCFException(f, ex);
-        }
-    }
+        assertEquals(0, r.invocationCount);
+    }}
 
     /**
      * thenCompose result completes exceptionally if action does
      */
-    public void testThenCompose_actionFailed1() {
+    public void testThenCompose_actionFailed() {
         for (ExecutionMode m : ExecutionMode.values())
-        for (Integer v1 : new Integer[] { 1, null }) {
-
+        for (boolean createIncomplete : new boolean[] { true, false })
+        for (Integer v1 : new Integer[] { 1, null })
+    {
         final CompletableFuture<Integer> f = new CompletableFuture<>();
         final FailingCompletableFutureFunction r
-            = new FailingCompletableFutureFunction();
-        final CompletableFuture<Integer> g = f.thenCompose(r);
-        f.complete(v1);
-        checkCompletedWithWrappedCFException(g);
-        checkCompletedNormally(f, v1);
-        }
-    }
-
-    public void testThenCompose_actionFailed2() {
-        for (ExecutionMode m : ExecutionMode.values())
-        for (Integer v1 : new Integer[] { 1, null }) {
+            = new FailingCompletableFutureFunction(m);
+        if (!createIncomplete) f.complete(v1);
+        final CompletableFuture<Integer> g = m.thenCompose(f, r);
+        if (createIncomplete) f.complete(v1);
 
-        final CompletableFuture<Integer> f = new CompletableFuture<>();
-        f.complete(v1);
-        final FailingCompletableFutureFunction r
-            = new FailingCompletableFutureFunction();
-        final CompletableFuture<Integer> g = f.thenCompose(r);
         checkCompletedWithWrappedCFException(g);
         checkCompletedNormally(f, v1);
-        }
-    }
+    }}
 
     /**
      * thenCompose result completes exceptionally if source cancelled
      */
-    public void testThenCompose_sourceCancelled1() {
+    public void testThenCompose_sourceCancelled() {
         for (ExecutionMode m : ExecutionMode.values())
-        for (boolean mayInterruptIfRunning : new boolean[] { true, false }) {
-
+        for (boolean createIncomplete : new boolean[] { true, false })
+        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
+    {
         final CompletableFuture<Integer> f = new CompletableFuture<>();
-        final CompletableFutureInc r = new CompletableFutureInc();
-        final CompletableFuture<Integer> g = f.thenCompose(r);
-        assertTrue(f.cancel(mayInterruptIfRunning));
-        checkCompletedWithWrappedCancellationException(g);
-        checkCancelled(f);
+        final CompletableFutureInc r = new CompletableFutureInc(m);
+        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
+        final CompletableFuture<Integer> g = m.thenCompose(f, r);
+        if (createIncomplete) {
+            checkIncomplete(g);
+            assertTrue(f.cancel(mayInterruptIfRunning));
         }
-    }
 
-    public void testThenCompose_sourceCancelled2() {
-        for (ExecutionMode m : ExecutionMode.values())
-        for (boolean mayInterruptIfRunning : new boolean[] { true, false }) {
-
-        final CompletableFuture<Integer> f = new CompletableFuture<>();
-        assertTrue(f.cancel(mayInterruptIfRunning));
-        final CompletableFutureInc r = new CompletableFutureInc();
-        final CompletableFuture<Integer> g = f.thenCompose(r);
         checkCompletedWithWrappedCancellationException(g);
         checkCancelled(f);
-        }
-    }
-
-    // asyncs
-
-    /**
-     * thenRunAsync result completes normally after normal completion of source
-     */
-    public void testThenRunAsync() {
-        CompletableFuture<Integer> f = new CompletableFuture<>();
-        Noop r = new Noop();
-        CompletableFuture<Void> g = f.thenRunAsync(r);
-        f.complete(null);
-        checkCompletedNormally(g, null);
-
-        // reordered version
-        f = new CompletableFuture<>();
-        f.complete(null);
-        r = new Noop();
-        g = f.thenRunAsync(r);
-        checkCompletedNormally(g, null);
-    }
-
-    /**
-     * thenRunAsync result completes exceptionally after exceptional
-     * completion of source
-     */
-    public void testThenRunAsync2() {
-        CompletableFuture<Integer> f = new CompletableFuture<>();
-        Noop r = new Noop();
-        CompletableFuture<Void> g = f.thenRunAsync(r);
-        f.completeExceptionally(new CFException());
-        try {
-            g.join();
-            shouldThrow();
-        } catch (CompletionException success) {}
-        checkCompletedWithWrappedCFException(g);
-    }
-
-    /**
-     * thenRunAsync result completes exceptionally if action does
-     */
-    public void testThenRunAsync3() {
-        CompletableFuture<Integer> f = new CompletableFuture<>();
-        FailingNoop r = new FailingNoop();
-        CompletableFuture<Void> g = f.thenRunAsync(r);
-        f.complete(null);
-        checkCompletedWithWrappedCFException(g);
-    }
-
-    /**
-     * thenRunAsync result completes exceptionally if source cancelled
-     */
-    public void testThenRunAsync4() {
-        CompletableFuture<Integer> f = new CompletableFuture<>();
-        Noop r = new Noop();
-        CompletableFuture<Void> g = f.thenRunAsync(r);
-        assertTrue(f.cancel(true));
-        checkCompletedWithWrappedCancellationException(g);
-    }
-
-    /**
-     * thenApplyAsync result completes normally after normal completion of source
-     */
-    public void testThenApplyAsync() {
-        CompletableFuture<Integer> f = new CompletableFuture<>();
-        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
-        f.complete(one);
-        checkCompletedNormally(g, two);
-    }
-
-    /**
-     * thenApplyAsync result completes exceptionally after exceptional
-     * completion of source
-     */
-    public void testThenApplyAsync2() {
-        CompletableFuture<Integer> f = new CompletableFuture<>();
-        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
-        f.completeExceptionally(new CFException());
-        checkCompletedWithWrappedCFException(g);
-    }
-
-    /**
-     * thenApplyAsync result completes exceptionally if action does
-     */
-    public void testThenApplyAsync3() {
-        CompletableFuture<Integer> f = new CompletableFuture<>();
-        FailingFunction r = new FailingFunction();
-        CompletableFuture<Integer> g = f.thenApplyAsync(r);
-        f.complete(null);
-        checkCompletedWithWrappedCFException(g);
-    }
-
-    /**
-     * thenApplyAsync result completes exceptionally if source cancelled
-     */
-    public void testThenApplyAsync4() {
-        CompletableFuture<Integer> f = new CompletableFuture<>();
-        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
-        assertTrue(f.cancel(true));
-        checkCompletedWithWrappedCancellationException(g);
-    }
-
-    /**
-     * thenAcceptAsync result completes normally after normal
-     * completion of source
-     */
-    public void testThenAcceptAsync() {
-        CompletableFuture<Integer> f = new CompletableFuture<>();
-        IncAction r = new IncAction();
-        CompletableFuture<Void> g = f.thenAcceptAsync(r);
-        f.complete(one);
-        checkCompletedNormally(g, null);
-        assertEquals(r.value, (Integer) 2);
-    }
-
-    /**
-     * thenAcceptAsync result completes exceptionally after exceptional
-     * completion of source
-     */
-    public void testThenAcceptAsync2() {
-        CompletableFuture<Integer> f = new CompletableFuture<>();
-        IncAction r = new IncAction();
-        CompletableFuture<Void> g = f.thenAcceptAsync(r);
-        f.completeExceptionally(new CFException());
-        checkCompletedWithWrappedCFException(g);
-    }
-
-    /**
-     * thenAcceptAsync result completes exceptionally if action does
-     */
-    public void testThenAcceptAsync3() {
-        CompletableFuture<Integer> f = new CompletableFuture<>();
-        FailingConsumer r = new FailingConsumer();
-        CompletableFuture<Void> g = f.thenAcceptAsync(r);
-        f.complete(null);
-        checkCompletedWithWrappedCFException(g);
-    }
-
-    /**
-     * thenAcceptAsync result completes exceptionally if source cancelled
-     */
-    public void testThenAcceptAsync4() {
-        CompletableFuture<Integer> f = new CompletableFuture<>();
-        IncAction r = new IncAction();
-        CompletableFuture<Void> g = f.thenAcceptAsync(r);
-        assertTrue(f.cancel(true));
-        checkCompletedWithWrappedCancellationException(g);
-    }
-
-    // async with explicit executors
-
-    /**
-     * thenRunAsync result completes normally after normal completion of source
-     */
-    public void testThenRunAsyncE() {
-        CompletableFuture<Integer> f = new CompletableFuture<>();
-        Noop r = new Noop();
-        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
-        f.complete(null);
-        checkCompletedNormally(g, null);
-
-        // reordered version
-        f = new CompletableFuture<>();
-        f.complete(null);
-        r = new Noop();
-        g = f.thenRunAsync(r, new ThreadExecutor());
-        checkCompletedNormally(g, null);
-    }
-
-    /**
-     * thenRunAsync result completes exceptionally after exceptional
-     * completion of source
-     */
-    public void testThenRunAsync2E() {
-        CompletableFuture<Integer> f = new CompletableFuture<>();
-        Noop r = new Noop();
-        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
-        f.completeExceptionally(new CFException());
-        try {
-            g.join();
-            shouldThrow();
-        } catch (CompletionException success) {}
-        checkCompletedWithWrappedCFException(g);
-    }
-
-    /**
-     * thenRunAsync result completes exceptionally if action does
-     */
-    public void testThenRunAsync3E() {
-        CompletableFuture<Integer> f = new CompletableFuture<>();
-        FailingNoop r = new FailingNoop();
-        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
-        f.complete(null);
-        checkCompletedWithWrappedCFException(g);
-    }
-
-    /**
-     * thenRunAsync result completes exceptionally if source cancelled
-     */
-    public void testThenRunAsync4E() {
-        CompletableFuture<Integer> f = new CompletableFuture<>();
-        Noop r = new Noop();
-        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
-        assertTrue(f.cancel(true));
-        checkCompletedWithWrappedCancellationException(g);
-    }
-
-    /**
-     * thenApplyAsync result completes normally after normal completion of source
-     */
-    public void testThenApplyAsyncE() {
-        CompletableFuture<Integer> f = new CompletableFuture<>();
-        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
-        f.complete(one);
-        checkCompletedNormally(g, two);
-    }
-
-    /**
-     * thenApplyAsync result completes exceptionally after exceptional
-     * completion of source
-     */
-    public void testThenApplyAsync2E() {
-        CompletableFuture<Integer> f = new CompletableFuture<>();
-        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
-        f.completeExceptionally(new CFException());
-        checkCompletedWithWrappedCFException(g);
-    }
-
-    /**
-     * thenApplyAsync result completes exceptionally if action does
-     */
-    public void testThenApplyAsync3E() {
-        CompletableFuture<Integer> f = new CompletableFuture<>();
-        FailingFunction r = new FailingFunction();
-        CompletableFuture<Integer> g = f.thenApplyAsync(r, new ThreadExecutor());
-        f.complete(null);
-        checkCompletedWithWrappedCFException(g);
-    }
-
-    /**
-     * thenApplyAsync result completes exceptionally if source cancelled
-     */
-    public void testThenApplyAsync4E() {
-        CompletableFuture<Integer> f = new CompletableFuture<>();
-        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
-        assertTrue(f.cancel(true));
-        checkCompletedWithWrappedCancellationException(g);
-    }
-
-    /**
-     * thenAcceptAsync result completes normally after normal
-     * completion of source
-     */
-    public void testThenAcceptAsyncE() {
-        CompletableFuture<Integer> f = new CompletableFuture<>();
-        IncAction r = new IncAction();
-        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
-        f.complete(one);
-        checkCompletedNormally(g, null);
-        assertEquals(r.value, (Integer) 2);
-    }
-
-    /**
-     * thenAcceptAsync result completes exceptionally after exceptional
-     * completion of source
-     */
-    public void testThenAcceptAsync2E() {
-        CompletableFuture<Integer> f = new CompletableFuture<>();
-        IncAction r = new IncAction();
-        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
-        f.completeExceptionally(new CFException());
-        checkCompletedWithWrappedCFException(g);
-    }
-
-    /**
-     * thenAcceptAsync result completes exceptionally if action does
-     */
-    public void testThenAcceptAsync3E() {
-        CompletableFuture<Integer> f = new CompletableFuture<>();
-        FailingConsumer r = new FailingConsumer();
-        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
-        f.complete(null);
-        checkCompletedWithWrappedCFException(g);
-    }
-
-    /**
-     * thenAcceptAsync result completes exceptionally if source cancelled
-     */
-    public void testThenAcceptAsync4E() {
-        CompletableFuture<Integer> f = new CompletableFuture<>();
-        IncAction r = new IncAction();
-        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
-        assertTrue(f.cancel(true));
-        checkCompletedWithWrappedCancellationException(g);
-    }
+    }}
 
     // other static methods
 
@@ -3291,7 +2736,7 @@ public class CompletableFutureTest exten
 
             () -> f.thenCompose(null),
             () -> f.thenComposeAsync(null),
-            () -> f.thenComposeAsync(new CompletableFutureInc(), null),
+            () -> f.thenComposeAsync(new CompletableFutureInc(ExecutionMode.EXECUTOR), null),
             () -> f.thenComposeAsync(null, exec),
 
             () -> f.exceptionally(null),
@@ -3328,37 +2773,37 @@ public class CompletableFutureTest exten
      * source result.
      */
     public void testWhenComplete_normalCompletion1() {
-        for (boolean createIncomplete : new boolean[] { true, false })
         for (ExecutionMode m : ExecutionMode.values())
-        for (Integer v1 : new Integer[] { 1, null }) {
-
-        final AtomicInteger a = new AtomicInteger();
+        for (boolean createIncomplete : new boolean[] { true, false })
+        for (Integer v1 : new Integer[] { 1, null })
+    {
+        final AtomicInteger a = new AtomicInteger(0);
         final CompletableFuture<Integer> f = new CompletableFuture<>();
         if (!createIncomplete) f.complete(v1);
-        final CompletableFuture<Integer> g =
-            m.whenComplete(f,
-                           (Integer x, Throwable t) -> {
-                               threadAssertSame(x, v1);
-                               threadAssertNull(t);
-                               a.getAndIncrement();
-                           });
+        final CompletableFuture<Integer> g = m.whenComplete
+            (f,
+             (Integer x, Throwable t) -> {
+                threadAssertSame(x, v1);
+                threadAssertNull(t);
+                a.getAndIncrement();
+            });
         if (createIncomplete) f.complete(v1);
-        checkCompletedNormally(f, v1);
+
         checkCompletedNormally(g, v1);
-        assertEquals(a.get(), 1);
-        }
-    }
+        checkCompletedNormally(f, v1);
+        assertEquals(1, a.get());
+    }}
 
     /**
      * whenComplete action executes on exceptional completion, propagating
      * source result.
      */
     public void testWhenComplete_exceptionalCompletion() {
-        for (boolean createIncomplete : new boolean[] { true, false })
         for (ExecutionMode m : ExecutionMode.values())
-        for (Integer v1 : new Integer[] { 1, null }) {
-
-        final AtomicInteger a = new AtomicInteger();
+        for (boolean createIncomplete : new boolean[] { true, false })
+        for (Integer v1 : new Integer[] { 1, null })
+    {
+        final AtomicInteger a = new AtomicInteger(0);
         final CFException ex = new CFException();
         final CompletableFuture<Integer> f = new CompletableFuture<>();
         if (!createIncomplete) f.completeExceptionally(ex);
@@ -3372,9 +2817,35 @@ public class CompletableFutureTest exten
         if (createIncomplete) f.completeExceptionally(ex);
         checkCompletedWithWrappedCFException(f, ex);
         checkCompletedWithWrappedCFException(g, ex);
-        assertEquals(a.get(), 1);
-        }
-    }
+        assertEquals(1, a.get());
+    }}
+
+    /**
+     * whenComplete action executes on cancelled source, propagating
+     * CancellationException.
+     */
+    public void testWhenComplete_sourceCancelled() {
+        for (ExecutionMode m : ExecutionMode.values())
+        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
+        for (boolean createIncomplete : new boolean[] { true, false })
+    {
+        final AtomicInteger a = new AtomicInteger(0);
+        final CompletableFuture<Integer> f = new CompletableFuture<>();
+        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
+        final CompletableFuture<Integer> g = m.whenComplete
+            (f,
+             (Integer x, Throwable t) -> {
+                threadAssertNull(x);
+                threadAssertTrue(t instanceof CancellationException);
+                a.getAndIncrement();
+            });
+        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
+
+        //try { g.join(); } catch (Throwable t) { throw new Error(t); }
+        checkCompletedWithWrappedCancellationException(g);
+        checkCancelled(f);
+        assertEquals(1, a.get());
+    }}
 
     /**
      * If a whenComplete action throws an exception when triggered by
@@ -3383,8 +2854,9 @@ public class CompletableFutureTest exten
     public void testWhenComplete_actionFailed() {
         for (boolean createIncomplete : new boolean[] { true, false })
         for (ExecutionMode m : ExecutionMode.values())
-        for (Integer v1 : new Integer[] { 1, null }) {
-
+        for (Integer v1 : new Integer[] { 1, null })
+    {
+        final AtomicInteger a = new AtomicInteger(0);
         final CFException ex = new CFException();
         final CompletableFuture<Integer> f = new CompletableFuture<>();
         if (!createIncomplete) f.complete(v1);
@@ -3393,13 +2865,14 @@ public class CompletableFutureTest exten
              (Integer x, Throwable t) -> {
                 threadAssertSame(x, v1);
                 threadAssertNull(t);
+                a.getAndIncrement();
                 throw ex;
             });
         if (createIncomplete) f.complete(v1);
         checkCompletedNormally(f, v1);
         checkCompletedWithWrappedCFException(g, ex);
-        }
-    }
+        assertEquals(1, a.get());
+    }}
 
     /**
      * If a whenComplete action throws an exception when triggered by
@@ -3409,8 +2882,9 @@ public class CompletableFutureTest exten
     public void testWhenComplete_actionFailedSourceFailed() {
         for (boolean createIncomplete : new boolean[] { true, false })
         for (ExecutionMode m : ExecutionMode.values())
-        for (Integer v1 : new Integer[] { 1, null }) {
-
+        for (Integer v1 : new Integer[] { 1, null })
+    {
+        final AtomicInteger a = new AtomicInteger(0);
         final CFException ex1 = new CFException();
         final CFException ex2 = new CFException();
         final CompletableFuture<Integer> f = new CompletableFuture<>();
@@ -3421,97 +2895,14 @@ public class CompletableFutureTest exten
              (Integer x, Throwable t) -> {
                 threadAssertSame(t, ex1);
                 threadAssertNull(x);
+                a.getAndIncrement();
                 throw ex2;
             });
         if (createIncomplete) f.completeExceptionally(ex1);
 
         checkCompletedWithWrappedCFException(f, ex1);
         checkCompletedWithWrappedCFException(g, ex1);
-        }
-    }
-
-    /**
-     * handleAsync action completes normally with function value on
-     * either normal or exceptional completion of source
-     */
-    public void testHandleAsync() {
-        CompletableFuture<Integer> f, g;
-        IntegerHandler r;
-
-        f = new CompletableFuture<>();
-        g = f.handleAsync(r = new IntegerHandler());
-        assertEquals(0, r.invocationCount);
-        f.completeExceptionally(new CFException());
-        checkCompletedWithWrappedCFException(f);
-        checkCompletedNormally(g, three);
-        assertEquals(1, r.invocationCount);
-
-        f = new CompletableFuture<>();
-        g = f.handleAsync(r = new IntegerHandler());
-        assertEquals(0, r.invocationCount);
-        f.completeExceptionally(new CFException());
-        checkCompletedWithWrappedCFException(f);
-        checkCompletedNormally(g, three);
-        assertEquals(1, r.invocationCount);
-
-        f = new CompletableFuture<>();
-        g = f.handleAsync(r = new IntegerHandler());
-        assertEquals(0, r.invocationCount);
-        f.complete(one);
-        checkCompletedNormally(f, one);
-        checkCompletedNormally(g, two);
-        assertEquals(1, r.invocationCount);
-
-        f = new CompletableFuture<>();
-        g = f.handleAsync(r = new IntegerHandler());
-        assertEquals(0, r.invocationCount);
-        f.complete(one);
-        checkCompletedNormally(f, one);
-        checkCompletedNormally(g, two);
-        assertEquals(1, r.invocationCount);
-    }
-
-    /**
-     * handleAsync action with Executor completes normally with
-     * function value on either normal or exceptional completion of
-     * source
-     */
-    public void testHandleAsync2() {
-        CompletableFuture<Integer> f, g;
-        ThreadExecutor exec = new ThreadExecutor();
-        IntegerHandler r;
-
-        f = new CompletableFuture<>();
-        g = f.handleAsync(r = new IntegerHandler(), exec);
-        assertEquals(0, r.invocationCount);
-        f.completeExceptionally(new CFException());
-        checkCompletedWithWrappedCFException(f);
-        checkCompletedNormally(g, three);
-        assertEquals(1, r.invocationCount);
-
-        f = new CompletableFuture<>();
-        g = f.handleAsync(r = new IntegerHandler(), exec);
-        assertEquals(0, r.invocationCount);
-        f.completeExceptionally(new CFException());
-        checkCompletedWithWrappedCFException(f);
-        checkCompletedNormally(g, three);
-        assertEquals(1, r.invocationCount);
-
-        f = new CompletableFuture<>();
-        g = f.handleAsync(r = new IntegerHandler(), exec);
-        assertEquals(0, r.invocationCount);
-        f.complete(one);
-        checkCompletedNormally(f, one);
-        checkCompletedNormally(g, two);
-        assertEquals(1, r.invocationCount);
-
-        f = new CompletableFuture<>();
-        g = f.handleAsync(r = new IntegerHandler(), exec);
-        assertEquals(0, r.invocationCount);
-        f.complete(one);
-        checkCompletedNormally(f, one);
-        checkCompletedNormally(g, two);
-        assertEquals(1, r.invocationCount);
-    }
+        assertEquals(1, a.get());
+    }}
 
 }