--- jsr166/src/test/tck/CompletableFutureTest.java	2013/03/31 18:16:35	1.12
+++ jsr166/src/test/tck/CompletableFutureTest.java	2014/06/01 23:20:19	1.37
@@ -16,6 +16,7 @@ import java.util.concurrent.ExecutionExc
 import java.util.concurrent.Future;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionException;
+import java.util.concurrent.CompletionStage;
 import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicInteger;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
@@ -55,6 +56,9 @@ public class CompletableFutureTest exten
 
     <T> void checkCompletedNormally(CompletableFuture<T> f, T value) {
         try {
+            assertEquals(value, f.get(LONG_DELAY_MS, MILLISECONDS));
+        } catch (Throwable fail) { threadUnexpectedException(fail); }
+        try {
             assertEquals(value, f.join());
         } catch (Throwable fail) { threadUnexpectedException(fail); }
         try {
@@ -63,16 +67,20 @@ public class CompletableFutureTest exten
         try {
             assertEquals(value, f.get());
         } catch (Throwable fail) { threadUnexpectedException(fail); }
-        try {
-            assertEquals(value, f.get(0L, SECONDS));
-        } catch (Throwable fail) { threadUnexpectedException(fail); }
         assertTrue(f.isDone());
         assertFalse(f.isCancelled());
+        assertFalse(f.isCompletedExceptionally());
         assertTrue(f.toString().contains("[Completed normally]"));
     }
 
     void checkCompletedWithWrappedCFException(CompletableFuture<?> f) {
         try {
+            f.get(LONG_DELAY_MS, MILLISECONDS);
+            shouldThrow();
+        } catch (ExecutionException success) {
+            assertTrue(success.getCause() instanceof CFException);
+        } catch (Throwable fail) { threadUnexpectedException(fail); }
+        try {
             f.join();
             shouldThrow();
         } catch (CompletionException success) {
@@ -90,18 +98,49 @@ public class CompletableFutureTest exten
         } catch (ExecutionException success) {
             assertTrue(success.getCause() instanceof CFException);
         } catch (Throwable fail) { threadUnexpectedException(fail); }
+        assertTrue(f.isDone());
+        assertFalse(f.isCancelled());
+        assertTrue(f.toString().contains("[Completed exceptionally]"));
+    }
+
+    void checkCompletedWithWrappedCFException(CompletableFuture<?> f,
+                                              CFException ex) {
         try {
-            f.get(0L, SECONDS);
+            f.get(LONG_DELAY_MS, MILLISECONDS);
             shouldThrow();
         } catch (ExecutionException success) {
-            assertTrue(success.getCause() instanceof CFException);
+            assertSame(ex, success.getCause());
+        } catch (Throwable fail) { threadUnexpectedException(fail); }
+        try {
+            f.join();
+            shouldThrow();
+        } catch (CompletionException success) {
+            assertSame(ex, success.getCause());
+        }
+        try {
+            f.getNow(null);
+            shouldThrow();
+        } catch (CompletionException success) {
+            assertSame(ex, success.getCause());
+        }
+        try {
+            f.get();
+            shouldThrow();
+        } catch (ExecutionException success) {
+            assertSame(ex, success.getCause());
         } catch (Throwable fail) { threadUnexpectedException(fail); }
         assertTrue(f.isDone());
         assertFalse(f.isCancelled());
+        assertTrue(f.toString().contains("[Completed exceptionally]"));
     }
 
     void checkCancelled(CompletableFuture<?> f) {
         try {
+            f.get(LONG_DELAY_MS, MILLISECONDS);
+            shouldThrow();
+        } catch (CancellationException success) {
+        } catch (Throwable fail) { threadUnexpectedException(fail); }
+        try {
             f.join();
             shouldThrow();
         } catch (CancellationException success) {}
@@ -114,17 +153,20 @@ public class CompletableFutureTest exten
             shouldThrow();
         } catch (CancellationException success) {
         } catch (Throwable fail) { threadUnexpectedException(fail); }
-        try {
-            f.get(0L, SECONDS);
-            shouldThrow();
-        } catch (CancellationException success) {
-        } catch (Throwable fail) { threadUnexpectedException(fail); }
         assertTrue(f.isDone());
+        assertTrue(f.isCompletedExceptionally());
         assertTrue(f.isCancelled());
+        assertTrue(f.toString().contains("[Completed exceptionally]"));
     }
 
     void checkCompletedWithWrappedCancellationException(CompletableFuture<?> f) {
         try {
+            f.get(LONG_DELAY_MS, MILLISECONDS);
+            shouldThrow();
+        } catch (ExecutionException success) {
+            assertTrue(success.getCause() instanceof CancellationException);
+        } catch (Throwable fail) { threadUnexpectedException(fail); }
+        try {
             f.join();
             shouldThrow();
         } catch (CompletionException success) {
@@ -142,14 +184,10 @@ public class CompletableFutureTest exten
         } catch (ExecutionException success) {
             assertTrue(success.getCause() instanceof CancellationException);
         } catch (Throwable fail) { threadUnexpectedException(fail); }
-        try {
-            f.get(0L, SECONDS);
-            shouldThrow();
-        } catch (ExecutionException success) {
-            assertTrue(success.getCause() instanceof CancellationException);
-        } catch (Throwable fail) { threadUnexpectedException(fail); }
         assertTrue(f.isDone());
         assertFalse(f.isCancelled());
+        assertTrue(f.isCompletedExceptionally());
+        assertTrue(f.toString().contains("[Completed exceptionally]"));
     }
 
     /**
@@ -157,7 +195,7 @@ public class CompletableFutureTest exten
      * by methods isDone, isCancelled, and getNow
      */
     public void testConstructor() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
+        CompletableFuture<Integer> f = new CompletableFuture<>();
         checkIncomplete(f);
     }
 
@@ -166,7 +204,7 @@ public class CompletableFutureTest exten
      * isCancelled, join, get, and getNow
      */
     public void testComplete() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
+        CompletableFuture<Integer> f = new CompletableFuture<>();
         checkIncomplete(f);
         f.complete(one);
         checkCompletedNormally(f, one);
@@ -177,7 +215,7 @@ public class CompletableFutureTest exten
      * methods isDone, isCancelled, join, get, and getNow
      */
     public void testCompleteExceptionally() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
+        CompletableFuture<Integer> f = new CompletableFuture<>();
         checkIncomplete(f);
         f.completeExceptionally(new CFException());
         checkCompletedWithWrappedCFException(f);
@@ -188,7 +226,7 @@ public class CompletableFutureTest exten
      * methods isDone, isCancelled, join, get, and getNow
      */
     public void testCancel() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
+        CompletableFuture<Integer> f = new CompletableFuture<>();
         checkIncomplete(f);
         assertTrue(f.cancel(true));
         checkCancelled(f);
@@ -198,7 +236,7 @@ public class CompletableFutureTest exten
      * obtrudeValue forces completion with given value
      */
     public void testObtrudeValue() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
+        CompletableFuture<Integer> f = new CompletableFuture<>();
         checkIncomplete(f);
         f.complete(one);
         checkCompletedNormally(f, one);
@@ -206,10 +244,10 @@ public class CompletableFutureTest exten
         checkCompletedNormally(f, three);
         f.obtrudeValue(two);
         checkCompletedNormally(f, two);
-        f = new CompletableFuture<Integer>();
+        f = new CompletableFuture<>();
         f.obtrudeValue(three);
         checkCompletedNormally(f, three);
-        f = new CompletableFuture<Integer>();
+        f = new CompletableFuture<>();
         f.completeExceptionally(new CFException());
         f.obtrudeValue(four);
         checkCompletedNormally(f, four);
@@ -219,16 +257,16 @@ public class CompletableFutureTest exten
      * obtrudeException forces completion with given exception
      */
     public void testObtrudeException() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
+        CompletableFuture<Integer> f = new CompletableFuture<>();
         checkIncomplete(f);
         f.complete(one);
         checkCompletedNormally(f, one);
         f.obtrudeException(new CFException());
         checkCompletedWithWrappedCFException(f);
-        f = new CompletableFuture<Integer>();
+        f = new CompletableFuture<>();
         f.obtrudeException(new CFException());
         checkCompletedWithWrappedCFException(f);
-        f = new CompletableFuture<Integer>();
+        f = new CompletableFuture<>();
         f.completeExceptionally(new CFException());
         f.obtrudeValue(four);
         checkCompletedNormally(f, four);
@@ -240,7 +278,7 @@ public class CompletableFutureTest exten
      * getNumberOfDependents returns number of dependent tasks
      */
     public void testGetNumberOfDependents() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
+        CompletableFuture<Integer> f = new CompletableFuture<>();
         assertEquals(f.getNumberOfDependents(), 0);
         CompletableFuture g = f.thenRun(new Noop());
         assertEquals(f.getNumberOfDependents(), 1);
@@ -253,7 +291,6 @@ public class CompletableFutureTest exten
         assertEquals(g.getNumberOfDependents(), 0);
     }
 
-
     /**
      * toString indicates current completion state
      */
@@ -279,20 +316,44 @@ public class CompletableFutureTest exten
         checkCompletedNormally(f, "test");
     }
 
+    // Choose non-commutative actions for better coverage
+
+    // A non-commutative function that handles null values as well,
+    // and produces null values occasionally.
+    public static Integer subtract(Integer x, Integer y) {
+        return (x == null && y == null) ? null :
+            ((x == null) ? 42 : x.intValue())
+            - ((y == null) ? 99 : y.intValue());
+    }
+
     static final Supplier<Integer> supplyOne =
         () -> Integer.valueOf(1);
     static final Function<Integer, Integer> inc =
         (Integer x) -> Integer.valueOf(x.intValue() + 1);
-    static final BiFunction<Integer, Integer, Integer> add =
-        (Integer x, Integer y) -> Integer.valueOf(x.intValue() + y.intValue());
+    static final BiFunction<Integer, Integer, Integer> subtract =
+        (Integer x, Integer y) -> subtract(x, y);
     static final class IncAction implements Consumer<Integer> {
         int value;
         public void accept(Integer x) { value = x.intValue() + 1; }
     }
-    static final class AddAction implements BiConsumer<Integer, Integer> {
-        int value;
+    static final class SubtractAction implements BiConsumer<Integer, Integer> {
+        int invocationCount = 0;
+        Integer value;
+        // Check this action was invoked exactly once when result is computed.
+        public boolean ran() { return invocationCount == 1; }
         public void accept(Integer x, Integer y) {
-            value = x.intValue() + y.intValue();
+            invocationCount++;
+            value = subtract(x, y);
+        }
+    }
+    static final class SubtractFunction implements BiFunction<Integer, Integer, Integer> {
+        int invocationCount = 0;
+        Integer value;
+        // Check this action was invoked exactly once when result is computed.
+        public boolean ran() { return invocationCount == 1; }
+        public Integer apply(Integer x, Integer y) {
+            invocationCount++;
+            return value = subtract(x, y);
         }
     }
     static final class Noop implements Runnable {
@@ -325,15 +386,19 @@ public class CompletableFutureTest exten
         public void run() { ran = true; throw new CFException(); }
     }
 
-    static final class CompletableFutureInc implements Function<Integer, CompletableFuture<Integer>> {
+    static final class CompletableFutureInc
+        implements Function<Integer, CompletableFuture<Integer>> {
+        boolean ran;
         public CompletableFuture<Integer> apply(Integer x) {
-            CompletableFuture<Integer> f = new CompletableFuture<Integer>();
+            ran = true;
+            CompletableFuture<Integer> f = new CompletableFuture<>();
             f.complete(Integer.valueOf(x.intValue() + 1));
             return f;
         }
     }
 
-    static final class FailingCompletableFutureFunction implements Function<Integer, CompletableFuture<Integer>> {
+    static final class FailingCompletableFutureFunction
+        implements Function<Integer, CompletableFuture<Integer>> {
         boolean ran;
         public CompletableFuture<Integer> apply(Integer x) {
             ran = true; throw new CFException();
@@ -342,7 +407,10 @@ public class CompletableFutureTest exten
 
     // Used for explicit executor tests
     static final class ThreadExecutor implements Executor {
+        AtomicInteger count = new AtomicInteger(0);
+
         public void execute(Runnable r) {
+            count.getAndIncrement();
             new Thread(r).start();
         }
     }
@@ -352,24 +420,126 @@ public class CompletableFutureTest exten
     }
 
     static final class IntegerHandler implements BiFunction<Integer, Throwable, Integer> {
+        boolean ran;
         public Integer apply(Integer x, Throwable t) {
+            ran = true;
             return (t == null) ? two : three;
         }
     }
 
+    /**
+     * Permits the testing of parallel code for the 3 different
+     * execution modes without repeating all the testing code.
+     */
+    enum ExecutionMode {
+        DEFAULT {
+            public <T,U> CompletableFuture<Void> runAfterBoth
+                (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
+                return f.runAfterBoth(g, a);
+            }
+            public <T,U> CompletableFuture<Void> thenAcceptBoth
+                (CompletableFuture<T> f,
+                 CompletionStage<? extends U> g,
+                 BiConsumer<? super T,? super U> a) {
+                return f.thenAcceptBoth(g, a);
+            }
+            public <T,U,V> CompletableFuture<V> thenCombine
+                (CompletableFuture<T> f,
+                 CompletionStage<? extends U> g,
+                 BiFunction<? super T,? super U,? extends V> a) {
+                return f.thenCombine(g, a);
+            }
+        },
+
+//             /** Experimental way to do more testing */
+//         REVERSE_DEFAULT {
+//             public <T,U> CompletableFuture<Void> runAfterBoth
+//                 (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
+//                 return g.runAfterBoth(f, a);
+//             }
+//             public <T,U> CompletableFuture<Void> thenAcceptBoth
+//                 (CompletableFuture<T> f,
+//                  CompletionStage<? extends U> g,
+//                  BiConsumer<? super T,? super U> a) {
+//                 return DEFAULT.thenAcceptBoth(f, g, a);
+//             }
+//         },
+
+        DEFAULT_ASYNC {
+            public <T,U> CompletableFuture<Void> runAfterBoth
+                (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
+                return f.runAfterBothAsync(g, a);
+            }
+            public <T,U> CompletableFuture<Void> thenAcceptBoth
+                (CompletableFuture<T> f,
+                 CompletionStage<? extends U> g,
+                 BiConsumer<? super T,? super U> a) {
+                return f.thenAcceptBothAsync(g, a);
+            }
+            public <T,U,V> CompletableFuture<V> thenCombine
+                (CompletableFuture<T> f,
+                 CompletionStage<? extends U> g,
+                 BiFunction<? super T,? super U,? extends V> a) {
+                return f.thenCombineAsync(g, a);
+            }
+        },
+
+//         REVERSE_DEFAULT_ASYNC {
+//             public <T,U> CompletableFuture<Void> runAfterBoth
+//                 (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
+//                 return f.runAfterBothAsync(g, a);
+//             }
+//             public <T,U> CompletableFuture<Void> thenAcceptBoth
+//                 (CompletableFuture<T> f,
+//                  CompletionStage<? extends U> g,
+//                  BiConsumer<? super T,? super U> a) {
+//                 return DEFAULT_ASYNC.thenAcceptBoth(f, g, a);
+//             }
+//         },
+
+        EXECUTOR {
+            public <T,U> CompletableFuture<Void> runAfterBoth
+                (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
+                return f.runAfterBothAsync(g, a, new ThreadExecutor());
+            }
+            public <T,U> CompletableFuture<Void> thenAcceptBoth
+                (CompletableFuture<T> f,
+                 CompletionStage<? extends U> g,
+                 BiConsumer<? super T,? super U> a) {
+                return f.thenAcceptBothAsync(g, a, new ThreadExecutor());
+            }
+            public <T,U,V> CompletableFuture<V> thenCombine
+                (CompletableFuture<T> f,
+                 CompletionStage<? extends U> g,
+                 BiFunction<? super T,? super U,? extends V> a) {
+                return f.thenCombineAsync(g, a, new ThreadExecutor());
+            }
+        };
+
+        public abstract <T,U> CompletableFuture<Void> runAfterBoth
+            (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a);
+        public abstract <T,U> CompletableFuture<Void> thenAcceptBoth
+            (CompletableFuture<T> f,
+             CompletionStage<? extends U> g,
+             BiConsumer<? super T,? super U> a);
+        public abstract <T,U,V> CompletableFuture<V> thenCombine
+            (CompletableFuture<T> f,
+             CompletionStage<? extends U> g,
+             BiFunction<? super T,? super U,? extends V> a);
+    }
 
     /**
      * exceptionally action completes with function value on source
-     * exception;  otherwise with source value
+     * exception; otherwise with source value
      */
     public void testExceptionally() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
+        CompletableFuture<Integer> f = new CompletableFuture<>();
         ExceptionToInteger r = new ExceptionToInteger();
         CompletableFuture<Integer> g = f.exceptionally(r);
         f.completeExceptionally(new CFException());
         checkCompletedNormally(g, three);
 
-        f = new CompletableFuture<Integer>();
+        f = new CompletableFuture<>();
         r = new ExceptionToInteger();
         g = f.exceptionally(r);
         f.complete(one);
@@ -381,16 +551,33 @@ public class CompletableFutureTest exten
      * normal or exceptional completion of source
      */
     public void testHandle() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
-        IntegerHandler r = new IntegerHandler();
-        CompletableFuture<Integer> g = f.handle(r);
+        CompletableFuture<Integer> f, g;
+        IntegerHandler r;
+
+        f = new CompletableFuture<>();
+        f.completeExceptionally(new CFException());
+        g = f.handle(r = new IntegerHandler());
+        assertTrue(r.ran);
+        checkCompletedNormally(g, three);
+
+        f = new CompletableFuture<>();
+        g = f.handle(r = new IntegerHandler());
+        assertFalse(r.ran);
         f.completeExceptionally(new CFException());
         checkCompletedNormally(g, three);
+        assertTrue(r.ran);
+
+        f = new CompletableFuture<>();
+        f.complete(one);
+        g = f.handle(r = new IntegerHandler());
+        assertTrue(r.ran);
+        checkCompletedNormally(g, two);
 
-        f = new CompletableFuture<Integer>();
-        r = new IntegerHandler();
-        g = f.handle(r);
+        f = new CompletableFuture<>();
+        g = f.handle(r = new IntegerHandler());
+        assertFalse(r.ran);
         f.complete(one);
+        assertTrue(r.ran);
         checkCompletedNormally(g, two);
     }
 
@@ -402,6 +589,7 @@ public class CompletableFutureTest exten
         CompletableFuture<Void> f = CompletableFuture.runAsync(r);
         assertNull(f.join());
         assertTrue(r.ran);
+        checkCompletedNormally(f, null);
     }
 
     /**
@@ -409,9 +597,12 @@ public class CompletableFutureTest exten
      */
     public void testRunAsync2() {
         Noop r = new Noop();
-        CompletableFuture<Void> f = CompletableFuture.runAsync(r, new ThreadExecutor());
+        ThreadExecutor exec = new ThreadExecutor();
+        CompletableFuture<Void> f = CompletableFuture.runAsync(r, exec);
         assertNull(f.join());
         assertTrue(r.ran);
+        checkCompletedNormally(f, null);
+        assertEquals(1, exec.count.get());
     }
 
     /**
@@ -428,16 +619,20 @@ public class CompletableFutureTest exten
      * supplyAsync completes with result of supplier
      */
     public void testSupplyAsync() {
-        CompletableFuture<Integer> f = CompletableFuture.supplyAsync(supplyOne);
+        CompletableFuture<Integer> f;
+        f = CompletableFuture.supplyAsync(supplyOne);
         assertEquals(f.join(), one);
+        checkCompletedNormally(f, one);
     }
 
     /**
      * supplyAsync with executor completes with result of supplier
      */
     public void testSupplyAsync2() {
-        CompletableFuture<Integer> f = CompletableFuture.supplyAsync(supplyOne, new ThreadExecutor());
+        CompletableFuture<Integer> f;
+        f = CompletableFuture.supplyAsync(supplyOne, new ThreadExecutor());
         assertEquals(f.join(), one);
+        checkCompletedNormally(f, one);
     }
 
     /**
@@ -456,17 +651,21 @@ public class CompletableFutureTest exten
      * thenRun result completes normally after normal completion of source
      */
     public void testThenRun() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
-        Noop r = new Noop();
-        CompletableFuture<Void> g = f.thenRun(r);
+        CompletableFuture<Integer> f;
+        CompletableFuture<Void> g;
+        Noop r;
+
+        f = new CompletableFuture<>();
+        g = f.thenRun(r = new Noop());
         f.complete(null);
         checkCompletedNormally(g, null);
-        // reordered version
-        f = new CompletableFuture<Integer>();
+        assertTrue(r.ran);
+
+        f = new CompletableFuture<>();
         f.complete(null);
-        r = new Noop();
-        g = f.thenRun(r);
+        g = f.thenRun(r = new Noop());
         checkCompletedNormally(g, null);
+        assertTrue(r.ran);
     }
 
     /**
@@ -474,21 +673,39 @@ public class CompletableFutureTest exten
      * completion of source
      */
     public void testThenRun2() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
-        Noop r = new Noop();
-        CompletableFuture<Void> g = f.thenRun(r);
+        CompletableFuture<Integer> f;
+        CompletableFuture<Void> g;
+        Noop r;
+
+        f = new CompletableFuture<>();
+        g = f.thenRun(r = new Noop());
         f.completeExceptionally(new CFException());
         checkCompletedWithWrappedCFException(g);
+        assertFalse(r.ran);
+
+        f = new CompletableFuture<>();
+        f.completeExceptionally(new CFException());
+        g = f.thenRun(r = new Noop());
+        checkCompletedWithWrappedCFException(g);
+        assertFalse(r.ran);
     }
 
     /**
      * thenRun result completes exceptionally if action does
      */
     public void testThenRun3() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
-        FailingNoop r = new FailingNoop();
-        CompletableFuture<Void> g = f.thenRun(r);
+        CompletableFuture<Integer> f;
+        CompletableFuture<Void> g;
+        FailingNoop r;
+
+        f = new CompletableFuture<>();
+        g = f.thenRun(r = new FailingNoop());
+        f.complete(null);
+        checkCompletedWithWrappedCFException(g);
+
+        f = new CompletableFuture<>();
         f.complete(null);
+        g = f.thenRun(r = new FailingNoop());
         checkCompletedWithWrappedCFException(g);
     }
 
@@ -496,18 +713,26 @@ public class CompletableFutureTest exten
      * thenRun result completes exceptionally if source cancelled
      */
     public void testThenRun4() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
-        Noop r = new Noop();
-        CompletableFuture<Void> g = f.thenRun(r);
+        CompletableFuture<Integer> f;
+        CompletableFuture<Void> g;
+        Noop r;
+
+        f = new CompletableFuture<>();
+        g = f.thenRun(r = new Noop());
         assertTrue(f.cancel(true));
         checkCompletedWithWrappedCancellationException(g);
+
+        f = new CompletableFuture<>();
+        assertTrue(f.cancel(true));
+        g = f.thenRun(r = new Noop());
+        checkCompletedWithWrappedCancellationException(g);
     }
 
     /**
      * thenApply result completes normally after normal completion of source
      */
     public void testThenApply() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
+        CompletableFuture<Integer> f = new CompletableFuture<>();
         CompletableFuture<Integer> g = f.thenApply(inc);
         f.complete(one);
         checkCompletedNormally(g, two);
@@ -518,7 +743,7 @@ public class CompletableFutureTest exten
      * completion of source
      */
     public void testThenApply2() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
+        CompletableFuture<Integer> f = new CompletableFuture<>();
         CompletableFuture<Integer> g = f.thenApply(inc);
         f.completeExceptionally(new CFException());
         checkCompletedWithWrappedCFException(g);
@@ -528,7 +753,7 @@ public class CompletableFutureTest exten
      * thenApply result completes exceptionally if action does
      */
     public void testThenApply3() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
+        CompletableFuture<Integer> f = new CompletableFuture<>();
         CompletableFuture<Integer> g = f.thenApply(new FailingFunction());
         f.complete(one);
         checkCompletedWithWrappedCFException(g);
@@ -538,7 +763,7 @@ public class CompletableFutureTest exten
      * thenApply result completes exceptionally if source cancelled
      */
     public void testThenApply4() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
+        CompletableFuture<Integer> f = new CompletableFuture<>();
         CompletableFuture<Integer> g = f.thenApply(inc);
         assertTrue(f.cancel(true));
         checkCompletedWithWrappedCancellationException(g);
@@ -548,7 +773,7 @@ public class CompletableFutureTest exten
      * thenAccept result completes normally after normal completion of source
      */
     public void testThenAccept() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
+        CompletableFuture<Integer> f = new CompletableFuture<>();
         IncAction r = new IncAction();
         CompletableFuture<Void> g = f.thenAccept(r);
         f.complete(one);
@@ -561,7 +786,7 @@ public class CompletableFutureTest exten
      * completion of source
      */
     public void testThenAccept2() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
+        CompletableFuture<Integer> f = new CompletableFuture<>();
         IncAction r = new IncAction();
         CompletableFuture<Void> g = f.thenAccept(r);
         f.completeExceptionally(new CFException());
@@ -572,7 +797,7 @@ public class CompletableFutureTest exten
      * thenAccept result completes exceptionally if action does
      */
     public void testThenAccept3() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
+        CompletableFuture<Integer> f = new CompletableFuture<>();
         FailingConsumer r = new FailingConsumer();
         CompletableFuture<Void> g = f.thenAccept(r);
         f.complete(one);
@@ -584,249 +809,913 @@ public class CompletableFutureTest exten
      * thenAccept result completes exceptionally if source cancelled
      */
     public void testThenAccept4() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
+        CompletableFuture<Integer> f = new CompletableFuture<>();
         IncAction r = new IncAction();
         CompletableFuture<Void> g = f.thenAccept(r);
         assertTrue(f.cancel(true));
         checkCompletedWithWrappedCancellationException(g);
     }
 
-
     /**
-     * thenCombine result completes normally after normal completion of sources
+     * thenCombine result completes normally after normal completion
+     * of sources
      */
-    public void testThenCombine() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
-        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
-        CompletableFuture<Integer> g = f.thenCombine(f2, add);
-        f.complete(one);
-        checkIncomplete(g);
-        f2.complete(two);
-        checkCompletedNormally(g, three);
+    public void testThenCombine_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 SubtractFunction r = new SubtractFunction();
+        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
+
+        f.complete(v1);
+        checkIncomplete(h);
+        assertFalse(r.ran());
+        g.complete(v2);
+
+        checkCompletedNormally(h, subtract(v1, v2));
+        checkCompletedNormally(f, v1);
+        checkCompletedNormally(g, v2);
+        }
+    }
 
-        f = new CompletableFuture<Integer>();
-        f.complete(one);
-        f2 = new CompletableFuture<Integer>();
-        g = f.thenCombine(f2, add);
-        checkIncomplete(g);
-        f2.complete(two);
-        checkCompletedNormally(g, three);
+    public void testThenCombine_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 SubtractFunction r = new SubtractFunction();
+        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
+
+        g.complete(v2);
+        checkIncomplete(h);
+        assertFalse(r.ran());
+        f.complete(v1);
+
+        checkCompletedNormally(h, subtract(v1, v2));
+        checkCompletedNormally(f, v1);
+        checkCompletedNormally(g, v2);
+        }
+    }
+
+    public void testThenCombine_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 SubtractFunction r = new SubtractFunction();
+
+        g.complete(v2);
+        f.complete(v1);
+        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
+
+        checkCompletedNormally(h, subtract(v1, v2));
+        checkCompletedNormally(f, v1);
+        checkCompletedNormally(g, v2);
+        }
+    }
+
+    public void testThenCombine_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 SubtractFunction r = new SubtractFunction();
+
+        f.complete(v1);
+        g.complete(v2);
+        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
+
+        checkCompletedNormally(h, subtract(v1, v2));
+        checkCompletedNormally(f, v1);
+        checkCompletedNormally(g, v2);
+        }
     }
 
     /**
      * thenCombine result completes exceptionally after exceptional
      * completion of either source
      */
-    public void testThenCombine2() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
-        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
-        CompletableFuture<Integer> g = f.thenCombine(f2, add);
-        f.completeExceptionally(new CFException());
-        f2.complete(two);
-        checkCompletedWithWrappedCFException(g);
+    public void testThenCombine_exceptionalCompletion1() {
+        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 CompletableFuture<Integer> h = m.thenCombine(f, g, r);
+        final CFException ex = new CFException();
+
+        f.completeExceptionally(ex);
+        checkIncomplete(h);
+        g.complete(v1);
+
+        checkCompletedWithWrappedCFException(h, ex);
+        checkCompletedWithWrappedCFException(f, ex);
+        assertFalse(r.ran());
+        checkCompletedNormally(g, v1);
+        }
+    }
 
-        f = new CompletableFuture<Integer>();
-        f.complete(one);
-        f2 = new CompletableFuture<Integer>();
-        g = f.thenCombine(f2, add);
-        f2.completeExceptionally(new CFException());
-        checkCompletedWithWrappedCFException(g);
+    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();
+        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);
+        assertFalse(r.ran());
+        checkCompletedNormally(f, v1);
+        }
+    }
+
+    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);
+        assertFalse(r.ran());
+        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);
+        assertFalse(r.ran());
+        checkCompletedNormally(g, v1);
+        }
     }
 
     /**
      * thenCombine result completes exceptionally if action does
      */
-    public void testThenCombine3() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
-        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
-        FailingBiFunction r = new FailingBiFunction();
-        CompletableFuture<Integer> g = f.thenCombine(f2, r);
-        f.complete(one);
-        checkIncomplete(g);
-        f2.complete(two);
-        checkCompletedWithWrappedCFException(g);
+    public void testThenCombine_actionFailed1() {
+        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);
+
+        f.complete(v1);
+        checkIncomplete(h);
+        g.complete(v2);
+
+        checkCompletedWithWrappedCFException(h);
+        checkCompletedNormally(f, v1);
+        checkCompletedNormally(g, v2);
+        }
+    }
+
+    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 testThenCombine4() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
-        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
-        CompletableFuture<Integer> g = f.thenCombine(f2, add);
-        assertTrue(f.cancel(true));
-        f2.complete(two);
-        checkCompletedWithWrappedCancellationException(g);
-        f = new CompletableFuture<Integer>();
-        f2 = new CompletableFuture<Integer>();
-        g = f.thenCombine(f2, add);
-        f.complete(one);
-        assertTrue(f2.cancel(true));
-        checkCompletedWithWrappedCancellationException(g);
+    public void testThenCombine_sourceCancelled1() {
+        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);
+        assertFalse(r.ran());
+        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);
+        assertFalse(r.ran());
+        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 }) {
+
+        final CompletableFuture<Integer> f = new CompletableFuture<>();
+        final CompletableFuture<Integer> g = new CompletableFuture<>();
+        final SubtractFunction r = new SubtractFunction();
+
+        assertTrue(g.cancel(mayInterruptIfRunning));
+        f.complete(v1);
+        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
+
+        checkCompletedWithWrappedCancellationException(h);
+        checkCancelled(g);
+        assertFalse(r.ran());
+        checkCompletedNormally(f, v1);
+        }
+    }
+
+    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);
+        assertFalse(r.ran());
+        checkCompletedNormally(g, v1);
+        }
     }
 
     /**
      * thenAcceptBoth result completes normally after normal
      * completion of sources
      */
-    public void testThenAcceptBoth() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
-        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
-        AddAction r = new AddAction();
-        CompletableFuture<Void> g = f.thenAcceptBoth(f2, r);
-        f.complete(one);
-        checkIncomplete(g);
-        f2.complete(two);
-        checkCompletedNormally(g, null);
-        assertEquals(r.value, 3);
+    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);
+        assertFalse(r.ran());
+        g.complete(v2);
+
+        checkCompletedNormally(h, null);
+        assertEquals(r.value, subtract(v1, v2));
+        checkCompletedNormally(f, v1);
+        checkCompletedNormally(g, v2);
+        }
+    }
 
-        r = new AddAction();
-        f = new CompletableFuture<Integer>();
-        f.complete(one);
-        f2 = new CompletableFuture<Integer>();
-        g = f.thenAcceptBoth(f2, r);
-        checkIncomplete(g);
-        f2.complete(two);
-        checkCompletedNormally(g, null);
-        assertEquals(r.value, 3);
+    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);
+        assertFalse(r.ran());
+        f.complete(v1);
+
+        checkCompletedNormally(h, null);
+        assertEquals(r.value, subtract(v1, v2));
+        checkCompletedNormally(f, v1);
+        checkCompletedNormally(g, v2);
+        }
+    }
+
+    public void testThenAcceptBoth_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 SubtractAction r = new SubtractAction();
+
+        g.complete(v2);
+        f.complete(v1);
+        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
+
+        checkCompletedNormally(h, null);
+        assertEquals(r.value, subtract(v1, v2));
+        checkCompletedNormally(f, v1);
+        checkCompletedNormally(g, 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));
+        checkCompletedNormally(f, v1);
+        checkCompletedNormally(g, v2);
+        }
     }
 
     /**
      * thenAcceptBoth result completes exceptionally after exceptional
      * completion of either source
      */
-    public void testThenAcceptBoth2() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
-        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
-        AddAction r = new AddAction();
-        CompletableFuture<Void> g = f.thenAcceptBoth(f2, r);
-        f.completeExceptionally(new CFException());
-        f2.complete(two);
-        checkCompletedWithWrappedCFException(g);
+    public void testThenAcceptBoth_exceptionalCompletion1() {
+        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 CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
+        final CFException ex = new CFException();
+
+        f.completeExceptionally(ex);
+        checkIncomplete(h);
+        g.complete(v1);
+
+        checkCompletedWithWrappedCFException(h, ex);
+        checkCompletedWithWrappedCFException(f, ex);
+        assertFalse(r.ran());
+        checkCompletedNormally(g, v1);
+        }
+    }
 
-        r = new AddAction();
-        f = new CompletableFuture<Integer>();
-        f.complete(one);
-        f2 = new CompletableFuture<Integer>();
-        g = f.thenAcceptBoth(f2, r);
-        f2.completeExceptionally(new CFException());
-        checkCompletedWithWrappedCFException(g);
+    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();
+        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);
+        assertFalse(r.ran());
+        checkCompletedNormally(f, v1);
+        }
+    }
+
+    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);
+        assertFalse(r.ran());
+        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);
+        assertFalse(r.ran());
+        checkCompletedNormally(g, v1);
+        }
     }
 
     /**
      * thenAcceptBoth result completes exceptionally if action does
      */
-    public void testThenAcceptBoth3() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
-        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
-        FailingBiConsumer r = new FailingBiConsumer();
-        CompletableFuture<Void> g = f.thenAcceptBoth(f2, r);
-        f.complete(one);
-        checkIncomplete(g);
-        f2.complete(two);
-        checkCompletedWithWrappedCFException(g);
+    public void testThenAcceptBoth_actionFailed1() {
+        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);
+
+        f.complete(v1);
+        checkIncomplete(h);
+        g.complete(v2);
+
+        checkCompletedWithWrappedCFException(h);
+        checkCompletedNormally(f, v1);
+        checkCompletedNormally(g, v2);
+        }
+    }
+
+    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 testThenAcceptBoth4() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
-        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
-        AddAction r = new AddAction();
-        CompletableFuture<Void> g = f.thenAcceptBoth(f2, r);
-        assertTrue(f.cancel(true));
-        f2.complete(two);
-        checkCompletedWithWrappedCancellationException(g);
-        f = new CompletableFuture<Integer>();
-        f2 = new CompletableFuture<Integer>();
-        r = new AddAction();
-        g = f.thenAcceptBoth(f2, r);
-        f.complete(one);
-        assertTrue(f2.cancel(true));
-        checkCompletedWithWrappedCancellationException(g);
+    public void testThenAcceptBoth_sourceCancelled1() {
+        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);
+        assertFalse(r.ran());
+        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);
+        assertFalse(r.ran());
+        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 }) {
+
+        final CompletableFuture<Integer> f = new CompletableFuture<>();
+        final CompletableFuture<Integer> g = new CompletableFuture<>();
+        final SubtractAction r = new SubtractAction();
+
+        assertTrue(g.cancel(mayInterruptIfRunning));
+        f.complete(v1);
+        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
+
+        checkCompletedWithWrappedCancellationException(h);
+        checkCancelled(g);
+        assertFalse(r.ran());
+        checkCompletedNormally(f, v1);
+        }
+    }
+
+    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);
+        assertFalse(r.ran());
+        checkCompletedNormally(g, v1);
+        }
     }
 
     /**
      * runAfterBoth result completes normally after normal
      * completion of sources
      */
-    public void testRunAfterBoth() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
-        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
-        Noop r = new Noop();
-        CompletableFuture<Void> g = f.runAfterBoth(f2, r);
-        f.complete(one);
-        checkIncomplete(g);
-        f2.complete(two);
-        checkCompletedNormally(g, null);
+    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);
+        assertFalse(r.ran);
+        g.complete(v2);
+
+        checkCompletedNormally(h, null);
         assertTrue(r.ran);
+        checkCompletedNormally(f, v1);
+        checkCompletedNormally(g, v2);
+        }
+    }
 
-        r = new Noop();
-        f = new CompletableFuture<Integer>();
-        f.complete(one);
-        f2 = new CompletableFuture<Integer>();
-        g = f.runAfterBoth(f2, r);
-        checkIncomplete(g);
-        f2.complete(two);
-        checkCompletedNormally(g, null);
+    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);
+        assertFalse(r.ran);
+        f.complete(v1);
+
+        checkCompletedNormally(h, null);
         assertTrue(r.ran);
+        checkCompletedNormally(f, v1);
+        checkCompletedNormally(g, v2);
+        }
+    }
+
+    public void testRunAfterBoth_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 Noop r = new Noop();
+
+        g.complete(v2);
+        f.complete(v1);
+        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
+
+        checkCompletedNormally(h, null);
+        assertTrue(r.ran);
+        checkCompletedNormally(f, v1);
+        checkCompletedNormally(g, 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);
+        assertTrue(r.ran);
+        checkCompletedNormally(f, v1);
+        checkCompletedNormally(g, v2);
+        }
     }
 
     /**
      * runAfterBoth result completes exceptionally after exceptional
      * completion of either source
      */
-    public void testRunAfterBoth2() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
-        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
-        Noop r = new Noop();
-        CompletableFuture<Void> g = f.runAfterBoth(f2, r);
-        f.completeExceptionally(new CFException());
-        f2.complete(two);
-        checkCompletedWithWrappedCFException(g);
+    public void testRunAfterBoth_exceptionalCompletion1() {
+        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 CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
+        final CFException ex = new CFException();
+
+        f.completeExceptionally(ex);
+        checkIncomplete(h);
+        g.complete(v1);
+
+        checkCompletedWithWrappedCFException(h, ex);
+        checkCompletedWithWrappedCFException(f, ex);
+        assertFalse(r.ran);
+        checkCompletedNormally(g, v1);
+        }
+    }
 
-        r = new Noop();
-        f = new CompletableFuture<Integer>();
-        f.complete(one);
-        f2 = new CompletableFuture<Integer>();
-        g = f.runAfterBoth(f2, r);
-        f2.completeExceptionally(new CFException());
-        checkCompletedWithWrappedCFException(g);
+    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();
+        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);
+        assertFalse(r.ran);
+        checkCompletedNormally(f, v1);
+        }
+    }
+
+    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);
+        assertFalse(r.ran);
+        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);
+        assertFalse(r.ran);
+        checkCompletedNormally(g, v1);
+        }
     }
 
     /**
      * runAfterBoth result completes exceptionally if action does
      */
-    public void testRunAfterBoth3() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
-        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
-        FailingNoop r = new FailingNoop();
-        CompletableFuture<Void> g = f.runAfterBoth(f2, r);
-        f.complete(one);
-        checkIncomplete(g);
-        f2.complete(two);
-        checkCompletedWithWrappedCFException(g);
+    public void testRunAfterBoth_actionFailed1() {
+        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);
+
+        f.complete(v1);
+        checkIncomplete(h);
+        g.complete(v2);
+
+        checkCompletedWithWrappedCFException(h);
+        checkCompletedNormally(f, v1);
+        checkCompletedNormally(g, v2);
+        }
+    }
+
+    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);
+
+        checkCompletedWithWrappedCFException(h);
+        checkCompletedNormally(f, v1);
+        checkCompletedNormally(g, v2);
+        }
     }
 
     /**
      * runAfterBoth result completes exceptionally if either source cancelled
      */
-    public void testRunAfterBoth4() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
-        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
-        Noop r = new Noop();
-        CompletableFuture<Void> g = f.runAfterBoth(f2, r);
-        assertTrue(f.cancel(true));
-        f2.complete(two);
-        checkCompletedWithWrappedCancellationException(g);
-        f = new CompletableFuture<Integer>();
-        f2 = new CompletableFuture<Integer>();
-        r = new Noop();
-        g = f.runAfterBoth(f2, r);
-        f.complete(one);
-        assertTrue(f2.cancel(true));
-        checkCompletedWithWrappedCancellationException(g);
+    public void testRunAfterBoth_sourceCancelled1() {
+        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);
+        assertFalse(r.ran);
+        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 }) {
+
+        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);
+
+        checkCompletedWithWrappedCancellationException(h);
+        checkCancelled(g);
+        assertFalse(r.ran);
+        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);
+        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
+
+        checkCompletedWithWrappedCancellationException(h);
+        checkCancelled(g);
+        assertFalse(r.ran);
+        checkCompletedNormally(f, v1);
+        }
+    }
+
+    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);
+        assertFalse(r.ran);
+        checkCompletedNormally(g, v1);
+        }
     }
 
     /**
@@ -834,17 +1723,17 @@ public class CompletableFutureTest exten
      * of either source
      */
     public void testApplyToEither() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
-        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
+        CompletableFuture<Integer> f = new CompletableFuture<>();
+        CompletableFuture<Integer> f2 = new CompletableFuture<>();
         CompletableFuture<Integer> g = f.applyToEither(f2, inc);
         f.complete(one);
         checkCompletedNormally(g, two);
         f2.complete(one);
         checkCompletedNormally(g, two);
 
-        f = new CompletableFuture<Integer>();
+        f = new CompletableFuture<>();
         f.complete(one);
-        f2 = new CompletableFuture<Integer>();
+        f2 = new CompletableFuture<>();
         g = f.applyToEither(f2, inc);
         checkCompletedNormally(g, two);
     }
@@ -854,15 +1743,15 @@ public class CompletableFutureTest exten
      * completion of either source
      */
     public void testApplyToEither2() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
-        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
+        CompletableFuture<Integer> f = new CompletableFuture<>();
+        CompletableFuture<Integer> f2 = new CompletableFuture<>();
         CompletableFuture<Integer> g = f.applyToEither(f2, inc);
         f.completeExceptionally(new CFException());
         f2.complete(one);
         checkCompletedWithWrappedCFException(g);
 
-        f = new CompletableFuture<Integer>();
-        f2 = new CompletableFuture<Integer>();
+        f = new CompletableFuture<>();
+        f2 = new CompletableFuture<>();
         f2.completeExceptionally(new CFException());
         g = f.applyToEither(f2, inc);
         checkCompletedWithWrappedCFException(g);
@@ -872,8 +1761,8 @@ public class CompletableFutureTest exten
      * applyToEither result completes exceptionally if action does
      */
     public void testApplyToEither3() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
-        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
+        CompletableFuture<Integer> f = new CompletableFuture<>();
+        CompletableFuture<Integer> f2 = new CompletableFuture<>();
         FailingFunction r = new FailingFunction();
         CompletableFuture<Integer> g = f.applyToEither(f2, r);
         f2.complete(two);
@@ -884,13 +1773,13 @@ public class CompletableFutureTest exten
      * applyToEither result completes exceptionally if either source cancelled
      */
     public void testApplyToEither4() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
-        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
+        CompletableFuture<Integer> f = new CompletableFuture<>();
+        CompletableFuture<Integer> f2 = new CompletableFuture<>();
         CompletableFuture<Integer> g = f.applyToEither(f2, inc);
         assertTrue(f.cancel(true));
         checkCompletedWithWrappedCancellationException(g);
-        f = new CompletableFuture<Integer>();
-        f2 = new CompletableFuture<Integer>();
+        f = new CompletableFuture<>();
+        f2 = new CompletableFuture<>();
         assertTrue(f2.cancel(true));
         checkCompletedWithWrappedCancellationException(g);
     }
@@ -900,8 +1789,8 @@ public class CompletableFutureTest exten
      * of either source
      */
     public void testAcceptEither() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
-        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
+        CompletableFuture<Integer> f = new CompletableFuture<>();
+        CompletableFuture<Integer> f2 = new CompletableFuture<>();
         IncAction r = new IncAction();
         CompletableFuture<Void> g = f.acceptEither(f2, r);
         f.complete(one);
@@ -911,9 +1800,9 @@ public class CompletableFutureTest exten
         assertEquals(r.value, 2);
 
         r = new IncAction();
-        f = new CompletableFuture<Integer>();
+        f = new CompletableFuture<>();
         f.complete(one);
-        f2 = new CompletableFuture<Integer>();
+        f2 = new CompletableFuture<>();
         g = f.acceptEither(f2, r);
         checkCompletedNormally(g, null);
         assertEquals(r.value, 2);
@@ -924,8 +1813,8 @@ public class CompletableFutureTest exten
      * completion of either source
      */
     public void testAcceptEither2() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
-        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
+        CompletableFuture<Integer> f = new CompletableFuture<>();
+        CompletableFuture<Integer> f2 = new CompletableFuture<>();
         IncAction r = new IncAction();
         CompletableFuture<Void> g = f.acceptEither(f2, r);
         f.completeExceptionally(new CFException());
@@ -933,8 +1822,8 @@ public class CompletableFutureTest exten
         checkCompletedWithWrappedCFException(g);
 
         r = new IncAction();
-        f = new CompletableFuture<Integer>();
-        f2 = new CompletableFuture<Integer>();
+        f = new CompletableFuture<>();
+        f2 = new CompletableFuture<>();
         f2.completeExceptionally(new CFException());
         g = f.acceptEither(f2, r);
         checkCompletedWithWrappedCFException(g);
@@ -944,8 +1833,8 @@ public class CompletableFutureTest exten
      * acceptEither result completes exceptionally if action does
      */
     public void testAcceptEither3() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
-        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
+        CompletableFuture<Integer> f = new CompletableFuture<>();
+        CompletableFuture<Integer> f2 = new CompletableFuture<>();
         FailingConsumer r = new FailingConsumer();
         CompletableFuture<Void> g = f.acceptEither(f2, r);
         f2.complete(two);
@@ -956,26 +1845,25 @@ public class CompletableFutureTest exten
      * acceptEither result completes exceptionally if either source cancelled
      */
     public void testAcceptEither4() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
-        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
+        CompletableFuture<Integer> f = new CompletableFuture<>();
+        CompletableFuture<Integer> f2 = new CompletableFuture<>();
         IncAction r = new IncAction();
         CompletableFuture<Void> g = f.acceptEither(f2, r);
         assertTrue(f.cancel(true));
         checkCompletedWithWrappedCancellationException(g);
-        f = new CompletableFuture<Integer>();
-        f2 = new CompletableFuture<Integer>();
+        f = new CompletableFuture<>();
+        f2 = new CompletableFuture<>();
         assertTrue(f2.cancel(true));
         checkCompletedWithWrappedCancellationException(g);
     }
 
-
     /**
      * runAfterEither result completes normally after normal completion
      * of either source
      */
     public void testRunAfterEither() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
-        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
+        CompletableFuture<Integer> f = new CompletableFuture<>();
+        CompletableFuture<Integer> f2 = new CompletableFuture<>();
         Noop r = new Noop();
         CompletableFuture<Void> g = f.runAfterEither(f2, r);
         f.complete(one);
@@ -985,9 +1873,9 @@ public class CompletableFutureTest exten
         assertTrue(r.ran);
 
         r = new Noop();
-        f = new CompletableFuture<Integer>();
+        f = new CompletableFuture<>();
         f.complete(one);
-        f2 = new CompletableFuture<Integer>();
+        f2 = new CompletableFuture<>();
         g = f.runAfterEither(f2, r);
         checkCompletedNormally(g, null);
         assertTrue(r.ran);
@@ -998,8 +1886,8 @@ public class CompletableFutureTest exten
      * completion of either source
      */
     public void testRunAfterEither2() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
-        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
+        CompletableFuture<Integer> f = new CompletableFuture<>();
+        CompletableFuture<Integer> f2 = new CompletableFuture<>();
         Noop r = new Noop();
         CompletableFuture<Void> g = f.runAfterEither(f2, r);
         f.completeExceptionally(new CFException());
@@ -1007,8 +1895,8 @@ public class CompletableFutureTest exten
         checkCompletedWithWrappedCFException(g);
 
         r = new Noop();
-        f = new CompletableFuture<Integer>();
-        f2 = new CompletableFuture<Integer>();
+        f = new CompletableFuture<>();
+        f2 = new CompletableFuture<>();
         f2.completeExceptionally(new CFException());
         g = f.runAfterEither(f2, r);
         checkCompletedWithWrappedCFException(g);
@@ -1018,8 +1906,8 @@ public class CompletableFutureTest exten
      * runAfterEither result completes exceptionally if action does
      */
     public void testRunAfterEither3() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
-        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
+        CompletableFuture<Integer> f = new CompletableFuture<>();
+        CompletableFuture<Integer> f2 = new CompletableFuture<>();
         FailingNoop r = new FailingNoop();
         CompletableFuture<Void> g = f.runAfterEither(f2, r);
         f2.complete(two);
@@ -1030,14 +1918,14 @@ public class CompletableFutureTest exten
      * runAfterEither result completes exceptionally if either source cancelled
      */
     public void testRunAfterEither4() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
-        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
+        CompletableFuture<Integer> f = new CompletableFuture<>();
+        CompletableFuture<Integer> f2 = new CompletableFuture<>();
         Noop r = new Noop();
         CompletableFuture<Void> g = f.runAfterEither(f2, r);
         assertTrue(f.cancel(true));
         checkCompletedWithWrappedCancellationException(g);
-        f = new CompletableFuture<Integer>();
-        f2 = new CompletableFuture<Integer>();
+        f = new CompletableFuture<>();
+        f2 = new CompletableFuture<>();
         assertTrue(f2.cancel(true));
         checkCompletedWithWrappedCancellationException(g);
     }
@@ -1046,11 +1934,20 @@ public class CompletableFutureTest exten
      * thenCompose result completes normally after normal completion of source
      */
     public void testThenCompose() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
-        CompletableFutureInc r = new CompletableFutureInc();
-        CompletableFuture<Integer> g = f.thenCompose(r);
+        CompletableFuture<Integer> f, g;
+        CompletableFutureInc r;
+
+        f = new CompletableFuture<>();
+        g = f.thenCompose(r = new CompletableFutureInc());
         f.complete(one);
         checkCompletedNormally(g, two);
+        assertTrue(r.ran);
+
+        f = new CompletableFuture<>();
+        f.complete(one);
+        g = f.thenCompose(r = new CompletableFutureInc());
+        checkCompletedNormally(g, two);
+        assertTrue(r.ran);
     }
 
     /**
@@ -1058,35 +1955,55 @@ public class CompletableFutureTest exten
      * completion of source
      */
     public void testThenCompose2() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
-        CompletableFutureInc r = new CompletableFutureInc();
-        CompletableFuture<Integer> g = f.thenCompose(r);
+        CompletableFuture<Integer> f, g;
+        CompletableFutureInc r;
+
+        f = new CompletableFuture<>();
+        g = f.thenCompose(r = new CompletableFutureInc());
         f.completeExceptionally(new CFException());
         checkCompletedWithWrappedCFException(g);
+
+        f = new CompletableFuture<>();
+        f.completeExceptionally(new CFException());
+        g = f.thenCompose(r = new CompletableFutureInc());
+        checkCompletedWithWrappedCFException(g);
     }
 
     /**
      * thenCompose result completes exceptionally if action does
      */
     public void testThenCompose3() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
-        FailingCompletableFutureFunction r = new FailingCompletableFutureFunction();
-        CompletableFuture<Integer> g = f.thenCompose(r);
+        CompletableFuture<Integer> f, g;
+        FailingCompletableFutureFunction r;
+
+        f = new CompletableFuture<>();
+        g = f.thenCompose(r = new FailingCompletableFutureFunction());
         f.complete(one);
         checkCompletedWithWrappedCFException(g);
+
+        f = new CompletableFuture<>();
+        f.complete(one);
+        g = f.thenCompose(r = new FailingCompletableFutureFunction());
+        checkCompletedWithWrappedCFException(g);
     }
 
     /**
      * thenCompose result completes exceptionally if source cancelled
      */
     public void testThenCompose4() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
-        CompletableFutureInc r = new CompletableFutureInc();
-        CompletableFuture<Integer> g = f.thenCompose(r);
+        CompletableFuture<Integer> f, g;
+        CompletableFutureInc r;
+
+        f = new CompletableFuture<>();
+        g = f.thenCompose(r = new CompletableFutureInc());
         assertTrue(f.cancel(true));
         checkCompletedWithWrappedCancellationException(g);
-    }
 
+        f = new CompletableFuture<>();
+        assertTrue(f.cancel(true));
+        g = f.thenCompose(r = new CompletableFutureInc());
+        checkCompletedWithWrappedCancellationException(g);
+    }
 
     // asyncs
 
@@ -1094,14 +2011,14 @@ public class CompletableFutureTest exten
      * thenRunAsync result completes normally after normal completion of source
      */
     public void testThenRunAsync() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
+        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<Integer>();
+        f = new CompletableFuture<>();
         f.complete(null);
         r = new Noop();
         g = f.thenRunAsync(r);
@@ -1113,15 +2030,14 @@ public class CompletableFutureTest exten
      * completion of source
      */
     public void testThenRunAsync2() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
+        CompletableFuture<Integer> f = new CompletableFuture<>();
         Noop r = new Noop();
         CompletableFuture<Void> g = f.thenRunAsync(r);
         f.completeExceptionally(new CFException());
         try {
             g.join();
             shouldThrow();
-        } catch (Exception ok) {
-        }
+        } catch (CompletionException success) {}
         checkCompletedWithWrappedCFException(g);
     }
 
@@ -1129,7 +2045,7 @@ public class CompletableFutureTest exten
      * thenRunAsync result completes exceptionally if action does
      */
     public void testThenRunAsync3() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
+        CompletableFuture<Integer> f = new CompletableFuture<>();
         FailingNoop r = new FailingNoop();
         CompletableFuture<Void> g = f.thenRunAsync(r);
         f.complete(null);
@@ -1140,7 +2056,7 @@ public class CompletableFutureTest exten
      * thenRunAsync result completes exceptionally if source cancelled
      */
     public void testThenRunAsync4() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
+        CompletableFuture<Integer> f = new CompletableFuture<>();
         Noop r = new Noop();
         CompletableFuture<Void> g = f.thenRunAsync(r);
         assertTrue(f.cancel(true));
@@ -1151,7 +2067,7 @@ public class CompletableFutureTest exten
      * thenApplyAsync result completes normally after normal completion of source
      */
     public void testThenApplyAsync() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
+        CompletableFuture<Integer> f = new CompletableFuture<>();
         CompletableFuture<Integer> g = f.thenApplyAsync(inc);
         f.complete(one);
         checkCompletedNormally(g, two);
@@ -1162,7 +2078,7 @@ public class CompletableFutureTest exten
      * completion of source
      */
     public void testThenApplyAsync2() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
+        CompletableFuture<Integer> f = new CompletableFuture<>();
         CompletableFuture<Integer> g = f.thenApplyAsync(inc);
         f.completeExceptionally(new CFException());
         checkCompletedWithWrappedCFException(g);
@@ -1172,7 +2088,7 @@ public class CompletableFutureTest exten
      * thenApplyAsync result completes exceptionally if action does
      */
     public void testThenApplyAsync3() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
+        CompletableFuture<Integer> f = new CompletableFuture<>();
         FailingFunction r = new FailingFunction();
         CompletableFuture<Integer> g = f.thenApplyAsync(r);
         f.complete(null);
@@ -1183,7 +2099,7 @@ public class CompletableFutureTest exten
      * thenApplyAsync result completes exceptionally if source cancelled
      */
     public void testThenApplyAsync4() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
+        CompletableFuture<Integer> f = new CompletableFuture<>();
         CompletableFuture<Integer> g = f.thenApplyAsync(inc);
         assertTrue(f.cancel(true));
         checkCompletedWithWrappedCancellationException(g);
@@ -1194,7 +2110,7 @@ public class CompletableFutureTest exten
      * completion of source
      */
     public void testThenAcceptAsync() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
+        CompletableFuture<Integer> f = new CompletableFuture<>();
         IncAction r = new IncAction();
         CompletableFuture<Void> g = f.thenAcceptAsync(r);
         f.complete(one);
@@ -1207,7 +2123,7 @@ public class CompletableFutureTest exten
      * completion of source
      */
     public void testThenAcceptAsync2() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
+        CompletableFuture<Integer> f = new CompletableFuture<>();
         IncAction r = new IncAction();
         CompletableFuture<Void> g = f.thenAcceptAsync(r);
         f.completeExceptionally(new CFException());
@@ -1218,7 +2134,7 @@ public class CompletableFutureTest exten
      * thenAcceptAsync result completes exceptionally if action does
      */
     public void testThenAcceptAsync3() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
+        CompletableFuture<Integer> f = new CompletableFuture<>();
         FailingConsumer r = new FailingConsumer();
         CompletableFuture<Void> g = f.thenAcceptAsync(r);
         f.complete(null);
@@ -1229,239 +2145,27 @@ public class CompletableFutureTest exten
      * thenAcceptAsync result completes exceptionally if source cancelled
      */
     public void testThenAcceptAsync4() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
+        CompletableFuture<Integer> f = new CompletableFuture<>();
         IncAction r = new IncAction();
         CompletableFuture<Void> g = f.thenAcceptAsync(r);
         assertTrue(f.cancel(true));
         checkCompletedWithWrappedCancellationException(g);
     }
-    /**
-     * thenCombineAsync result completes normally after normal
-     * completion of sources
-     */
-    public void testThenCombineAsync() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
-        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
-        CompletableFuture<Integer> g = f.thenCombineAsync(f2, add);
-        f.complete(one);
-        checkIncomplete(g);
-        f2.complete(two);
-        checkCompletedNormally(g, three);
-    }
-
-    /**
-     * thenCombineAsync result completes exceptionally after exceptional
-     * completion of source
-     */
-    public void testThenCombineAsync2() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
-        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
-        CompletableFuture<Integer> g = f.thenCombineAsync(f2, add);
-        f.completeExceptionally(new CFException());
-        f2.complete(two);
-        checkCompletedWithWrappedCFException(g);
-
-        f = new CompletableFuture<Integer>();
-        f2 = new CompletableFuture<Integer>();
-        g = f.thenCombineAsync(f2, add);
-        f.complete(one);
-        f2.completeExceptionally(new CFException());
-        checkCompletedWithWrappedCFException(g);
-    }
-
-    /**
-     * thenCombineAsync result completes exceptionally if action does
-     */
-    public void testThenCombineAsync3() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
-        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
-        FailingBiFunction r = new FailingBiFunction();
-        CompletableFuture<Integer> g = f.thenCombineAsync(f2, r);
-        f.complete(one);
-        checkIncomplete(g);
-        f2.complete(two);
-        checkCompletedWithWrappedCFException(g);
-    }
-
-    /**
-     * thenCombineAsync result completes exceptionally if either source cancelled
-     */
-    public void testThenCombineAsync4() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
-        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
-        CompletableFuture<Integer> g = f.thenCombineAsync(f2, add);
-        assertTrue(f.cancel(true));
-        f2.complete(two);
-        checkCompletedWithWrappedCancellationException(g);
-
-        f = new CompletableFuture<Integer>();
-        f2 = new CompletableFuture<Integer>();
-        g = f.thenCombineAsync(f2, add);
-        f.complete(one);
-        assertTrue(f2.cancel(true));
-        checkCompletedWithWrappedCancellationException(g);
-    }
-
-    /**
-     * thenAcceptBothAsync result completes normally after normal
-     * completion of sources
-     */
-    public void testThenAcceptBothAsync() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
-        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
-        AddAction r = new AddAction();
-        CompletableFuture<Void> g = f.thenAcceptBothAsync(f2, r);
-        f.complete(one);
-        checkIncomplete(g);
-        f2.complete(two);
-        checkCompletedNormally(g, null);
-        assertEquals(r.value, 3);
-    }
-
-    /**
-     * thenAcceptBothAsync result completes exceptionally after exceptional
-     * completion of source
-     */
-    public void testThenAcceptBothAsync2() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
-        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
-        AddAction r = new AddAction();
-        CompletableFuture<Void> g = f.thenAcceptBothAsync(f2, r);
-        f.completeExceptionally(new CFException());
-        f2.complete(two);
-        checkCompletedWithWrappedCFException(g);
-
-        r = new AddAction();
-        f = new CompletableFuture<Integer>();
-        f2 = new CompletableFuture<Integer>();
-        g = f.thenAcceptBothAsync(f2, r);
-        f.complete(one);
-        f2.completeExceptionally(new CFException());
-        checkCompletedWithWrappedCFException(g);
-    }
-
-    /**
-     * thenAcceptBothAsync result completes exceptionally if action does
-     */
-    public void testThenAcceptBothAsync3() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
-        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
-        FailingBiConsumer r = new FailingBiConsumer();
-        CompletableFuture<Void> g = f.thenAcceptBothAsync(f2, r);
-        f.complete(one);
-        checkIncomplete(g);
-        f2.complete(two);
-        checkCompletedWithWrappedCFException(g);
-    }
-
-    /**
-     * thenAcceptBothAsync result completes exceptionally if either source cancelled
-     */
-    public void testThenAcceptBothAsync4() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
-        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
-        AddAction r = new AddAction();
-        CompletableFuture<Void> g = f.thenAcceptBothAsync(f2, r);
-        assertTrue(f.cancel(true));
-        f2.complete(two);
-        checkCompletedWithWrappedCancellationException(g);
-
-        r = new AddAction();
-        f = new CompletableFuture<Integer>();
-        f2 = new CompletableFuture<Integer>();
-        g = f.thenAcceptBothAsync(f2, r);
-        f.complete(one);
-        assertTrue(f2.cancel(true));
-        checkCompletedWithWrappedCancellationException(g);
-    }
-
-    /**
-     * runAfterBothAsync result completes normally after normal
-     * completion of sources
-     */
-    public void testRunAfterBothAsync() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
-        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
-        Noop r = new Noop();
-        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r);
-        f.complete(one);
-        checkIncomplete(g);
-        f2.complete(two);
-        checkCompletedNormally(g, null);
-        assertTrue(r.ran);
-    }
-
-    /**
-     * runAfterBothAsync result completes exceptionally after exceptional
-     * completion of source
-     */
-    public void testRunAfterBothAsync2() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
-        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
-        Noop r = new Noop();
-        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r);
-        f.completeExceptionally(new CFException());
-        f2.complete(two);
-        checkCompletedWithWrappedCFException(g);
-
-        r = new Noop();
-        f = new CompletableFuture<Integer>();
-        f2 = new CompletableFuture<Integer>();
-        g = f.runAfterBothAsync(f2, r);
-        f.complete(one);
-        f2.completeExceptionally(new CFException());
-        checkCompletedWithWrappedCFException(g);
-    }
-
-    /**
-     * runAfterBothAsync result completes exceptionally if action does
-     */
-    public void testRunAfterBothAsync3() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
-        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
-        FailingNoop r = new FailingNoop();
-        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r);
-        f.complete(one);
-        checkIncomplete(g);
-        f2.complete(two);
-        checkCompletedWithWrappedCFException(g);
-    }
-
-    /**
-     * runAfterBothAsync result completes exceptionally if either source cancelled
-     */
-    public void testRunAfterBothAsync4() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
-        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
-        Noop r = new Noop();
-        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r);
-        assertTrue(f.cancel(true));
-        f2.complete(two);
-        checkCompletedWithWrappedCancellationException(g);
-
-        r = new Noop();
-        f = new CompletableFuture<Integer>();
-        f2 = new CompletableFuture<Integer>();
-        g = f.runAfterBothAsync(f2, r);
-        f.complete(one);
-        assertTrue(f2.cancel(true));
-        checkCompletedWithWrappedCancellationException(g);
-    }
 
     /**
      * applyToEitherAsync result completes normally after normal
      * completion of sources
      */
     public void testApplyToEitherAsync() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
-        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
+        CompletableFuture<Integer> f = new CompletableFuture<>();
+        CompletableFuture<Integer> f2 = new CompletableFuture<>();
         CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
         f.complete(one);
         checkCompletedNormally(g, two);
 
-        f = new CompletableFuture<Integer>();
+        f = new CompletableFuture<>();
         f.complete(one);
-        f2 = new CompletableFuture<Integer>();
+        f2 = new CompletableFuture<>();
         g = f.applyToEitherAsync(f2, inc);
         checkCompletedNormally(g, two);
     }
@@ -1471,14 +2175,14 @@ public class CompletableFutureTest exten
      * completion of source
      */
     public void testApplyToEitherAsync2() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
-        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
+        CompletableFuture<Integer> f = new CompletableFuture<>();
+        CompletableFuture<Integer> f2 = new CompletableFuture<>();
         CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
         f.completeExceptionally(new CFException());
         checkCompletedWithWrappedCFException(g);
 
-        f = new CompletableFuture<Integer>();
-        f2 = new CompletableFuture<Integer>();
+        f = new CompletableFuture<>();
+        f2 = new CompletableFuture<>();
         f2.completeExceptionally(new CFException());
         g = f.applyToEitherAsync(f2, inc);
         f.complete(one);
@@ -1489,8 +2193,8 @@ public class CompletableFutureTest exten
      * applyToEitherAsync result completes exceptionally if action does
      */
     public void testApplyToEitherAsync3() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
-        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
+        CompletableFuture<Integer> f = new CompletableFuture<>();
+        CompletableFuture<Integer> f2 = new CompletableFuture<>();
         FailingFunction r = new FailingFunction();
         CompletableFuture<Integer> g = f.applyToEitherAsync(f2, r);
         f.complete(one);
@@ -1501,14 +2205,14 @@ public class CompletableFutureTest exten
      * applyToEitherAsync result completes exceptionally if either source cancelled
      */
     public void testApplyToEitherAsync4() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
-        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
+        CompletableFuture<Integer> f = new CompletableFuture<>();
+        CompletableFuture<Integer> f2 = new CompletableFuture<>();
         CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
         assertTrue(f.cancel(true));
         checkCompletedWithWrappedCancellationException(g);
 
-        f = new CompletableFuture<Integer>();
-        f2 = new CompletableFuture<Integer>();
+        f = new CompletableFuture<>();
+        f2 = new CompletableFuture<>();
         assertTrue(f2.cancel(true));
         g = f.applyToEitherAsync(f2, inc);
         checkCompletedWithWrappedCancellationException(g);
@@ -1519,8 +2223,8 @@ public class CompletableFutureTest exten
      * completion of sources
      */
     public void testAcceptEitherAsync() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
-        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
+        CompletableFuture<Integer> f = new CompletableFuture<>();
+        CompletableFuture<Integer> f2 = new CompletableFuture<>();
         IncAction r = new IncAction();
         CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
         f.complete(one);
@@ -1528,9 +2232,9 @@ public class CompletableFutureTest exten
         assertEquals(r.value, 2);
 
         r = new IncAction();
-        f = new CompletableFuture<Integer>();
+        f = new CompletableFuture<>();
         f.complete(one);
-        f2 = new CompletableFuture<Integer>();
+        f2 = new CompletableFuture<>();
         g = f.acceptEitherAsync(f2, r);
         checkCompletedNormally(g, null);
         assertEquals(r.value, 2);
@@ -1541,16 +2245,16 @@ public class CompletableFutureTest exten
      * completion of source
      */
     public void testAcceptEitherAsync2() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
-        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
+        CompletableFuture<Integer> f = new CompletableFuture<>();
+        CompletableFuture<Integer> f2 = new CompletableFuture<>();
         IncAction r = new IncAction();
         CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
         f.completeExceptionally(new CFException());
         checkCompletedWithWrappedCFException(g);
 
         r = new IncAction();
-        f = new CompletableFuture<Integer>();
-        f2 = new CompletableFuture<Integer>();
+        f = new CompletableFuture<>();
+        f2 = new CompletableFuture<>();
         f2.completeExceptionally(new CFException());
         g = f.acceptEitherAsync(f2, r);
         f.complete(one);
@@ -1561,8 +2265,8 @@ public class CompletableFutureTest exten
      * acceptEitherAsync result completes exceptionally if action does
      */
     public void testAcceptEitherAsync3() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
-        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
+        CompletableFuture<Integer> f = new CompletableFuture<>();
+        CompletableFuture<Integer> f2 = new CompletableFuture<>();
         FailingConsumer r = new FailingConsumer();
         CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
         f.complete(one);
@@ -1574,16 +2278,16 @@ public class CompletableFutureTest exten
      * source cancelled
      */
     public void testAcceptEitherAsync4() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
-        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
+        CompletableFuture<Integer> f = new CompletableFuture<>();
+        CompletableFuture<Integer> f2 = new CompletableFuture<>();
         IncAction r = new IncAction();
         CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
         assertTrue(f.cancel(true));
         checkCompletedWithWrappedCancellationException(g);
 
         r = new IncAction();
-        f = new CompletableFuture<Integer>();
-        f2 = new CompletableFuture<Integer>();
+        f = new CompletableFuture<>();
+        f2 = new CompletableFuture<>();
         assertTrue(f2.cancel(true));
         g = f.acceptEitherAsync(f2, r);
         checkCompletedWithWrappedCancellationException(g);
@@ -1594,8 +2298,8 @@ public class CompletableFutureTest exten
      * completion of sources
      */
     public void testRunAfterEitherAsync() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
-        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
+        CompletableFuture<Integer> f = new CompletableFuture<>();
+        CompletableFuture<Integer> f2 = new CompletableFuture<>();
         Noop r = new Noop();
         CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
         f.complete(one);
@@ -1603,9 +2307,9 @@ public class CompletableFutureTest exten
         assertTrue(r.ran);
 
         r = new Noop();
-        f = new CompletableFuture<Integer>();
+        f = new CompletableFuture<>();
         f.complete(one);
-        f2 = new CompletableFuture<Integer>();
+        f2 = new CompletableFuture<>();
         g = f.runAfterEitherAsync(f2, r);
         checkCompletedNormally(g, null);
         assertTrue(r.ran);
@@ -1616,16 +2320,16 @@ public class CompletableFutureTest exten
      * completion of source
      */
     public void testRunAfterEitherAsync2() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
-        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
+        CompletableFuture<Integer> f = new CompletableFuture<>();
+        CompletableFuture<Integer> f2 = new CompletableFuture<>();
         Noop r = new Noop();
         CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
         f.completeExceptionally(new CFException());
         checkCompletedWithWrappedCFException(g);
 
         r = new Noop();
-        f = new CompletableFuture<Integer>();
-        f2 = new CompletableFuture<Integer>();
+        f = new CompletableFuture<>();
+        f2 = new CompletableFuture<>();
         f2.completeExceptionally(new CFException());
         g = f.runAfterEitherAsync(f2, r);
         f.complete(one);
@@ -1636,8 +2340,8 @@ public class CompletableFutureTest exten
      * runAfterEitherAsync result completes exceptionally if action does
      */
     public void testRunAfterEitherAsync3() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
-        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
+        CompletableFuture<Integer> f = new CompletableFuture<>();
+        CompletableFuture<Integer> f2 = new CompletableFuture<>();
         FailingNoop r = new FailingNoop();
         CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
         f.complete(one);
@@ -1649,16 +2353,16 @@ public class CompletableFutureTest exten
      * source cancelled
      */
     public void testRunAfterEitherAsync4() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
-        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
+        CompletableFuture<Integer> f = new CompletableFuture<>();
+        CompletableFuture<Integer> f2 = new CompletableFuture<>();
         Noop r = new Noop();
         CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
         assertTrue(f.cancel(true));
         checkCompletedWithWrappedCancellationException(g);
 
         r = new Noop();
-        f = new CompletableFuture<Integer>();
-        f2 = new CompletableFuture<Integer>();
+        f = new CompletableFuture<>();
+        f2 = new CompletableFuture<>();
         assertTrue(f2.cancel(true));
         g = f.runAfterEitherAsync(f2, r);
         checkCompletedWithWrappedCancellationException(g);
@@ -1669,10 +2373,17 @@ public class CompletableFutureTest exten
      * completion of source
      */
     public void testThenComposeAsync() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
-        CompletableFutureInc r = new CompletableFutureInc();
-        CompletableFuture<Integer> g = f.thenComposeAsync(r);
+        CompletableFuture<Integer> f, g;
+        CompletableFutureInc r;
+
+        f = new CompletableFuture<>();
+        g = f.thenComposeAsync(r = new CompletableFutureInc());
+        f.complete(one);
+        checkCompletedNormally(g, two);
+
+        f = new CompletableFuture<>();
         f.complete(one);
+        g = f.thenComposeAsync(r = new CompletableFutureInc());
         checkCompletedNormally(g, two);
     }
 
@@ -1681,21 +2392,37 @@ public class CompletableFutureTest exten
      * exceptional completion of source
      */
     public void testThenComposeAsync2() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
-        CompletableFutureInc r = new CompletableFutureInc();
-        CompletableFuture<Integer> g = f.thenComposeAsync(r);
+        CompletableFuture<Integer> f, g;
+        CompletableFutureInc r;
+
+        f = new CompletableFuture<>();
+        g = f.thenComposeAsync(r = new CompletableFutureInc());
         f.completeExceptionally(new CFException());
         checkCompletedWithWrappedCFException(g);
+        assertFalse(r.ran);
+
+        f = new CompletableFuture<>();
+        f.completeExceptionally(new CFException());
+        g = f.thenComposeAsync(r = new CompletableFutureInc());
+        checkCompletedWithWrappedCFException(g);
+        assertFalse(r.ran);
     }
 
     /**
      * thenComposeAsync result completes exceptionally if action does
      */
     public void testThenComposeAsync3() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
-        FailingCompletableFutureFunction r = new FailingCompletableFutureFunction();
-        CompletableFuture<Integer> g = f.thenComposeAsync(r);
+        CompletableFuture<Integer> f, g;
+        FailingCompletableFutureFunction r;
+
+        f = new CompletableFuture<>();
+        g = f.thenComposeAsync(r = new FailingCompletableFutureFunction());
+        f.complete(one);
+        checkCompletedWithWrappedCFException(g);
+
+        f = new CompletableFuture<>();
         f.complete(one);
+        g = f.thenComposeAsync(r = new FailingCompletableFutureFunction());
         checkCompletedWithWrappedCFException(g);
     }
 
@@ -1703,13 +2430,19 @@ public class CompletableFutureTest exten
      * thenComposeAsync result completes exceptionally if source cancelled
      */
     public void testThenComposeAsync4() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
-        CompletableFutureInc r = new CompletableFutureInc();
-        CompletableFuture<Integer> g = f.thenComposeAsync(r);
+        CompletableFuture<Integer> f, g;
+        CompletableFutureInc r;
+
+        f = new CompletableFuture<>();
+        g = f.thenComposeAsync(r = new CompletableFutureInc());
         assertTrue(f.cancel(true));
         checkCompletedWithWrappedCancellationException(g);
-    }
 
+        f = new CompletableFuture<>();
+        assertTrue(f.cancel(true));
+        g = f.thenComposeAsync(r = new CompletableFutureInc());
+        checkCompletedWithWrappedCancellationException(g);
+    }
 
     // async with explicit executors
 
@@ -1717,14 +2450,14 @@ public class CompletableFutureTest exten
      * thenRunAsync result completes normally after normal completion of source
      */
     public void testThenRunAsyncE() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
+        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<Integer>();
+        f = new CompletableFuture<>();
         f.complete(null);
         r = new Noop();
         g = f.thenRunAsync(r, new ThreadExecutor());
@@ -1736,15 +2469,14 @@ public class CompletableFutureTest exten
      * completion of source
      */
     public void testThenRunAsync2E() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
+        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 (Exception ok) {
-        }
+        } catch (CompletionException success) {}
         checkCompletedWithWrappedCFException(g);
     }
 
@@ -1752,7 +2484,7 @@ public class CompletableFutureTest exten
      * thenRunAsync result completes exceptionally if action does
      */
     public void testThenRunAsync3E() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
+        CompletableFuture<Integer> f = new CompletableFuture<>();
         FailingNoop r = new FailingNoop();
         CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
         f.complete(null);
@@ -1763,7 +2495,7 @@ public class CompletableFutureTest exten
      * thenRunAsync result completes exceptionally if source cancelled
      */
     public void testThenRunAsync4E() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
+        CompletableFuture<Integer> f = new CompletableFuture<>();
         Noop r = new Noop();
         CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
         assertTrue(f.cancel(true));
@@ -1774,7 +2506,7 @@ public class CompletableFutureTest exten
      * thenApplyAsync result completes normally after normal completion of source
      */
     public void testThenApplyAsyncE() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
+        CompletableFuture<Integer> f = new CompletableFuture<>();
         CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
         f.complete(one);
         checkCompletedNormally(g, two);
@@ -1785,7 +2517,7 @@ public class CompletableFutureTest exten
      * completion of source
      */
     public void testThenApplyAsync2E() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
+        CompletableFuture<Integer> f = new CompletableFuture<>();
         CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
         f.completeExceptionally(new CFException());
         checkCompletedWithWrappedCFException(g);
@@ -1795,7 +2527,7 @@ public class CompletableFutureTest exten
      * thenApplyAsync result completes exceptionally if action does
      */
     public void testThenApplyAsync3E() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
+        CompletableFuture<Integer> f = new CompletableFuture<>();
         FailingFunction r = new FailingFunction();
         CompletableFuture<Integer> g = f.thenApplyAsync(r, new ThreadExecutor());
         f.complete(null);
@@ -1806,7 +2538,7 @@ public class CompletableFutureTest exten
      * thenApplyAsync result completes exceptionally if source cancelled
      */
     public void testThenApplyAsync4E() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
+        CompletableFuture<Integer> f = new CompletableFuture<>();
         CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
         assertTrue(f.cancel(true));
         checkCompletedWithWrappedCancellationException(g);
@@ -1817,7 +2549,7 @@ public class CompletableFutureTest exten
      * completion of source
      */
     public void testThenAcceptAsyncE() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
+        CompletableFuture<Integer> f = new CompletableFuture<>();
         IncAction r = new IncAction();
         CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
         f.complete(one);
@@ -1830,7 +2562,7 @@ public class CompletableFutureTest exten
      * completion of source
      */
     public void testThenAcceptAsync2E() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
+        CompletableFuture<Integer> f = new CompletableFuture<>();
         IncAction r = new IncAction();
         CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
         f.completeExceptionally(new CFException());
@@ -1841,7 +2573,7 @@ public class CompletableFutureTest exten
      * thenAcceptAsync result completes exceptionally if action does
      */
     public void testThenAcceptAsync3E() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
+        CompletableFuture<Integer> f = new CompletableFuture<>();
         FailingConsumer r = new FailingConsumer();
         CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
         f.complete(null);
@@ -1852,239 +2584,27 @@ public class CompletableFutureTest exten
      * thenAcceptAsync result completes exceptionally if source cancelled
      */
     public void testThenAcceptAsync4E() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
+        CompletableFuture<Integer> f = new CompletableFuture<>();
         IncAction r = new IncAction();
         CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
         assertTrue(f.cancel(true));
         checkCompletedWithWrappedCancellationException(g);
     }
-    /**
-     * thenCombineAsync result completes normally after normal
-     * completion of sources
-     */
-    public void testThenCombineAsyncE() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
-        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
-        CompletableFuture<Integer> g = f.thenCombineAsync(f2, add, new ThreadExecutor());
-        f.complete(one);
-        checkIncomplete(g);
-        f2.complete(two);
-        checkCompletedNormally(g, three);
-    }
-
-    /**
-     * thenCombineAsync result completes exceptionally after exceptional
-     * completion of source
-     */
-    public void testThenCombineAsync2E() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
-        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
-        CompletableFuture<Integer> g = f.thenCombineAsync(f2, add, new ThreadExecutor());
-        f.completeExceptionally(new CFException());
-        f2.complete(two);
-        checkCompletedWithWrappedCFException(g);
-
-        f = new CompletableFuture<Integer>();
-        f2 = new CompletableFuture<Integer>();
-        g = f.thenCombineAsync(f2, add, new ThreadExecutor());
-        f.complete(one);
-        f2.completeExceptionally(new CFException());
-        checkCompletedWithWrappedCFException(g);
-    }
-
-    /**
-     * thenCombineAsync result completes exceptionally if action does
-     */
-    public void testThenCombineAsync3E() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
-        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
-        FailingBiFunction r = new FailingBiFunction();
-        CompletableFuture<Integer> g = f.thenCombineAsync(f2, r, new ThreadExecutor());
-        f.complete(one);
-        checkIncomplete(g);
-        f2.complete(two);
-        checkCompletedWithWrappedCFException(g);
-    }
-
-    /**
-     * thenCombineAsync result completes exceptionally if either source cancelled
-     */
-    public void testThenCombineAsync4E() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
-        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
-        CompletableFuture<Integer> g = f.thenCombineAsync(f2, add, new ThreadExecutor());
-        assertTrue(f.cancel(true));
-        f2.complete(two);
-        checkCompletedWithWrappedCancellationException(g);
-
-        f = new CompletableFuture<Integer>();
-        f2 = new CompletableFuture<Integer>();
-        g = f.thenCombineAsync(f2, add, new ThreadExecutor());
-        f.complete(one);
-        assertTrue(f2.cancel(true));
-        checkCompletedWithWrappedCancellationException(g);
-    }
-
-    /**
-     * thenAcceptBothAsync result completes normally after normal
-     * completion of sources
-     */
-    public void testThenAcceptBothAsyncE() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
-        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
-        AddAction r = new AddAction();
-        CompletableFuture<Void> g = f.thenAcceptBothAsync(f2, r, new ThreadExecutor());
-        f.complete(one);
-        checkIncomplete(g);
-        f2.complete(two);
-        checkCompletedNormally(g, null);
-        assertEquals(r.value, 3);
-    }
-
-    /**
-     * thenAcceptBothAsync result completes exceptionally after exceptional
-     * completion of source
-     */
-    public void testThenAcceptBothAsync2E() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
-        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
-        AddAction r = new AddAction();
-        CompletableFuture<Void> g = f.thenAcceptBothAsync(f2, r, new ThreadExecutor());
-        f.completeExceptionally(new CFException());
-        f2.complete(two);
-        checkCompletedWithWrappedCFException(g);
-
-        r = new AddAction();
-        f = new CompletableFuture<Integer>();
-        f2 = new CompletableFuture<Integer>();
-        g = f.thenAcceptBothAsync(f2, r, new ThreadExecutor());
-        f.complete(one);
-        f2.completeExceptionally(new CFException());
-        checkCompletedWithWrappedCFException(g);
-    }
-
-    /**
-     * thenAcceptBothAsync result completes exceptionally if action does
-     */
-    public void testThenAcceptBothAsync3E() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
-        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
-        FailingBiConsumer r = new FailingBiConsumer();
-        CompletableFuture<Void> g = f.thenAcceptBothAsync(f2, r, new ThreadExecutor());
-        f.complete(one);
-        checkIncomplete(g);
-        f2.complete(two);
-        checkCompletedWithWrappedCFException(g);
-    }
-
-    /**
-     * thenAcceptBothAsync result completes exceptionally if either source cancelled
-     */
-    public void testThenAcceptBothAsync4E() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
-        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
-        AddAction r = new AddAction();
-        CompletableFuture<Void> g = f.thenAcceptBothAsync(f2, r, new ThreadExecutor());
-        assertTrue(f.cancel(true));
-        f2.complete(two);
-        checkCompletedWithWrappedCancellationException(g);
-
-        r = new AddAction();
-        f = new CompletableFuture<Integer>();
-        f2 = new CompletableFuture<Integer>();
-        g = f.thenAcceptBothAsync(f2, r, new ThreadExecutor());
-        f.complete(one);
-        assertTrue(f2.cancel(true));
-        checkCompletedWithWrappedCancellationException(g);
-    }
-
-    /**
-     * runAfterBothAsync result completes normally after normal
-     * completion of sources
-     */
-    public void testRunAfterBothAsyncE() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
-        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
-        Noop r = new Noop();
-        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
-        f.complete(one);
-        checkIncomplete(g);
-        f2.complete(two);
-        checkCompletedNormally(g, null);
-        assertTrue(r.ran);
-    }
-
-    /**
-     * runAfterBothAsync result completes exceptionally after exceptional
-     * completion of source
-     */
-    public void testRunAfterBothAsync2E() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
-        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
-        Noop r = new Noop();
-        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
-        f.completeExceptionally(new CFException());
-        f2.complete(two);
-        checkCompletedWithWrappedCFException(g);
-
-        r = new Noop();
-        f = new CompletableFuture<Integer>();
-        f2 = new CompletableFuture<Integer>();
-        g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
-        f.complete(one);
-        f2.completeExceptionally(new CFException());
-        checkCompletedWithWrappedCFException(g);
-    }
-
-    /**
-     * runAfterBothAsync result completes exceptionally if action does
-     */
-    public void testRunAfterBothAsync3E() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
-        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
-        FailingNoop r = new FailingNoop();
-        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
-        f.complete(one);
-        checkIncomplete(g);
-        f2.complete(two);
-        checkCompletedWithWrappedCFException(g);
-    }
-
-    /**
-     * runAfterBothAsync result completes exceptionally if either source cancelled
-     */
-    public void testRunAfterBothAsync4E() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
-        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
-        Noop r = new Noop();
-        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
-        assertTrue(f.cancel(true));
-        f2.complete(two);
-        checkCompletedWithWrappedCancellationException(g);
-
-        r = new Noop();
-        f = new CompletableFuture<Integer>();
-        f2 = new CompletableFuture<Integer>();
-        g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
-        f.complete(one);
-        assertTrue(f2.cancel(true));
-        checkCompletedWithWrappedCancellationException(g);
-    }
 
     /**
      * applyToEitherAsync result completes normally after normal
      * completion of sources
      */
     public void testApplyToEitherAsyncE() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
-        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
+        CompletableFuture<Integer> f = new CompletableFuture<>();
+        CompletableFuture<Integer> f2 = new CompletableFuture<>();
         CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
         f.complete(one);
         checkCompletedNormally(g, two);
 
-        f = new CompletableFuture<Integer>();
+        f = new CompletableFuture<>();
         f.complete(one);
-        f2 = new CompletableFuture<Integer>();
+        f2 = new CompletableFuture<>();
         g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
         checkCompletedNormally(g, two);
     }
@@ -2094,14 +2614,14 @@ public class CompletableFutureTest exten
      * completion of source
      */
     public void testApplyToEitherAsync2E() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
-        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
+        CompletableFuture<Integer> f = new CompletableFuture<>();
+        CompletableFuture<Integer> f2 = new CompletableFuture<>();
         CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
         f.completeExceptionally(new CFException());
         checkCompletedWithWrappedCFException(g);
 
-        f = new CompletableFuture<Integer>();
-        f2 = new CompletableFuture<Integer>();
+        f = new CompletableFuture<>();
+        f2 = new CompletableFuture<>();
         f2.completeExceptionally(new CFException());
         g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
         f.complete(one);
@@ -2112,8 +2632,8 @@ public class CompletableFutureTest exten
      * applyToEitherAsync result completes exceptionally if action does
      */
     public void testApplyToEitherAsync3E() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
-        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
+        CompletableFuture<Integer> f = new CompletableFuture<>();
+        CompletableFuture<Integer> f2 = new CompletableFuture<>();
         FailingFunction r = new FailingFunction();
         CompletableFuture<Integer> g = f.applyToEitherAsync(f2, r, new ThreadExecutor());
         f.complete(one);
@@ -2124,14 +2644,14 @@ public class CompletableFutureTest exten
      * applyToEitherAsync result completes exceptionally if either source cancelled
      */
     public void testApplyToEitherAsync4E() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
-        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
+        CompletableFuture<Integer> f = new CompletableFuture<>();
+        CompletableFuture<Integer> f2 = new CompletableFuture<>();
         CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
         assertTrue(f.cancel(true));
         checkCompletedWithWrappedCancellationException(g);
 
-        f = new CompletableFuture<Integer>();
-        f2 = new CompletableFuture<Integer>();
+        f = new CompletableFuture<>();
+        f2 = new CompletableFuture<>();
         assertTrue(f2.cancel(true));
         g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
         checkCompletedWithWrappedCancellationException(g);
@@ -2142,8 +2662,8 @@ public class CompletableFutureTest exten
      * completion of sources
      */
     public void testAcceptEitherAsyncE() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
-        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
+        CompletableFuture<Integer> f = new CompletableFuture<>();
+        CompletableFuture<Integer> f2 = new CompletableFuture<>();
         IncAction r = new IncAction();
         CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
         f.complete(one);
@@ -2151,9 +2671,9 @@ public class CompletableFutureTest exten
         assertEquals(r.value, 2);
 
         r = new IncAction();
-        f = new CompletableFuture<Integer>();
+        f = new CompletableFuture<>();
         f.complete(one);
-        f2 = new CompletableFuture<Integer>();
+        f2 = new CompletableFuture<>();
         g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
         checkCompletedNormally(g, null);
         assertEquals(r.value, 2);
@@ -2164,16 +2684,16 @@ public class CompletableFutureTest exten
      * completion of source
      */
     public void testAcceptEitherAsync2E() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
-        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
+        CompletableFuture<Integer> f = new CompletableFuture<>();
+        CompletableFuture<Integer> f2 = new CompletableFuture<>();
         IncAction r = new IncAction();
         CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
         f.completeExceptionally(new CFException());
         checkCompletedWithWrappedCFException(g);
 
         r = new IncAction();
-        f = new CompletableFuture<Integer>();
-        f2 = new CompletableFuture<Integer>();
+        f = new CompletableFuture<>();
+        f2 = new CompletableFuture<>();
         f2.completeExceptionally(new CFException());
         g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
         f.complete(one);
@@ -2184,8 +2704,8 @@ public class CompletableFutureTest exten
      * acceptEitherAsync result completes exceptionally if action does
      */
     public void testAcceptEitherAsync3E() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
-        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
+        CompletableFuture<Integer> f = new CompletableFuture<>();
+        CompletableFuture<Integer> f2 = new CompletableFuture<>();
         FailingConsumer r = new FailingConsumer();
         CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
         f.complete(one);
@@ -2197,16 +2717,16 @@ public class CompletableFutureTest exten
      * source cancelled
      */
     public void testAcceptEitherAsync4E() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
-        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
+        CompletableFuture<Integer> f = new CompletableFuture<>();
+        CompletableFuture<Integer> f2 = new CompletableFuture<>();
         IncAction r = new IncAction();
         CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
         assertTrue(f.cancel(true));
         checkCompletedWithWrappedCancellationException(g);
 
         r = new IncAction();
-        f = new CompletableFuture<Integer>();
-        f2 = new CompletableFuture<Integer>();
+        f = new CompletableFuture<>();
+        f2 = new CompletableFuture<>();
         assertTrue(f2.cancel(true));
         g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
         checkCompletedWithWrappedCancellationException(g);
@@ -2217,8 +2737,8 @@ public class CompletableFutureTest exten
      * completion of sources
      */
     public void testRunAfterEitherAsyncE() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
-        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
+        CompletableFuture<Integer> f = new CompletableFuture<>();
+        CompletableFuture<Integer> f2 = new CompletableFuture<>();
         Noop r = new Noop();
         CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
         f.complete(one);
@@ -2226,9 +2746,9 @@ public class CompletableFutureTest exten
         assertTrue(r.ran);
 
         r = new Noop();
-        f = new CompletableFuture<Integer>();
+        f = new CompletableFuture<>();
         f.complete(one);
-        f2 = new CompletableFuture<Integer>();
+        f2 = new CompletableFuture<>();
         g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
         checkCompletedNormally(g, null);
         assertTrue(r.ran);
@@ -2239,16 +2759,16 @@ public class CompletableFutureTest exten
      * completion of source
      */
     public void testRunAfterEitherAsync2E() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
-        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
+        CompletableFuture<Integer> f = new CompletableFuture<>();
+        CompletableFuture<Integer> f2 = new CompletableFuture<>();
         Noop r = new Noop();
         CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
         f.completeExceptionally(new CFException());
         checkCompletedWithWrappedCFException(g);
 
         r = new Noop();
-        f = new CompletableFuture<Integer>();
-        f2 = new CompletableFuture<Integer>();
+        f = new CompletableFuture<>();
+        f2 = new CompletableFuture<>();
         f2.completeExceptionally(new CFException());
         g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
         f.complete(one);
@@ -2259,8 +2779,8 @@ public class CompletableFutureTest exten
      * runAfterEitherAsync result completes exceptionally if action does
      */
     public void testRunAfterEitherAsync3E() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
-        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
+        CompletableFuture<Integer> f = new CompletableFuture<>();
+        CompletableFuture<Integer> f2 = new CompletableFuture<>();
         FailingNoop r = new FailingNoop();
         CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
         f.complete(one);
@@ -2272,16 +2792,16 @@ public class CompletableFutureTest exten
      * source cancelled
      */
     public void testRunAfterEitherAsync4E() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
-        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
+        CompletableFuture<Integer> f = new CompletableFuture<>();
+        CompletableFuture<Integer> f2 = new CompletableFuture<>();
         Noop r = new Noop();
         CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
         assertTrue(f.cancel(true));
         checkCompletedWithWrappedCancellationException(g);
 
         r = new Noop();
-        f = new CompletableFuture<Integer>();
-        f2 = new CompletableFuture<Integer>();
+        f = new CompletableFuture<>();
+        f2 = new CompletableFuture<>();
         assertTrue(f2.cancel(true));
         g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
         checkCompletedWithWrappedCancellationException(g);
@@ -2292,7 +2812,7 @@ public class CompletableFutureTest exten
      * completion of source
      */
     public void testThenComposeAsyncE() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
+        CompletableFuture<Integer> f = new CompletableFuture<>();
         CompletableFutureInc r = new CompletableFutureInc();
         CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
         f.complete(one);
@@ -2304,7 +2824,7 @@ public class CompletableFutureTest exten
      * exceptional completion of source
      */
     public void testThenComposeAsync2E() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
+        CompletableFuture<Integer> f = new CompletableFuture<>();
         CompletableFutureInc r = new CompletableFutureInc();
         CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
         f.completeExceptionally(new CFException());
@@ -2315,7 +2835,7 @@ public class CompletableFutureTest exten
      * thenComposeAsync result completes exceptionally if action does
      */
     public void testThenComposeAsync3E() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
+        CompletableFuture<Integer> f = new CompletableFuture<>();
         FailingCompletableFutureFunction r = new FailingCompletableFutureFunction();
         CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
         f.complete(one);
@@ -2326,7 +2846,7 @@ public class CompletableFutureTest exten
      * thenComposeAsync result completes exceptionally if source cancelled
      */
     public void testThenComposeAsync4E() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
+        CompletableFuture<Integer> f = new CompletableFuture<>();
         CompletableFutureInc r = new CompletableFutureInc();
         CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
         assertTrue(f.cancel(true));
@@ -2340,24 +2860,27 @@ public class CompletableFutureTest exten
      * with the value null
      */
     public void testAllOf_empty() throws Exception {
-        CompletableFuture<?> f = CompletableFuture.allOf();
+        CompletableFuture<Void> f = CompletableFuture.allOf();
         checkCompletedNormally(f, null);
     }
 
     /**
-     * allOf returns a future completed when all components complete
+     * allOf returns a future completed normally with the value null
+     * when all components complete normally
      */
-    public void testAllOf() throws Exception {
+    public void testAllOf_normal() throws Exception {
         for (int k = 1; k < 20; ++k) {
-            CompletableFuture[] fs = new CompletableFuture[k];
+            CompletableFuture<Integer>[] fs = (CompletableFuture<Integer>[]) new CompletableFuture[k];
             for (int i = 0; i < k; ++i)
-                fs[i] = new CompletableFuture<Integer>();
+                fs[i] = new CompletableFuture<>();
             CompletableFuture<Void> f = CompletableFuture.allOf(fs);
             for (int i = 0; i < k; ++i) {
                 checkIncomplete(f);
+                checkIncomplete(CompletableFuture.allOf(fs));
                 fs[i].complete(one);
             }
             checkCompletedNormally(f, null);
+            checkCompletedNormally(CompletableFuture.allOf(fs), null);
         }
     }
 
@@ -2365,23 +2888,43 @@ public class CompletableFutureTest exten
      * anyOf(no component futures) returns an incomplete future
      */
     public void testAnyOf_empty() throws Exception {
-        CompletableFuture<?> f = CompletableFuture.anyOf();
+        CompletableFuture<Object> f = CompletableFuture.anyOf();
         checkIncomplete(f);
     }
 
     /**
-     * allOf returns a future completed when any components complete
+     * anyOf returns a future completed normally with a value when
+     * a component future does
      */
-    public void testAnyOf() throws Exception {
-        for (int k = 1; k < 20; ++k) {
+    public void testAnyOf_normal() throws Exception {
+        for (int k = 0; k < 10; ++k) {
             CompletableFuture[] fs = new CompletableFuture[k];
             for (int i = 0; i < k; ++i)
-                fs[i] = new CompletableFuture<Integer>();
+                fs[i] = new CompletableFuture<>();
             CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
             checkIncomplete(f);
             for (int i = 0; i < k; ++i) {
                 fs[i].complete(one);
                 checkCompletedNormally(f, one);
+                checkCompletedNormally(CompletableFuture.anyOf(fs), one);
+            }
+        }
+    }
+
+    /**
+     * anyOf result completes exceptionally when any component does.
+     */
+    public void testAnyOf_exceptional() throws Exception {
+        for (int k = 0; k < 10; ++k) {
+            CompletableFuture[] fs = new CompletableFuture[k];
+            for (int i = 0; i < k; ++i)
+                fs[i] = new CompletableFuture<>();
+            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
+            checkIncomplete(f);
+            for (int i = 0; i < k; ++i) {
+                fs[i].completeExceptionally(new CFException());
+                checkCompletedWithWrappedCFException(f);
+                checkCompletedWithWrappedCFException(CompletableFuture.anyOf(fs));
             }
         }
     }
@@ -2390,44 +2933,339 @@ public class CompletableFutureTest exten
      * Completion methods throw NullPointerException with null arguments
      */
     public void testNPE() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
-        CompletableFuture<Integer> g = new CompletableFuture<Integer>();
-        CompletableFuture h;
-        Runnable[] actions = {
-            () => f.thenApply(null),
-        }
-        try { h = f.thenApply(null); } catch (NullPointerException ok) {}
-        try { h = f.thenAccept(null); } catch (NullPointerException ok) {}
-        try { h = f.thenRun(null); } catch (NullPointerException ok) {}
-        try { h = f.thenCombine(g, null); } catch (NullPointerException ok) {}
-        try { h = f.thenCombine(null, null); } catch (NullPointerException ok) {}
-        try { h = f.applyToEither(g, null); } catch (NullPointerException ok) {}
-        try { h = f.applyToEither(null, null); } catch (NullPointerException ok) {}
-        try { h = f.thenAcceptBoth(g, null); } catch (NullPointerException ok) {}
-        try { h = f.thenAcceptBoth(null, null); } catch (NullPointerException ok) {}
-        try { h = f.runAfterEither(g, null); } catch (NullPointerException ok) {}
-        try { h = f.runAfterEither(null, null); } catch (NullPointerException ok) {}
-        try { h = f.runAfterBoth(g, null); } catch (NullPointerException ok) {}
-        try { h = f.runAfterBoth(null, null); } catch (NullPointerException ok) {}
-        try { h = f.exceptionally(null); } catch (NullPointerException ok) {}
-        try { h = f.handle(null); } catch (NullPointerException ok) {}
-        try { h = f.thenCompose(null); } catch (NullPointerException ok) {}
-
-        try { h = f.thenApplyAsync(null); } catch (NullPointerException ok) {}
-        try { h = f.thenAcceptAsync(null); } catch (NullPointerException ok) {}
-        try { h = f.thenRunAsync(null); } catch (NullPointerException ok) {}
-        try { h = f.thenCombineAsync(g, null); } catch (NullPointerException ok) {}
-        try { h = f.thenCombineAsync(null, null); } catch (NullPointerException ok) {}
-        try { h = f.applyToEitherAsync(g, null); } catch (NullPointerException ok) {}
-        try { h = f.applyToEitherAsync(null, null); } catch (NullPointerException ok) {}
-        try { h = f.thenAcceptBothAsync(g, null); } catch (NullPointerException ok) {}
-        try { h = f.thenAcceptBothAsync(null, null); } catch (NullPointerException ok) {}
-        try { h = f.runAfterEitherAsync(g, null); } catch (NullPointerException ok) {}
-        try { h = f.runAfterEitherAsync(null, null); } catch (NullPointerException ok) {}
-        try { h = f.runAfterBothAsync(g, null); } catch (NullPointerException ok) {}
-        try { h = f.runAfterBothAsync(null, null); } catch (NullPointerException ok) {}
+        CompletableFuture<Integer> f = new CompletableFuture<>();
+        CompletableFuture<Integer> g = new CompletableFuture<>();
+        CompletableFuture<Integer> nullFuture = (CompletableFuture<Integer>)null;
+        CompletableFuture<?> h;
+        ThreadExecutor exec = new ThreadExecutor();
+
+        Runnable[] throwingActions = {
+            () -> CompletableFuture.supplyAsync(null),
+            () -> CompletableFuture.supplyAsync(null, exec),
+            () -> CompletableFuture.supplyAsync(supplyOne, null),
+
+            () -> CompletableFuture.runAsync(null),
+            () -> CompletableFuture.runAsync(null, exec),
+            () -> CompletableFuture.runAsync(() -> {}, null),
+
+            () -> f.completeExceptionally(null),
+
+            () -> f.thenApply(null),
+            () -> f.thenApplyAsync(null),
+            () -> f.thenApplyAsync((x) -> x, null),
+            () -> f.thenApplyAsync(null, exec),
+
+            () -> f.thenAccept(null),
+            () -> f.thenAcceptAsync(null),
+            () -> f.thenAcceptAsync((x) -> {} , null),
+            () -> f.thenAcceptAsync(null, exec),
+
+            () -> f.thenRun(null),
+            () -> f.thenRunAsync(null),
+            () -> f.thenRunAsync(() -> {} , null),
+            () -> f.thenRunAsync(null, exec),
+
+            () -> f.thenCombine(g, null),
+            () -> f.thenCombineAsync(g, null),
+            () -> f.thenCombineAsync(g, null, exec),
+            () -> f.thenCombine(nullFuture, (x, y) -> x),
+            () -> f.thenCombineAsync(nullFuture, (x, y) -> x),
+            () -> f.thenCombineAsync(nullFuture, (x, y) -> x, exec),
+            () -> f.thenCombineAsync(g, (x, y) -> x, null),
+
+            () -> f.thenAcceptBoth(g, null),
+            () -> f.thenAcceptBothAsync(g, null),
+            () -> f.thenAcceptBothAsync(g, null, exec),
+            () -> f.thenAcceptBoth(nullFuture, (x, y) -> {}),
+            () -> f.thenAcceptBothAsync(nullFuture, (x, y) -> {}),
+            () -> f.thenAcceptBothAsync(nullFuture, (x, y) -> {}, exec),
+            () -> f.thenAcceptBothAsync(g, (x, y) -> {}, null),
+
+            () -> f.runAfterBoth(g, null),
+            () -> f.runAfterBothAsync(g, null),
+            () -> f.runAfterBothAsync(g, null, exec),
+            () -> f.runAfterBoth(nullFuture, () -> {}),
+            () -> f.runAfterBothAsync(nullFuture, () -> {}),
+            () -> f.runAfterBothAsync(nullFuture, () -> {}, exec),
+            () -> f.runAfterBothAsync(g, () -> {}, null),
+
+            () -> f.applyToEither(g, null),
+            () -> f.applyToEitherAsync(g, null),
+            () -> f.applyToEitherAsync(g, null, exec),
+            () -> f.applyToEither(nullFuture, (x) -> x),
+            () -> f.applyToEitherAsync(nullFuture, (x) -> x),
+            () -> f.applyToEitherAsync(nullFuture, (x) -> x, exec),
+            () -> f.applyToEitherAsync(g, (x) -> x, null),
+
+            () -> f.acceptEither(g, null),
+            () -> f.acceptEitherAsync(g, null),
+            () -> f.acceptEitherAsync(g, null, exec),
+            () -> f.acceptEither(nullFuture, (x) -> {}),
+            () -> f.acceptEitherAsync(nullFuture, (x) -> {}),
+            () -> f.acceptEitherAsync(nullFuture, (x) -> {}, exec),
+            () -> f.acceptEitherAsync(g, (x) -> {}, null),
+
+            () -> f.runAfterEither(g, null),
+            () -> f.runAfterEitherAsync(g, null),
+            () -> f.runAfterEitherAsync(g, null, exec),
+            () -> f.runAfterEither(nullFuture, () -> {}),
+            () -> f.runAfterEitherAsync(nullFuture, () -> {}),
+            () -> f.runAfterEitherAsync(nullFuture, () -> {}, exec),
+            () -> f.runAfterEitherAsync(g, () -> {}, null),
+
+            () -> f.thenCompose(null),
+            () -> f.thenComposeAsync(null),
+            () -> f.thenComposeAsync(new CompletableFutureInc(), null),
+            () -> f.thenComposeAsync(null, exec),
+
+            () -> f.exceptionally(null),
+
+            () -> f.handle(null),
+
+            () -> CompletableFuture.allOf((CompletableFuture<?>)null),
+            () -> CompletableFuture.allOf((CompletableFuture<?>[])null),
+            () -> CompletableFuture.allOf(f, null),
+            () -> CompletableFuture.allOf(null, f),
+
+            () -> CompletableFuture.anyOf((CompletableFuture<?>)null),
+            () -> CompletableFuture.anyOf((CompletableFuture<?>[])null),
+            () -> CompletableFuture.anyOf(f, null),
+            () -> CompletableFuture.anyOf(null, f),
+
+            () -> f.obtrudeException(null),
+        };
+
+        assertThrows(NullPointerException.class, throwingActions);
+        assertEquals(0, exec.count.get());
+    }
+
+    /**
+     * toCompletableFuture returns this CompletableFuture.
+     */
+    public void testToCompletableFuture() {
+        CompletableFuture<Integer> f = new CompletableFuture<>();
+        assertSame(f, f.toCompletableFuture());
+    }
+
+    /**
+     * whenComplete action executes on normal completion, propagating
+     * source result.
+     */
+    public void testWhenComplete1() {
+        final AtomicInteger a = new AtomicInteger();
+        CompletableFuture<Integer> f = new CompletableFuture<>();
+        CompletableFuture<Integer> g =
+            f.whenComplete((Integer x, Throwable t) -> a.getAndIncrement());
+        f.complete(three);
+        checkCompletedNormally(f, three);
+        checkCompletedNormally(g, three);
+        assertEquals(a.get(), 1);
+    }
 
+    /**
+     * whenComplete action executes on exceptional completion, propagating
+     * source result.
+     */
+    public void testWhenComplete2() {
+        final AtomicInteger a = new AtomicInteger();
+        CompletableFuture<Integer> f = new CompletableFuture<>();
+        CompletableFuture<Integer> g =
+            f.whenComplete((Integer x, Throwable t) -> a.getAndIncrement());
+        f.completeExceptionally(new CFException());
+        assertTrue(f.isCompletedExceptionally());
+        assertTrue(g.isCompletedExceptionally());
+        assertEquals(a.get(), 1);
     }
 
+    /**
+     * If a whenComplete action throws an exception when triggered by
+     * a normal completion, it completes exceptionally
+     */
+    public void testWhenComplete3() {
+        CompletableFuture<Integer> f = new CompletableFuture<>();
+        CompletableFuture<Integer> g =
+            f.whenComplete((Integer x, Throwable t) ->
+                           { throw new CFException(); } );
+        f.complete(three);
+        checkCompletedNormally(f, three);
+        assertTrue(g.isCompletedExceptionally());
+        checkCompletedWithWrappedCFException(g);
+    }
+
+    /**
+     * whenCompleteAsync action executes on normal completion, propagating
+     * source result.
+     */
+    public void testWhenCompleteAsync1() {
+        final AtomicInteger a = new AtomicInteger();
+        CompletableFuture<Integer> f = new CompletableFuture<>();
+        CompletableFuture<Integer> g =
+            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement());
+        f.complete(three);
+        checkCompletedNormally(f, three);
+        checkCompletedNormally(g, three);
+        assertEquals(a.get(), 1);
+    }
+
+    /**
+     * whenCompleteAsync action executes on exceptional completion, propagating
+     * source result.
+     */
+    public void testWhenCompleteAsync2() {
+        final AtomicInteger a = new AtomicInteger();
+        CompletableFuture<Integer> f = new CompletableFuture<>();
+        CompletableFuture<Integer> g =
+            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement());
+        f.completeExceptionally(new CFException());
+        checkCompletedWithWrappedCFException(f);
+        checkCompletedWithWrappedCFException(g);
+    }
+
+    /**
+     * If a whenCompleteAsync action throws an exception when
+     * triggered by a normal completion, it completes exceptionally
+     */
+    public void testWhenCompleteAsync3() {
+        CompletableFuture<Integer> f = new CompletableFuture<>();
+        CompletableFuture<Integer> g =
+            f.whenCompleteAsync((Integer x, Throwable t) ->
+                           { throw new CFException(); } );
+        f.complete(three);
+        checkCompletedNormally(f, three);
+        checkCompletedWithWrappedCFException(g);
+    }
+
+    /**
+     * whenCompleteAsync action executes on normal completion, propagating
+     * source result.
+     */
+    public void testWhenCompleteAsync1e() {
+        final AtomicInteger a = new AtomicInteger();
+        ThreadExecutor exec = new ThreadExecutor();
+        CompletableFuture<Integer> f = new CompletableFuture<>();
+        CompletableFuture<Integer> g =
+            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement(),
+                                exec);
+        f.complete(three);
+        checkCompletedNormally(f, three);
+        checkCompletedNormally(g, three);
+        assertEquals(a.get(), 1);
+    }
+
+    /**
+     * whenCompleteAsync action executes on exceptional completion, propagating
+     * source result.
+     */
+    public void testWhenCompleteAsync2e() {
+        final AtomicInteger a = new AtomicInteger();
+        ThreadExecutor exec = new ThreadExecutor();
+        CompletableFuture<Integer> f = new CompletableFuture<>();
+        CompletableFuture<Integer> g =
+            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement(),
+                                exec);
+        f.completeExceptionally(new CFException());
+        checkCompletedWithWrappedCFException(f);
+        checkCompletedWithWrappedCFException(g);
+    }
+
+    /**
+     * If a whenCompleteAsync action throws an exception when triggered
+     * by a normal completion, it completes exceptionally
+     */
+    public void testWhenCompleteAsync3e() {
+        ThreadExecutor exec = new ThreadExecutor();
+        CompletableFuture<Integer> f = new CompletableFuture<>();
+        CompletableFuture<Integer> g =
+            f.whenCompleteAsync((Integer x, Throwable t) ->
+                                { throw new CFException(); },
+                                exec);
+        f.complete(three);
+        checkCompletedNormally(f, three);
+        checkCompletedWithWrappedCFException(g);
+    }
+
+    /**
+     * 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());
+        assertFalse(r.ran);
+        f.completeExceptionally(new CFException());
+        checkCompletedWithWrappedCFException(f);
+        checkCompletedNormally(g, three);
+        assertTrue(r.ran);
+
+        f = new CompletableFuture<>();
+        g = f.handleAsync(r = new IntegerHandler());
+        assertFalse(r.ran);
+        f.completeExceptionally(new CFException());
+        checkCompletedWithWrappedCFException(f);
+        checkCompletedNormally(g, three);
+        assertTrue(r.ran);
+
+        f = new CompletableFuture<>();
+        g = f.handleAsync(r = new IntegerHandler());
+        assertFalse(r.ran);
+        f.complete(one);
+        checkCompletedNormally(f, one);
+        checkCompletedNormally(g, two);
+        assertTrue(r.ran);
+
+        f = new CompletableFuture<>();
+        g = f.handleAsync(r = new IntegerHandler());
+        assertFalse(r.ran);
+        f.complete(one);
+        checkCompletedNormally(f, one);
+        checkCompletedNormally(g, two);
+        assertTrue(r.ran);
+    }
+
+    /**
+     * 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);
+        assertFalse(r.ran);
+        f.completeExceptionally(new CFException());
+        checkCompletedWithWrappedCFException(f);
+        checkCompletedNormally(g, three);
+        assertTrue(r.ran);
+
+        f = new CompletableFuture<>();
+        g = f.handleAsync(r = new IntegerHandler(), exec);
+        assertFalse(r.ran);
+        f.completeExceptionally(new CFException());
+        checkCompletedWithWrappedCFException(f);
+        checkCompletedNormally(g, three);
+        assertTrue(r.ran);
+
+        f = new CompletableFuture<>();
+        g = f.handleAsync(r = new IntegerHandler(), exec);
+        assertFalse(r.ran);
+        f.complete(one);
+        checkCompletedNormally(f, one);
+        checkCompletedNormally(g, two);
+        assertTrue(r.ran);
+
+        f = new CompletableFuture<>();
+        g = f.handleAsync(r = new IntegerHandler(), exec);
+        assertFalse(r.ran);
+        f.complete(one);
+        checkCompletedNormally(f, one);
+        checkCompletedNormally(g, two);
+        assertTrue(r.ran);
+    }
 
 }