--- jsr166/src/test/tck/CompletableFutureTest.java	2014/06/06 21:19:22	1.74
+++ jsr166/src/test/tck/CompletableFutureTest.java	2014/06/16 21:34:49	1.89
@@ -227,11 +227,14 @@ public class CompletableFutureTest exten
      * isCancelled, join, get, and getNow
      */
     public void testComplete() {
+        for (Integer v1 : new Integer[] { 1, null })
+    {
         CompletableFuture<Integer> f = new CompletableFuture<>();
         checkIncomplete(f);
-        f.complete(one);
-        checkCompletedNormally(f, one);
-    }
+        assertTrue(f.complete(v1));
+        assertFalse(f.complete(v1));
+        checkCompletedNormally(f, v1);
+    }}
 
     /**
      * completeExceptionally completes exceptionally, as indicated by
@@ -250,11 +253,14 @@ public class CompletableFutureTest exten
      * methods isDone, isCancelled, join, get, and getNow
      */
     public void testCancel() {
+        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
+    {
         CompletableFuture<Integer> f = new CompletableFuture<>();
         checkIncomplete(f);
         assertTrue(f.cancel(true));
+        assertTrue(f.cancel(true));
         checkCancelled(f);
-    }
+    }}
 
     /**
      * obtrudeValue forces completion with given value
@@ -262,7 +268,7 @@ public class CompletableFutureTest exten
     public void testObtrudeValue() {
         CompletableFuture<Integer> f = new CompletableFuture<>();
         checkIncomplete(f);
-        f.complete(one);
+        assertTrue(f.complete(one));
         checkCompletedNormally(f, one);
         f.obtrudeValue(three);
         checkCompletedNormally(f, three);
@@ -289,7 +295,7 @@ public class CompletableFutureTest exten
         CompletableFuture<Integer> f;
 
         f = new CompletableFuture<>();
-        f.complete(v1);
+        assertTrue(f.complete(v1));
         for (int i = 0; i < 2; i++) {
             f.obtrudeException(ex = new CFException());
             checkCompletedExceptionally(f, ex);
@@ -309,7 +315,7 @@ public class CompletableFutureTest exten
         checkCompletedExceptionally(f, ex);
         f.completeExceptionally(new CFException());
         checkCompletedExceptionally(f, ex);
-        f.complete(v1);
+        assertFalse(f.complete(v1));
         checkCompletedExceptionally(f, ex);
     }}
 
@@ -317,18 +323,24 @@ public class CompletableFutureTest exten
      * getNumberOfDependents returns number of dependent tasks
      */
     public void testGetNumberOfDependents() {
+        for (ExecutionMode m : ExecutionMode.values())
+        for (Integer v1 : new Integer[] { 1, null })
+    {
         CompletableFuture<Integer> f = new CompletableFuture<>();
         assertEquals(0, f.getNumberOfDependents());
-        CompletableFuture g = f.thenRun(new Noop(ExecutionMode.DEFAULT));
+        final CompletableFuture<Void> g = m.thenRun(f, new Noop(m));
         assertEquals(1, f.getNumberOfDependents());
         assertEquals(0, g.getNumberOfDependents());
-        CompletableFuture h = f.thenRun(new Noop(ExecutionMode.DEFAULT));
+        final CompletableFuture<Void> h = m.thenRun(f, new Noop(m));
         assertEquals(2, f.getNumberOfDependents());
-        f.complete(1);
+        assertEquals(0, h.getNumberOfDependents());
+        assertTrue(f.complete(v1));
         checkCompletedNormally(g, null);
+        checkCompletedNormally(h, null);
         assertEquals(0, f.getNumberOfDependents());
         assertEquals(0, g.getNumberOfDependents());
-    }
+        assertEquals(0, h.getNumberOfDependents());
+    }}
 
     /**
      * toString indicates current completion state
@@ -339,20 +351,18 @@ public class CompletableFutureTest exten
         f = new CompletableFuture<String>();
         assertTrue(f.toString().contains("[Not completed]"));
 
-        f.complete("foo");
+        assertTrue(f.complete("foo"));
         assertTrue(f.toString().contains("[Completed normally]"));
 
         f = new CompletableFuture<String>();
-        f.completeExceptionally(new IndexOutOfBoundsException());
+        assertTrue(f.completeExceptionally(new IndexOutOfBoundsException()));
         assertTrue(f.toString().contains("[Completed exceptionally]"));
 
-        f = new CompletableFuture<String>();
-        f.cancel(true);
-        assertTrue(f.toString().contains("[Completed exceptionally]"));
-
-        f = new CompletableFuture<String>();
-        f.cancel(false);
-        assertTrue(f.toString().contains("[Completed exceptionally]"));
+        for (boolean mayInterruptIfRunning : new boolean[] { true, false }) {
+            f = new CompletableFuture<String>();
+            assertTrue(f.cancel(mayInterruptIfRunning));
+            assertTrue(f.toString().contains("[Completed exceptionally]"));
+        }
     }
 
     /**
@@ -529,7 +539,7 @@ public class CompletableFutureTest exten
             invoked();
             value = x;
             CompletableFuture<Integer> f = new CompletableFuture<>();
-            f.complete(inc(x));
+            assertTrue(f.complete(inc(x)));
             return f;
         }
     }
@@ -837,21 +847,20 @@ public class CompletableFutureTest exten
     {
         final AtomicInteger a = new AtomicInteger(0);
         final CompletableFuture<Integer> f = new CompletableFuture<>();
-        if (!createIncomplete) f.complete(v1);
+        if (!createIncomplete) assertTrue(f.complete(v1));
         final CompletableFuture<Integer> g = f.exceptionally
             ((Throwable t) -> {
                 // Should not be called
                 a.getAndIncrement();
                 throw new AssertionError();
             });
-        if (createIncomplete) f.complete(v1);
+        if (createIncomplete) assertTrue(f.complete(v1));
 
         checkCompletedNormally(g, v1);
         checkCompletedNormally(f, v1);
         assertEquals(0, a.get());
     }}
 
-
     /**
      * exceptionally action completes with function value on source
      * exception
@@ -900,6 +909,149 @@ public class CompletableFutureTest exten
     }}
 
     /**
+     * whenComplete action executes on normal completion, propagating
+     * source result.
+     */
+    public void testWhenComplete_normalCompletion1() {
+        for (ExecutionMode m : ExecutionMode.values())
+        for (boolean createIncomplete : new boolean[] { true, false })
+        for (Integer v1 : new Integer[] { 1, null })
+    {
+        final AtomicInteger a = new AtomicInteger(0);
+        final CompletableFuture<Integer> f = new CompletableFuture<>();
+        if (!createIncomplete) assertTrue(f.complete(v1));
+        final CompletableFuture<Integer> g = m.whenComplete
+            (f,
+             (Integer x, Throwable t) -> {
+                m.checkExecutionMode();
+                threadAssertSame(x, v1);
+                threadAssertNull(t);
+                a.getAndIncrement();
+            });
+        if (createIncomplete) assertTrue(f.complete(v1));
+
+        checkCompletedNormally(g, v1);
+        checkCompletedNormally(f, v1);
+        assertEquals(1, a.get());
+    }}
+
+    /**
+     * whenComplete action executes on exceptional completion, propagating
+     * source result.
+     */
+    public void testWhenComplete_exceptionalCompletion() {
+        for (ExecutionMode m : ExecutionMode.values())
+        for (boolean createIncomplete : new boolean[] { true, false })
+        for (Integer v1 : new Integer[] { 1, null })
+    {
+        final AtomicInteger a = new AtomicInteger(0);
+        final CFException ex = new CFException();
+        final CompletableFuture<Integer> f = new CompletableFuture<>();
+        if (!createIncomplete) f.completeExceptionally(ex);
+        final CompletableFuture<Integer> g = m.whenComplete
+            (f,
+             (Integer x, Throwable t) -> {
+                m.checkExecutionMode();
+                threadAssertNull(x);
+                threadAssertSame(t, ex);
+                a.getAndIncrement();
+            });
+        if (createIncomplete) f.completeExceptionally(ex);
+
+        checkCompletedWithWrappedException(g, ex);
+        checkCompletedExceptionally(f, ex);
+        assertEquals(1, a.get());
+    }}
+
+    /**
+     * whenComplete action executes on cancelled source, propagating
+     * CancellationException.
+     */
+    public void testWhenComplete_sourceCancelled() {
+        for (ExecutionMode m : ExecutionMode.values())
+        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
+        for (boolean createIncomplete : new boolean[] { true, false })
+    {
+        final AtomicInteger a = new AtomicInteger(0);
+        final CompletableFuture<Integer> f = new CompletableFuture<>();
+        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
+        final CompletableFuture<Integer> g = m.whenComplete
+            (f,
+             (Integer x, Throwable t) -> {
+                m.checkExecutionMode();
+                threadAssertNull(x);
+                threadAssertTrue(t instanceof CancellationException);
+                a.getAndIncrement();
+            });
+        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
+
+        checkCompletedWithWrappedCancellationException(g);
+        checkCancelled(f);
+        assertEquals(1, a.get());
+    }}
+
+    /**
+     * If a whenComplete action throws an exception when triggered by
+     * a normal completion, it completes exceptionally
+     */
+    public void testWhenComplete_actionFailed() {
+        for (boolean createIncomplete : new boolean[] { true, false })
+        for (ExecutionMode m : ExecutionMode.values())
+        for (Integer v1 : new Integer[] { 1, null })
+    {
+        final AtomicInteger a = new AtomicInteger(0);
+        final CFException ex = new CFException();
+        final CompletableFuture<Integer> f = new CompletableFuture<>();
+        if (!createIncomplete) assertTrue(f.complete(v1));
+        final CompletableFuture<Integer> g = m.whenComplete
+            (f,
+             (Integer x, Throwable t) -> {
+                m.checkExecutionMode();
+                threadAssertSame(x, v1);
+                threadAssertNull(t);
+                a.getAndIncrement();
+                throw ex;
+            });
+        if (createIncomplete) assertTrue(f.complete(v1));
+
+        checkCompletedWithWrappedException(g, ex);
+        checkCompletedNormally(f, v1);
+        assertEquals(1, a.get());
+    }}
+
+    /**
+     * If a whenComplete action throws an exception when triggered by
+     * a source completion that also throws an exception, the source
+     * exception takes precedence.
+     */
+    public void testWhenComplete_actionFailedSourceFailed() {
+        for (boolean createIncomplete : new boolean[] { true, false })
+        for (ExecutionMode m : ExecutionMode.values())
+        for (Integer v1 : new Integer[] { 1, null })
+    {
+        final AtomicInteger a = new AtomicInteger(0);
+        final CFException ex1 = new CFException();
+        final CFException ex2 = new CFException();
+        final CompletableFuture<Integer> f = new CompletableFuture<>();
+
+        if (!createIncomplete) f.completeExceptionally(ex1);
+        final CompletableFuture<Integer> g = m.whenComplete
+            (f,
+             (Integer x, Throwable t) -> {
+                m.checkExecutionMode();
+                threadAssertSame(t, ex1);
+                threadAssertNull(x);
+                a.getAndIncrement();
+                throw ex2;
+            });
+        if (createIncomplete) f.completeExceptionally(ex1);
+
+        checkCompletedWithWrappedException(g, ex1);
+        checkCompletedExceptionally(f, ex1);
+        assertEquals(1, a.get());
+    }}
+
+    /**
      * handle action completes normally with function value on normal
      * completion of source
      */
@@ -910,7 +1062,7 @@ public class CompletableFutureTest exten
     {
         final CompletableFuture<Integer> f = new CompletableFuture<>();
         final AtomicInteger a = new AtomicInteger(0);
-        if (!createIncomplete) f.complete(v1);
+        if (!createIncomplete) assertTrue(f.complete(v1));
         final CompletableFuture<Integer> g = m.handle
             (f,
              (Integer x, Throwable t) -> {
@@ -920,7 +1072,7 @@ public class CompletableFutureTest exten
                 a.getAndIncrement();
                 return inc(v1);
             });
-        if (createIncomplete) f.complete(v1);
+        if (createIncomplete) assertTrue(f.complete(v1));
 
         checkCompletedNormally(g, inc(v1));
         checkCompletedNormally(f, v1);
@@ -1021,7 +1173,7 @@ public class CompletableFutureTest exten
         final CompletableFuture<Integer> f = new CompletableFuture<>();
         final AtomicInteger a = new AtomicInteger(0);
         final CFException ex = new CFException();
-        if (!createIncomplete) f.complete(v1);
+        if (!createIncomplete) assertTrue(f.complete(v1));
         final CompletableFuture<Integer> g = m.handle
             (f,
              (Integer x, Throwable t) -> {
@@ -1031,7 +1183,7 @@ public class CompletableFutureTest exten
                 a.getAndIncrement();
                 throw ex;
             });
-        if (createIncomplete) f.complete(v1);
+        if (createIncomplete) assertTrue(f.complete(v1));
 
         checkCompletedWithWrappedException(g, ex);
         checkCompletedNormally(f, v1);
@@ -1117,11 +1269,11 @@ public class CompletableFutureTest exten
     {
         final CompletableFuture<Integer> f = new CompletableFuture<>();
         final Noop r = new Noop(m);
-        if (!createIncomplete) f.complete(v1);
+        if (!createIncomplete) assertTrue(f.complete(v1));
         final CompletableFuture<Void> g = m.thenRun(f, r);
         if (createIncomplete) {
             checkIncomplete(g);
-            f.complete(v1);
+            assertTrue(f.complete(v1));
         }
 
         checkCompletedNormally(g, null);
@@ -1184,11 +1336,11 @@ public class CompletableFutureTest exten
     {
         final CompletableFuture<Integer> f = new CompletableFuture<>();
         final FailingRunnable r = new FailingRunnable(m);
-        if (!createIncomplete) f.complete(v1);
+        if (!createIncomplete) assertTrue(f.complete(v1));
         final CompletableFuture<Void> g = m.thenRun(f, r);
         if (createIncomplete) {
             checkIncomplete(g);
-            f.complete(v1);
+            assertTrue(f.complete(v1));
         }
 
         checkCompletedWithWrappedCFException(g);
@@ -1205,11 +1357,11 @@ public class CompletableFutureTest exten
     {
         final CompletableFuture<Integer> f = new CompletableFuture<>();
         final IncFunction r = new IncFunction(m);
-        if (!createIncomplete) f.complete(v1);
+        if (!createIncomplete) assertTrue(f.complete(v1));
         final CompletableFuture<Integer> g = m.thenApply(f, r);
         if (createIncomplete) {
             checkIncomplete(g);
-            f.complete(v1);
+            assertTrue(f.complete(v1));
         }
 
         checkCompletedNormally(g, inc(v1));
@@ -1272,11 +1424,11 @@ public class CompletableFutureTest exten
     {
         final CompletableFuture<Integer> f = new CompletableFuture<>();
         final FailingFunction r = new FailingFunction(m);
-        if (!createIncomplete) f.complete(v1);
+        if (!createIncomplete) assertTrue(f.complete(v1));
         final CompletableFuture<Integer> g = m.thenApply(f, r);
         if (createIncomplete) {
             checkIncomplete(g);
-            f.complete(v1);
+            assertTrue(f.complete(v1));
         }
 
         checkCompletedWithWrappedCFException(g);
@@ -1293,11 +1445,11 @@ public class CompletableFutureTest exten
     {
         final CompletableFuture<Integer> f = new CompletableFuture<>();
         final NoopConsumer r = new NoopConsumer(m);
-        if (!createIncomplete) f.complete(v1);
+        if (!createIncomplete) assertTrue(f.complete(v1));
         final CompletableFuture<Void> g = m.thenAccept(f, r);
         if (createIncomplete) {
             checkIncomplete(g);
-            f.complete(v1);
+            assertTrue(f.complete(v1));
         }
 
         checkCompletedNormally(g, null);
@@ -1377,88 +1529,126 @@ public class CompletableFutureTest exten
      */
     public void testThenCombine_normalCompletion() {
         for (ExecutionMode m : ExecutionMode.values())
-        for (boolean createIncomplete : new boolean[] { true, false })
         for (boolean fFirst : new boolean[] { true, false })
         for (Integer v1 : new Integer[] { 1, null })
         for (Integer v2 : new Integer[] { 2, null })
     {
         final CompletableFuture<Integer> f = new CompletableFuture<>();
         final CompletableFuture<Integer> g = new CompletableFuture<>();
-        final SubtractFunction r = new SubtractFunction(m);
-
-        if (fFirst) f.complete(v1); else g.complete(v2);
-        if (!createIncomplete)
-            if (!fFirst) f.complete(v1); else g.complete(v2);
-        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
-        if (createIncomplete) {
-            checkIncomplete(h);
-            r.assertNotInvoked();
-            if (!fFirst) f.complete(v1); else g.complete(v2);
-        }
-
-        checkCompletedNormally(h, subtract(v1, v2));
+        final SubtractFunction r1 = new SubtractFunction(m);
+        final SubtractFunction r2 = new SubtractFunction(m);
+        final SubtractFunction r3 = new SubtractFunction(m);
+
+        final CompletableFuture<Integer> fst =  fFirst ? f : g;
+        final CompletableFuture<Integer> snd = !fFirst ? f : g;
+        final Integer w1 =  fFirst ? v1 : v2;
+        final Integer w2 = !fFirst ? v1 : v2;
+
+        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
+        assertTrue(fst.complete(w1));
+        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
+        checkIncomplete(h1);
+        checkIncomplete(h2);
+        r1.assertNotInvoked();
+        r2.assertNotInvoked();
+        assertTrue(snd.complete(w2));
+        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
+
+        checkCompletedNormally(h1, subtract(v1, v2));
+        checkCompletedNormally(h2, subtract(v1, v2));
+        checkCompletedNormally(h3, subtract(v1, v2));
+        r1.assertValue(subtract(v1, v2));
+        r2.assertValue(subtract(v1, v2));
+        r3.assertValue(subtract(v1, v2));
         checkCompletedNormally(f, v1);
         checkCompletedNormally(g, v2);
-        r.assertValue(subtract(v1, v2));
     }}
 
     /**
      * thenCombine result completes exceptionally after exceptional
      * completion of either source
      */
-    public void testThenCombine_exceptionalCompletion() {
+    public void testThenCombine_exceptionalCompletion() throws Throwable {
         for (ExecutionMode m : ExecutionMode.values())
-        for (boolean createIncomplete : new boolean[] { true, false })
         for (boolean fFirst : new boolean[] { true, false })
+        for (boolean failFirst : new boolean[] { true, false })
         for (Integer v1 : new Integer[] { 1, null })
     {
         final CompletableFuture<Integer> f = new CompletableFuture<>();
         final CompletableFuture<Integer> g = new CompletableFuture<>();
         final CFException ex = new CFException();
-        final SubtractFunction r = new SubtractFunction(m);
-
-        (fFirst ? f : g).complete(v1);
-        if (!createIncomplete)
-            (!fFirst ? f : g).completeExceptionally(ex);
-        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
-        if (createIncomplete) {
-            checkIncomplete(h);
-            (!fFirst ? f : g).completeExceptionally(ex);
-        }
+        final SubtractFunction r1 = new SubtractFunction(m);
+        final SubtractFunction r2 = new SubtractFunction(m);
+        final SubtractFunction r3 = new SubtractFunction(m);
+
+        final CompletableFuture<Integer> fst =  fFirst ? f : g;
+        final CompletableFuture<Integer> snd = !fFirst ? f : g;
+        final Callable<Boolean> complete1 = failFirst ?
+            () -> fst.completeExceptionally(ex) :
+            () -> fst.complete(v1);
+        final Callable<Boolean> complete2 = failFirst ?
+            () -> snd.complete(v1) :
+            () -> snd.completeExceptionally(ex);
+
+        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
+        assertTrue(complete1.call());
+        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
+        checkIncomplete(h1);
+        checkIncomplete(h2);
+        assertTrue(complete2.call());
+        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
 
-        checkCompletedWithWrappedException(h, ex);
-        r.assertNotInvoked();
-        checkCompletedNormally(fFirst ? f : g, v1);
-        checkCompletedExceptionally(!fFirst ? f : g, ex);
+        checkCompletedWithWrappedException(h1, ex);
+        checkCompletedWithWrappedException(h2, ex);
+        checkCompletedWithWrappedException(h3, ex);
+        r1.assertNotInvoked();
+        r2.assertNotInvoked();
+        r3.assertNotInvoked();
+        checkCompletedNormally(failFirst ? snd : fst, v1);
+        checkCompletedExceptionally(failFirst ? fst : snd, ex);
     }}
 
     /**
      * thenCombine result completes exceptionally if either source cancelled
      */
-    public void testThenCombine_sourceCancelled() {
+    public void testThenCombine_sourceCancelled() throws Throwable {
         for (ExecutionMode m : ExecutionMode.values())
         for (boolean mayInterruptIfRunning : new boolean[] { true, false })
-        for (boolean createIncomplete : new boolean[] { true, false })
         for (boolean fFirst : new boolean[] { true, false })
+        for (boolean failFirst : 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(m);
+        final SubtractFunction r1 = new SubtractFunction(m);
+        final SubtractFunction r2 = new SubtractFunction(m);
+        final SubtractFunction r3 = new SubtractFunction(m);
 
-        (fFirst ? f : g).complete(v1);
-        if (!createIncomplete)
-            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
-        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
-        if (createIncomplete) {
-            checkIncomplete(h);
-            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
-        }
+        final CompletableFuture<Integer> fst =  fFirst ? f : g;
+        final CompletableFuture<Integer> snd = !fFirst ? f : g;
+        final Callable<Boolean> complete1 = failFirst ?
+            () -> fst.cancel(mayInterruptIfRunning) :
+            () -> fst.complete(v1);
+        final Callable<Boolean> complete2 = failFirst ?
+            () -> snd.complete(v1) :
+            () -> snd.cancel(mayInterruptIfRunning);
 
-        checkCompletedWithWrappedCancellationException(h);
-        checkCancelled(!fFirst ? f : g);
-        r.assertNotInvoked();
-        checkCompletedNormally(fFirst ? f : g, v1);
+        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
+        assertTrue(complete1.call());
+        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
+        checkIncomplete(h1);
+        checkIncomplete(h2);
+        assertTrue(complete2.call());
+        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
+
+        checkCompletedWithWrappedCancellationException(h1);
+        checkCompletedWithWrappedCancellationException(h2);
+        checkCompletedWithWrappedCancellationException(h3);
+        r1.assertNotInvoked();
+        r2.assertNotInvoked();
+        r3.assertNotInvoked();
+        checkCompletedNormally(failFirst ? snd : fst, v1);
+        checkCancelled(failFirst ? fst : snd);
     }}
 
     /**
@@ -1472,18 +1662,27 @@ public class CompletableFutureTest exten
     {
         final CompletableFuture<Integer> f = new CompletableFuture<>();
         final CompletableFuture<Integer> g = new CompletableFuture<>();
-        final FailingBiFunction r = new FailingBiFunction(m);
-        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
+        final FailingBiFunction r1 = new FailingBiFunction(m);
+        final FailingBiFunction r2 = new FailingBiFunction(m);
+        final FailingBiFunction r3 = new FailingBiFunction(m);
+
+        final CompletableFuture<Integer> fst =  fFirst ? f : g;
+        final CompletableFuture<Integer> snd = !fFirst ? f : g;
+        final Integer w1 =  fFirst ? v1 : v2;
+        final Integer w2 = !fFirst ? v1 : v2;
+
+        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
+        assertTrue(fst.complete(w1));
+        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
+        assertTrue(snd.complete(w2));
+        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
 
-        if (fFirst) {
-            f.complete(v1);
-            g.complete(v2);
-        } else {
-            g.complete(v2);
-            f.complete(v1);
-        }
-
-        checkCompletedWithWrappedCFException(h);
+        checkCompletedWithWrappedCFException(h1);
+        checkCompletedWithWrappedCFException(h2);
+        checkCompletedWithWrappedCFException(h3);
+        r1.assertInvoked();
+        r2.assertInvoked();
+        r3.assertInvoked();
         checkCompletedNormally(f, v1);
         checkCompletedNormally(g, v2);
     }}
@@ -1494,27 +1693,37 @@ public class CompletableFutureTest exten
      */
     public void testThenAcceptBoth_normalCompletion() {
         for (ExecutionMode m : ExecutionMode.values())
-        for (boolean createIncomplete : new boolean[] { true, false })
         for (boolean fFirst : new boolean[] { true, false })
         for (Integer v1 : new Integer[] { 1, null })
         for (Integer v2 : new Integer[] { 2, null })
     {
         final CompletableFuture<Integer> f = new CompletableFuture<>();
         final CompletableFuture<Integer> g = new CompletableFuture<>();
-        final SubtractAction r = new SubtractAction(m);
-
-        if (fFirst) f.complete(v1); else g.complete(v2);
-        if (!createIncomplete)
-            if (!fFirst) f.complete(v1); else g.complete(v2);
-        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
-        if (createIncomplete) {
-            checkIncomplete(h);
-            r.assertNotInvoked();
-            if (!fFirst) f.complete(v1); else g.complete(v2);
-        }
+        final SubtractAction r1 = new SubtractAction(m);
+        final SubtractAction r2 = new SubtractAction(m);
+        final SubtractAction r3 = new SubtractAction(m);
+
+        final CompletableFuture<Integer> fst =  fFirst ? f : g;
+        final CompletableFuture<Integer> snd = !fFirst ? f : g;
+        final Integer w1 =  fFirst ? v1 : v2;
+        final Integer w2 = !fFirst ? v1 : v2;
+
+        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
+        assertTrue(fst.complete(w1));
+        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
+        checkIncomplete(h1);
+        checkIncomplete(h2);
+        r1.assertNotInvoked();
+        r2.assertNotInvoked();
+        assertTrue(snd.complete(w2));
+        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
 
-        checkCompletedNormally(h, null);
-        r.assertValue(subtract(v1, v2));
+        checkCompletedNormally(h1, null);
+        checkCompletedNormally(h2, null);
+        checkCompletedNormally(h3, null);
+        r1.assertValue(subtract(v1, v2));
+        r2.assertValue(subtract(v1, v2));
+        r3.assertValue(subtract(v1, v2));
         checkCompletedNormally(f, v1);
         checkCompletedNormally(g, v2);
     }}
@@ -1523,59 +1732,87 @@ public class CompletableFutureTest exten
      * thenAcceptBoth result completes exceptionally after exceptional
      * completion of either source
      */
-    public void testThenAcceptBoth_exceptionalCompletion() {
+    public void testThenAcceptBoth_exceptionalCompletion() throws Throwable {
         for (ExecutionMode m : ExecutionMode.values())
-        for (boolean createIncomplete : new boolean[] { true, false })
         for (boolean fFirst : new boolean[] { true, false })
+        for (boolean failFirst : new boolean[] { true, false })
         for (Integer v1 : new Integer[] { 1, null })
     {
         final CompletableFuture<Integer> f = new CompletableFuture<>();
         final CompletableFuture<Integer> g = new CompletableFuture<>();
         final CFException ex = new CFException();
-        final SubtractAction r = new SubtractAction(m);
-
-        (fFirst ? f : g).complete(v1);
-        if (!createIncomplete)
-            (!fFirst ? f : g).completeExceptionally(ex);
-        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
-        if (createIncomplete) {
-            checkIncomplete(h);
-            (!fFirst ? f : g).completeExceptionally(ex);
-        }
+        final SubtractAction r1 = new SubtractAction(m);
+        final SubtractAction r2 = new SubtractAction(m);
+        final SubtractAction r3 = new SubtractAction(m);
+
+        final CompletableFuture<Integer> fst =  fFirst ? f : g;
+        final CompletableFuture<Integer> snd = !fFirst ? f : g;
+        final Callable<Boolean> complete1 = failFirst ?
+            () -> fst.completeExceptionally(ex) :
+            () -> fst.complete(v1);
+        final Callable<Boolean> complete2 = failFirst ?
+            () -> snd.complete(v1) :
+            () -> snd.completeExceptionally(ex);
+
+        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
+        assertTrue(complete1.call());
+        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
+        checkIncomplete(h1);
+        checkIncomplete(h2);
+        assertTrue(complete2.call());
+        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
 
-        checkCompletedWithWrappedException(h, ex);
-        r.assertNotInvoked();
-        checkCompletedNormally(fFirst ? f : g, v1);
-        checkCompletedExceptionally(!fFirst ? f : g, ex);
+        checkCompletedWithWrappedException(h1, ex);
+        checkCompletedWithWrappedException(h2, ex);
+        checkCompletedWithWrappedException(h3, ex);
+        r1.assertNotInvoked();
+        r2.assertNotInvoked();
+        r3.assertNotInvoked();
+        checkCompletedNormally(failFirst ? snd : fst, v1);
+        checkCompletedExceptionally(failFirst ? fst : snd, ex);
     }}
 
     /**
      * thenAcceptBoth result completes exceptionally if either source cancelled
      */
-    public void testThenAcceptBoth_sourceCancelled() {
+    public void testThenAcceptBoth_sourceCancelled() throws Throwable {
         for (ExecutionMode m : ExecutionMode.values())
         for (boolean mayInterruptIfRunning : new boolean[] { true, false })
-        for (boolean createIncomplete : new boolean[] { true, false })
         for (boolean fFirst : new boolean[] { true, false })
+        for (boolean failFirst : 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(m);
+        final SubtractAction r1 = new SubtractAction(m);
+        final SubtractAction r2 = new SubtractAction(m);
+        final SubtractAction r3 = new SubtractAction(m);
 
-        (fFirst ? f : g).complete(v1);
-        if (!createIncomplete)
-            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
-        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
-        if (createIncomplete) {
-            checkIncomplete(h);
-            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
-        }
+        final CompletableFuture<Integer> fst =  fFirst ? f : g;
+        final CompletableFuture<Integer> snd = !fFirst ? f : g;
+        final Callable<Boolean> complete1 = failFirst ?
+            () -> fst.cancel(mayInterruptIfRunning) :
+            () -> fst.complete(v1);
+        final Callable<Boolean> complete2 = failFirst ?
+            () -> snd.complete(v1) :
+            () -> snd.cancel(mayInterruptIfRunning);
 
-        checkCompletedWithWrappedCancellationException(h);
-        checkCancelled(!fFirst ? f : g);
-        r.assertNotInvoked();
-        checkCompletedNormally(fFirst ? f : g, v1);
+        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
+        assertTrue(complete1.call());
+        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
+        checkIncomplete(h1);
+        checkIncomplete(h2);
+        assertTrue(complete2.call());
+        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
+
+        checkCompletedWithWrappedCancellationException(h1);
+        checkCompletedWithWrappedCancellationException(h2);
+        checkCompletedWithWrappedCancellationException(h3);
+        r1.assertNotInvoked();
+        r2.assertNotInvoked();
+        r3.assertNotInvoked();
+        checkCompletedNormally(failFirst ? snd : fst, v1);
+        checkCancelled(failFirst ? fst : snd);
     }}
 
     /**
@@ -1589,18 +1826,27 @@ public class CompletableFutureTest exten
     {
         final CompletableFuture<Integer> f = new CompletableFuture<>();
         final CompletableFuture<Integer> g = new CompletableFuture<>();
-        final FailingBiConsumer r = new FailingBiConsumer(m);
-        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
-
-        if (fFirst) {
-            f.complete(v1);
-            g.complete(v2);
-        } else {
-            g.complete(v2);
-            f.complete(v1);
-        }
+        final FailingBiConsumer r1 = new FailingBiConsumer(m);
+        final FailingBiConsumer r2 = new FailingBiConsumer(m);
+        final FailingBiConsumer r3 = new FailingBiConsumer(m);
+
+        final CompletableFuture<Integer> fst =  fFirst ? f : g;
+        final CompletableFuture<Integer> snd = !fFirst ? f : g;
+        final Integer w1 =  fFirst ? v1 : v2;
+        final Integer w2 = !fFirst ? v1 : v2;
+
+        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
+        assertTrue(fst.complete(w1));
+        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
+        assertTrue(snd.complete(w2));
+        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
 
-        checkCompletedWithWrappedCFException(h);
+        checkCompletedWithWrappedCFException(h1);
+        checkCompletedWithWrappedCFException(h2);
+        checkCompletedWithWrappedCFException(h3);
+        r1.assertInvoked();
+        r2.assertInvoked();
+        r3.assertInvoked();
         checkCompletedNormally(f, v1);
         checkCompletedNormally(g, v2);
     }}
@@ -1611,27 +1857,37 @@ public class CompletableFutureTest exten
      */
     public void testRunAfterBoth_normalCompletion() {
         for (ExecutionMode m : ExecutionMode.values())
-        for (boolean createIncomplete : new boolean[] { true, false })
         for (boolean fFirst : new boolean[] { true, false })
         for (Integer v1 : new Integer[] { 1, null })
         for (Integer v2 : new Integer[] { 2, null })
     {
         final CompletableFuture<Integer> f = new CompletableFuture<>();
         final CompletableFuture<Integer> g = new CompletableFuture<>();
-        final Noop r = new Noop(m);
-
-        if (fFirst) f.complete(v1); else g.complete(v2);
-        if (!createIncomplete)
-            if (!fFirst) f.complete(v1); else g.complete(v2);
-        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
-        if (createIncomplete) {
-            checkIncomplete(h);
-            r.assertNotInvoked();
-            if (!fFirst) f.complete(v1); else g.complete(v2);
-        }
+        final Noop r1 = new Noop(m);
+        final Noop r2 = new Noop(m);
+        final Noop r3 = new Noop(m);
+
+        final CompletableFuture<Integer> fst =  fFirst ? f : g;
+        final CompletableFuture<Integer> snd = !fFirst ? f : g;
+        final Integer w1 =  fFirst ? v1 : v2;
+        final Integer w2 = !fFirst ? v1 : v2;
+
+        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
+        assertTrue(fst.complete(w1));
+        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
+        checkIncomplete(h1);
+        checkIncomplete(h2);
+        r1.assertNotInvoked();
+        r2.assertNotInvoked();
+        assertTrue(snd.complete(w2));
+        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
 
-        checkCompletedNormally(h, null);
-        r.assertInvoked();
+        checkCompletedNormally(h1, null);
+        checkCompletedNormally(h2, null);
+        checkCompletedNormally(h3, null);
+        r1.assertInvoked();
+        r2.assertInvoked();
+        r3.assertInvoked();
         checkCompletedNormally(f, v1);
         checkCompletedNormally(g, v2);
     }}
@@ -1640,60 +1896,87 @@ public class CompletableFutureTest exten
      * runAfterBoth result completes exceptionally after exceptional
      * completion of either source
      */
-    public void testRunAfterBoth_exceptionalCompletion() {
+    public void testRunAfterBoth_exceptionalCompletion() throws Throwable {
         for (ExecutionMode m : ExecutionMode.values())
-        for (boolean createIncomplete : new boolean[] { true, false })
         for (boolean fFirst : new boolean[] { true, false })
+        for (boolean failFirst : new boolean[] { true, false })
         for (Integer v1 : new Integer[] { 1, null })
     {
         final CompletableFuture<Integer> f = new CompletableFuture<>();
         final CompletableFuture<Integer> g = new CompletableFuture<>();
         final CFException ex = new CFException();
-        final Noop r = new Noop(m);
-
-        (fFirst ? f : g).complete(v1);
-        if (!createIncomplete)
-            (!fFirst ? f : g).completeExceptionally(ex);
-        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
-        if (createIncomplete) {
-            checkIncomplete(h);
-            (!fFirst ? f : g).completeExceptionally(ex);
-        }
+        final Noop r1 = new Noop(m);
+        final Noop r2 = new Noop(m);
+        final Noop r3 = new Noop(m);
+
+        final CompletableFuture<Integer> fst =  fFirst ? f : g;
+        final CompletableFuture<Integer> snd = !fFirst ? f : g;
+        final Callable<Boolean> complete1 = failFirst ?
+            () -> fst.completeExceptionally(ex) :
+            () -> fst.complete(v1);
+        final Callable<Boolean> complete2 = failFirst ?
+            () -> snd.complete(v1) :
+            () -> snd.completeExceptionally(ex);
+
+        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
+        assertTrue(complete1.call());
+        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
+        checkIncomplete(h1);
+        checkIncomplete(h2);
+        assertTrue(complete2.call());
+        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
 
-        checkCompletedWithWrappedException(h, ex);
-        r.assertNotInvoked();
-        checkCompletedNormally(fFirst ? f : g, v1);
-        checkCompletedExceptionally(!fFirst ? f : g, ex);
+        checkCompletedWithWrappedException(h1, ex);
+        checkCompletedWithWrappedException(h2, ex);
+        checkCompletedWithWrappedException(h3, ex);
+        r1.assertNotInvoked();
+        r2.assertNotInvoked();
+        r3.assertNotInvoked();
+        checkCompletedNormally(failFirst ? snd : fst, v1);
+        checkCompletedExceptionally(failFirst ? fst : snd, ex);
     }}
 
     /**
      * runAfterBoth result completes exceptionally if either source cancelled
      */
-    public void testRunAfterBoth_sourceCancelled() {
+    public void testRunAfterBoth_sourceCancelled() throws Throwable {
         for (ExecutionMode m : ExecutionMode.values())
         for (boolean mayInterruptIfRunning : new boolean[] { true, false })
-        for (boolean createIncomplete : new boolean[] { true, false })
         for (boolean fFirst : new boolean[] { true, false })
+        for (boolean failFirst : 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(m);
+        final Noop r1 = new Noop(m);
+        final Noop r2 = new Noop(m);
+        final Noop r3 = new Noop(m);
 
+        final CompletableFuture<Integer> fst =  fFirst ? f : g;
+        final CompletableFuture<Integer> snd = !fFirst ? f : g;
+        final Callable<Boolean> complete1 = failFirst ?
+            () -> fst.cancel(mayInterruptIfRunning) :
+            () -> fst.complete(v1);
+        final Callable<Boolean> complete2 = failFirst ?
+            () -> snd.complete(v1) :
+            () -> snd.cancel(mayInterruptIfRunning);
 
-        (fFirst ? f : g).complete(v1);
-        if (!createIncomplete)
-            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
-        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
-        if (createIncomplete) {
-            checkIncomplete(h);
-            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
-        }
+        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
+        assertTrue(complete1.call());
+        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
+        checkIncomplete(h1);
+        checkIncomplete(h2);
+        assertTrue(complete2.call());
+        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
 
-        checkCompletedWithWrappedCancellationException(h);
-        checkCancelled(!fFirst ? f : g);
-        r.assertNotInvoked();
-        checkCompletedNormally(fFirst ? f : g, v1);
+        checkCompletedWithWrappedCancellationException(h1);
+        checkCompletedWithWrappedCancellationException(h2);
+        checkCompletedWithWrappedCancellationException(h3);
+        r1.assertNotInvoked();
+        r2.assertNotInvoked();
+        r3.assertNotInvoked();
+        checkCompletedNormally(failFirst ? snd : fst, v1);
+        checkCancelled(failFirst ? fst : snd);
     }}
 
     /**
@@ -1709,19 +1992,25 @@ public class CompletableFutureTest exten
         final CompletableFuture<Integer> g = new CompletableFuture<>();
         final FailingRunnable r1 = new FailingRunnable(m);
         final FailingRunnable r2 = new FailingRunnable(m);
+        final FailingRunnable r3 = new FailingRunnable(m);
 
-        CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
-        if (fFirst) {
-            f.complete(v1);
-            g.complete(v2);
-        } else {
-            g.complete(v2);
-            f.complete(v1);
-        }
-        CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
+        final CompletableFuture<Integer> fst =  fFirst ? f : g;
+        final CompletableFuture<Integer> snd = !fFirst ? f : g;
+        final Integer w1 =  fFirst ? v1 : v2;
+        final Integer w2 = !fFirst ? v1 : v2;
+
+        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
+        assertTrue(fst.complete(w1));
+        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
+        assertTrue(snd.complete(w2));
+        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
 
         checkCompletedWithWrappedCFException(h1);
         checkCompletedWithWrappedCFException(h2);
+        checkCompletedWithWrappedCFException(h3);
+        r1.assertInvoked();
+        r2.assertInvoked();
+        r3.assertInvoked();
         checkCompletedNormally(f, v1);
         checkCompletedNormally(g, v2);
     }}
@@ -1844,13 +2133,8 @@ public class CompletableFutureTest exten
 
         final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
         final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
-        if (fFirst) {
-            f.complete(v1);
-            g.completeExceptionally(ex);
-        } else {
-            g.completeExceptionally(ex);
-            f.complete(v1);
-        }
+        assertTrue(fFirst ? f.complete(v1) : g.completeExceptionally(ex));
+        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
         final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
         final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
 
@@ -1956,13 +2240,8 @@ public class CompletableFutureTest exten
 
         final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
         final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
-        if (fFirst) {
-            f.complete(v1);
-            g.cancel(mayInterruptIfRunning);
-        } else {
-            g.cancel(mayInterruptIfRunning);
-            f.complete(v1);
-        }
+        assertTrue(fFirst ? f.complete(v1) : g.cancel(mayInterruptIfRunning));
+        assertTrue(!fFirst ? f.complete(v1) : g.cancel(mayInterruptIfRunning));
         final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
         final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
 
@@ -2164,13 +2443,8 @@ public class CompletableFutureTest exten
 
         final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
         final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
-        if (fFirst) {
-            f.complete(v1);
-            g.completeExceptionally(ex);
-        } else {
-            g.completeExceptionally(ex);
-            f.complete(v1);
-        }
+        assertTrue(fFirst ? f.complete(v1) : g.completeExceptionally(ex));
+        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
         final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
         final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
 
@@ -2373,7 +2647,7 @@ public class CompletableFutureTest exten
         checkIncomplete(h1);
         rs[0].assertNotInvoked();
         rs[1].assertNotInvoked();
-        f.completeExceptionally(ex);
+        assertTrue(f.completeExceptionally(ex));
         checkCompletedWithWrappedException(h0, ex);
         checkCompletedWithWrappedException(h1, ex);
         final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
@@ -2381,7 +2655,7 @@ public class CompletableFutureTest exten
         checkCompletedWithWrappedException(h2, ex);
         checkCompletedWithWrappedException(h3, ex);
 
-        g.complete(v1);
+        assertTrue(g.complete(v1));
 
         // unspecified behavior - both source completions available
         final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
@@ -2424,13 +2698,8 @@ public class CompletableFutureTest exten
 
         final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
         final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
-        if (fFirst) {
-            f.complete(v1);
-            g.completeExceptionally(ex);
-        } else {
-            g.completeExceptionally(ex);
-            f.complete(v1);
-        }
+        assertTrue( fFirst ? f.complete(v1) : g.completeExceptionally(ex));
+        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
         final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
         final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
 
@@ -2495,7 +2764,7 @@ public class CompletableFutureTest exten
         checkCompletedWithWrappedCancellationException(h2);
         checkCompletedWithWrappedCancellationException(h3);
 
-        g.complete(v1);
+        assertTrue(g.complete(v1));
 
         // unspecified behavior - both source completions available
         final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
@@ -2539,7 +2808,7 @@ public class CompletableFutureTest exten
 
         final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
         final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
-        f.complete(v1);
+        assertTrue(f.complete(v1));
         final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
         final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
         checkCompletedWithWrappedCFException(h0);
@@ -2547,7 +2816,7 @@ public class CompletableFutureTest exten
         checkCompletedWithWrappedCFException(h2);
         checkCompletedWithWrappedCFException(h3);
         for (int i = 0; i < 4; i++) rs[i].assertInvoked();
-        g.complete(v2);
+        assertTrue(g.complete(v2));
         final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
         final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
         checkCompletedWithWrappedCFException(h4);
@@ -2568,9 +2837,9 @@ public class CompletableFutureTest exten
     {
         final CompletableFuture<Integer> f = new CompletableFuture<>();
         final CompletableFutureInc r = new CompletableFutureInc(m);
-        if (!createIncomplete) f.complete(v1);
+        if (!createIncomplete) assertTrue(f.complete(v1));
         final CompletableFuture<Integer> g = m.thenCompose(f, r);
-        if (createIncomplete) f.complete(v1);
+        if (createIncomplete) assertTrue(f.complete(v1));
 
         checkCompletedNormally(g, inc(v1));
         checkCompletedNormally(f, v1);
@@ -2608,9 +2877,9 @@ public class CompletableFutureTest exten
         final CompletableFuture<Integer> f = new CompletableFuture<>();
         final FailingCompletableFutureFunction r
             = new FailingCompletableFutureFunction(m);
-        if (!createIncomplete) f.complete(v1);
+        if (!createIncomplete) assertTrue(f.complete(v1));
         final CompletableFuture<Integer> g = m.thenCompose(f, r);
-        if (createIncomplete) f.complete(v1);
+        if (createIncomplete) assertTrue(f.complete(v1));
 
         checkCompletedWithWrappedCFException(g);
         checkCompletedNormally(f, v1);
@@ -2653,13 +2922,13 @@ public class CompletableFutureTest exten
      * when all components complete normally
      */
     public void testAllOf_normal() throws Exception {
-        for (int k = 1; k < 20; ++k) {
+        for (int k = 1; k < 10; k++) {
             CompletableFuture<Integer>[] fs
                 = (CompletableFuture<Integer>[]) new CompletableFuture[k];
-            for (int i = 0; i < k; ++i)
+            for (int i = 0; i < k; i++)
                 fs[i] = new CompletableFuture<>();
             CompletableFuture<Void> f = CompletableFuture.allOf(fs);
-            for (int i = 0; i < k; ++i) {
+            for (int i = 0; i < k; i++) {
                 checkIncomplete(f);
                 checkIncomplete(CompletableFuture.allOf(fs));
                 fs[i].complete(one);
@@ -2670,10 +2939,10 @@ public class CompletableFutureTest exten
     }
 
     public void testAllOf_backwards() throws Exception {
-        for (int k = 1; k < 20; ++k) {
+        for (int k = 1; k < 10; k++) {
             CompletableFuture<Integer>[] fs
                 = (CompletableFuture<Integer>[]) new CompletableFuture[k];
-            for (int i = 0; i < k; ++i)
+            for (int i = 0; i < k; i++)
                 fs[i] = new CompletableFuture<>();
             CompletableFuture<Void> f = CompletableFuture.allOf(fs);
             for (int i = k - 1; i >= 0; i--) {
@@ -2686,29 +2955,74 @@ public class CompletableFutureTest exten
         }
     }
 
+    public void testAllOf_exceptional() throws Exception {
+        for (int k = 1; k < 10; k++) {
+            CompletableFuture<Integer>[] fs
+                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
+            CFException ex = new CFException();
+            for (int i = 0; i < k; i++)
+                fs[i] = new CompletableFuture<>();
+            CompletableFuture<Void> f = CompletableFuture.allOf(fs);
+            for (int i = 0; i < k; i++) {
+                checkIncomplete(f);
+                checkIncomplete(CompletableFuture.allOf(fs));
+                if (i != k/2) {
+                    fs[i].complete(i);
+                    checkCompletedNormally(fs[i], i);
+                } else {
+                    fs[i].completeExceptionally(ex);
+                    checkCompletedExceptionally(fs[i], ex);
+                }
+            }
+            checkCompletedWithWrappedException(f, ex);
+            checkCompletedWithWrappedException(CompletableFuture.allOf(fs), ex);
+        }
+    }
+
     /**
      * anyOf(no component futures) returns an incomplete future
      */
     public void testAnyOf_empty() throws Exception {
+        for (Integer v1 : new Integer[] { 1, null })
+    {
         CompletableFuture<Object> f = CompletableFuture.anyOf();
         checkIncomplete(f);
-    }
+
+        f.complete(v1);
+        checkCompletedNormally(f, v1);
+    }}
 
     /**
      * anyOf returns a future completed normally with a value when
      * a component future does
      */
     public void testAnyOf_normal() throws Exception {
-        for (int k = 0; k < 10; ++k) {
+        for (int k = 0; k < 10; k++) {
             CompletableFuture[] fs = new CompletableFuture[k];
-            for (int i = 0; i < k; ++i)
+            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].complete(one);
-                checkCompletedNormally(f, one);
-                checkCompletedNormally(CompletableFuture.anyOf(fs), one);
+            for (int i = 0; i < k; i++) {
+                fs[i].complete(i);
+                checkCompletedNormally(f, 0);
+                int x = (int) CompletableFuture.anyOf(fs).join();
+                assertTrue(0 <= x && x <= i);
+            }
+        }
+    }
+    public void testAnyOf_normal_backwards() 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 = k - 1; i >= 0; i--) {
+                fs[i].complete(i);
+                checkCompletedNormally(f, k - 1);
+                int x = (int) CompletableFuture.anyOf(fs).join();
+                assertTrue(i <= x && x <= k - 1);
             }
         }
     }
@@ -2717,15 +3031,36 @@ public class CompletableFutureTest exten
      * anyOf result completes exceptionally when any component does.
      */
     public void testAnyOf_exceptional() throws Exception {
-        for (int k = 0; k < 10; ++k) {
+        for (int k = 0; k < 10; k++) {
+            CompletableFuture[] fs = new CompletableFuture[k];
+            CFException[] exs = new CFException[k];
+            for (int i = 0; i < k; i++) {
+                fs[i] = new CompletableFuture<>();
+                exs[i] = new CFException();
+            }
+            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
+            checkIncomplete(f);
+            for (int i = 0; i < k; i++) {
+                fs[i].completeExceptionally(exs[i]);
+                checkCompletedWithWrappedException(f, exs[0]);
+                checkCompletedWithWrappedCFException(CompletableFuture.anyOf(fs));
+            }
+        }
+    }
+
+    public void testAnyOf_exceptional_backwards() throws Exception {
+        for (int k = 0; k < 10; k++) {
             CompletableFuture[] fs = new CompletableFuture[k];
-            for (int i = 0; i < k; ++i)
+            CFException[] exs = new CFException[k];
+            for (int i = 0; i < k; i++) {
                 fs[i] = new CompletableFuture<>();
+                exs[i] = new CFException();
+            }
             CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
             checkIncomplete(f);
-            for (int i = 0; i < k; ++i) {
-                fs[i].completeExceptionally(new CFException());
-                checkCompletedWithWrappedCFException(f);
+            for (int i = k - 1; i >= 0; i--) {
+                fs[i].completeExceptionally(exs[i]);
+                checkCompletedWithWrappedException(f, exs[k - 1]);
                 checkCompletedWithWrappedCFException(CompletableFuture.anyOf(fs));
             }
         }
@@ -2849,145 +3184,94 @@ public class CompletableFutureTest exten
         assertSame(f, f.toCompletableFuture());
     }
 
-    /**
-     * whenComplete action executes on normal completion, propagating
-     * source result.
-     */
-    public void testWhenComplete_normalCompletion1() {
-        for (ExecutionMode m : ExecutionMode.values())
-        for (boolean createIncomplete : new boolean[] { true, false })
-        for (Integer v1 : new Integer[] { 1, null })
-    {
-        final AtomicInteger a = new AtomicInteger(0);
-        final CompletableFuture<Integer> f = new CompletableFuture<>();
-        if (!createIncomplete) f.complete(v1);
-        final CompletableFuture<Integer> g = m.whenComplete
-            (f,
-             (Integer x, Throwable t) -> {
-                m.checkExecutionMode();
-                threadAssertSame(x, v1);
-                threadAssertNull(t);
-                a.getAndIncrement();
-            });
-        if (createIncomplete) f.complete(v1);
+    //--- tests of implementation details; not part of official tck ---
 
-        checkCompletedNormally(g, v1);
-        checkCompletedNormally(f, v1);
-        assertEquals(1, a.get());
-    }}
+    Object resultOf(CompletableFuture<?> f) {
+        try {
+            java.lang.reflect.Field resultField
+                = CompletableFuture.class.getDeclaredField("result");
+            resultField.setAccessible(true);
+            return resultField.get(f);
+        } catch (Throwable t) { throw new AssertionError(t); }
+    }
 
-    /**
-     * whenComplete action executes on exceptional completion, propagating
-     * source result.
-     */
-    public void testWhenComplete_exceptionalCompletion() {
+    public void testExceptionPropagationReusesResultObject() {
+        if (!testImplementationDetails) return;
         for (ExecutionMode m : ExecutionMode.values())
-        for (boolean createIncomplete : new boolean[] { true, false })
-        for (Integer v1 : new Integer[] { 1, null })
     {
-        final AtomicInteger a = new AtomicInteger(0);
         final CFException ex = new CFException();
-        final CompletableFuture<Integer> f = new CompletableFuture<>();
-        if (!createIncomplete) f.completeExceptionally(ex);
-        final CompletableFuture<Integer> g = m.whenComplete
-            (f,
-             (Integer x, Throwable t) -> {
-                m.checkExecutionMode();
-                threadAssertNull(x);
-                threadAssertSame(t, ex);
-                a.getAndIncrement();
-            });
-        if (createIncomplete) f.completeExceptionally(ex);
-        checkCompletedExceptionally(f, ex);
-        checkCompletedWithWrappedException(g, ex);
-        assertEquals(1, a.get());
-    }}
+        final CompletableFuture<Integer> v42 = CompletableFuture.completedFuture(42);
+        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
 
-    /**
-     * whenComplete action executes on cancelled source, propagating
-     * CancellationException.
-     */
-    public void testWhenComplete_sourceCancelled() {
-        for (ExecutionMode m : ExecutionMode.values())
-        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
-        for (boolean createIncomplete : new boolean[] { true, false })
-    {
-        final AtomicInteger a = new AtomicInteger(0);
-        final CompletableFuture<Integer> f = new CompletableFuture<>();
-        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
-        final CompletableFuture<Integer> g = m.whenComplete
-            (f,
-             (Integer x, Throwable t) -> {
-                m.checkExecutionMode();
-                threadAssertNull(x);
-                threadAssertTrue(t instanceof CancellationException);
-                a.getAndIncrement();
-            });
-        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
+        List<Function<CompletableFuture<Integer>, CompletableFuture<?>>> funs
+            = new ArrayList<>();
 
-        checkCompletedWithWrappedCancellationException(g);
-        checkCancelled(f);
-        assertEquals(1, a.get());
-    }}
+        funs.add((y) -> m.thenRun(y, new Noop(m)));
+        funs.add((y) -> m.thenAccept(y, new NoopConsumer(m)));
+        funs.add((y) -> m.thenApply(y, new IncFunction(m)));
 
-    /**
-     * If a whenComplete action throws an exception when triggered by
-     * a normal completion, it completes exceptionally
-     */
-    public void testWhenComplete_actionFailed() {
-        for (boolean createIncomplete : new boolean[] { true, false })
-        for (ExecutionMode m : ExecutionMode.values())
-        for (Integer v1 : new Integer[] { 1, null })
-    {
-        final AtomicInteger a = new AtomicInteger(0);
-        final CFException ex = new CFException();
-        final CompletableFuture<Integer> f = new CompletableFuture<>();
-        if (!createIncomplete) f.complete(v1);
-        final CompletableFuture<Integer> g = m.whenComplete
-            (f,
-             (Integer x, Throwable t) -> {
-                m.checkExecutionMode();
-                threadAssertSame(x, v1);
-                threadAssertNull(t);
-                a.getAndIncrement();
-                throw ex;
-            });
-        if (createIncomplete) f.complete(v1);
-        checkCompletedNormally(f, v1);
-        checkCompletedWithWrappedException(g, ex);
-        assertEquals(1, a.get());
-    }}
+        funs.add((y) -> m.runAfterEither(y, incomplete, new Noop(m)));
+        funs.add((y) -> m.acceptEither(y, incomplete, new NoopConsumer(m)));
+        funs.add((y) -> m.applyToEither(y, incomplete, new IncFunction(m)));
 
-    /**
-     * If a whenComplete action throws an exception when triggered by
-     * a source completion that also throws an exception, the source
-     * exception takes precedence.
-     */
-    public void testWhenComplete_actionFailedSourceFailed() {
-        for (boolean createIncomplete : new boolean[] { true, false })
-        for (ExecutionMode m : ExecutionMode.values())
-        for (Integer v1 : new Integer[] { 1, null })
-    {
-        final AtomicInteger a = new AtomicInteger(0);
-        final CFException ex1 = new CFException();
-        final CFException ex2 = new CFException();
-        final CompletableFuture<Integer> f = new CompletableFuture<>();
+        funs.add((y) -> m.runAfterBoth(y, v42, new Noop(m)));
+        funs.add((y) -> m.thenAcceptBoth(y, v42, new SubtractAction(m)));
+        funs.add((y) -> m.thenCombine(y, v42, new SubtractFunction(m)));
 
-        if (!createIncomplete) f.completeExceptionally(ex1);
-        final CompletableFuture<Integer> g = m.whenComplete
-            (f,
-             (Integer x, Throwable t) -> {
-                m.checkExecutionMode();
-                threadAssertSame(t, ex1);
-                threadAssertNull(x);
-                a.getAndIncrement();
-                throw ex2;
-            });
-        if (createIncomplete) f.completeExceptionally(ex1);
+        funs.add((y) -> m.whenComplete(y, (Integer x, Throwable t) -> {}));
 
-        checkCompletedExceptionally(f, ex1);
-        checkCompletedWithWrappedException(g, ex1);
-        assertEquals(1, a.get());
+        funs.add((y) -> m.thenCompose(y, new CompletableFutureInc(m)));
+
+        funs.add((y) -> CompletableFuture.allOf(new CompletableFuture<?>[] {y, v42}));
+        funs.add((y) -> CompletableFuture.anyOf(new CompletableFuture<?>[] {y, incomplete}));
+
+        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
+                 fun : funs) {
+            CompletableFuture<Integer> f = new CompletableFuture<>();
+            f.completeExceptionally(ex);
+            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
+            checkCompletedWithWrappedException(src, ex);
+            CompletableFuture<?> dep = fun.apply(src);
+            checkCompletedWithWrappedException(dep, ex);
+            assertSame(resultOf(src), resultOf(dep));
+        }
+
+        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
+                 fun : funs) {
+            CompletableFuture<Integer> f = new CompletableFuture<>();
+            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
+            CompletableFuture<?> dep = fun.apply(src);
+            f.completeExceptionally(ex);
+            checkCompletedWithWrappedException(src, ex);
+            checkCompletedWithWrappedException(dep, ex);
+            assertSame(resultOf(src), resultOf(dep));
+        }
+
+        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
+        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
+                 fun : funs) {
+            CompletableFuture<Integer> f = new CompletableFuture<>();
+            f.cancel(mayInterruptIfRunning);
+            checkCancelled(f);
+            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
+            checkCompletedWithWrappedCancellationException(src);
+            CompletableFuture<?> dep = fun.apply(src);
+            checkCompletedWithWrappedCancellationException(dep);
+            assertSame(resultOf(src), resultOf(dep));
+        }
+
+        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
+        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
+                 fun : funs) {
+            CompletableFuture<Integer> f = new CompletableFuture<>();
+            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
+            CompletableFuture<?> dep = fun.apply(src);
+            f.cancel(mayInterruptIfRunning);
+            checkCancelled(f);
+            checkCompletedWithWrappedCancellationException(src);
+            checkCompletedWithWrappedCancellationException(dep);
+            assertSame(resultOf(src), resultOf(dep));
+        }
     }}
 
 }