--- jsr166/src/test/tck/CompletableFutureTest.java	2013/04/08 20:46:59	1.22
+++ jsr166/src/test/tck/CompletableFutureTest.java	2014/06/01 20:40:13	1.33
@@ -68,6 +68,7 @@ public class CompletableFutureTest exten
         } catch (Throwable fail) { threadUnexpectedException(fail); }
         assertTrue(f.isDone());
         assertFalse(f.isCancelled());
+        assertFalse(f.isCompletedExceptionally());
         assertTrue(f.toString().contains("[Completed normally]"));
     }
 
@@ -101,6 +102,37 @@ public class CompletableFutureTest exten
         assertTrue(f.toString().contains("[Completed exceptionally]"));
     }
 
+    void checkCompletedWithWrappedCFException(CompletableFuture<?> f,
+                                              CFException ex) {
+        try {
+            f.get(LONG_DELAY_MS, MILLISECONDS);
+            shouldThrow();
+        } catch (ExecutionException success) {
+            assertSame(ex, success.getCause());
+        } catch (Throwable fail) { threadUnexpectedException(fail); }
+        try {
+            f.join();
+            shouldThrow();
+        } catch (CompletionException success) {
+            assertSame(ex, success.getCause());
+        }
+        try {
+            f.getNow(null);
+            shouldThrow();
+        } catch (CompletionException success) {
+            assertSame(ex, success.getCause());
+        }
+        try {
+            f.get();
+            shouldThrow();
+        } catch (ExecutionException success) {
+            assertSame(ex, success.getCause());
+        } catch (Throwable fail) { threadUnexpectedException(fail); }
+        assertTrue(f.isDone());
+        assertFalse(f.isCancelled());
+        assertTrue(f.toString().contains("[Completed exceptionally]"));
+    }
+
     void checkCancelled(CompletableFuture<?> f) {
         try {
             f.get(LONG_DELAY_MS, MILLISECONDS);
@@ -121,6 +153,7 @@ public class CompletableFutureTest exten
         } catch (CancellationException success) {
         } catch (Throwable fail) { threadUnexpectedException(fail); }
         assertTrue(f.isDone());
+        assertTrue(f.isCompletedExceptionally());
         assertTrue(f.isCancelled());
         assertTrue(f.toString().contains("[Completed exceptionally]"));
     }
@@ -152,6 +185,7 @@ public class CompletableFutureTest exten
         } catch (Throwable fail) { threadUnexpectedException(fail); }
         assertTrue(f.isDone());
         assertFalse(f.isCancelled());
+        assertTrue(f.isCompletedExceptionally());
         assertTrue(f.toString().contains("[Completed exceptionally]"));
     }
 
@@ -256,7 +290,6 @@ public class CompletableFutureTest exten
         assertEquals(g.getNumberOfDependents(), 0);
     }
 
-
     /**
      * toString indicates current completion state
      */
@@ -371,10 +404,9 @@ public class CompletableFutureTest exten
         }
     }
 
-
     /**
      * exceptionally action completes with function value on source
-     * exception;  otherwise with source value
+     * exception; otherwise with source value
      */
     public void testExceptionally() {
         CompletableFuture<Integer> f = new CompletableFuture<>();
@@ -495,17 +527,21 @@ public class CompletableFutureTest exten
      * thenRun result completes normally after normal completion of source
      */
     public void testThenRun() {
-        CompletableFuture<Integer> f = new CompletableFuture<>();
-        Noop r = new Noop();
-        CompletableFuture<Void> g = f.thenRun(r);
+        CompletableFuture<Integer> f;
+        CompletableFuture<Void> g;
+        Noop r;
+
+        f = new CompletableFuture<>();
+        g = f.thenRun(r = new Noop());
         f.complete(null);
         checkCompletedNormally(g, null);
-        // reordered version
+        assertTrue(r.ran);
+
         f = new CompletableFuture<>();
         f.complete(null);
-        r = new Noop();
-        g = f.thenRun(r);
+        g = f.thenRun(r = new Noop());
         checkCompletedNormally(g, null);
+        assertTrue(r.ran);
     }
 
     /**
@@ -513,32 +549,58 @@ public class CompletableFutureTest exten
      * completion of source
      */
     public void testThenRun2() {
-        CompletableFuture<Integer> f = new CompletableFuture<>();
-        Noop r = new Noop();
-        CompletableFuture<Void> g = f.thenRun(r);
+        CompletableFuture<Integer> f;
+        CompletableFuture<Void> g;
+        Noop r;
+
+        f = new CompletableFuture<>();
+        g = f.thenRun(r = new Noop());
+        f.completeExceptionally(new CFException());
+        checkCompletedWithWrappedCFException(g);
+        assertFalse(r.ran);
+
+        f = new CompletableFuture<>();
         f.completeExceptionally(new CFException());
+        g = f.thenRun(r = new Noop());
         checkCompletedWithWrappedCFException(g);
+        assertFalse(r.ran);
     }
 
     /**
      * thenRun result completes exceptionally if action does
      */
     public void testThenRun3() {
-        CompletableFuture<Integer> f = new CompletableFuture<>();
-        FailingNoop r = new FailingNoop();
-        CompletableFuture<Void> g = f.thenRun(r);
+        CompletableFuture<Integer> f;
+        CompletableFuture<Void> g;
+        FailingNoop r;
+
+        f = new CompletableFuture<>();
+        g = f.thenRun(r = new FailingNoop());
         f.complete(null);
         checkCompletedWithWrappedCFException(g);
+
+        f = new CompletableFuture<>();
+        f.complete(null);
+        g = f.thenRun(r = new FailingNoop());
+        checkCompletedWithWrappedCFException(g);
     }
 
     /**
      * thenRun result completes exceptionally if source cancelled
      */
     public void testThenRun4() {
-        CompletableFuture<Integer> f = new CompletableFuture<>();
-        Noop r = new Noop();
-        CompletableFuture<Void> g = f.thenRun(r);
+        CompletableFuture<Integer> f;
+        CompletableFuture<Void> g;
+        Noop r;
+
+        f = new CompletableFuture<>();
+        g = f.thenRun(r = new Noop());
+        assertTrue(f.cancel(true));
+        checkCompletedWithWrappedCancellationException(g);
+
+        f = new CompletableFuture<>();
         assertTrue(f.cancel(true));
+        g = f.thenRun(r = new Noop());
         checkCompletedWithWrappedCancellationException(g);
     }
 
@@ -630,7 +692,6 @@ public class CompletableFutureTest exten
         checkCompletedWithWrappedCancellationException(g);
     }
 
-
     /**
      * thenCombine result completes normally after normal completion
      * of sources
@@ -889,114 +950,288 @@ public class CompletableFutureTest exten
      * runAfterBoth result completes normally after normal
      * completion of sources
      */
-    public void testRunAfterBoth() {
-        CompletableFuture<Integer> f, g;
-        CompletableFuture<Void> h;
-        Noop r;
+    public void testRunAfterBoth_normalCompletion1() {
+        for (Integer v1 : new Integer[] { 1, null })
+        for (Integer v2 : new Integer[] { 2, null }) {
+
+        final CompletableFuture<Integer> f = new CompletableFuture<>();
+        final CompletableFuture<Integer> g = new CompletableFuture<>();
+        final Noop r = new Noop();
+        final CompletableFuture<Void> h = f.runAfterBoth(g, r);
 
-        f = new CompletableFuture<>();
-        g = new CompletableFuture<>();
-        h = f.runAfterBoth(g, r = new Noop());
-        f.complete(3);
+        f.complete(v1);
         checkIncomplete(h);
-        g.complete(1);
+        assertFalse(r.ran);
+        g.complete(v2);
+
         checkCompletedNormally(h, null);
         assertTrue(r.ran);
+        checkCompletedNormally(f, v1);
+        checkCompletedNormally(g, v2);
+        }
+    }
 
-        f = new CompletableFuture<>();
-        g = new CompletableFuture<>();
-        h = f.runAfterBoth(g, r = new Noop());
-        g.complete(1);
+    public void testRunAfterBoth_normalCompletion2() {
+        for (Integer v1 : new Integer[] { 1, null })
+        for (Integer v2 : new Integer[] { 2, null }) {
+
+        final CompletableFuture<Integer> f = new CompletableFuture<>();
+        final CompletableFuture<Integer> g = new CompletableFuture<>();
+        final Noop r = new Noop();
+        final CompletableFuture<Void> h = f.runAfterBoth(g, r);
+
+        g.complete(v2);
         checkIncomplete(h);
-        f.complete(3);
+        assertFalse(r.ran);
+        f.complete(v1);
+
         checkCompletedNormally(h, null);
         assertTrue(r.ran);
+        checkCompletedNormally(f, v1);
+        checkCompletedNormally(g, v2);
+        }
+    }
+
+    public void testRunAfterBoth_normalCompletion3() {
+        for (Integer v1 : new Integer[] { 1, null })
+        for (Integer v2 : new Integer[] { 2, null }) {
+
+        final CompletableFuture<Integer> f = new CompletableFuture<>();
+        final CompletableFuture<Integer> g = new CompletableFuture<>();
+        final Noop r = new Noop();
+
+        g.complete(v2);
+        f.complete(v1);
+        final CompletableFuture<Void> h = f.runAfterBoth(g, r);
+
+        checkCompletedNormally(h, null);
+        assertTrue(r.ran);
+        checkCompletedNormally(f, v1);
+        checkCompletedNormally(g, v2);
+        }
+    }
+
+    public void testRunAfterBoth_normalCompletion4() {
+        for (Integer v1 : new Integer[] { 1, null })
+        for (Integer v2 : new Integer[] { 2, null }) {
+
+        final CompletableFuture<Integer> f = new CompletableFuture<>();
+        final CompletableFuture<Integer> g = new CompletableFuture<>();
+        final Noop r = new Noop();
+
+        f.complete(v1);
+        g.complete(v2);
+        final CompletableFuture<Void> h = f.runAfterBoth(g, r);
 
-        f = new CompletableFuture<>();
-        g = new CompletableFuture<>();
-        g.complete(1);
-        f.complete(3);
-        h = f.runAfterBoth(g, r = new Noop());
         checkCompletedNormally(h, null);
         assertTrue(r.ran);
+        checkCompletedNormally(f, v1);
+        checkCompletedNormally(g, v2);
+        }
     }
 
     /**
      * runAfterBoth result completes exceptionally after exceptional
      * completion of either source
      */
-    public void testRunAfterBoth2() {
-        CompletableFuture<Integer> f, g;
-        CompletableFuture<Void> h;
-        Noop r;
+    public void testRunAfterBoth_exceptionalCompletion1() {
+        for (Integer v1 : new Integer[] { 1, null }) {
 
-        f = new CompletableFuture<>();
-        g = new CompletableFuture<>();
-        h = f.runAfterBoth(g, r = new Noop());
-        f.completeExceptionally(new CFException());
+        final CompletableFuture<Integer> f = new CompletableFuture<>();
+        final CompletableFuture<Integer> g = new CompletableFuture<>();
+        final Noop r = new Noop();
+        final CompletableFuture<Void> h = f.runAfterBoth(g, r);
+        final CFException ex = new CFException();
+
+        f.completeExceptionally(ex);
         checkIncomplete(h);
-        g.complete(1);
-        checkCompletedWithWrappedCFException(h);
+        g.complete(v1);
+
+        checkCompletedWithWrappedCFException(h, ex);
+        checkCompletedWithWrappedCFException(f, ex);
         assertFalse(r.ran);
+        checkCompletedNormally(g, v1);
+        }
+    }
 
-        f = new CompletableFuture<>();
-        g = new CompletableFuture<>();
-        h = f.runAfterBoth(g, r = new Noop());
-        g.completeExceptionally(new CFException());
+    public void testRunAfterBoth_exceptionalCompletion2() {
+        for (Integer v1 : new Integer[] { 1, null }) {
+
+        final CompletableFuture<Integer> f = new CompletableFuture<>();
+        final CompletableFuture<Integer> g = new CompletableFuture<>();
+        final Noop r = new Noop();
+        final CompletableFuture<Void> h = f.runAfterBoth(g, r);
+        final CFException ex = new CFException();
+
+        g.completeExceptionally(ex);
         checkIncomplete(h);
-        f.complete(3);
-        checkCompletedWithWrappedCFException(h);
+        f.complete(v1);
+
+        checkCompletedWithWrappedCFException(h, ex);
+        checkCompletedWithWrappedCFException(g, ex);
         assertFalse(r.ran);
+        checkCompletedNormally(f, v1);
+        }
+    }
 
-        f = new CompletableFuture<>();
-        g = new CompletableFuture<>();
-        g.completeExceptionally(new CFException());
-        f.complete(3);
-        h = f.runAfterBoth(g, r = new Noop());
-        checkCompletedWithWrappedCFException(h);
+    public void testRunAfterBoth_exceptionalCompletion3() {
+        for (Integer v1 : new Integer[] { 1, null }) {
+
+        final CompletableFuture<Integer> f = new CompletableFuture<>();
+        final CompletableFuture<Integer> g = new CompletableFuture<>();
+        final Noop r = new Noop();
+        final CFException ex = new CFException();
+
+        g.completeExceptionally(ex);
+        f.complete(v1);
+        final CompletableFuture<Void> h = f.runAfterBoth(g, r);
+
+        checkCompletedWithWrappedCFException(h, ex);
+        checkCompletedWithWrappedCFException(g, ex);
         assertFalse(r.ran);
+        checkCompletedNormally(f, v1);
+        }
+    }
 
-        f = new CompletableFuture<>();
-        g = new CompletableFuture<>();
-        f.completeExceptionally(new CFException());
-        g.complete(1);
-        h = f.runAfterBoth(g, r = new Noop());
-        checkCompletedWithWrappedCFException(h);
+    public void testRunAfterBoth_exceptionalCompletion4() {
+        for (Integer v1 : new Integer[] { 1, null }) {
+
+        final CompletableFuture<Integer> f = new CompletableFuture<>();
+        final CompletableFuture<Integer> g = new CompletableFuture<>();
+        final Noop r = new Noop();
+        final CFException ex = new CFException();
+
+        f.completeExceptionally(ex);
+        g.complete(v1);
+        final CompletableFuture<Void> h = f.runAfterBoth(g, r);
+
+        checkCompletedWithWrappedCFException(h, ex);
+        checkCompletedWithWrappedCFException(f, ex);
         assertFalse(r.ran);
+        checkCompletedNormally(g, v1);
+        }
     }
 
     /**
      * runAfterBoth result completes exceptionally if action does
      */
-    public void testRunAfterBoth3() {
-        CompletableFuture<Integer> f = new CompletableFuture<>();
-        CompletableFuture<Integer> f2 = new CompletableFuture<>();
-        FailingNoop r = new FailingNoop();
-        CompletableFuture<Void> g = f.runAfterBoth(f2, r);
-        f.complete(one);
-        checkIncomplete(g);
-        f2.complete(two);
-        checkCompletedWithWrappedCFException(g);
+    public void testRunAfterBoth_actionFailed1() {
+        for (Integer v1 : new Integer[] { 1, null })
+        for (Integer v2 : new Integer[] { 2, null }) {
+
+        final CompletableFuture<Integer> f = new CompletableFuture<>();
+        final CompletableFuture<Integer> g = new CompletableFuture<>();
+        final FailingNoop r = new FailingNoop();
+        final CompletableFuture<Void> h = f.runAfterBoth(g, r);
+
+        f.complete(v1);
+        checkIncomplete(h);
+        g.complete(v2);
+
+        checkCompletedWithWrappedCFException(h);
+        checkCompletedNormally(f, v1);
+        checkCompletedNormally(g, v2);
+        }
+    }
+
+    public void testRunAfterBoth_actionFailed2() {
+        for (Integer v1 : new Integer[] { 1, null })
+        for (Integer v2 : new Integer[] { 2, null }) {
+
+        final CompletableFuture<Integer> f = new CompletableFuture<>();
+        final CompletableFuture<Integer> g = new CompletableFuture<>();
+        final FailingNoop r = new FailingNoop();
+        final CompletableFuture<Void> h = f.runAfterBoth(g, r);
+
+        g.complete(v2);
+        checkIncomplete(h);
+        f.complete(v1);
+
+        checkCompletedWithWrappedCFException(h);
+        checkCompletedNormally(f, v1);
+        checkCompletedNormally(g, v2);
+        }
     }
 
     /**
      * runAfterBoth result completes exceptionally if either source cancelled
      */
-    public void testRunAfterBoth4() {
-        CompletableFuture<Integer> f = new CompletableFuture<>();
-        CompletableFuture<Integer> f2 = new CompletableFuture<>();
-        Noop r = new Noop();
-        CompletableFuture<Void> g = f.runAfterBoth(f2, r);
-        assertTrue(f.cancel(true));
-        f2.complete(two);
-        checkCompletedWithWrappedCancellationException(g);
-        f = new CompletableFuture<>();
-        f2 = new CompletableFuture<>();
-        r = new Noop();
-        g = f.runAfterBoth(f2, r);
-        f.complete(one);
-        assertTrue(f2.cancel(true));
-        checkCompletedWithWrappedCancellationException(g);
+    public void testRunAfterBoth_sourceCancelled1() {
+        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
+        for (Integer v1 : new Integer[] { 1, null }) {
+
+        final CompletableFuture<Integer> f = new CompletableFuture<>();
+        final CompletableFuture<Integer> g = new CompletableFuture<>();
+        final Noop r = new Noop();
+        final CompletableFuture<Void> h = f.runAfterBoth(g, r);
+
+        assertTrue(f.cancel(mayInterruptIfRunning));
+        checkIncomplete(h);
+        g.complete(v1);
+
+        checkCompletedWithWrappedCancellationException(h);
+        checkCancelled(f);
+        assertFalse(r.ran);
+        checkCompletedNormally(g, v1);
+        }
+    }
+
+    public void testRunAfterBoth_sourceCancelled2() {
+        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
+        for (Integer v1 : new Integer[] { 1, null }) {
+
+        final CompletableFuture<Integer> f = new CompletableFuture<>();
+        final CompletableFuture<Integer> g = new CompletableFuture<>();
+        final Noop r = new Noop();
+        final CompletableFuture<Void> h = f.runAfterBoth(g, r);
+
+        assertTrue(g.cancel(mayInterruptIfRunning));
+        checkIncomplete(h);
+        f.complete(v1);
+
+        checkCompletedWithWrappedCancellationException(h);
+        checkCancelled(g);
+        assertFalse(r.ran);
+        checkCompletedNormally(f, v1);
+        }
+    }
+
+    public void testRunAfterBoth_sourceCancelled3() {
+        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
+        for (Integer v1 : new Integer[] { 1, null }) {
+
+        final CompletableFuture<Integer> f = new CompletableFuture<>();
+        final CompletableFuture<Integer> g = new CompletableFuture<>();
+        final Noop r = new Noop();
+
+        assertTrue(g.cancel(mayInterruptIfRunning));
+        f.complete(v1);
+        final CompletableFuture<Void> h = f.runAfterBoth(g, r);
+
+        checkCompletedWithWrappedCancellationException(h);
+        checkCancelled(g);
+        assertFalse(r.ran);
+        checkCompletedNormally(f, v1);
+        }
+    }
+
+    public void testRunAfterBoth_sourceCancelled4() {
+        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
+        for (Integer v1 : new Integer[] { 1, null }) {
+
+        final CompletableFuture<Integer> f = new CompletableFuture<>();
+        final CompletableFuture<Integer> g = new CompletableFuture<>();
+        final Noop r = new Noop();
+
+        assertTrue(f.cancel(mayInterruptIfRunning));
+        g.complete(v1);
+        final CompletableFuture<Void> h = f.runAfterBoth(g, r);
+
+        checkCompletedWithWrappedCancellationException(h);
+        checkCancelled(f);
+        assertFalse(r.ran);
+        checkCompletedNormally(g, v1);
+        }
     }
 
     /**
@@ -1138,7 +1373,6 @@ public class CompletableFutureTest exten
         checkCompletedWithWrappedCancellationException(g);
     }
 
-
     /**
      * runAfterEither result completes normally after normal completion
      * of either source
@@ -1287,7 +1521,6 @@ public class CompletableFutureTest exten
         checkCompletedWithWrappedCancellationException(g);
     }
 
-
     // asyncs
 
     /**
@@ -1320,8 +1553,7 @@ public class CompletableFutureTest exten
         try {
             g.join();
             shouldThrow();
-        } catch (Exception ok) {
-        }
+        } catch (CompletionException success) {}
         checkCompletedWithWrappedCFException(g);
     }
 
@@ -2055,7 +2287,6 @@ public class CompletableFutureTest exten
         checkCompletedWithWrappedCancellationException(g);
     }
 
-
     // async with explicit executors
 
     /**
@@ -2088,8 +2319,7 @@ public class CompletableFutureTest exten
         try {
             g.join();
             shouldThrow();
-        } catch (Exception ok) {
-        }
+        } catch (CompletionException success) {}
         checkCompletedWithWrappedCFException(g);
     }
 
@@ -2826,14 +3056,15 @@ public class CompletableFutureTest exten
      * with the value null
      */
     public void testAllOf_empty() throws Exception {
-        CompletableFuture<?> f = CompletableFuture.allOf();
+        CompletableFuture<Void> f = CompletableFuture.allOf();
         checkCompletedNormally(f, null);
     }
 
     /**
-     * allOf returns a future completed when all components complete
+     * allOf returns a future completed normally with the value null
+     * when all components complete normally
      */
-    public void testAllOf() throws Exception {
+    public void testAllOf_normal() throws Exception {
         for (int k = 1; k < 20; ++k) {
             CompletableFuture<Integer>[] fs = (CompletableFuture<Integer>[]) new CompletableFuture[k];
             for (int i = 0; i < k; ++i)
@@ -2841,9 +3072,11 @@ public class CompletableFutureTest exten
             CompletableFuture<Void> f = CompletableFuture.allOf(fs);
             for (int i = 0; i < k; ++i) {
                 checkIncomplete(f);
+                checkIncomplete(CompletableFuture.allOf(fs));
                 fs[i].complete(one);
             }
             checkCompletedNormally(f, null);
+            checkCompletedNormally(CompletableFuture.allOf(fs), null);
         }
     }
 
@@ -2851,15 +3084,16 @@ public class CompletableFutureTest exten
      * anyOf(no component futures) returns an incomplete future
      */
     public void testAnyOf_empty() throws Exception {
-        CompletableFuture<?> f = CompletableFuture.anyOf();
+        CompletableFuture<Object> f = CompletableFuture.anyOf();
         checkIncomplete(f);
     }
 
     /**
-     * anyOf returns a future completed when any components complete
+     * anyOf returns a future completed normally with a value when
+     * a component future does
      */
-    public void testAnyOf() throws Exception {
-        for (int k = 1; k < 20; ++k) {
+    public void testAnyOf_normal() throws Exception {
+        for (int k = 0; k < 10; ++k) {
             CompletableFuture[] fs = new CompletableFuture[k];
             for (int i = 0; i < k; ++i)
                 fs[i] = new CompletableFuture<>();
@@ -2868,6 +3102,25 @@ public class CompletableFutureTest exten
             for (int i = 0; i < k; ++i) {
                 fs[i].complete(one);
                 checkCompletedNormally(f, one);
+                checkCompletedNormally(CompletableFuture.anyOf(fs), one);
+            }
+        }
+    }
+
+    /**
+     * anyOf result completes exceptionally when any component does.
+     */
+    public void testAnyOf_exceptional() throws Exception {
+        for (int k = 0; k < 10; ++k) {
+            CompletableFuture[] fs = new CompletableFuture[k];
+            for (int i = 0; i < k; ++i)
+                fs[i] = new CompletableFuture<>();
+            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
+            checkIncomplete(f);
+            for (int i = 0; i < k; ++i) {
+                fs[i].completeExceptionally(new CFException());
+                checkCompletedWithWrappedCFException(f);
+                checkCompletedWithWrappedCFException(CompletableFuture.anyOf(fs));
             }
         }
     }
@@ -2883,101 +3136,332 @@ public class CompletableFutureTest exten
         ThreadExecutor exec = new ThreadExecutor();
 
         Runnable[] throwingActions = {
-            () -> { CompletableFuture.supplyAsync(null); },
-            () -> { CompletableFuture.supplyAsync(null, exec); },
-            () -> { CompletableFuture.supplyAsync(supplyOne, null); },
-
-            () -> { CompletableFuture.runAsync(null); },
-            () -> { CompletableFuture.runAsync(null, exec); },
-            () -> { CompletableFuture.runAsync(() -> {}, null); },
-
-            () -> { f.completeExceptionally(null); },
-
-            () -> { f.thenApply(null); },
-            () -> { f.thenApplyAsync(null); },
-            () -> { f.thenApplyAsync((x) -> x, null); },
-            () -> { f.thenApplyAsync(null, exec); },
-
-            () -> { f.thenAccept(null); },
-            () -> { f.thenAcceptAsync(null); },
-            () -> { f.thenAcceptAsync((x) -> { ; }, null); },
-            () -> { f.thenAcceptAsync(null, exec); },
-
-            () -> { f.thenRun(null); },
-            () -> { f.thenRunAsync(null); },
-            () -> { f.thenRunAsync(() -> { ; }, null); },
-            () -> { f.thenRunAsync(null, exec); },
-
-            () -> { f.thenCombine(g, null); },
-            () -> { f.thenCombineAsync(g, null); },
-            () -> { f.thenCombineAsync(g, null, exec); },
-            () -> { f.thenCombine(nullFuture, (x, y) -> x); },
-            () -> { f.thenCombineAsync(nullFuture, (x, y) -> x); },
-            () -> { f.thenCombineAsync(nullFuture, (x, y) -> x, exec); },
-            () -> { f.thenCombineAsync(g, (x, y) -> x, null); },
-
-            () -> { f.thenAcceptBoth(g, null); },
-            () -> { f.thenAcceptBothAsync(g, null); },
-            () -> { f.thenAcceptBothAsync(g, null, exec); },
-            () -> { f.thenAcceptBoth(nullFuture, (x, y) -> {}); },
-            () -> { f.thenAcceptBothAsync(nullFuture, (x, y) -> {}); },
-            () -> { f.thenAcceptBothAsync(nullFuture, (x, y) -> {}, exec); },
-            () -> { f.thenAcceptBothAsync(g, (x, y) -> {}, null); },
-
-            () -> { f.runAfterBoth(g, null); },
-            () -> { f.runAfterBothAsync(g, null); },
-            () -> { f.runAfterBothAsync(g, null, exec); },
-            () -> { f.runAfterBoth(nullFuture, () -> {}); },
-            () -> { f.runAfterBothAsync(nullFuture, () -> {}); },
-            () -> { f.runAfterBothAsync(nullFuture, () -> {}, exec); },
-            () -> { f.runAfterBothAsync(g, () -> {}, null); },
-
-            () -> { f.applyToEither(g, null); },
-            () -> { f.applyToEitherAsync(g, null); },
-            () -> { f.applyToEitherAsync(g, null, exec); },
-            () -> { f.applyToEither(nullFuture, (x) -> x); },
-            () -> { f.applyToEitherAsync(nullFuture, (x) -> x); },
-            () -> { f.applyToEitherAsync(nullFuture, (x) -> x, exec); },
-            () -> { f.applyToEitherAsync(g, (x) -> x, null); },
-
-            () -> { f.acceptEither(g, null); },
-            () -> { f.acceptEitherAsync(g, null); },
-            () -> { f.acceptEitherAsync(g, null, exec); },
-            () -> { f.acceptEither(nullFuture, (x) -> {}); },
-            () -> { f.acceptEitherAsync(nullFuture, (x) -> {}); },
-            () -> { f.acceptEitherAsync(nullFuture, (x) -> {}, exec); },
-            () -> { f.acceptEitherAsync(g, (x) -> {}, null); },
-
-            () -> { f.runAfterEither(g, null); },
-            () -> { f.runAfterEitherAsync(g, null); },
-            () -> { f.runAfterEitherAsync(g, null, exec); },
-            () -> { f.runAfterEither(nullFuture, () -> {}); },
-            () -> { f.runAfterEitherAsync(nullFuture, () -> {}); },
-            () -> { f.runAfterEitherAsync(nullFuture, () -> {}, exec); },
-            () -> { f.runAfterEitherAsync(g, () -> {}, null); },
-
-            () -> { f.thenCompose(null); },
-            () -> { f.thenComposeAsync(null); },
-            () -> { f.thenComposeAsync(new CompletableFutureInc(), null); },
-            () -> { f.thenComposeAsync(null, exec); },
-
-            () -> { f.exceptionally(null); },
-
-            () -> { f.handle(null); },
-
-            () -> { CompletableFuture.allOf((CompletableFuture<?>)null); },
-            () -> { CompletableFuture.allOf((CompletableFuture<?>[])null); },
-            () -> { CompletableFuture.allOf(f, null); },
-            () -> { CompletableFuture.allOf(null, f); },
-
-            () -> { CompletableFuture.anyOf((CompletableFuture<?>)null); },
-            () -> { CompletableFuture.anyOf((CompletableFuture<?>[])null); },
-            () -> { CompletableFuture.anyOf(f, null); },
-            () -> { CompletableFuture.anyOf(null, f); },
+            () -> CompletableFuture.supplyAsync(null),
+            () -> CompletableFuture.supplyAsync(null, exec),
+            () -> CompletableFuture.supplyAsync(supplyOne, null),
+
+            () -> CompletableFuture.runAsync(null),
+            () -> CompletableFuture.runAsync(null, exec),
+            () -> CompletableFuture.runAsync(() -> {}, null),
+
+            () -> f.completeExceptionally(null),
+
+            () -> f.thenApply(null),
+            () -> f.thenApplyAsync(null),
+            () -> f.thenApplyAsync((x) -> x, null),
+            () -> f.thenApplyAsync(null, exec),
+
+            () -> f.thenAccept(null),
+            () -> f.thenAcceptAsync(null),
+            () -> f.thenAcceptAsync((x) -> {} , null),
+            () -> f.thenAcceptAsync(null, exec),
+
+            () -> f.thenRun(null),
+            () -> f.thenRunAsync(null),
+            () -> f.thenRunAsync(() -> {} , null),
+            () -> f.thenRunAsync(null, exec),
+
+            () -> f.thenCombine(g, null),
+            () -> f.thenCombineAsync(g, null),
+            () -> f.thenCombineAsync(g, null, exec),
+            () -> f.thenCombine(nullFuture, (x, y) -> x),
+            () -> f.thenCombineAsync(nullFuture, (x, y) -> x),
+            () -> f.thenCombineAsync(nullFuture, (x, y) -> x, exec),
+            () -> f.thenCombineAsync(g, (x, y) -> x, null),
+
+            () -> f.thenAcceptBoth(g, null),
+            () -> f.thenAcceptBothAsync(g, null),
+            () -> f.thenAcceptBothAsync(g, null, exec),
+            () -> f.thenAcceptBoth(nullFuture, (x, y) -> {}),
+            () -> f.thenAcceptBothAsync(nullFuture, (x, y) -> {}),
+            () -> f.thenAcceptBothAsync(nullFuture, (x, y) -> {}, exec),
+            () -> f.thenAcceptBothAsync(g, (x, y) -> {}, null),
+
+            () -> f.runAfterBoth(g, null),
+            () -> f.runAfterBothAsync(g, null),
+            () -> f.runAfterBothAsync(g, null, exec),
+            () -> f.runAfterBoth(nullFuture, () -> {}),
+            () -> f.runAfterBothAsync(nullFuture, () -> {}),
+            () -> f.runAfterBothAsync(nullFuture, () -> {}, exec),
+            () -> f.runAfterBothAsync(g, () -> {}, null),
+
+            () -> f.applyToEither(g, null),
+            () -> f.applyToEitherAsync(g, null),
+            () -> f.applyToEitherAsync(g, null, exec),
+            () -> f.applyToEither(nullFuture, (x) -> x),
+            () -> f.applyToEitherAsync(nullFuture, (x) -> x),
+            () -> f.applyToEitherAsync(nullFuture, (x) -> x, exec),
+            () -> f.applyToEitherAsync(g, (x) -> x, null),
+
+            () -> f.acceptEither(g, null),
+            () -> f.acceptEitherAsync(g, null),
+            () -> f.acceptEitherAsync(g, null, exec),
+            () -> f.acceptEither(nullFuture, (x) -> {}),
+            () -> f.acceptEitherAsync(nullFuture, (x) -> {}),
+            () -> f.acceptEitherAsync(nullFuture, (x) -> {}, exec),
+            () -> f.acceptEitherAsync(g, (x) -> {}, null),
+
+            () -> f.runAfterEither(g, null),
+            () -> f.runAfterEitherAsync(g, null),
+            () -> f.runAfterEitherAsync(g, null, exec),
+            () -> f.runAfterEither(nullFuture, () -> {}),
+            () -> f.runAfterEitherAsync(nullFuture, () -> {}),
+            () -> f.runAfterEitherAsync(nullFuture, () -> {}, exec),
+            () -> f.runAfterEitherAsync(g, () -> {}, null),
+
+            () -> f.thenCompose(null),
+            () -> f.thenComposeAsync(null),
+            () -> f.thenComposeAsync(new CompletableFutureInc(), null),
+            () -> f.thenComposeAsync(null, exec),
+
+            () -> f.exceptionally(null),
+
+            () -> f.handle(null),
+
+            () -> CompletableFuture.allOf((CompletableFuture<?>)null),
+            () -> CompletableFuture.allOf((CompletableFuture<?>[])null),
+            () -> CompletableFuture.allOf(f, null),
+            () -> CompletableFuture.allOf(null, f),
+
+            () -> CompletableFuture.anyOf((CompletableFuture<?>)null),
+            () -> CompletableFuture.anyOf((CompletableFuture<?>[])null),
+            () -> CompletableFuture.anyOf(f, null),
+            () -> CompletableFuture.anyOf(null, f),
+
+            () -> f.obtrudeException(null),
         };
 
         assertThrows(NullPointerException.class, throwingActions);
         assertEquals(0, exec.count.get());
     }
 
+    /**
+     * toCompletableFuture returns this CompletableFuture.
+     */
+    public void testToCompletableFuture() {
+        CompletableFuture<Integer> f = new CompletableFuture<>();
+        assertSame(f, f.toCompletableFuture());
+    }
+
+    /**
+     * whenComplete action executes on normal completion, propagating
+     * source result.
+     */
+    public void testWhenComplete1() {
+        final AtomicInteger a = new AtomicInteger();
+        CompletableFuture<Integer> f = new CompletableFuture<>();
+        CompletableFuture<Integer> g =
+            f.whenComplete((Integer x, Throwable t) -> a.getAndIncrement());
+        f.complete(three);
+        checkCompletedNormally(f, three);
+        checkCompletedNormally(g, three);
+        assertEquals(a.get(), 1);
+    }
+
+    /**
+     * whenComplete action executes on exceptional completion, propagating
+     * source result.
+     */
+    public void testWhenComplete2() {
+        final AtomicInteger a = new AtomicInteger();
+        CompletableFuture<Integer> f = new CompletableFuture<>();
+        CompletableFuture<Integer> g =
+            f.whenComplete((Integer x, Throwable t) -> a.getAndIncrement());
+        f.completeExceptionally(new CFException());
+        assertTrue(f.isCompletedExceptionally());
+        assertTrue(g.isCompletedExceptionally());
+        assertEquals(a.get(), 1);
+    }
+
+    /**
+     * If a whenComplete action throws an exception when triggered by
+     * a normal completion, it completes exceptionally
+     */
+    public void testWhenComplete3() {
+        CompletableFuture<Integer> f = new CompletableFuture<>();
+        CompletableFuture<Integer> g =
+            f.whenComplete((Integer x, Throwable t) ->
+                           { throw new CFException(); } );
+        f.complete(three);
+        checkCompletedNormally(f, three);
+        assertTrue(g.isCompletedExceptionally());
+        checkCompletedWithWrappedCFException(g);
+    }
+
+    /**
+     * whenCompleteAsync action executes on normal completion, propagating
+     * source result.
+     */
+    public void testWhenCompleteAsync1() {
+        final AtomicInteger a = new AtomicInteger();
+        CompletableFuture<Integer> f = new CompletableFuture<>();
+        CompletableFuture<Integer> g =
+            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement());
+        f.complete(three);
+        checkCompletedNormally(f, three);
+        checkCompletedNormally(g, three);
+        assertEquals(a.get(), 1);
+    }
+
+    /**
+     * whenCompleteAsync action executes on exceptional completion, propagating
+     * source result.
+     */
+    public void testWhenCompleteAsync2() {
+        final AtomicInteger a = new AtomicInteger();
+        CompletableFuture<Integer> f = new CompletableFuture<>();
+        CompletableFuture<Integer> g =
+            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement());
+        f.completeExceptionally(new CFException());
+        checkCompletedWithWrappedCFException(f);
+        checkCompletedWithWrappedCFException(g);
+    }
+
+    /**
+     * If a whenCompleteAsync action throws an exception when
+     * triggered by a normal completion, it completes exceptionally
+     */
+    public void testWhenCompleteAsync3() {
+        CompletableFuture<Integer> f = new CompletableFuture<>();
+        CompletableFuture<Integer> g =
+            f.whenCompleteAsync((Integer x, Throwable t) ->
+                           { throw new CFException(); } );
+        f.complete(three);
+        checkCompletedNormally(f, three);
+        checkCompletedWithWrappedCFException(g);
+    }
+
+    /**
+     * whenCompleteAsync action executes on normal completion, propagating
+     * source result.
+     */
+    public void testWhenCompleteAsync1e() {
+        final AtomicInteger a = new AtomicInteger();
+        ThreadExecutor exec = new ThreadExecutor();
+        CompletableFuture<Integer> f = new CompletableFuture<>();
+        CompletableFuture<Integer> g =
+            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement(),
+                                exec);
+        f.complete(three);
+        checkCompletedNormally(f, three);
+        checkCompletedNormally(g, three);
+        assertEquals(a.get(), 1);
+    }
+
+    /**
+     * whenCompleteAsync action executes on exceptional completion, propagating
+     * source result.
+     */
+    public void testWhenCompleteAsync2e() {
+        final AtomicInteger a = new AtomicInteger();
+        ThreadExecutor exec = new ThreadExecutor();
+        CompletableFuture<Integer> f = new CompletableFuture<>();
+        CompletableFuture<Integer> g =
+            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement(),
+                                exec);
+        f.completeExceptionally(new CFException());
+        checkCompletedWithWrappedCFException(f);
+        checkCompletedWithWrappedCFException(g);
+    }
+
+    /**
+     * If a whenCompleteAsync action throws an exception when triggered
+     * by a normal completion, it completes exceptionally
+     */
+    public void testWhenCompleteAsync3e() {
+        ThreadExecutor exec = new ThreadExecutor();
+        CompletableFuture<Integer> f = new CompletableFuture<>();
+        CompletableFuture<Integer> g =
+            f.whenCompleteAsync((Integer x, Throwable t) ->
+                                { throw new CFException(); },
+                                exec);
+        f.complete(three);
+        checkCompletedNormally(f, three);
+        checkCompletedWithWrappedCFException(g);
+    }
+
+    /**
+     * handleAsync action completes normally with function value on
+     * either normal or exceptional completion of source
+     */
+    public void testHandleAsync() {
+        CompletableFuture<Integer> f, g;
+        IntegerHandler r;
+
+        f = new CompletableFuture<>();
+        g = f.handleAsync(r = new IntegerHandler());
+        assertFalse(r.ran);
+        f.completeExceptionally(new CFException());
+        checkCompletedWithWrappedCFException(f);
+        checkCompletedNormally(g, three);
+        assertTrue(r.ran);
+
+        f = new CompletableFuture<>();
+        g = f.handleAsync(r = new IntegerHandler());
+        assertFalse(r.ran);
+        f.completeExceptionally(new CFException());
+        checkCompletedWithWrappedCFException(f);
+        checkCompletedNormally(g, three);
+        assertTrue(r.ran);
+
+        f = new CompletableFuture<>();
+        g = f.handleAsync(r = new IntegerHandler());
+        assertFalse(r.ran);
+        f.complete(one);
+        checkCompletedNormally(f, one);
+        checkCompletedNormally(g, two);
+        assertTrue(r.ran);
+
+        f = new CompletableFuture<>();
+        g = f.handleAsync(r = new IntegerHandler());
+        assertFalse(r.ran);
+        f.complete(one);
+        checkCompletedNormally(f, one);
+        checkCompletedNormally(g, two);
+        assertTrue(r.ran);
+    }
+
+    /**
+     * handleAsync action with Executor completes normally with
+     * function value on either normal or exceptional completion of
+     * source
+     */
+    public void testHandleAsync2() {
+        CompletableFuture<Integer> f, g;
+        ThreadExecutor exec = new ThreadExecutor();
+        IntegerHandler r;
+
+        f = new CompletableFuture<>();
+        g = f.handleAsync(r = new IntegerHandler(), exec);
+        assertFalse(r.ran);
+        f.completeExceptionally(new CFException());
+        checkCompletedWithWrappedCFException(f);
+        checkCompletedNormally(g, three);
+        assertTrue(r.ran);
+
+        f = new CompletableFuture<>();
+        g = f.handleAsync(r = new IntegerHandler(), exec);
+        assertFalse(r.ran);
+        f.completeExceptionally(new CFException());
+        checkCompletedWithWrappedCFException(f);
+        checkCompletedNormally(g, three);
+        assertTrue(r.ran);
+
+        f = new CompletableFuture<>();
+        g = f.handleAsync(r = new IntegerHandler(), exec);
+        assertFalse(r.ran);
+        f.complete(one);
+        checkCompletedNormally(f, one);
+        checkCompletedNormally(g, two);
+        assertTrue(r.ran);
+
+        f = new CompletableFuture<>();
+        g = f.handleAsync(r = new IntegerHandler(), exec);
+        assertFalse(r.ran);
+        f.complete(one);
+        checkCompletedNormally(f, one);
+        checkCompletedNormally(g, two);
+        assertTrue(r.ran);
+    }
+
 }