--- jsr166/src/test/tck/CompletableFutureTest.java	2014/06/01 21:17:05	1.34
+++ jsr166/src/test/tck/CompletableFutureTest.java	2014/06/01 23:51:44	1.38
@@ -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;
@@ -317,20 +318,60 @@ public class CompletableFutureTest exten
 
     // Choose non-commutative actions for better coverage
 
+    // A non-commutative function that handles and produces null values as well.
+    static Integer subtract(Integer x, Integer y) {
+        return (x == null && y == null) ? null :
+            ((x == null) ? 42 : x.intValue())
+            - ((y == null) ? 99 : y.intValue());
+    }
+
+    // A function that handles and produces null values as well.
+    static Integer inc(Integer x) {
+        return (x == null) ? null : x + 1;
+    }
+
     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> subtract =
-        (Integer x, Integer y) -> Integer.valueOf(x.intValue() - y.intValue());
+        (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; }
+        int invocationCount = 0;
+        Integer value;
+        public boolean ran() { return invocationCount == 1; }
+        public void accept(Integer x) {
+            invocationCount++;
+            value = inc(x);
+        }
+    }
+    static final class IncFunction implements Function<Integer,Integer> {
+        int invocationCount = 0;
+        Integer value;
+        public boolean ran() { return invocationCount == 1; }
+        public Integer apply(Integer x) {
+            invocationCount++;
+            return value = inc(x);
+        }
     }
     static final class SubtractAction implements BiConsumer<Integer, Integer> {
-        int value;
+        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 {
@@ -405,6 +446,211 @@ public class CompletableFutureTest exten
     }
 
     /**
+     * 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);
+            }
+            public <T,U> CompletableFuture<U> applyToEither
+                (CompletableFuture<T> f,
+                 CompletionStage<? extends T> g,
+                 Function<? super T,U> a) {
+                return f.applyToEither(g, a);
+            }
+            public <T> CompletableFuture<Void> acceptEither
+                (CompletableFuture<T> f,
+                 CompletionStage<? extends T> g,
+                 Consumer<? super T> a) {
+                return f.acceptEither(g, a);
+            }
+            public <T> CompletableFuture<Void> runAfterEither
+                (CompletableFuture<T> f,
+                 CompletionStage<?> g,
+                 java.lang.Runnable a) {
+                return f.runAfterEither(g, a);
+            }
+            public <T,U> CompletableFuture<U> thenCompose
+                (CompletableFuture<T> f,
+                 Function<? super T,? extends CompletionStage<U>> a) {
+                return f.thenCompose(a);
+            }
+            public <T> CompletableFuture<T> whenComplete
+                (CompletableFuture<T> f,
+                 BiConsumer<? super T,? super Throwable> a) {
+                return f.whenComplete(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);
+            }
+            public <T,U> CompletableFuture<U> applyToEither
+                (CompletableFuture<T> f,
+                 CompletionStage<? extends T> g,
+                 Function<? super T,U> a) {
+                return f.applyToEitherAsync(g, a);
+            }
+            public <T> CompletableFuture<Void> acceptEither
+                (CompletableFuture<T> f,
+                 CompletionStage<? extends T> g,
+                 Consumer<? super T> a) {
+                return f.acceptEitherAsync(g, a);
+            }
+            public <T> CompletableFuture<Void> runAfterEither
+                (CompletableFuture<T> f,
+                 CompletionStage<?> g,
+                 java.lang.Runnable a) {
+                return f.runAfterEitherAsync(g, a);
+            }
+            public <T,U> CompletableFuture<U> thenCompose
+                (CompletableFuture<T> f,
+                 Function<? super T,? extends CompletionStage<U>> a) {
+                return f.thenComposeAsync(a);
+            }
+            public <T> CompletableFuture<T> whenComplete
+                (CompletableFuture<T> f,
+                 BiConsumer<? super T,? super Throwable> a) {
+                return f.whenCompleteAsync(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 <T,U> CompletableFuture<U> applyToEither
+                (CompletableFuture<T> f,
+                 CompletionStage<? extends T> g,
+                 Function<? super T,U> a) {
+                return f.applyToEitherAsync(g, a, new ThreadExecutor());
+            }
+            public <T> CompletableFuture<Void> acceptEither
+                (CompletableFuture<T> f,
+                 CompletionStage<? extends T> g,
+                 Consumer<? super T> a) {
+                return f.acceptEitherAsync(g, a, new ThreadExecutor());
+            }
+            public <T> CompletableFuture<Void> runAfterEither
+                (CompletableFuture<T> f,
+                 CompletionStage<?> g,
+                 java.lang.Runnable a) {
+                return f.runAfterEitherAsync(g, a, new ThreadExecutor());
+            }
+            public <T,U> CompletableFuture<U> thenCompose
+                (CompletableFuture<T> f,
+                 Function<? super T,? extends CompletionStage<U>> a) {
+                return f.thenComposeAsync(a, new ThreadExecutor());
+            }
+            public <T> CompletableFuture<T> whenComplete
+                (CompletableFuture<T> f,
+                 BiConsumer<? super T,? super Throwable> a) {
+                return f.whenCompleteAsync(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);
+        public abstract <T,U> CompletableFuture<U> applyToEither
+            (CompletableFuture<T> f,
+             CompletionStage<? extends T> g,
+             Function<? super T,U> a);
+        public abstract <T> CompletableFuture<Void> acceptEither
+            (CompletableFuture<T> f,
+             CompletionStage<? extends T> g,
+             Consumer<? super T> a);
+        public abstract <T> CompletableFuture<Void> runAfterEither
+            (CompletableFuture<T> f,
+             CompletionStage<?> g,
+             java.lang.Runnable a);
+        public abstract <T,U> CompletableFuture<U> thenCompose
+            (CompletableFuture<T> f,
+             Function<? super T,? extends CompletionStage<U>> a);
+        public abstract <T> CompletableFuture<T> whenComplete
+            (CompletableFuture<T> f,
+             BiConsumer<? super T,? super Throwable> a);
+
+
+    }
+
+    /**
      * exceptionally action completes with function value on source
      * exception; otherwise with source value
      */
@@ -654,7 +900,7 @@ public class CompletableFutureTest exten
         CompletableFuture<Void> g = f.thenAccept(r);
         f.complete(one);
         checkCompletedNormally(g, null);
-        assertEquals(r.value, 2);
+        assertEquals(r.value, (Integer) 2);
     }
 
     /**
@@ -696,284 +942,600 @@ public class CompletableFutureTest exten
      * thenCombine result completes normally after normal completion
      * of sources
      */
-    public void testThenCombine() {
-        CompletableFuture<Integer> f, g, h;
+    public void testThenCombine_normalCompletion1() {
+        for (ExecutionMode m : ExecutionMode.values())
+        for (Integer v1 : new Integer[] { 1, null })
+        for (Integer v2 : new Integer[] { 2, null }) {
 
-        f = new CompletableFuture<>();
-        g = new CompletableFuture<>();
-        h = f.thenCombine(g, subtract);
-        f.complete(3);
+        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);
-        g.complete(1);
-        checkCompletedNormally(h, 2);
+        assertFalse(r.ran());
+        g.complete(v2);
 
-        f = new CompletableFuture<>();
-        g = new CompletableFuture<>();
-        h = f.thenCombine(g, subtract);
-        g.complete(1);
+        checkCompletedNormally(h, subtract(v1, v2));
+        checkCompletedNormally(f, v1);
+        checkCompletedNormally(g, v2);
+        }
+    }
+
+    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);
-        f.complete(3);
-        checkCompletedNormally(h, 2);
+        assertFalse(r.ran());
+        f.complete(v1);
 
-        f = new CompletableFuture<>();
-        g = new CompletableFuture<>();
-        g.complete(1);
-        f.complete(3);
-        h = f.thenCombine(g, subtract);
-        checkCompletedNormally(h, 2);
+        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, g, h;
+    public void testThenCombine_exceptionalCompletion1() {
+        for (ExecutionMode m : ExecutionMode.values())
+        for (Integer v1 : new Integer[] { 1, null }) {
 
-        f = new CompletableFuture<>();
-        g = new CompletableFuture<>();
-        h = f.thenCombine(g, subtract);
-        f.completeExceptionally(new CFException());
+        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(1);
-        checkCompletedWithWrappedCFException(h);
+        g.complete(v1);
 
-        f = new CompletableFuture<>();
-        g = new CompletableFuture<>();
-        h = f.thenCombine(g, subtract);
-        g.completeExceptionally(new CFException());
+        checkCompletedWithWrappedCFException(h, ex);
+        checkCompletedWithWrappedCFException(f, ex);
+        assertFalse(r.ran());
+        checkCompletedNormally(g, v1);
+        }
+    }
+
+    public void testThenCombine_exceptionalCompletion2() {
+        for (ExecutionMode m : ExecutionMode.values())
+        for (Integer v1 : new Integer[] { 1, null }) {
+
+        final CompletableFuture<Integer> f = new CompletableFuture<>();
+        final CompletableFuture<Integer> g = new CompletableFuture<>();
+        final SubtractFunction r = new SubtractFunction();
+        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
+        final CFException ex = new CFException();
+
+        g.completeExceptionally(ex);
         checkIncomplete(h);
-        f.complete(3);
-        checkCompletedWithWrappedCFException(h);
+        f.complete(v1);
 
-        f = new CompletableFuture<>();
-        g = new CompletableFuture<>();
-        f.complete(3);
-        g.completeExceptionally(new CFException());
-        h = f.thenCombine(g, subtract);
-        checkCompletedWithWrappedCFException(h);
+        checkCompletedWithWrappedCFException(h, ex);
+        checkCompletedWithWrappedCFException(g, ex);
+        assertFalse(r.ran());
+        checkCompletedNormally(f, v1);
+        }
+    }
 
-        f = new CompletableFuture<>();
-        g = new CompletableFuture<>();
-        f.completeExceptionally(new CFException());
-        g.complete(3);
-        h = f.thenCombine(g, subtract);
-        checkCompletedWithWrappedCFException(h);
+    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<>();
-        CompletableFuture<Integer> f2 = new CompletableFuture<>();
-        FailingBiFunction r = new FailingBiFunction();
-        CompletableFuture<Integer> g = f.thenCombine(f2, r);
-        f.complete(one);
-        checkIncomplete(g);
-        assertFalse(r.ran);
-        f2.complete(two);
-        checkCompletedWithWrappedCFException(g);
-        assertTrue(r.ran);
+    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, g, h;
+    public void testThenCombine_sourceCancelled1() {
+        for (ExecutionMode m : ExecutionMode.values())
+        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
+        for (Integer v1 : new Integer[] { 1, null }) {
 
-        f = new CompletableFuture<>();
-        g = new CompletableFuture<>();
-        h = f.thenCombine(g, subtract);
-        assertTrue(f.cancel(true));
+        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(1);
+        g.complete(v1);
+
         checkCompletedWithWrappedCancellationException(h);
+        checkCancelled(f);
+        assertFalse(r.ran());
+        checkCompletedNormally(g, v1);
+        }
+    }
 
-        f = new CompletableFuture<>();
-        g = new CompletableFuture<>();
-        h = f.thenCombine(g, subtract);
-        assertTrue(g.cancel(true));
+    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(3);
+        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);
 
-        f = new CompletableFuture<>();
-        g = new CompletableFuture<>();
-        assertTrue(f.cancel(true));
-        assertTrue(g.cancel(true));
-        h = f.thenCombine(g, subtract);
         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, g;
-        CompletableFuture<Void> h;
-        SubtractAction r;
+    public void testThenAcceptBoth_normalCompletion1() {
+        for (ExecutionMode m : ExecutionMode.values())
+        for (Integer v1 : new Integer[] { 1, null })
+        for (Integer v2 : new Integer[] { 2, null }) {
 
-        f = new CompletableFuture<>();
-        g = new CompletableFuture<>();
-        h = f.thenAcceptBoth(g, r = new SubtractAction());
-        f.complete(3);
+        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);
-        g.complete(1);
+        assertFalse(r.ran());
+        g.complete(v2);
+
         checkCompletedNormally(h, null);
-        assertEquals(r.value, 2);
+        assertEquals(r.value, subtract(v1, v2));
+        checkCompletedNormally(f, v1);
+        checkCompletedNormally(g, v2);
+        }
+    }
 
-        f = new CompletableFuture<>();
-        g = new CompletableFuture<>();
-        h = f.thenAcceptBoth(g, r = new SubtractAction());
-        g.complete(1);
+    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);
-        f.complete(3);
+        assertFalse(r.ran());
+        f.complete(v1);
+
         checkCompletedNormally(h, null);
-        assertEquals(r.value, 2);
+        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);
 
-        f = new CompletableFuture<>();
-        g = new CompletableFuture<>();
-        g.complete(1);
-        f.complete(3);
-        h = f.thenAcceptBoth(g, r = new SubtractAction());
         checkCompletedNormally(h, null);
-        assertEquals(r.value, 2);
+        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, g;
-        CompletableFuture<Void> h;
-        SubtractAction r;
+    public void testThenAcceptBoth_exceptionalCompletion1() {
+        for (ExecutionMode m : ExecutionMode.values())
+        for (Integer v1 : new Integer[] { 1, null }) {
 
-        f = new CompletableFuture<>();
-        g = new CompletableFuture<>();
-        h = f.thenAcceptBoth(g, r = new SubtractAction());
-        f.completeExceptionally(new CFException());
+        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(1);
-        checkCompletedWithWrappedCFException(h);
+        g.complete(v1);
 
-        f = new CompletableFuture<>();
-        g = new CompletableFuture<>();
-        h = f.thenAcceptBoth(g, r = new SubtractAction());
-        g.completeExceptionally(new CFException());
+        checkCompletedWithWrappedCFException(h, ex);
+        checkCompletedWithWrappedCFException(f, ex);
+        assertFalse(r.ran());
+        checkCompletedNormally(g, v1);
+        }
+    }
+
+    public void testThenAcceptBoth_exceptionalCompletion2() {
+        for (ExecutionMode m : ExecutionMode.values())
+        for (Integer v1 : new Integer[] { 1, null }) {
+
+        final CompletableFuture<Integer> f = new CompletableFuture<>();
+        final CompletableFuture<Integer> g = new CompletableFuture<>();
+        final SubtractAction r = new SubtractAction();
+        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
+        final CFException ex = new CFException();
+
+        g.completeExceptionally(ex);
         checkIncomplete(h);
-        f.complete(3);
-        checkCompletedWithWrappedCFException(h);
+        f.complete(v1);
 
-        f = new CompletableFuture<>();
-        g = new CompletableFuture<>();
-        f.complete(3);
-        g.completeExceptionally(new CFException());
-        h = f.thenAcceptBoth(g, r = new SubtractAction());
-        checkCompletedWithWrappedCFException(h);
+        checkCompletedWithWrappedCFException(h, ex);
+        checkCompletedWithWrappedCFException(g, ex);
+        assertFalse(r.ran());
+        checkCompletedNormally(f, v1);
+        }
+    }
 
-        f = new CompletableFuture<>();
-        g = new CompletableFuture<>();
-        f.completeExceptionally(new CFException());
-        g.complete(3);
-        h = f.thenAcceptBoth(g, r = new SubtractAction());
-        checkCompletedWithWrappedCFException(h);
+    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, g;
-        CompletableFuture<Void> h;
-        FailingBiConsumer r;
+    public void testThenAcceptBoth_actionFailed1() {
+        for (ExecutionMode m : ExecutionMode.values())
+        for (Integer v1 : new Integer[] { 1, null })
+        for (Integer v2 : new Integer[] { 2, null }) {
 
-        f = new CompletableFuture<>();
-        g = new CompletableFuture<>();
-        h = f.thenAcceptBoth(g, r = new FailingBiConsumer());
-        f.complete(3);
+        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(1);
+        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);
 
-        f = new CompletableFuture<>();
-        g = new CompletableFuture<>();
-        f.complete(3);
-        g.complete(1);
-        h = f.thenAcceptBoth(g, r = new FailingBiConsumer());
         checkCompletedWithWrappedCFException(h);
+        checkCompletedNormally(f, v1);
+        checkCompletedNormally(g, v2);
+        }
     }
 
     /**
      * thenAcceptBoth result completes exceptionally if either source cancelled
      */
-    public void testThenAcceptBoth4() {
-        CompletableFuture<Integer> f, g;
-        CompletableFuture<Void> h;
-        SubtractAction r;
+    public void testThenAcceptBoth_sourceCancelled1() {
+        for (ExecutionMode m : ExecutionMode.values())
+        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
+        for (Integer v1 : new Integer[] { 1, null }) {
 
-        f = new CompletableFuture<>();
-        g = new CompletableFuture<>();
-        h = f.thenAcceptBoth(g, r = new SubtractAction());
-        assertTrue(f.cancel(true));
+        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(1);
+        g.complete(v1);
+
         checkCompletedWithWrappedCancellationException(h);
+        checkCancelled(f);
+        assertFalse(r.ran());
+        checkCompletedNormally(g, v1);
+        }
+    }
 
-        f = new CompletableFuture<>();
-        g = new CompletableFuture<>();
-        h = f.thenAcceptBoth(g, r = new SubtractAction());
-        assertTrue(g.cancel(true));
+    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(3);
-        checkCompletedWithWrappedCancellationException(h);
+        f.complete(v1);
 
-        f = new CompletableFuture<>();
-        g = new CompletableFuture<>();
-        f.complete(3);
-        assertTrue(g.cancel(true));
-        h = f.thenAcceptBoth(g, r = new SubtractAction());
         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);
 
-        f = new CompletableFuture<>();
-        g = new CompletableFuture<>();
-        assertTrue(f.cancel(true));
-        g.complete(3);
-        h = f.thenAcceptBoth(g, r = new SubtractAction());
         checkCompletedWithWrappedCancellationException(h);
+        checkCancelled(g);
+        assertFalse(r.ran());
+        checkCompletedNormally(f, v1);
+        }
     }
 
-    /**
-     * 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 r) {
-                return f.runAfterBoth(g, r);
-            }
-        },
+    public void testThenAcceptBoth_sourceCancelled4() {
+        for (ExecutionMode m : ExecutionMode.values())
+        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
+        for (Integer v1 : new Integer[] { 1, null }) {
 
-        DEFAULT_ASYNC {
-            public <T,U> CompletableFuture<Void> runAfterBoth
-                (CompletableFuture<T> f, CompletableFuture<U> g, Runnable r) {
-                return f.runAfterBothAsync(g, r);
-            }
-        },
+        final CompletableFuture<Integer> f = new CompletableFuture<>();
+        final CompletableFuture<Integer> g = new CompletableFuture<>();
+        final SubtractAction r = new SubtractAction();
 
-        EXECUTOR {
-            public <T,U> CompletableFuture<Void> runAfterBoth
-                (CompletableFuture<T> f, CompletableFuture<U> g, Runnable r) {
-                return f.runAfterBothAsync(g, r, new ThreadExecutor());
-            }
-        };
+        assertTrue(f.cancel(mayInterruptIfRunning));
+        g.complete(v1);
+        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
 
-        public abstract <T,U> CompletableFuture<Void> runAfterBoth
-            (CompletableFuture<T> f, CompletableFuture<U> g, Runnable r);
+        checkCompletedWithWrappedCancellationException(h);
+        checkCancelled(f);
+        assertFalse(r.ran());
+        checkCompletedNormally(g, v1);
+        }
     }
 
     /**
@@ -1357,7 +1919,7 @@ public class CompletableFutureTest exten
         checkCompletedNormally(g, null);
         f2.complete(one);
         checkCompletedNormally(g, null);
-        assertEquals(r.value, 2);
+        assertEquals(r.value, (Integer) 2);
 
         r = new IncAction();
         f = new CompletableFuture<>();
@@ -1365,7 +1927,7 @@ public class CompletableFutureTest exten
         f2 = new CompletableFuture<>();
         g = f.acceptEither(f2, r);
         checkCompletedNormally(g, null);
-        assertEquals(r.value, 2);
+        assertEquals(r.value, (Integer) 2);
     }
 
     /**
@@ -1675,7 +2237,7 @@ public class CompletableFutureTest exten
         CompletableFuture<Void> g = f.thenAcceptAsync(r);
         f.complete(one);
         checkCompletedNormally(g, null);
-        assertEquals(r.value, 2);
+        assertEquals(r.value, (Integer) 2);
     }
 
     /**
@@ -1713,260 +2275,6 @@ public class CompletableFutureTest exten
     }
 
     /**
-     * thenCombineAsync result completes normally after normal
-     * completion of sources
-     */
-    public void testThenCombineAsync() {
-        CompletableFuture<Integer> f, g, h;
-
-        f = new CompletableFuture<>();
-        g = new CompletableFuture<>();
-        h = f.thenCombineAsync(g, subtract);
-        f.complete(3);
-        checkIncomplete(h);
-        g.complete(1);
-        checkCompletedNormally(h, 2);
-
-        f = new CompletableFuture<>();
-        g = new CompletableFuture<>();
-        h = f.thenCombineAsync(g, subtract);
-        g.complete(1);
-        checkIncomplete(h);
-        f.complete(3);
-        checkCompletedNormally(h, 2);
-
-        f = new CompletableFuture<>();
-        g = new CompletableFuture<>();
-        g.complete(1);
-        f.complete(3);
-        h = f.thenCombineAsync(g, subtract);
-        checkCompletedNormally(h, 2);
-    }
-
-    /**
-     * thenCombineAsync result completes exceptionally after exceptional
-     * completion of either source
-     */
-    public void testThenCombineAsync2() {
-        CompletableFuture<Integer> f, g, h;
-
-        f = new CompletableFuture<>();
-        g = new CompletableFuture<>();
-        h = f.thenCombineAsync(g, subtract);
-        f.completeExceptionally(new CFException());
-        checkIncomplete(h);
-        g.complete(1);
-        checkCompletedWithWrappedCFException(h);
-
-        f = new CompletableFuture<>();
-        g = new CompletableFuture<>();
-        h = f.thenCombineAsync(g, subtract);
-        g.completeExceptionally(new CFException());
-        checkIncomplete(h);
-        f.complete(3);
-        checkCompletedWithWrappedCFException(h);
-
-        f = new CompletableFuture<>();
-        g = new CompletableFuture<>();
-        g.completeExceptionally(new CFException());
-        f.complete(3);
-        h = f.thenCombineAsync(g, subtract);
-        checkCompletedWithWrappedCFException(h);
-    }
-
-    /**
-     * thenCombineAsync result completes exceptionally if action does
-     */
-    public void testThenCombineAsync3() {
-        CompletableFuture<Integer> f = new CompletableFuture<>();
-        CompletableFuture<Integer> f2 = new CompletableFuture<>();
-        FailingBiFunction r = new FailingBiFunction();
-        CompletableFuture<Integer> g = f.thenCombineAsync(f2, r);
-        f.complete(one);
-        checkIncomplete(g);
-        assertFalse(r.ran);
-        f2.complete(two);
-        checkCompletedWithWrappedCFException(g);
-        assertTrue(r.ran);
-    }
-
-    /**
-     * thenCombineAsync result completes exceptionally if either source cancelled
-     */
-    public void testThenCombineAsync4() {
-        CompletableFuture<Integer> f, g, h;
-
-        f = new CompletableFuture<>();
-        g = new CompletableFuture<>();
-        h = f.thenCombineAsync(g, subtract);
-        assertTrue(f.cancel(true));
-        checkIncomplete(h);
-        g.complete(1);
-        checkCompletedWithWrappedCancellationException(h);
-
-        f = new CompletableFuture<>();
-        g = new CompletableFuture<>();
-        h = f.thenCombineAsync(g, subtract);
-        assertTrue(g.cancel(true));
-        checkIncomplete(h);
-        f.complete(3);
-        checkCompletedWithWrappedCancellationException(h);
-
-        f = new CompletableFuture<>();
-        g = new CompletableFuture<>();
-        g.complete(3);
-        assertTrue(f.cancel(true));
-        h = f.thenCombineAsync(g, subtract);
-        checkCompletedWithWrappedCancellationException(h);
-
-        f = new CompletableFuture<>();
-        g = new CompletableFuture<>();
-        f.complete(3);
-        assertTrue(g.cancel(true));
-        h = f.thenCombineAsync(g, subtract);
-        checkCompletedWithWrappedCancellationException(h);
-    }
-
-    /**
-     * thenAcceptBothAsync result completes normally after normal
-     * completion of sources
-     */
-    public void testThenAcceptBothAsync() {
-        CompletableFuture<Integer> f, g;
-        CompletableFuture<Void> h;
-        SubtractAction r;
-
-        f = new CompletableFuture<>();
-        g = new CompletableFuture<>();
-        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
-        f.complete(3);
-        checkIncomplete(h);
-        g.complete(1);
-        checkCompletedNormally(h, null);
-        assertEquals(r.value, 2);
-
-        f = new CompletableFuture<>();
-        g = new CompletableFuture<>();
-        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
-        g.complete(1);
-        checkIncomplete(h);
-        f.complete(3);
-        checkCompletedNormally(h, null);
-        assertEquals(r.value, 2);
-
-        f = new CompletableFuture<>();
-        g = new CompletableFuture<>();
-        g.complete(1);
-        f.complete(3);
-        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
-        checkCompletedNormally(h, null);
-        assertEquals(r.value, 2);
-    }
-
-    /**
-     * thenAcceptBothAsync result completes exceptionally after exceptional
-     * completion of source
-     */
-    public void testThenAcceptBothAsync2() {
-        CompletableFuture<Integer> f, g;
-        CompletableFuture<Void> h;
-        SubtractAction r;
-
-        f = new CompletableFuture<>();
-        g = new CompletableFuture<>();
-        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
-        f.completeExceptionally(new CFException());
-        checkIncomplete(h);
-        g.complete(1);
-        checkCompletedWithWrappedCFException(h);
-
-        f = new CompletableFuture<>();
-        g = new CompletableFuture<>();
-        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
-        g.completeExceptionally(new CFException());
-        checkIncomplete(h);
-        f.complete(3);
-        checkCompletedWithWrappedCFException(h);
-
-        f = new CompletableFuture<>();
-        g = new CompletableFuture<>();
-        f.complete(3);
-        g.completeExceptionally(new CFException());
-        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
-        checkCompletedWithWrappedCFException(h);
-
-        f = new CompletableFuture<>();
-        g = new CompletableFuture<>();
-        f.completeExceptionally(new CFException());
-        g.complete(3);
-        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
-        checkCompletedWithWrappedCFException(h);
-    }
-
-    /**
-     * thenAcceptBothAsync result completes exceptionally if action does
-     */
-    public void testThenAcceptBothAsync3() {
-        CompletableFuture<Integer> f, g;
-        CompletableFuture<Void> h;
-        FailingBiConsumer r;
-
-        f = new CompletableFuture<>();
-        g = new CompletableFuture<>();
-        h = f.thenAcceptBothAsync(g, r = new FailingBiConsumer());
-        f.complete(3);
-        checkIncomplete(h);
-        g.complete(1);
-        checkCompletedWithWrappedCFException(h);
-
-        f = new CompletableFuture<>();
-        g = new CompletableFuture<>();
-        f.complete(3);
-        g.complete(1);
-        h = f.thenAcceptBothAsync(g, r = new FailingBiConsumer());
-        checkCompletedWithWrappedCFException(h);
-    }
-
-    /**
-     * thenAcceptBothAsync result completes exceptionally if either source cancelled
-     */
-    public void testThenAcceptBothAsync4() {
-        CompletableFuture<Integer> f, g;
-        CompletableFuture<Void> h;
-        SubtractAction r;
-
-        f = new CompletableFuture<>();
-        g = new CompletableFuture<>();
-        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
-        assertTrue(f.cancel(true));
-        checkIncomplete(h);
-        g.complete(1);
-        checkCompletedWithWrappedCancellationException(h);
-
-        f = new CompletableFuture<>();
-        g = new CompletableFuture<>();
-        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
-        assertTrue(g.cancel(true));
-        checkIncomplete(h);
-        f.complete(3);
-        checkCompletedWithWrappedCancellationException(h);
-
-        f = new CompletableFuture<>();
-        g = new CompletableFuture<>();
-        f.complete(3);
-        assertTrue(g.cancel(true));
-        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
-        checkCompletedWithWrappedCancellationException(h);
-
-        f = new CompletableFuture<>();
-        g = new CompletableFuture<>();
-        assertTrue(f.cancel(true));
-        g.complete(3);
-        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
-        checkCompletedWithWrappedCancellationException(h);
-    }
-
-    /**
      * applyToEitherAsync result completes normally after normal
      * completion of sources
      */
@@ -2043,7 +2351,7 @@ public class CompletableFutureTest exten
         CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
         f.complete(one);
         checkCompletedNormally(g, null);
-        assertEquals(r.value, 2);
+        assertEquals(r.value, (Integer) 2);
 
         r = new IncAction();
         f = new CompletableFuture<>();
@@ -2051,7 +2359,7 @@ public class CompletableFutureTest exten
         f2 = new CompletableFuture<>();
         g = f.acceptEitherAsync(f2, r);
         checkCompletedNormally(g, null);
-        assertEquals(r.value, 2);
+        assertEquals(r.value, (Integer) 2);
     }
 
     /**
@@ -2368,7 +2676,7 @@ public class CompletableFutureTest exten
         CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
         f.complete(one);
         checkCompletedNormally(g, null);
-        assertEquals(r.value, 2);
+        assertEquals(r.value, (Integer) 2);
     }
 
     /**
@@ -2406,286 +2714,6 @@ public class CompletableFutureTest exten
     }
 
     /**
-     * thenCombineAsync result completes normally after normal
-     * completion of sources
-     */
-    public void testThenCombineAsyncE() {
-        CompletableFuture<Integer> f, g, h;
-        ThreadExecutor e = new ThreadExecutor();
-        int count = 0;
-
-        f = new CompletableFuture<>();
-        g = new CompletableFuture<>();
-        h = f.thenCombineAsync(g, subtract, e);
-        f.complete(3);
-        checkIncomplete(h);
-        g.complete(1);
-        checkCompletedNormally(h, 2);
-        assertEquals(++count, e.count.get());
-
-        f = new CompletableFuture<>();
-        g = new CompletableFuture<>();
-        h = f.thenCombineAsync(g, subtract, e);
-        g.complete(1);
-        checkIncomplete(h);
-        f.complete(3);
-        checkCompletedNormally(h, 2);
-        assertEquals(++count, e.count.get());
-
-        f = new CompletableFuture<>();
-        g = new CompletableFuture<>();
-        g.complete(1);
-        f.complete(3);
-        h = f.thenCombineAsync(g, subtract, e);
-        checkCompletedNormally(h, 2);
-        assertEquals(++count, e.count.get());
-    }
-
-    /**
-     * thenCombineAsync result completes exceptionally after exceptional
-     * completion of either source
-     */
-    public void testThenCombineAsync2E() {
-        CompletableFuture<Integer> f, g, h;
-        ThreadExecutor e = new ThreadExecutor();
-        int count = 0;
-
-        f = new CompletableFuture<>();
-        g = new CompletableFuture<>();
-        h = f.thenCombineAsync(g, subtract, e);
-        f.completeExceptionally(new CFException());
-        checkIncomplete(h);
-        g.complete(1);
-        checkCompletedWithWrappedCFException(h);
-
-        f = new CompletableFuture<>();
-        g = new CompletableFuture<>();
-        h = f.thenCombineAsync(g, subtract, e);
-        g.completeExceptionally(new CFException());
-        checkIncomplete(h);
-        f.complete(3);
-        checkCompletedWithWrappedCFException(h);
-
-        f = new CompletableFuture<>();
-        g = new CompletableFuture<>();
-        g.completeExceptionally(new CFException());
-        h = f.thenCombineAsync(g, subtract, e);
-        checkIncomplete(h);
-        f.complete(3);
-        checkCompletedWithWrappedCFException(h);
-
-        assertEquals(0, e.count.get());
-    }
-
-    /**
-     * thenCombineAsync result completes exceptionally if action does
-     */
-    public void testThenCombineAsync3E() {
-        CompletableFuture<Integer> f = new CompletableFuture<>();
-        CompletableFuture<Integer> f2 = new CompletableFuture<>();
-        FailingBiFunction r = new FailingBiFunction();
-        CompletableFuture<Integer> g = f.thenCombineAsync(f2, r, new ThreadExecutor());
-        f.complete(one);
-        checkIncomplete(g);
-        assertFalse(r.ran);
-        f2.complete(two);
-        checkCompletedWithWrappedCFException(g);
-        assertTrue(r.ran);
-    }
-
-    /**
-     * thenCombineAsync result completes exceptionally if either source cancelled
-     */
-    public void testThenCombineAsync4E() {
-        CompletableFuture<Integer> f, g, h;
-        ThreadExecutor e = new ThreadExecutor();
-
-        f = new CompletableFuture<>();
-        g = new CompletableFuture<>();
-        h = f.thenCombineAsync(g, subtract, e);
-        assertTrue(f.cancel(true));
-        checkIncomplete(h);
-        g.complete(1);
-        checkCompletedWithWrappedCancellationException(h);
-
-        f = new CompletableFuture<>();
-        g = new CompletableFuture<>();
-        h = f.thenCombineAsync(g, subtract, e);
-        assertTrue(g.cancel(true));
-        checkIncomplete(h);
-        f.complete(3);
-        checkCompletedWithWrappedCancellationException(h);
-
-        f = new CompletableFuture<>();
-        g = new CompletableFuture<>();
-        assertTrue(g.cancel(true));
-        h = f.thenCombineAsync(g, subtract, e);
-        checkIncomplete(h);
-        f.complete(3);
-        checkCompletedWithWrappedCancellationException(h);
-
-        f = new CompletableFuture<>();
-        g = new CompletableFuture<>();
-        assertTrue(f.cancel(true));
-        assertTrue(g.cancel(true));
-        h = f.thenCombineAsync(g, subtract, e);
-        checkCompletedWithWrappedCancellationException(h);
-
-        assertEquals(0, e.count.get());
-    }
-
-    /**
-     * thenAcceptBothAsync result completes normally after normal
-     * completion of sources
-     */
-    public void testThenAcceptBothAsyncE() {
-        CompletableFuture<Integer> f, g;
-        CompletableFuture<Void> h;
-        SubtractAction r;
-        ThreadExecutor e = new ThreadExecutor();
-
-        f = new CompletableFuture<>();
-        g = new CompletableFuture<>();
-        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
-        f.complete(3);
-        checkIncomplete(h);
-        g.complete(1);
-        checkCompletedNormally(h, null);
-        assertEquals(r.value, 2);
-
-        f = new CompletableFuture<>();
-        g = new CompletableFuture<>();
-        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
-        g.complete(1);
-        checkIncomplete(h);
-        f.complete(3);
-        checkCompletedNormally(h, null);
-        assertEquals(r.value, 2);
-
-        f = new CompletableFuture<>();
-        g = new CompletableFuture<>();
-        g.complete(1);
-        f.complete(3);
-        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
-        checkCompletedNormally(h, null);
-        assertEquals(r.value, 2);
-
-        assertEquals(3, e.count.get());
-    }
-
-    /**
-     * thenAcceptBothAsync result completes exceptionally after exceptional
-     * completion of source
-     */
-    public void testThenAcceptBothAsync2E() {
-        CompletableFuture<Integer> f, g;
-        CompletableFuture<Void> h;
-        SubtractAction r;
-        ThreadExecutor e = new ThreadExecutor();
-
-        f = new CompletableFuture<>();
-        g = new CompletableFuture<>();
-        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
-        f.completeExceptionally(new CFException());
-        checkIncomplete(h);
-        g.complete(1);
-        checkCompletedWithWrappedCFException(h);
-
-        f = new CompletableFuture<>();
-        g = new CompletableFuture<>();
-        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
-        g.completeExceptionally(new CFException());
-        checkIncomplete(h);
-        f.complete(3);
-        checkCompletedWithWrappedCFException(h);
-
-        f = new CompletableFuture<>();
-        g = new CompletableFuture<>();
-        f.complete(3);
-        g.completeExceptionally(new CFException());
-        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
-        checkCompletedWithWrappedCFException(h);
-
-        f = new CompletableFuture<>();
-        g = new CompletableFuture<>();
-        f.completeExceptionally(new CFException());
-        g.complete(3);
-        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
-        checkCompletedWithWrappedCFException(h);
-
-        assertEquals(0, e.count.get());
-    }
-
-    /**
-     * thenAcceptBothAsync result completes exceptionally if action does
-     */
-    public void testThenAcceptBothAsync3E() {
-        CompletableFuture<Integer> f, g;
-        CompletableFuture<Void> h;
-        FailingBiConsumer r;
-        ThreadExecutor e = new ThreadExecutor();
-
-        f = new CompletableFuture<>();
-        g = new CompletableFuture<>();
-        h = f.thenAcceptBothAsync(g, r = new FailingBiConsumer(), e);
-        f.complete(3);
-        checkIncomplete(h);
-        g.complete(1);
-        checkCompletedWithWrappedCFException(h);
-
-        f = new CompletableFuture<>();
-        g = new CompletableFuture<>();
-        f.complete(3);
-        g.complete(1);
-        h = f.thenAcceptBothAsync(g, r = new FailingBiConsumer(), e);
-        checkCompletedWithWrappedCFException(h);
-
-        assertEquals(2, e.count.get());
-    }
-
-    /**
-     * thenAcceptBothAsync result completes exceptionally if either source cancelled
-     */
-    public void testThenAcceptBothAsync4E() {
-        CompletableFuture<Integer> f, g;
-        CompletableFuture<Void> h;
-        SubtractAction r;
-        ThreadExecutor e = new ThreadExecutor();
-
-        f = new CompletableFuture<>();
-        g = new CompletableFuture<>();
-        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
-        assertTrue(f.cancel(true));
-        checkIncomplete(h);
-        g.complete(1);
-        checkCompletedWithWrappedCancellationException(h);
-
-        f = new CompletableFuture<>();
-        g = new CompletableFuture<>();
-        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
-        assertTrue(g.cancel(true));
-        checkIncomplete(h);
-        f.complete(3);
-        checkCompletedWithWrappedCancellationException(h);
-
-        f = new CompletableFuture<>();
-        g = new CompletableFuture<>();
-        f.complete(3);
-        assertTrue(g.cancel(true));
-        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
-        checkCompletedWithWrappedCancellationException(h);
-
-        f = new CompletableFuture<>();
-        g = new CompletableFuture<>();
-        assertTrue(f.cancel(true));
-        g.complete(3);
-        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
-        checkCompletedWithWrappedCancellationException(h);
-
-        assertEquals(0, e.count.get());
-    }
-
-    /**
      * applyToEitherAsync result completes normally after normal
      * completion of sources
      */
@@ -2762,7 +2790,7 @@ public class CompletableFutureTest exten
         CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
         f.complete(one);
         checkCompletedNormally(g, null);
-        assertEquals(r.value, 2);
+        assertEquals(r.value, (Integer) 2);
 
         r = new IncAction();
         f = new CompletableFuture<>();
@@ -2770,7 +2798,7 @@ public class CompletableFutureTest exten
         f2 = new CompletableFuture<>();
         g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
         checkCompletedNormally(g, null);
-        assertEquals(r.value, 2);
+        assertEquals(r.value, (Integer) 2);
     }
 
     /**