ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/test/tck/CompletableFutureTest.java
(Generate patch)

Comparing jsr166/src/test/tck/CompletableFutureTest.java (file contents):
Revision 1.69 by jsr166, Fri Jun 6 19:39:50 2014 UTC vs.
Revision 1.162 by jsr166, Sun Jul 3 15:27:28 2016 UTC

# Line 5 | Line 5
5   * http://creativecommons.org/publicdomain/zero/1.0/
6   */
7  
8 < import junit.framework.*;
8 > import static java.util.concurrent.TimeUnit.MILLISECONDS;
9 > import static java.util.concurrent.TimeUnit.SECONDS;
10 > import static java.util.concurrent.CompletableFuture.completedFuture;
11 > import static java.util.concurrent.CompletableFuture.failedFuture;
12 >
13 > import java.lang.reflect.Method;
14 > import java.lang.reflect.Modifier;
15 >
16 > import java.util.stream.Collectors;
17 > import java.util.stream.Stream;
18 >
19 > import java.util.ArrayList;
20 > import java.util.Arrays;
21 > import java.util.List;
22 > import java.util.Objects;
23 > import java.util.Set;
24   import java.util.concurrent.Callable;
10 import java.util.concurrent.Executor;
11 import java.util.concurrent.ExecutorService;
12 import java.util.concurrent.Executors;
25   import java.util.concurrent.CancellationException;
14 import java.util.concurrent.CountDownLatch;
15 import java.util.concurrent.ExecutionException;
16 import java.util.concurrent.Future;
26   import java.util.concurrent.CompletableFuture;
27   import java.util.concurrent.CompletionException;
28   import java.util.concurrent.CompletionStage;
29 + import java.util.concurrent.ExecutionException;
30 + import java.util.concurrent.Executor;
31   import java.util.concurrent.ForkJoinPool;
32   import java.util.concurrent.ForkJoinTask;
33 + import java.util.concurrent.RejectedExecutionException;
34   import java.util.concurrent.TimeoutException;
35 + import java.util.concurrent.TimeUnit;
36   import java.util.concurrent.atomic.AtomicInteger;
37 < import static java.util.concurrent.TimeUnit.MILLISECONDS;
25 < import static java.util.concurrent.TimeUnit.SECONDS;
26 < import java.util.*;
27 < import java.util.function.Supplier;
28 < import java.util.function.Consumer;
37 > import java.util.concurrent.atomic.AtomicReference;
38   import java.util.function.BiConsumer;
30 import java.util.function.Function;
39   import java.util.function.BiFunction;
40 + import java.util.function.Consumer;
41 + import java.util.function.Function;
42 + import java.util.function.Predicate;
43 + import java.util.function.Supplier;
44 +
45 + import junit.framework.AssertionFailedError;
46 + import junit.framework.Test;
47 + import junit.framework.TestSuite;
48  
49   public class CompletableFutureTest extends JSR166TestCase {
50  
51      public static void main(String[] args) {
52 <        junit.textui.TestRunner.run(suite());
52 >        main(suite(), args);
53      }
54      public static Test suite() {
55          return new TestSuite(CompletableFutureTest.class);
# Line 44 | Line 60 | public class CompletableFutureTest exten
60      void checkIncomplete(CompletableFuture<?> f) {
61          assertFalse(f.isDone());
62          assertFalse(f.isCancelled());
63 <        assertTrue(f.toString().contains("[Not completed]"));
63 >        assertTrue(f.toString().contains("Not completed"));
64          try {
65              assertNull(f.getNow(null));
66          } catch (Throwable fail) { threadUnexpectedException(fail); }
# Line 57 | Line 73 | public class CompletableFutureTest exten
73      }
74  
75      <T> void checkCompletedNormally(CompletableFuture<T> f, T value) {
76 <        try {
77 <            assertEquals(value, f.get(LONG_DELAY_MS, MILLISECONDS));
62 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
76 >        checkTimedGet(f, value);
77 >
78          try {
79              assertEquals(value, f.join());
80          } catch (Throwable fail) { threadUnexpectedException(fail); }
# Line 75 | Line 90 | public class CompletableFutureTest exten
90          assertTrue(f.toString().contains("[Completed normally]"));
91      }
92  
93 <    void checkCompletedWithWrappedCFException(CompletableFuture<?> f) {
94 <        try {
95 <            f.get(LONG_DELAY_MS, MILLISECONDS);
96 <            shouldThrow();
97 <        } catch (ExecutionException success) {
98 <            assertTrue(success.getCause() instanceof CFException);
99 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
100 <        try {
101 <            f.join();
102 <            shouldThrow();
103 <        } catch (CompletionException success) {
104 <            assertTrue(success.getCause() instanceof CFException);
105 <        }
106 <        try {
107 <            f.getNow(null);
108 <            shouldThrow();
109 <        } catch (CompletionException success) {
95 <            assertTrue(success.getCause() instanceof CFException);
93 >    /**
94 >     * Returns the "raw" internal exceptional completion of f,
95 >     * without any additional wrapping with CompletionException.
96 >     */
97 >    <U> Throwable exceptionalCompletion(CompletableFuture<U> f) {
98 >        // handle (and whenComplete) can distinguish between "direct"
99 >        // and "wrapped" exceptional completion
100 >        return f.handle((U u, Throwable t) -> t).join();
101 >    }
102 >
103 >    void checkCompletedExceptionally(CompletableFuture<?> f,
104 >                                     boolean wrapped,
105 >                                     Consumer<Throwable> checker) {
106 >        Throwable cause = exceptionalCompletion(f);
107 >        if (wrapped) {
108 >            assertTrue(cause instanceof CompletionException);
109 >            cause = cause.getCause();
110          }
111 <        try {
98 <            f.get();
99 <            shouldThrow();
100 <        } catch (ExecutionException success) {
101 <            assertTrue(success.getCause() instanceof CFException);
102 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
103 <        assertTrue(f.isDone());
104 <        assertFalse(f.isCancelled());
105 <        assertTrue(f.toString().contains("[Completed exceptionally]"));
106 <    }
111 >        checker.accept(cause);
112  
113 <    void checkCompletedWithWrappedCFException(CompletableFuture<?> f,
109 <                                              CFException ex) {
113 >        long startTime = System.nanoTime();
114          try {
115              f.get(LONG_DELAY_MS, MILLISECONDS);
116              shouldThrow();
117          } catch (ExecutionException success) {
118 <            assertSame(ex, success.getCause());
118 >            assertSame(cause, success.getCause());
119          } catch (Throwable fail) { threadUnexpectedException(fail); }
120 +        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS / 2);
121 +
122          try {
123              f.join();
124              shouldThrow();
125          } catch (CompletionException success) {
126 <            assertSame(ex, success.getCause());
127 <        }
126 >            assertSame(cause, success.getCause());
127 >        } catch (Throwable fail) { threadUnexpectedException(fail); }
128 >
129          try {
130              f.getNow(null);
131              shouldThrow();
132          } catch (CompletionException success) {
133 <            assertSame(ex, success.getCause());
134 <        }
133 >            assertSame(cause, success.getCause());
134 >        } catch (Throwable fail) { threadUnexpectedException(fail); }
135 >
136          try {
137              f.get();
138              shouldThrow();
139          } catch (ExecutionException success) {
140 <            assertSame(ex, success.getCause());
140 >            assertSame(cause, success.getCause());
141          } catch (Throwable fail) { threadUnexpectedException(fail); }
142 <        assertTrue(f.isDone());
142 >
143          assertFalse(f.isCancelled());
144 +        assertTrue(f.isDone());
145 +        assertTrue(f.isCompletedExceptionally());
146          assertTrue(f.toString().contains("[Completed exceptionally]"));
147      }
148  
149 +    void checkCompletedWithWrappedCFException(CompletableFuture<?> f) {
150 +        checkCompletedExceptionally(f, true,
151 +            (t) -> assertTrue(t instanceof CFException));
152 +    }
153 +
154 +    void checkCompletedWithWrappedCancellationException(CompletableFuture<?> f) {
155 +        checkCompletedExceptionally(f, true,
156 +            (t) -> assertTrue(t instanceof CancellationException));
157 +    }
158 +
159 +    void checkCompletedWithTimeoutException(CompletableFuture<?> f) {
160 +        checkCompletedExceptionally(f, false,
161 +            (t) -> assertTrue(t instanceof TimeoutException));
162 +    }
163 +
164 +    void checkCompletedWithWrappedException(CompletableFuture<?> f,
165 +                                            Throwable ex) {
166 +        checkCompletedExceptionally(f, true, (t) -> assertSame(t, ex));
167 +    }
168 +
169 +    void checkCompletedExceptionally(CompletableFuture<?> f, Throwable ex) {
170 +        checkCompletedExceptionally(f, false, (t) -> assertSame(t, ex));
171 +    }
172 +
173      void checkCancelled(CompletableFuture<?> f) {
174 +        long startTime = System.nanoTime();
175          try {
176              f.get(LONG_DELAY_MS, MILLISECONDS);
177              shouldThrow();
178          } catch (CancellationException success) {
179          } catch (Throwable fail) { threadUnexpectedException(fail); }
180 +        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS / 2);
181 +
182          try {
183              f.join();
184              shouldThrow();
# Line 155 | Line 192 | public class CompletableFutureTest exten
192              shouldThrow();
193          } catch (CancellationException success) {
194          } catch (Throwable fail) { threadUnexpectedException(fail); }
158        assertTrue(f.isDone());
159        assertTrue(f.isCompletedExceptionally());
160        assertTrue(f.isCancelled());
161        assertTrue(f.toString().contains("[Completed exceptionally]"));
162    }
195  
196 <    void checkCompletedWithWrappedCancellationException(CompletableFuture<?> f) {
197 <        try {
166 <            f.get(LONG_DELAY_MS, MILLISECONDS);
167 <            shouldThrow();
168 <        } catch (ExecutionException success) {
169 <            assertTrue(success.getCause() instanceof CancellationException);
170 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
171 <        try {
172 <            f.join();
173 <            shouldThrow();
174 <        } catch (CompletionException success) {
175 <            assertTrue(success.getCause() instanceof CancellationException);
176 <        }
177 <        try {
178 <            f.getNow(null);
179 <            shouldThrow();
180 <        } catch (CompletionException success) {
181 <            assertTrue(success.getCause() instanceof CancellationException);
182 <        }
183 <        try {
184 <            f.get();
185 <            shouldThrow();
186 <        } catch (ExecutionException success) {
187 <            assertTrue(success.getCause() instanceof CancellationException);
188 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
196 >        assertTrue(exceptionalCompletion(f) instanceof CancellationException);
197 >
198          assertTrue(f.isDone());
190        assertFalse(f.isCancelled());
199          assertTrue(f.isCompletedExceptionally());
200 +        assertTrue(f.isCancelled());
201          assertTrue(f.toString().contains("[Completed exceptionally]"));
202      }
203  
# Line 206 | Line 215 | public class CompletableFutureTest exten
215       * isCancelled, join, get, and getNow
216       */
217      public void testComplete() {
218 +        for (Integer v1 : new Integer[] { 1, null })
219 +    {
220          CompletableFuture<Integer> f = new CompletableFuture<>();
221          checkIncomplete(f);
222 <        f.complete(one);
223 <        checkCompletedNormally(f, one);
224 <    }
222 >        assertTrue(f.complete(v1));
223 >        assertFalse(f.complete(v1));
224 >        checkCompletedNormally(f, v1);
225 >    }}
226  
227      /**
228       * completeExceptionally completes exceptionally, as indicated by
# Line 218 | Line 230 | public class CompletableFutureTest exten
230       */
231      public void testCompleteExceptionally() {
232          CompletableFuture<Integer> f = new CompletableFuture<>();
233 +        CFException ex = new CFException();
234          checkIncomplete(f);
235 <        f.completeExceptionally(new CFException());
236 <        checkCompletedWithWrappedCFException(f);
235 >        f.completeExceptionally(ex);
236 >        checkCompletedExceptionally(f, ex);
237      }
238  
239      /**
# Line 228 | Line 241 | public class CompletableFutureTest exten
241       * methods isDone, isCancelled, join, get, and getNow
242       */
243      public void testCancel() {
244 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
245 +    {
246          CompletableFuture<Integer> f = new CompletableFuture<>();
247          checkIncomplete(f);
248 <        assertTrue(f.cancel(true));
248 >        assertTrue(f.cancel(mayInterruptIfRunning));
249 >        assertTrue(f.cancel(mayInterruptIfRunning));
250 >        assertTrue(f.cancel(!mayInterruptIfRunning));
251          checkCancelled(f);
252 <    }
252 >    }}
253  
254      /**
255       * obtrudeValue forces completion with given value
# Line 240 | Line 257 | public class CompletableFutureTest exten
257      public void testObtrudeValue() {
258          CompletableFuture<Integer> f = new CompletableFuture<>();
259          checkIncomplete(f);
260 <        f.complete(one);
260 >        assertTrue(f.complete(one));
261          checkCompletedNormally(f, one);
262          f.obtrudeValue(three);
263          checkCompletedNormally(f, three);
# Line 261 | Line 278 | public class CompletableFutureTest exten
278       * obtrudeException forces completion with given exception
279       */
280      public void testObtrudeException() {
281 <        CompletableFuture<Integer> f = new CompletableFuture<>();
282 <        checkIncomplete(f);
283 <        f.complete(one);
284 <        checkCompletedNormally(f, one);
285 <        f.obtrudeException(new CFException());
269 <        checkCompletedWithWrappedCFException(f);
281 >        for (Integer v1 : new Integer[] { 1, null })
282 >    {
283 >        CFException ex;
284 >        CompletableFuture<Integer> f;
285 >
286          f = new CompletableFuture<>();
287 <        f.obtrudeException(new CFException());
288 <        checkCompletedWithWrappedCFException(f);
287 >        assertTrue(f.complete(v1));
288 >        for (int i = 0; i < 2; i++) {
289 >            f.obtrudeException(ex = new CFException());
290 >            checkCompletedExceptionally(f, ex);
291 >        }
292 >
293          f = new CompletableFuture<>();
294 +        for (int i = 0; i < 2; i++) {
295 +            f.obtrudeException(ex = new CFException());
296 +            checkCompletedExceptionally(f, ex);
297 +        }
298 +
299 +        f = new CompletableFuture<>();
300 +        f.completeExceptionally(ex = new CFException());
301 +        f.obtrudeValue(v1);
302 +        checkCompletedNormally(f, v1);
303 +        f.obtrudeException(ex = new CFException());
304 +        checkCompletedExceptionally(f, ex);
305          f.completeExceptionally(new CFException());
306 <        f.obtrudeValue(four);
307 <        checkCompletedNormally(f, four);
308 <        f.obtrudeException(new CFException());
309 <        checkCompletedWithWrappedCFException(f);
279 <    }
306 >        checkCompletedExceptionally(f, ex);
307 >        assertFalse(f.complete(v1));
308 >        checkCompletedExceptionally(f, ex);
309 >    }}
310  
311      /**
312       * getNumberOfDependents returns number of dependent tasks
313       */
314      public void testGetNumberOfDependents() {
315 +        for (ExecutionMode m : ExecutionMode.values())
316 +        for (Integer v1 : new Integer[] { 1, null })
317 +    {
318          CompletableFuture<Integer> f = new CompletableFuture<>();
319          assertEquals(0, f.getNumberOfDependents());
320 <        CompletableFuture g = f.thenRun(new Noop(ExecutionMode.DEFAULT));
320 >        final CompletableFuture<Void> g = m.thenRun(f, new Noop(m));
321          assertEquals(1, f.getNumberOfDependents());
322          assertEquals(0, g.getNumberOfDependents());
323 <        CompletableFuture h = f.thenRun(new Noop(ExecutionMode.DEFAULT));
323 >        final CompletableFuture<Void> h = m.thenRun(f, new Noop(m));
324          assertEquals(2, f.getNumberOfDependents());
325 <        f.complete(1);
325 >        assertEquals(0, h.getNumberOfDependents());
326 >        assertTrue(f.complete(v1));
327          checkCompletedNormally(g, null);
328 +        checkCompletedNormally(h, null);
329          assertEquals(0, f.getNumberOfDependents());
330          assertEquals(0, g.getNumberOfDependents());
331 <    }
331 >        assertEquals(0, h.getNumberOfDependents());
332 >    }}
333  
334      /**
335       * toString indicates current completion state
# Line 304 | Line 340 | public class CompletableFutureTest exten
340          f = new CompletableFuture<String>();
341          assertTrue(f.toString().contains("[Not completed]"));
342  
343 <        f.complete("foo");
343 >        assertTrue(f.complete("foo"));
344          assertTrue(f.toString().contains("[Completed normally]"));
345  
346          f = new CompletableFuture<String>();
347 <        f.completeExceptionally(new IndexOutOfBoundsException());
347 >        assertTrue(f.completeExceptionally(new IndexOutOfBoundsException()));
348          assertTrue(f.toString().contains("[Completed exceptionally]"));
349 +
350 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false }) {
351 +            f = new CompletableFuture<String>();
352 +            assertTrue(f.cancel(mayInterruptIfRunning));
353 +            assertTrue(f.toString().contains("[Completed exceptionally]"));
354 +        }
355      }
356  
357      /**
# Line 418 | Line 460 | public class CompletableFutureTest exten
460      class FailingSupplier extends CheckedAction
461          implements Supplier<Integer>
462      {
463 <        FailingSupplier(ExecutionMode m) { super(m); }
463 >        final CFException ex;
464 >        FailingSupplier(ExecutionMode m) { super(m); ex = new CFException(); }
465          public Integer get() {
466              invoked();
467 <            throw new CFException();
467 >            throw ex;
468          }
469      }
470  
471      class FailingConsumer extends CheckedIntegerAction
472          implements Consumer<Integer>
473      {
474 <        FailingConsumer(ExecutionMode m) { super(m); }
474 >        final CFException ex;
475 >        FailingConsumer(ExecutionMode m) { super(m); ex = new CFException(); }
476          public void accept(Integer x) {
477              invoked();
478              value = x;
479 <            throw new CFException();
479 >            throw ex;
480          }
481      }
482  
483      class FailingBiConsumer extends CheckedIntegerAction
484          implements BiConsumer<Integer, Integer>
485      {
486 <        FailingBiConsumer(ExecutionMode m) { super(m); }
486 >        final CFException ex;
487 >        FailingBiConsumer(ExecutionMode m) { super(m); ex = new CFException(); }
488          public void accept(Integer x, Integer y) {
489              invoked();
490              value = subtract(x, y);
491 <            throw new CFException();
491 >            throw ex;
492          }
493      }
494  
495      class FailingFunction extends CheckedIntegerAction
496          implements Function<Integer, Integer>
497      {
498 <        FailingFunction(ExecutionMode m) { super(m); }
498 >        final CFException ex;
499 >        FailingFunction(ExecutionMode m) { super(m); ex = new CFException(); }
500          public Integer apply(Integer x) {
501              invoked();
502              value = x;
503 <            throw new CFException();
503 >            throw ex;
504          }
505      }
506  
507      class FailingBiFunction extends CheckedIntegerAction
508          implements BiFunction<Integer, Integer, Integer>
509      {
510 <        FailingBiFunction(ExecutionMode m) { super(m); }
510 >        final CFException ex;
511 >        FailingBiFunction(ExecutionMode m) { super(m); ex = new CFException(); }
512          public Integer apply(Integer x, Integer y) {
513              invoked();
514              value = subtract(x, y);
515 <            throw new CFException();
515 >            throw ex;
516          }
517      }
518  
519      class FailingRunnable extends CheckedAction implements Runnable {
520 <        FailingRunnable(ExecutionMode m) { super(m); }
520 >        final CFException ex;
521 >        FailingRunnable(ExecutionMode m) { super(m); ex = new CFException(); }
522          public void run() {
523              invoked();
524 <            throw new CFException();
524 >            throw ex;
525          }
526      }
527  
480
528      class CompletableFutureInc extends CheckedIntegerAction
529          implements Function<Integer, CompletableFuture<Integer>>
530      {
# Line 486 | Line 533 | public class CompletableFutureTest exten
533              invoked();
534              value = x;
535              CompletableFuture<Integer> f = new CompletableFuture<>();
536 <            f.complete(inc(x));
536 >            assertTrue(f.complete(inc(x)));
537              return f;
538          }
539      }
# Line 494 | Line 541 | public class CompletableFutureTest exten
541      class FailingCompletableFutureFunction extends CheckedIntegerAction
542          implements Function<Integer, CompletableFuture<Integer>>
543      {
544 <        FailingCompletableFutureFunction(ExecutionMode m) { super(m); }
544 >        final CFException ex;
545 >        FailingCompletableFutureFunction(ExecutionMode m) { super(m); ex = new CFException(); }
546          public CompletableFuture<Integer> apply(Integer x) {
547              invoked();
548              value = x;
549 <            throw new CFException();
549 >            throw ex;
550 >        }
551 >    }
552 >
553 >    static class CountingRejectingExecutor implements Executor {
554 >        final RejectedExecutionException ex = new RejectedExecutionException();
555 >        final AtomicInteger count = new AtomicInteger(0);
556 >        public void execute(Runnable r) {
557 >            count.getAndIncrement();
558 >            throw ex;
559          }
560      }
561  
# Line 516 | Line 573 | public class CompletableFutureTest exten
573          }
574      }
575  
576 +    static final boolean defaultExecutorIsCommonPool
577 +        = ForkJoinPool.getCommonPoolParallelism() > 1;
578 +
579      /**
580       * Permits the testing of parallel code for the 3 different
581       * execution modes without copy/pasting all the test methods.
582       */
583      enum ExecutionMode {
584 <        DEFAULT {
584 >        SYNC {
585              public void checkExecutionMode() {
586                  assertFalse(ThreadExecutor.startedCurrentThread());
587                  assertNull(ForkJoinTask.getPool());
# Line 597 | Line 657 | public class CompletableFutureTest exten
657  
658          ASYNC {
659              public void checkExecutionMode() {
660 <                assertSame(ForkJoinPool.commonPool(),
661 <                           ForkJoinTask.getPool());
660 >                assertEquals(defaultExecutorIsCommonPool,
661 >                             (ForkJoinPool.commonPool() == ForkJoinTask.getPool()));
662              }
663              public CompletableFuture<Void> runAsync(Runnable a) {
664                  return CompletableFuture.runAsync(a);
# Line 794 | Line 854 | public class CompletableFutureTest exten
854      {
855          final AtomicInteger a = new AtomicInteger(0);
856          final CompletableFuture<Integer> f = new CompletableFuture<>();
857 <        if (!createIncomplete) f.complete(v1);
857 >        if (!createIncomplete) assertTrue(f.complete(v1));
858          final CompletableFuture<Integer> g = f.exceptionally
859              ((Throwable t) -> {
800                // Should not be called
860                  a.getAndIncrement();
861 <                throw new AssertionError();
861 >                threadFail("should not be called");
862 >                return null;            // unreached
863              });
864 <        if (createIncomplete) f.complete(v1);
864 >        if (createIncomplete) assertTrue(f.complete(v1));
865  
866          checkCompletedNormally(g, v1);
867          checkCompletedNormally(f, v1);
868          assertEquals(0, a.get());
869      }}
870  
811
871      /**
872       * exceptionally action completes with function value on source
873       * exception
# Line 823 | Line 882 | public class CompletableFutureTest exten
882          if (!createIncomplete) f.completeExceptionally(ex);
883          final CompletableFuture<Integer> g = f.exceptionally
884              ((Throwable t) -> {
885 <                ExecutionMode.DEFAULT.checkExecutionMode();
885 >                ExecutionMode.SYNC.checkExecutionMode();
886                  threadAssertSame(t, ex);
887                  a.getAndIncrement();
888                  return v1;
# Line 834 | Line 893 | public class CompletableFutureTest exten
893          assertEquals(1, a.get());
894      }}
895  
896 +    /**
897 +     * If an "exceptionally action" throws an exception, it completes
898 +     * exceptionally with that exception
899 +     */
900      public void testExceptionally_exceptionalCompletionActionFailed() {
901          for (boolean createIncomplete : new boolean[] { true, false })
839        for (Integer v1 : new Integer[] { 1, null })
902      {
903          final AtomicInteger a = new AtomicInteger(0);
904          final CFException ex1 = new CFException();
# Line 845 | Line 907 | public class CompletableFutureTest exten
907          if (!createIncomplete) f.completeExceptionally(ex1);
908          final CompletableFuture<Integer> g = f.exceptionally
909              ((Throwable t) -> {
910 <                ExecutionMode.DEFAULT.checkExecutionMode();
910 >                ExecutionMode.SYNC.checkExecutionMode();
911                  threadAssertSame(t, ex1);
912                  a.getAndIncrement();
913                  throw ex2;
914              });
915          if (createIncomplete) f.completeExceptionally(ex1);
916  
917 <        checkCompletedWithWrappedCFException(g, ex2);
917 >        checkCompletedWithWrappedException(g, ex2);
918 >        checkCompletedExceptionally(f, ex1);
919 >        assertEquals(1, a.get());
920 >    }}
921 >
922 >    /**
923 >     * whenComplete action executes on normal completion, propagating
924 >     * source result.
925 >     */
926 >    public void testWhenComplete_normalCompletion() {
927 >        for (ExecutionMode m : ExecutionMode.values())
928 >        for (boolean createIncomplete : new boolean[] { true, false })
929 >        for (Integer v1 : new Integer[] { 1, null })
930 >    {
931 >        final AtomicInteger a = new AtomicInteger(0);
932 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
933 >        if (!createIncomplete) assertTrue(f.complete(v1));
934 >        final CompletableFuture<Integer> g = m.whenComplete
935 >            (f,
936 >             (Integer result, Throwable t) -> {
937 >                m.checkExecutionMode();
938 >                threadAssertSame(result, v1);
939 >                threadAssertNull(t);
940 >                a.getAndIncrement();
941 >            });
942 >        if (createIncomplete) assertTrue(f.complete(v1));
943 >
944 >        checkCompletedNormally(g, v1);
945 >        checkCompletedNormally(f, v1);
946 >        assertEquals(1, a.get());
947 >    }}
948 >
949 >    /**
950 >     * whenComplete action executes on exceptional completion, propagating
951 >     * source result.
952 >     */
953 >    public void testWhenComplete_exceptionalCompletion() {
954 >        for (ExecutionMode m : ExecutionMode.values())
955 >        for (boolean createIncomplete : new boolean[] { true, false })
956 >    {
957 >        final AtomicInteger a = new AtomicInteger(0);
958 >        final CFException ex = new CFException();
959 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
960 >        if (!createIncomplete) f.completeExceptionally(ex);
961 >        final CompletableFuture<Integer> g = m.whenComplete
962 >            (f,
963 >             (Integer result, Throwable t) -> {
964 >                m.checkExecutionMode();
965 >                threadAssertNull(result);
966 >                threadAssertSame(t, ex);
967 >                a.getAndIncrement();
968 >            });
969 >        if (createIncomplete) f.completeExceptionally(ex);
970 >
971 >        checkCompletedWithWrappedException(g, ex);
972 >        checkCompletedExceptionally(f, ex);
973 >        assertEquals(1, a.get());
974 >    }}
975 >
976 >    /**
977 >     * whenComplete action executes on cancelled source, propagating
978 >     * CancellationException.
979 >     */
980 >    public void testWhenComplete_sourceCancelled() {
981 >        for (ExecutionMode m : ExecutionMode.values())
982 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
983 >        for (boolean createIncomplete : new boolean[] { true, false })
984 >    {
985 >        final AtomicInteger a = new AtomicInteger(0);
986 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
987 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
988 >        final CompletableFuture<Integer> g = m.whenComplete
989 >            (f,
990 >             (Integer result, Throwable t) -> {
991 >                m.checkExecutionMode();
992 >                threadAssertNull(result);
993 >                threadAssertTrue(t instanceof CancellationException);
994 >                a.getAndIncrement();
995 >            });
996 >        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
997 >
998 >        checkCompletedWithWrappedCancellationException(g);
999 >        checkCancelled(f);
1000 >        assertEquals(1, a.get());
1001 >    }}
1002 >
1003 >    /**
1004 >     * If a whenComplete action throws an exception when triggered by
1005 >     * a normal completion, it completes exceptionally
1006 >     */
1007 >    public void testWhenComplete_sourceCompletedNormallyActionFailed() {
1008 >        for (boolean createIncomplete : new boolean[] { true, false })
1009 >        for (ExecutionMode m : ExecutionMode.values())
1010 >        for (Integer v1 : new Integer[] { 1, null })
1011 >    {
1012 >        final AtomicInteger a = new AtomicInteger(0);
1013 >        final CFException ex = new CFException();
1014 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1015 >        if (!createIncomplete) assertTrue(f.complete(v1));
1016 >        final CompletableFuture<Integer> g = m.whenComplete
1017 >            (f,
1018 >             (Integer result, Throwable t) -> {
1019 >                m.checkExecutionMode();
1020 >                threadAssertSame(result, v1);
1021 >                threadAssertNull(t);
1022 >                a.getAndIncrement();
1023 >                throw ex;
1024 >            });
1025 >        if (createIncomplete) assertTrue(f.complete(v1));
1026 >
1027 >        checkCompletedWithWrappedException(g, ex);
1028 >        checkCompletedNormally(f, v1);
1029 >        assertEquals(1, a.get());
1030 >    }}
1031 >
1032 >    /**
1033 >     * If a whenComplete action throws an exception when triggered by
1034 >     * a source completion that also throws an exception, the source
1035 >     * exception takes precedence (unlike handle)
1036 >     */
1037 >    public void testWhenComplete_sourceFailedActionFailed() {
1038 >        for (boolean createIncomplete : new boolean[] { true, false })
1039 >        for (ExecutionMode m : ExecutionMode.values())
1040 >    {
1041 >        final AtomicInteger a = new AtomicInteger(0);
1042 >        final CFException ex1 = new CFException();
1043 >        final CFException ex2 = new CFException();
1044 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1045 >
1046 >        if (!createIncomplete) f.completeExceptionally(ex1);
1047 >        final CompletableFuture<Integer> g = m.whenComplete
1048 >            (f,
1049 >             (Integer result, Throwable t) -> {
1050 >                m.checkExecutionMode();
1051 >                threadAssertSame(t, ex1);
1052 >                threadAssertNull(result);
1053 >                a.getAndIncrement();
1054 >                throw ex2;
1055 >            });
1056 >        if (createIncomplete) f.completeExceptionally(ex1);
1057 >
1058 >        checkCompletedWithWrappedException(g, ex1);
1059 >        checkCompletedExceptionally(f, ex1);
1060 >        if (testImplementationDetails) {
1061 >            assertEquals(1, ex1.getSuppressed().length);
1062 >            assertSame(ex2, ex1.getSuppressed()[0]);
1063 >        }
1064          assertEquals(1, a.get());
1065      }}
1066  
# Line 867 | Line 1075 | public class CompletableFutureTest exten
1075      {
1076          final CompletableFuture<Integer> f = new CompletableFuture<>();
1077          final AtomicInteger a = new AtomicInteger(0);
1078 <        if (!createIncomplete) f.complete(v1);
1078 >        if (!createIncomplete) assertTrue(f.complete(v1));
1079          final CompletableFuture<Integer> g = m.handle
1080              (f,
1081 <             (Integer x, Throwable t) -> {
1081 >             (Integer result, Throwable t) -> {
1082                  m.checkExecutionMode();
1083 <                threadAssertSame(x, v1);
1083 >                threadAssertSame(result, v1);
1084                  threadAssertNull(t);
1085                  a.getAndIncrement();
1086                  return inc(v1);
1087              });
1088 <        if (createIncomplete) f.complete(v1);
1088 >        if (createIncomplete) assertTrue(f.complete(v1));
1089  
1090          checkCompletedNormally(g, inc(v1));
1091          checkCompletedNormally(f, v1);
# Line 899 | Line 1107 | public class CompletableFutureTest exten
1107          if (!createIncomplete) f.completeExceptionally(ex);
1108          final CompletableFuture<Integer> g = m.handle
1109              (f,
1110 <             (Integer x, Throwable t) -> {
1110 >             (Integer result, Throwable t) -> {
1111                  m.checkExecutionMode();
1112 <                threadAssertNull(x);
1112 >                threadAssertNull(result);
1113                  threadAssertSame(t, ex);
1114                  a.getAndIncrement();
1115                  return v1;
# Line 909 | Line 1117 | public class CompletableFutureTest exten
1117          if (createIncomplete) f.completeExceptionally(ex);
1118  
1119          checkCompletedNormally(g, v1);
1120 <        checkCompletedWithWrappedCFException(f, ex);
1120 >        checkCompletedExceptionally(f, ex);
1121          assertEquals(1, a.get());
1122      }}
1123  
# Line 928 | Line 1136 | public class CompletableFutureTest exten
1136          if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1137          final CompletableFuture<Integer> g = m.handle
1138              (f,
1139 <             (Integer x, Throwable t) -> {
1139 >             (Integer result, Throwable t) -> {
1140                  m.checkExecutionMode();
1141 <                threadAssertNull(x);
1141 >                threadAssertNull(result);
1142                  threadAssertTrue(t instanceof CancellationException);
1143                  a.getAndIncrement();
1144                  return v1;
# Line 943 | Line 1151 | public class CompletableFutureTest exten
1151      }}
1152  
1153      /**
1154 <     * handle result completes exceptionally if action does
1154 >     * If a "handle action" throws an exception when triggered by
1155 >     * a normal completion, it completes exceptionally
1156       */
1157 <    public void testHandle_sourceFailedActionFailed() {
1157 >    public void testHandle_sourceCompletedNormallyActionFailed() {
1158          for (ExecutionMode m : ExecutionMode.values())
1159          for (boolean createIncomplete : new boolean[] { true, false })
1160 +        for (Integer v1 : new Integer[] { 1, null })
1161      {
1162          final CompletableFuture<Integer> f = new CompletableFuture<>();
1163          final AtomicInteger a = new AtomicInteger(0);
1164 <        final CFException ex1 = new CFException();
1165 <        final CFException ex2 = new CFException();
956 <        if (!createIncomplete) f.completeExceptionally(ex1);
1164 >        final CFException ex = new CFException();
1165 >        if (!createIncomplete) assertTrue(f.complete(v1));
1166          final CompletableFuture<Integer> g = m.handle
1167              (f,
1168 <             (Integer x, Throwable t) -> {
1168 >             (Integer result, Throwable t) -> {
1169                  m.checkExecutionMode();
1170 <                threadAssertNull(x);
1171 <                threadAssertSame(ex1, t);
1170 >                threadAssertSame(result, v1);
1171 >                threadAssertNull(t);
1172                  a.getAndIncrement();
1173 <                throw ex2;
1173 >                throw ex;
1174              });
1175 <        if (createIncomplete) f.completeExceptionally(ex1);
1175 >        if (createIncomplete) assertTrue(f.complete(v1));
1176  
1177 <        checkCompletedWithWrappedCFException(g, ex2);
1178 <        checkCompletedWithWrappedCFException(f, ex1);
1177 >        checkCompletedWithWrappedException(g, ex);
1178 >        checkCompletedNormally(f, v1);
1179          assertEquals(1, a.get());
1180      }}
1181  
1182 <    public void testHandle_sourceCompletedNormallyActionFailed() {
1183 <        for (ExecutionMode m : ExecutionMode.values())
1182 >    /**
1183 >     * If a "handle action" throws an exception when triggered by
1184 >     * a source completion that also throws an exception, the action
1185 >     * exception takes precedence (unlike whenComplete)
1186 >     */
1187 >    public void testHandle_sourceFailedActionFailed() {
1188          for (boolean createIncomplete : new boolean[] { true, false })
1189 <        for (Integer v1 : new Integer[] { 1, null })
1189 >        for (ExecutionMode m : ExecutionMode.values())
1190      {
978        final CompletableFuture<Integer> f = new CompletableFuture<>();
1191          final AtomicInteger a = new AtomicInteger(0);
1192 <        final CFException ex = new CFException();
1193 <        if (!createIncomplete) f.complete(v1);
1192 >        final CFException ex1 = new CFException();
1193 >        final CFException ex2 = new CFException();
1194 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1195 >
1196 >        if (!createIncomplete) f.completeExceptionally(ex1);
1197          final CompletableFuture<Integer> g = m.handle
1198              (f,
1199 <             (Integer x, Throwable t) -> {
1199 >             (Integer result, Throwable t) -> {
1200                  m.checkExecutionMode();
1201 <                threadAssertSame(x, v1);
1202 <                threadAssertNull(t);
1201 >                threadAssertNull(result);
1202 >                threadAssertSame(ex1, t);
1203                  a.getAndIncrement();
1204 <                throw ex;
1204 >                throw ex2;
1205              });
1206 <        if (createIncomplete) f.complete(v1);
1206 >        if (createIncomplete) f.completeExceptionally(ex1);
1207  
1208 <        checkCompletedWithWrappedCFException(g, ex);
1209 <        checkCompletedNormally(f, v1);
1208 >        checkCompletedWithWrappedException(g, ex2);
1209 >        checkCompletedExceptionally(f, ex1);
1210          assertEquals(1, a.get());
1211      }}
1212  
# Line 1024 | Line 1239 | public class CompletableFutureTest exten
1239      {
1240          final FailingRunnable r = new FailingRunnable(m);
1241          final CompletableFuture<Void> f = m.runAsync(r);
1242 <        checkCompletedWithWrappedCFException(f);
1242 >        checkCompletedWithWrappedException(f, r.ex);
1243          r.assertInvoked();
1244      }}
1245  
1246 +    public void testRunAsync_rejectingExecutor() {
1247 +        CountingRejectingExecutor e = new CountingRejectingExecutor();
1248 +        try {
1249 +            CompletableFuture.runAsync(() -> {}, e);
1250 +            shouldThrow();
1251 +        } catch (Throwable t) {
1252 +            assertSame(e.ex, t);
1253 +        }
1254 +
1255 +        assertEquals(1, e.count.get());
1256 +    }
1257 +
1258      /**
1259       * supplyAsync completes with result of supplier
1260       */
# Line 1058 | Line 1285 | public class CompletableFutureTest exten
1285      {
1286          FailingSupplier r = new FailingSupplier(m);
1287          CompletableFuture<Integer> f = m.supplyAsync(r);
1288 <        checkCompletedWithWrappedCFException(f);
1288 >        checkCompletedWithWrappedException(f, r.ex);
1289          r.assertInvoked();
1290      }}
1291  
1292 +    public void testSupplyAsync_rejectingExecutor() {
1293 +        CountingRejectingExecutor e = new CountingRejectingExecutor();
1294 +        try {
1295 +            CompletableFuture.supplyAsync(() -> null, e);
1296 +            shouldThrow();
1297 +        } catch (Throwable t) {
1298 +            assertSame(e.ex, t);
1299 +        }
1300 +
1301 +        assertEquals(1, e.count.get());
1302 +    }
1303 +
1304      // seq completion methods
1305  
1306      /**
# Line 1069 | Line 1308 | public class CompletableFutureTest exten
1308       */
1309      public void testThenRun_normalCompletion() {
1310          for (ExecutionMode m : ExecutionMode.values())
1072        for (boolean createIncomplete : new boolean[] { true, false })
1311          for (Integer v1 : new Integer[] { 1, null })
1312      {
1313          final CompletableFuture<Integer> f = new CompletableFuture<>();
1314 <        final Noop r = new Noop(m);
1315 <        if (!createIncomplete) f.complete(v1);
1078 <        final CompletableFuture<Void> g = m.thenRun(f, r);
1079 <        if (createIncomplete) {
1080 <            checkIncomplete(g);
1081 <            f.complete(v1);
1082 <        }
1314 >        final Noop[] rs = new Noop[6];
1315 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1316  
1317 <        checkCompletedNormally(g, null);
1317 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1318 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1319 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1320 >        checkIncomplete(h0);
1321 >        checkIncomplete(h1);
1322 >        checkIncomplete(h2);
1323 >        assertTrue(f.complete(v1));
1324 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1325 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1326 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1327 >
1328 >        checkCompletedNormally(h0, null);
1329 >        checkCompletedNormally(h1, null);
1330 >        checkCompletedNormally(h2, null);
1331 >        checkCompletedNormally(h3, null);
1332 >        checkCompletedNormally(h4, null);
1333 >        checkCompletedNormally(h5, null);
1334          checkCompletedNormally(f, v1);
1335 <        r.assertInvoked();
1335 >        for (Noop r : rs) r.assertInvoked();
1336      }}
1337  
1338      /**
# Line 1092 | Line 1341 | public class CompletableFutureTest exten
1341       */
1342      public void testThenRun_exceptionalCompletion() {
1343          for (ExecutionMode m : ExecutionMode.values())
1095        for (boolean createIncomplete : new boolean[] { true, false })
1344      {
1345          final CFException ex = new CFException();
1346          final CompletableFuture<Integer> f = new CompletableFuture<>();
1347 <        final Noop r = new Noop(m);
1348 <        if (!createIncomplete) f.completeExceptionally(ex);
1101 <        final CompletableFuture<Void> g = m.thenRun(f, r);
1102 <        if (createIncomplete) {
1103 <            checkIncomplete(g);
1104 <            f.completeExceptionally(ex);
1105 <        }
1347 >        final Noop[] rs = new Noop[6];
1348 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1349  
1350 <        checkCompletedWithWrappedCFException(g, ex);
1351 <        checkCompletedWithWrappedCFException(f, ex);
1352 <        r.assertNotInvoked();
1350 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1351 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1352 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1353 >        checkIncomplete(h0);
1354 >        checkIncomplete(h1);
1355 >        checkIncomplete(h2);
1356 >        assertTrue(f.completeExceptionally(ex));
1357 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1358 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1359 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1360 >
1361 >        checkCompletedWithWrappedException(h0, ex);
1362 >        checkCompletedWithWrappedException(h1, ex);
1363 >        checkCompletedWithWrappedException(h2, ex);
1364 >        checkCompletedWithWrappedException(h3, ex);
1365 >        checkCompletedWithWrappedException(h4, ex);
1366 >        checkCompletedWithWrappedException(h5, ex);
1367 >        checkCompletedExceptionally(f, ex);
1368 >        for (Noop r : rs) r.assertNotInvoked();
1369      }}
1370  
1371      /**
# Line 1114 | Line 1373 | public class CompletableFutureTest exten
1373       */
1374      public void testThenRun_sourceCancelled() {
1375          for (ExecutionMode m : ExecutionMode.values())
1117        for (boolean createIncomplete : new boolean[] { true, false })
1376          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1377      {
1378          final CompletableFuture<Integer> f = new CompletableFuture<>();
1379 <        final Noop r = new Noop(m);
1380 <        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1123 <        final CompletableFuture<Void> g = m.thenRun(f, r);
1124 <        if (createIncomplete) {
1125 <            checkIncomplete(g);
1126 <            assertTrue(f.cancel(mayInterruptIfRunning));
1127 <        }
1379 >        final Noop[] rs = new Noop[6];
1380 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1381  
1382 <        checkCompletedWithWrappedCancellationException(g);
1382 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1383 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1384 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1385 >        checkIncomplete(h0);
1386 >        checkIncomplete(h1);
1387 >        checkIncomplete(h2);
1388 >        assertTrue(f.cancel(mayInterruptIfRunning));
1389 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1390 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1391 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1392 >
1393 >        checkCompletedWithWrappedCancellationException(h0);
1394 >        checkCompletedWithWrappedCancellationException(h1);
1395 >        checkCompletedWithWrappedCancellationException(h2);
1396 >        checkCompletedWithWrappedCancellationException(h3);
1397 >        checkCompletedWithWrappedCancellationException(h4);
1398 >        checkCompletedWithWrappedCancellationException(h5);
1399          checkCancelled(f);
1400 <        r.assertNotInvoked();
1400 >        for (Noop r : rs) r.assertNotInvoked();
1401      }}
1402  
1403      /**
# Line 1136 | Line 1405 | public class CompletableFutureTest exten
1405       */
1406      public void testThenRun_actionFailed() {
1407          for (ExecutionMode m : ExecutionMode.values())
1139        for (boolean createIncomplete : new boolean[] { true, false })
1408          for (Integer v1 : new Integer[] { 1, null })
1409      {
1410          final CompletableFuture<Integer> f = new CompletableFuture<>();
1411 <        final FailingRunnable r = new FailingRunnable(m);
1412 <        if (!createIncomplete) f.complete(v1);
1145 <        final CompletableFuture<Void> g = m.thenRun(f, r);
1146 <        if (createIncomplete) {
1147 <            checkIncomplete(g);
1148 <            f.complete(v1);
1149 <        }
1411 >        final FailingRunnable[] rs = new FailingRunnable[6];
1412 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingRunnable(m);
1413  
1414 <        checkCompletedWithWrappedCFException(g);
1414 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1415 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1416 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1417 >        assertTrue(f.complete(v1));
1418 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1419 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1420 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1421 >
1422 >        checkCompletedWithWrappedException(h0, rs[0].ex);
1423 >        checkCompletedWithWrappedException(h1, rs[1].ex);
1424 >        checkCompletedWithWrappedException(h2, rs[2].ex);
1425 >        checkCompletedWithWrappedException(h3, rs[3].ex);
1426 >        checkCompletedWithWrappedException(h4, rs[4].ex);
1427 >        checkCompletedWithWrappedException(h5, rs[5].ex);
1428          checkCompletedNormally(f, v1);
1429      }}
1430  
# Line 1157 | Line 1433 | public class CompletableFutureTest exten
1433       */
1434      public void testThenApply_normalCompletion() {
1435          for (ExecutionMode m : ExecutionMode.values())
1160        for (boolean createIncomplete : new boolean[] { true, false })
1436          for (Integer v1 : new Integer[] { 1, null })
1437      {
1438          final CompletableFuture<Integer> f = new CompletableFuture<>();
1439 <        final IncFunction r = new IncFunction(m);
1440 <        if (!createIncomplete) f.complete(v1);
1166 <        final CompletableFuture<Integer> g = m.thenApply(f, r);
1167 <        if (createIncomplete) {
1168 <            checkIncomplete(g);
1169 <            f.complete(v1);
1170 <        }
1439 >        final IncFunction[] rs = new IncFunction[4];
1440 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1441  
1442 <        checkCompletedNormally(g, inc(v1));
1442 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1443 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1444 >        checkIncomplete(h0);
1445 >        checkIncomplete(h1);
1446 >        assertTrue(f.complete(v1));
1447 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1448 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1449 >
1450 >        checkCompletedNormally(h0, inc(v1));
1451 >        checkCompletedNormally(h1, inc(v1));
1452 >        checkCompletedNormally(h2, inc(v1));
1453 >        checkCompletedNormally(h3, inc(v1));
1454          checkCompletedNormally(f, v1);
1455 <        r.assertInvoked();
1455 >        for (IncFunction r : rs) r.assertValue(inc(v1));
1456      }}
1457  
1458      /**
# Line 1180 | Line 1461 | public class CompletableFutureTest exten
1461       */
1462      public void testThenApply_exceptionalCompletion() {
1463          for (ExecutionMode m : ExecutionMode.values())
1183        for (boolean createIncomplete : new boolean[] { true, false })
1464      {
1465          final CFException ex = new CFException();
1466          final CompletableFuture<Integer> f = new CompletableFuture<>();
1467 <        final IncFunction r = new IncFunction(m);
1468 <        if (!createIncomplete) f.completeExceptionally(ex);
1189 <        final CompletableFuture<Integer> g = m.thenApply(f, r);
1190 <        if (createIncomplete) {
1191 <            checkIncomplete(g);
1192 <            f.completeExceptionally(ex);
1193 <        }
1467 >        final IncFunction[] rs = new IncFunction[4];
1468 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1469  
1470 <        checkCompletedWithWrappedCFException(g, ex);
1471 <        checkCompletedWithWrappedCFException(f, ex);
1472 <        r.assertNotInvoked();
1470 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1471 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1472 >        assertTrue(f.completeExceptionally(ex));
1473 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1474 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1475 >
1476 >        checkCompletedWithWrappedException(h0, ex);
1477 >        checkCompletedWithWrappedException(h1, ex);
1478 >        checkCompletedWithWrappedException(h2, ex);
1479 >        checkCompletedWithWrappedException(h3, ex);
1480 >        checkCompletedExceptionally(f, ex);
1481 >        for (IncFunction r : rs) r.assertNotInvoked();
1482      }}
1483  
1484      /**
# Line 1202 | Line 1486 | public class CompletableFutureTest exten
1486       */
1487      public void testThenApply_sourceCancelled() {
1488          for (ExecutionMode m : ExecutionMode.values())
1205        for (boolean createIncomplete : new boolean[] { true, false })
1489          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1490      {
1491          final CompletableFuture<Integer> f = new CompletableFuture<>();
1492 <        final IncFunction r = new IncFunction(m);
1493 <        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1211 <        final CompletableFuture<Integer> g = m.thenApply(f, r);
1212 <        if (createIncomplete) {
1213 <            checkIncomplete(g);
1214 <            assertTrue(f.cancel(mayInterruptIfRunning));
1215 <        }
1492 >        final IncFunction[] rs = new IncFunction[4];
1493 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1494  
1495 <        checkCompletedWithWrappedCancellationException(g);
1495 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1496 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1497 >        assertTrue(f.cancel(mayInterruptIfRunning));
1498 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1499 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1500 >
1501 >        checkCompletedWithWrappedCancellationException(h0);
1502 >        checkCompletedWithWrappedCancellationException(h1);
1503 >        checkCompletedWithWrappedCancellationException(h2);
1504 >        checkCompletedWithWrappedCancellationException(h3);
1505          checkCancelled(f);
1506 <        r.assertNotInvoked();
1506 >        for (IncFunction r : rs) r.assertNotInvoked();
1507      }}
1508  
1509      /**
# Line 1224 | Line 1511 | public class CompletableFutureTest exten
1511       */
1512      public void testThenApply_actionFailed() {
1513          for (ExecutionMode m : ExecutionMode.values())
1227        for (boolean createIncomplete : new boolean[] { true, false })
1514          for (Integer v1 : new Integer[] { 1, null })
1515      {
1516          final CompletableFuture<Integer> f = new CompletableFuture<>();
1517 <        final FailingFunction r = new FailingFunction(m);
1518 <        if (!createIncomplete) f.complete(v1);
1233 <        final CompletableFuture<Integer> g = m.thenApply(f, r);
1234 <        if (createIncomplete) {
1235 <            checkIncomplete(g);
1236 <            f.complete(v1);
1237 <        }
1517 >        final FailingFunction[] rs = new FailingFunction[4];
1518 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingFunction(m);
1519  
1520 <        checkCompletedWithWrappedCFException(g);
1520 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1521 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1522 >        assertTrue(f.complete(v1));
1523 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1524 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1525 >
1526 >        checkCompletedWithWrappedException(h0, rs[0].ex);
1527 >        checkCompletedWithWrappedException(h1, rs[1].ex);
1528 >        checkCompletedWithWrappedException(h2, rs[2].ex);
1529 >        checkCompletedWithWrappedException(h3, rs[3].ex);
1530          checkCompletedNormally(f, v1);
1531      }}
1532  
# Line 1245 | Line 1535 | public class CompletableFutureTest exten
1535       */
1536      public void testThenAccept_normalCompletion() {
1537          for (ExecutionMode m : ExecutionMode.values())
1248        for (boolean createIncomplete : new boolean[] { true, false })
1538          for (Integer v1 : new Integer[] { 1, null })
1539      {
1540          final CompletableFuture<Integer> f = new CompletableFuture<>();
1541 <        final NoopConsumer r = new NoopConsumer(m);
1542 <        if (!createIncomplete) f.complete(v1);
1254 <        final CompletableFuture<Void> g = m.thenAccept(f, r);
1255 <        if (createIncomplete) {
1256 <            checkIncomplete(g);
1257 <            f.complete(v1);
1258 <        }
1541 >        final NoopConsumer[] rs = new NoopConsumer[4];
1542 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1543  
1544 <        checkCompletedNormally(g, null);
1545 <        r.assertValue(v1);
1544 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1545 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1546 >        checkIncomplete(h0);
1547 >        checkIncomplete(h1);
1548 >        assertTrue(f.complete(v1));
1549 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1550 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1551 >
1552 >        checkCompletedNormally(h0, null);
1553 >        checkCompletedNormally(h1, null);
1554 >        checkCompletedNormally(h2, null);
1555 >        checkCompletedNormally(h3, null);
1556          checkCompletedNormally(f, v1);
1557 +        for (NoopConsumer r : rs) r.assertValue(v1);
1558      }}
1559  
1560      /**
# Line 1268 | Line 1563 | public class CompletableFutureTest exten
1563       */
1564      public void testThenAccept_exceptionalCompletion() {
1565          for (ExecutionMode m : ExecutionMode.values())
1271        for (boolean createIncomplete : new boolean[] { true, false })
1566      {
1567          final CFException ex = new CFException();
1568          final CompletableFuture<Integer> f = new CompletableFuture<>();
1569 <        final NoopConsumer r = new NoopConsumer(m);
1570 <        if (!createIncomplete) f.completeExceptionally(ex);
1277 <        final CompletableFuture<Void> g = m.thenAccept(f, r);
1278 <        if (createIncomplete) {
1279 <            checkIncomplete(g);
1280 <            f.completeExceptionally(ex);
1281 <        }
1569 >        final NoopConsumer[] rs = new NoopConsumer[4];
1570 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1571  
1572 <        checkCompletedWithWrappedCFException(g, ex);
1573 <        checkCompletedWithWrappedCFException(f, ex);
1574 <        r.assertNotInvoked();
1572 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1573 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1574 >        assertTrue(f.completeExceptionally(ex));
1575 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1576 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1577 >
1578 >        checkCompletedWithWrappedException(h0, ex);
1579 >        checkCompletedWithWrappedException(h1, ex);
1580 >        checkCompletedWithWrappedException(h2, ex);
1581 >        checkCompletedWithWrappedException(h3, ex);
1582 >        checkCompletedExceptionally(f, ex);
1583 >        for (NoopConsumer r : rs) r.assertNotInvoked();
1584      }}
1585  
1586      /**
# Line 1290 | Line 1588 | public class CompletableFutureTest exten
1588       */
1589      public void testThenAccept_sourceCancelled() {
1590          for (ExecutionMode m : ExecutionMode.values())
1293        for (boolean createIncomplete : new boolean[] { true, false })
1591          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1592      {
1593          final CompletableFuture<Integer> f = new CompletableFuture<>();
1594 <        final NoopConsumer r = new NoopConsumer(m);
1595 <        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1299 <        final CompletableFuture<Void> g = m.thenAccept(f, r);
1300 <        if (createIncomplete) {
1301 <            checkIncomplete(g);
1302 <            assertTrue(f.cancel(mayInterruptIfRunning));
1303 <        }
1594 >        final NoopConsumer[] rs = new NoopConsumer[4];
1595 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1596  
1597 <        checkCompletedWithWrappedCancellationException(g);
1597 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1598 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1599 >        assertTrue(f.cancel(mayInterruptIfRunning));
1600 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1601 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1602 >
1603 >        checkCompletedWithWrappedCancellationException(h0);
1604 >        checkCompletedWithWrappedCancellationException(h1);
1605 >        checkCompletedWithWrappedCancellationException(h2);
1606 >        checkCompletedWithWrappedCancellationException(h3);
1607          checkCancelled(f);
1608 <        r.assertNotInvoked();
1608 >        for (NoopConsumer r : rs) r.assertNotInvoked();
1609      }}
1610  
1611      /**
# Line 1312 | Line 1613 | public class CompletableFutureTest exten
1613       */
1614      public void testThenAccept_actionFailed() {
1615          for (ExecutionMode m : ExecutionMode.values())
1315        for (boolean createIncomplete : new boolean[] { true, false })
1616          for (Integer v1 : new Integer[] { 1, null })
1617      {
1618          final CompletableFuture<Integer> f = new CompletableFuture<>();
1619 <        final FailingConsumer r = new FailingConsumer(m);
1620 <        if (!createIncomplete) f.complete(v1);
1321 <        final CompletableFuture<Void> g = m.thenAccept(f, r);
1322 <        if (createIncomplete) {
1323 <            checkIncomplete(g);
1324 <            f.complete(v1);
1325 <        }
1619 >        final FailingConsumer[] rs = new FailingConsumer[4];
1620 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingConsumer(m);
1621  
1622 <        checkCompletedWithWrappedCFException(g);
1622 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1623 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1624 >        assertTrue(f.complete(v1));
1625 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1626 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1627 >
1628 >        checkCompletedWithWrappedException(h0, rs[0].ex);
1629 >        checkCompletedWithWrappedException(h1, rs[1].ex);
1630 >        checkCompletedWithWrappedException(h2, rs[2].ex);
1631 >        checkCompletedWithWrappedException(h3, rs[3].ex);
1632          checkCompletedNormally(f, v1);
1633      }}
1634  
# Line 1334 | Line 1638 | public class CompletableFutureTest exten
1638       */
1639      public void testThenCombine_normalCompletion() {
1640          for (ExecutionMode m : ExecutionMode.values())
1337        for (boolean createIncomplete : new boolean[] { true, false })
1641          for (boolean fFirst : new boolean[] { true, false })
1642          for (Integer v1 : new Integer[] { 1, null })
1643          for (Integer v2 : new Integer[] { 2, null })
1644      {
1645          final CompletableFuture<Integer> f = new CompletableFuture<>();
1646          final CompletableFuture<Integer> g = new CompletableFuture<>();
1647 <        final SubtractFunction r = new SubtractFunction(m);
1647 >        final SubtractFunction[] rs = new SubtractFunction[6];
1648 >        for (int i = 0; i < rs.length; i++) rs[i] = new SubtractFunction(m);
1649  
1650 <        if (fFirst) f.complete(v1); else g.complete(v2);
1651 <        if (!createIncomplete)
1652 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1653 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1654 <        if (createIncomplete) {
1655 <            checkIncomplete(h);
1656 <            r.assertNotInvoked();
1657 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1658 <        }
1650 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1651 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1652 >        final Integer w1 =  fFirst ? v1 : v2;
1653 >        final Integer w2 = !fFirst ? v1 : v2;
1654 >
1655 >        final CompletableFuture<Integer> h0 = m.thenCombine(f, g, rs[0]);
1656 >        final CompletableFuture<Integer> h1 = m.thenCombine(fst, fst, rs[1]);
1657 >        assertTrue(fst.complete(w1));
1658 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, rs[2]);
1659 >        final CompletableFuture<Integer> h3 = m.thenCombine(fst, fst, rs[3]);
1660 >        checkIncomplete(h0); rs[0].assertNotInvoked();
1661 >        checkIncomplete(h2); rs[2].assertNotInvoked();
1662 >        checkCompletedNormally(h1, subtract(w1, w1));
1663 >        checkCompletedNormally(h3, subtract(w1, w1));
1664 >        rs[1].assertValue(subtract(w1, w1));
1665 >        rs[3].assertValue(subtract(w1, w1));
1666 >        assertTrue(snd.complete(w2));
1667 >        final CompletableFuture<Integer> h4 = m.thenCombine(f, g, rs[4]);
1668 >
1669 >        checkCompletedNormally(h0, subtract(v1, v2));
1670 >        checkCompletedNormally(h2, subtract(v1, v2));
1671 >        checkCompletedNormally(h4, subtract(v1, v2));
1672 >        rs[0].assertValue(subtract(v1, v2));
1673 >        rs[2].assertValue(subtract(v1, v2));
1674 >        rs[4].assertValue(subtract(v1, v2));
1675  
1356        checkCompletedNormally(h, subtract(v1, v2));
1676          checkCompletedNormally(f, v1);
1677          checkCompletedNormally(g, v2);
1359        r.assertInvoked();
1678      }}
1679  
1680      /**
1681       * thenCombine result completes exceptionally after exceptional
1682       * completion of either source
1683       */
1684 <    public void testThenCombine_exceptionalCompletion() {
1684 >    public void testThenCombine_exceptionalCompletion() throws Throwable {
1685          for (ExecutionMode m : ExecutionMode.values())
1368        for (boolean createIncomplete : new boolean[] { true, false })
1686          for (boolean fFirst : new boolean[] { true, false })
1687 +        for (boolean failFirst : new boolean[] { true, false })
1688          for (Integer v1 : new Integer[] { 1, null })
1689      {
1690          final CompletableFuture<Integer> f = new CompletableFuture<>();
1691          final CompletableFuture<Integer> g = new CompletableFuture<>();
1692          final CFException ex = new CFException();
1693 <        final SubtractFunction r = new SubtractFunction(m);
1694 <
1695 <        (fFirst ? f : g).complete(v1);
1696 <        if (!createIncomplete)
1697 <            (!fFirst ? f : g).completeExceptionally(ex);
1698 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1699 <        if (createIncomplete) {
1700 <            checkIncomplete(h);
1701 <            (!fFirst ? f : g).completeExceptionally(ex);
1702 <        }
1703 <
1704 <        checkCompletedWithWrappedCFException(h, ex);
1705 <        r.assertNotInvoked();
1706 <        checkCompletedNormally(fFirst ? f : g, v1);
1707 <        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1693 >        final SubtractFunction r1 = new SubtractFunction(m);
1694 >        final SubtractFunction r2 = new SubtractFunction(m);
1695 >        final SubtractFunction r3 = new SubtractFunction(m);
1696 >
1697 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1698 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1699 >        final Callable<Boolean> complete1 = failFirst ?
1700 >            () -> fst.completeExceptionally(ex) :
1701 >            () -> fst.complete(v1);
1702 >        final Callable<Boolean> complete2 = failFirst ?
1703 >            () -> snd.complete(v1) :
1704 >            () -> snd.completeExceptionally(ex);
1705 >
1706 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1707 >        assertTrue(complete1.call());
1708 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1709 >        checkIncomplete(h1);
1710 >        checkIncomplete(h2);
1711 >        assertTrue(complete2.call());
1712 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1713 >
1714 >        checkCompletedWithWrappedException(h1, ex);
1715 >        checkCompletedWithWrappedException(h2, ex);
1716 >        checkCompletedWithWrappedException(h3, ex);
1717 >        r1.assertNotInvoked();
1718 >        r2.assertNotInvoked();
1719 >        r3.assertNotInvoked();
1720 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1721 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
1722      }}
1723  
1724      /**
1725       * thenCombine result completes exceptionally if either source cancelled
1726       */
1727 <    public void testThenCombine_sourceCancelled() {
1727 >    public void testThenCombine_sourceCancelled() throws Throwable {
1728          for (ExecutionMode m : ExecutionMode.values())
1729          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1398        for (boolean createIncomplete : new boolean[] { true, false })
1730          for (boolean fFirst : new boolean[] { true, false })
1731 +        for (boolean failFirst : new boolean[] { true, false })
1732          for (Integer v1 : new Integer[] { 1, null })
1733      {
1734          final CompletableFuture<Integer> f = new CompletableFuture<>();
1735          final CompletableFuture<Integer> g = new CompletableFuture<>();
1736 <        final SubtractFunction r = new SubtractFunction(m);
1737 <
1738 <        (fFirst ? f : g).complete(v1);
1739 <        if (!createIncomplete)
1740 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1741 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1742 <        if (createIncomplete) {
1743 <            checkIncomplete(h);
1744 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1745 <        }
1736 >        final SubtractFunction r1 = new SubtractFunction(m);
1737 >        final SubtractFunction r2 = new SubtractFunction(m);
1738 >        final SubtractFunction r3 = new SubtractFunction(m);
1739 >
1740 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1741 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1742 >        final Callable<Boolean> complete1 = failFirst ?
1743 >            () -> fst.cancel(mayInterruptIfRunning) :
1744 >            () -> fst.complete(v1);
1745 >        final Callable<Boolean> complete2 = failFirst ?
1746 >            () -> snd.complete(v1) :
1747 >            () -> snd.cancel(mayInterruptIfRunning);
1748 >
1749 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1750 >        assertTrue(complete1.call());
1751 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1752 >        checkIncomplete(h1);
1753 >        checkIncomplete(h2);
1754 >        assertTrue(complete2.call());
1755 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1756  
1757 <        checkCompletedWithWrappedCancellationException(h);
1758 <        checkCancelled(!fFirst ? f : g);
1759 <        r.assertNotInvoked();
1760 <        checkCompletedNormally(fFirst ? f : g, v1);
1757 >        checkCompletedWithWrappedCancellationException(h1);
1758 >        checkCompletedWithWrappedCancellationException(h2);
1759 >        checkCompletedWithWrappedCancellationException(h3);
1760 >        r1.assertNotInvoked();
1761 >        r2.assertNotInvoked();
1762 >        r3.assertNotInvoked();
1763 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1764 >        checkCancelled(failFirst ? fst : snd);
1765      }}
1766  
1767      /**
# Line 1429 | Line 1775 | public class CompletableFutureTest exten
1775      {
1776          final CompletableFuture<Integer> f = new CompletableFuture<>();
1777          final CompletableFuture<Integer> g = new CompletableFuture<>();
1778 <        final FailingBiFunction r = new FailingBiFunction(m);
1779 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1780 <
1781 <        if (fFirst) {
1782 <            f.complete(v1);
1783 <            g.complete(v2);
1784 <        } else {
1785 <            g.complete(v2);
1786 <            f.complete(v1);
1787 <        }
1788 <
1789 <        checkCompletedWithWrappedCFException(h);
1778 >        final FailingBiFunction r1 = new FailingBiFunction(m);
1779 >        final FailingBiFunction r2 = new FailingBiFunction(m);
1780 >        final FailingBiFunction r3 = new FailingBiFunction(m);
1781 >
1782 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1783 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1784 >        final Integer w1 =  fFirst ? v1 : v2;
1785 >        final Integer w2 = !fFirst ? v1 : v2;
1786 >
1787 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1788 >        assertTrue(fst.complete(w1));
1789 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1790 >        assertTrue(snd.complete(w2));
1791 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1792 >
1793 >        checkCompletedWithWrappedException(h1, r1.ex);
1794 >        checkCompletedWithWrappedException(h2, r2.ex);
1795 >        checkCompletedWithWrappedException(h3, r3.ex);
1796 >        r1.assertInvoked();
1797 >        r2.assertInvoked();
1798 >        r3.assertInvoked();
1799          checkCompletedNormally(f, v1);
1800          checkCompletedNormally(g, v2);
1801      }}
# Line 1451 | Line 1806 | public class CompletableFutureTest exten
1806       */
1807      public void testThenAcceptBoth_normalCompletion() {
1808          for (ExecutionMode m : ExecutionMode.values())
1454        for (boolean createIncomplete : new boolean[] { true, false })
1809          for (boolean fFirst : new boolean[] { true, false })
1810          for (Integer v1 : new Integer[] { 1, null })
1811          for (Integer v2 : new Integer[] { 2, null })
1812      {
1813          final CompletableFuture<Integer> f = new CompletableFuture<>();
1814          final CompletableFuture<Integer> g = new CompletableFuture<>();
1815 <        final SubtractAction r = new SubtractAction(m);
1816 <
1817 <        if (fFirst) f.complete(v1); else g.complete(v2);
1818 <        if (!createIncomplete)
1819 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1820 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1821 <        if (createIncomplete) {
1822 <            checkIncomplete(h);
1823 <            r.assertNotInvoked();
1824 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1825 <        }
1815 >        final SubtractAction r1 = new SubtractAction(m);
1816 >        final SubtractAction r2 = new SubtractAction(m);
1817 >        final SubtractAction r3 = new SubtractAction(m);
1818 >
1819 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1820 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1821 >        final Integer w1 =  fFirst ? v1 : v2;
1822 >        final Integer w2 = !fFirst ? v1 : v2;
1823 >
1824 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1825 >        assertTrue(fst.complete(w1));
1826 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1827 >        checkIncomplete(h1);
1828 >        checkIncomplete(h2);
1829 >        r1.assertNotInvoked();
1830 >        r2.assertNotInvoked();
1831 >        assertTrue(snd.complete(w2));
1832 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1833  
1834 <        checkCompletedNormally(h, null);
1835 <        r.assertValue(subtract(v1, v2));
1834 >        checkCompletedNormally(h1, null);
1835 >        checkCompletedNormally(h2, null);
1836 >        checkCompletedNormally(h3, null);
1837 >        r1.assertValue(subtract(v1, v2));
1838 >        r2.assertValue(subtract(v1, v2));
1839 >        r3.assertValue(subtract(v1, v2));
1840          checkCompletedNormally(f, v1);
1841          checkCompletedNormally(g, v2);
1842      }}
# Line 1480 | Line 1845 | public class CompletableFutureTest exten
1845       * thenAcceptBoth result completes exceptionally after exceptional
1846       * completion of either source
1847       */
1848 <    public void testThenAcceptBoth_exceptionalCompletion() {
1848 >    public void testThenAcceptBoth_exceptionalCompletion() throws Throwable {
1849          for (ExecutionMode m : ExecutionMode.values())
1485        for (boolean createIncomplete : new boolean[] { true, false })
1850          for (boolean fFirst : new boolean[] { true, false })
1851 +        for (boolean failFirst : new boolean[] { true, false })
1852          for (Integer v1 : new Integer[] { 1, null })
1853      {
1854          final CompletableFuture<Integer> f = new CompletableFuture<>();
1855          final CompletableFuture<Integer> g = new CompletableFuture<>();
1856          final CFException ex = new CFException();
1857 <        final SubtractAction r = new SubtractAction(m);
1858 <
1859 <        (fFirst ? f : g).complete(v1);
1860 <        if (!createIncomplete)
1861 <            (!fFirst ? f : g).completeExceptionally(ex);
1862 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1863 <        if (createIncomplete) {
1864 <            checkIncomplete(h);
1865 <            (!fFirst ? f : g).completeExceptionally(ex);
1866 <        }
1867 <
1868 <        checkCompletedWithWrappedCFException(h, ex);
1869 <        r.assertNotInvoked();
1870 <        checkCompletedNormally(fFirst ? f : g, v1);
1871 <        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1857 >        final SubtractAction r1 = new SubtractAction(m);
1858 >        final SubtractAction r2 = new SubtractAction(m);
1859 >        final SubtractAction r3 = new SubtractAction(m);
1860 >
1861 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1862 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1863 >        final Callable<Boolean> complete1 = failFirst ?
1864 >            () -> fst.completeExceptionally(ex) :
1865 >            () -> fst.complete(v1);
1866 >        final Callable<Boolean> complete2 = failFirst ?
1867 >            () -> snd.complete(v1) :
1868 >            () -> snd.completeExceptionally(ex);
1869 >
1870 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1871 >        assertTrue(complete1.call());
1872 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1873 >        checkIncomplete(h1);
1874 >        checkIncomplete(h2);
1875 >        assertTrue(complete2.call());
1876 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1877 >
1878 >        checkCompletedWithWrappedException(h1, ex);
1879 >        checkCompletedWithWrappedException(h2, ex);
1880 >        checkCompletedWithWrappedException(h3, ex);
1881 >        r1.assertNotInvoked();
1882 >        r2.assertNotInvoked();
1883 >        r3.assertNotInvoked();
1884 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1885 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
1886      }}
1887  
1888      /**
1889       * thenAcceptBoth result completes exceptionally if either source cancelled
1890       */
1891 <    public void testThenAcceptBoth_sourceCancelled() {
1891 >    public void testThenAcceptBoth_sourceCancelled() throws Throwable {
1892          for (ExecutionMode m : ExecutionMode.values())
1893          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1515        for (boolean createIncomplete : new boolean[] { true, false })
1894          for (boolean fFirst : new boolean[] { true, false })
1895 +        for (boolean failFirst : new boolean[] { true, false })
1896          for (Integer v1 : new Integer[] { 1, null })
1897      {
1898          final CompletableFuture<Integer> f = new CompletableFuture<>();
1899          final CompletableFuture<Integer> g = new CompletableFuture<>();
1900 <        final SubtractAction r = new SubtractAction(m);
1901 <
1902 <        (fFirst ? f : g).complete(v1);
1903 <        if (!createIncomplete)
1904 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1905 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1906 <        if (createIncomplete) {
1907 <            checkIncomplete(h);
1908 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1909 <        }
1900 >        final SubtractAction r1 = new SubtractAction(m);
1901 >        final SubtractAction r2 = new SubtractAction(m);
1902 >        final SubtractAction r3 = new SubtractAction(m);
1903 >
1904 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1905 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1906 >        final Callable<Boolean> complete1 = failFirst ?
1907 >            () -> fst.cancel(mayInterruptIfRunning) :
1908 >            () -> fst.complete(v1);
1909 >        final Callable<Boolean> complete2 = failFirst ?
1910 >            () -> snd.complete(v1) :
1911 >            () -> snd.cancel(mayInterruptIfRunning);
1912 >
1913 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1914 >        assertTrue(complete1.call());
1915 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1916 >        checkIncomplete(h1);
1917 >        checkIncomplete(h2);
1918 >        assertTrue(complete2.call());
1919 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1920  
1921 <        checkCompletedWithWrappedCancellationException(h);
1922 <        checkCancelled(!fFirst ? f : g);
1923 <        r.assertNotInvoked();
1924 <        checkCompletedNormally(fFirst ? f : g, v1);
1921 >        checkCompletedWithWrappedCancellationException(h1);
1922 >        checkCompletedWithWrappedCancellationException(h2);
1923 >        checkCompletedWithWrappedCancellationException(h3);
1924 >        r1.assertNotInvoked();
1925 >        r2.assertNotInvoked();
1926 >        r3.assertNotInvoked();
1927 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1928 >        checkCancelled(failFirst ? fst : snd);
1929      }}
1930  
1931      /**
# Line 1546 | Line 1939 | public class CompletableFutureTest exten
1939      {
1940          final CompletableFuture<Integer> f = new CompletableFuture<>();
1941          final CompletableFuture<Integer> g = new CompletableFuture<>();
1942 <        final FailingBiConsumer r = new FailingBiConsumer(m);
1943 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1944 <
1945 <        if (fFirst) {
1946 <            f.complete(v1);
1947 <            g.complete(v2);
1948 <        } else {
1949 <            g.complete(v2);
1950 <            f.complete(v1);
1951 <        }
1952 <
1953 <        checkCompletedWithWrappedCFException(h);
1942 >        final FailingBiConsumer r1 = new FailingBiConsumer(m);
1943 >        final FailingBiConsumer r2 = new FailingBiConsumer(m);
1944 >        final FailingBiConsumer r3 = new FailingBiConsumer(m);
1945 >
1946 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1947 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1948 >        final Integer w1 =  fFirst ? v1 : v2;
1949 >        final Integer w2 = !fFirst ? v1 : v2;
1950 >
1951 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1952 >        assertTrue(fst.complete(w1));
1953 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1954 >        assertTrue(snd.complete(w2));
1955 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1956 >
1957 >        checkCompletedWithWrappedException(h1, r1.ex);
1958 >        checkCompletedWithWrappedException(h2, r2.ex);
1959 >        checkCompletedWithWrappedException(h3, r3.ex);
1960 >        r1.assertInvoked();
1961 >        r2.assertInvoked();
1962 >        r3.assertInvoked();
1963          checkCompletedNormally(f, v1);
1964          checkCompletedNormally(g, v2);
1965      }}
# Line 1568 | Line 1970 | public class CompletableFutureTest exten
1970       */
1971      public void testRunAfterBoth_normalCompletion() {
1972          for (ExecutionMode m : ExecutionMode.values())
1571        for (boolean createIncomplete : new boolean[] { true, false })
1973          for (boolean fFirst : new boolean[] { true, false })
1974          for (Integer v1 : new Integer[] { 1, null })
1975          for (Integer v2 : new Integer[] { 2, null })
1976      {
1977          final CompletableFuture<Integer> f = new CompletableFuture<>();
1978          final CompletableFuture<Integer> g = new CompletableFuture<>();
1979 <        final Noop r = new Noop(m);
1980 <
1981 <        if (fFirst) f.complete(v1); else g.complete(v2);
1982 <        if (!createIncomplete)
1983 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1984 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1985 <        if (createIncomplete) {
1986 <            checkIncomplete(h);
1987 <            r.assertNotInvoked();
1988 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1989 <        }
1979 >        final Noop r1 = new Noop(m);
1980 >        final Noop r2 = new Noop(m);
1981 >        final Noop r3 = new Noop(m);
1982 >
1983 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1984 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1985 >        final Integer w1 =  fFirst ? v1 : v2;
1986 >        final Integer w2 = !fFirst ? v1 : v2;
1987 >
1988 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
1989 >        assertTrue(fst.complete(w1));
1990 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
1991 >        checkIncomplete(h1);
1992 >        checkIncomplete(h2);
1993 >        r1.assertNotInvoked();
1994 >        r2.assertNotInvoked();
1995 >        assertTrue(snd.complete(w2));
1996 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
1997  
1998 <        checkCompletedNormally(h, null);
1999 <        r.assertInvoked();
1998 >        checkCompletedNormally(h1, null);
1999 >        checkCompletedNormally(h2, null);
2000 >        checkCompletedNormally(h3, null);
2001 >        r1.assertInvoked();
2002 >        r2.assertInvoked();
2003 >        r3.assertInvoked();
2004          checkCompletedNormally(f, v1);
2005          checkCompletedNormally(g, v2);
2006      }}
# Line 1597 | Line 2009 | public class CompletableFutureTest exten
2009       * runAfterBoth result completes exceptionally after exceptional
2010       * completion of either source
2011       */
2012 <    public void testRunAfterBoth_exceptionalCompletion() {
2012 >    public void testRunAfterBoth_exceptionalCompletion() throws Throwable {
2013          for (ExecutionMode m : ExecutionMode.values())
1602        for (boolean createIncomplete : new boolean[] { true, false })
2014          for (boolean fFirst : new boolean[] { true, false })
2015 +        for (boolean failFirst : new boolean[] { true, false })
2016          for (Integer v1 : new Integer[] { 1, null })
2017      {
2018          final CompletableFuture<Integer> f = new CompletableFuture<>();
2019          final CompletableFuture<Integer> g = new CompletableFuture<>();
2020          final CFException ex = new CFException();
2021 <        final Noop r = new Noop(m);
2022 <
2023 <        (fFirst ? f : g).complete(v1);
2024 <        if (!createIncomplete)
2025 <            (!fFirst ? f : g).completeExceptionally(ex);
2026 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2027 <        if (createIncomplete) {
2028 <            checkIncomplete(h);
2029 <            (!fFirst ? f : g).completeExceptionally(ex);
2030 <        }
2031 <
2032 <        checkCompletedWithWrappedCFException(h, ex);
2033 <        r.assertNotInvoked();
2034 <        checkCompletedNormally(fFirst ? f : g, v1);
2035 <        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
2021 >        final Noop r1 = new Noop(m);
2022 >        final Noop r2 = new Noop(m);
2023 >        final Noop r3 = new Noop(m);
2024 >
2025 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
2026 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
2027 >        final Callable<Boolean> complete1 = failFirst ?
2028 >            () -> fst.completeExceptionally(ex) :
2029 >            () -> fst.complete(v1);
2030 >        final Callable<Boolean> complete2 = failFirst ?
2031 >            () -> snd.complete(v1) :
2032 >            () -> snd.completeExceptionally(ex);
2033 >
2034 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2035 >        assertTrue(complete1.call());
2036 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2037 >        checkIncomplete(h1);
2038 >        checkIncomplete(h2);
2039 >        assertTrue(complete2.call());
2040 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2041 >
2042 >        checkCompletedWithWrappedException(h1, ex);
2043 >        checkCompletedWithWrappedException(h2, ex);
2044 >        checkCompletedWithWrappedException(h3, ex);
2045 >        r1.assertNotInvoked();
2046 >        r2.assertNotInvoked();
2047 >        r3.assertNotInvoked();
2048 >        checkCompletedNormally(failFirst ? snd : fst, v1);
2049 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
2050      }}
2051  
2052      /**
2053       * runAfterBoth result completes exceptionally if either source cancelled
2054       */
2055 <    public void testRunAfterBoth_sourceCancelled() {
2055 >    public void testRunAfterBoth_sourceCancelled() throws Throwable {
2056          for (ExecutionMode m : ExecutionMode.values())
2057          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1632        for (boolean createIncomplete : new boolean[] { true, false })
2058          for (boolean fFirst : new boolean[] { true, false })
2059 +        for (boolean failFirst : new boolean[] { true, false })
2060          for (Integer v1 : new Integer[] { 1, null })
2061      {
2062          final CompletableFuture<Integer> f = new CompletableFuture<>();
2063          final CompletableFuture<Integer> g = new CompletableFuture<>();
2064 <        final Noop r = new Noop(m);
2065 <
2066 <
2067 <        (fFirst ? f : g).complete(v1);
2068 <        if (!createIncomplete)
2069 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
2070 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2071 <        if (createIncomplete) {
2072 <            checkIncomplete(h);
2073 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
2074 <        }
2064 >        final Noop r1 = new Noop(m);
2065 >        final Noop r2 = new Noop(m);
2066 >        final Noop r3 = new Noop(m);
2067 >
2068 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
2069 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
2070 >        final Callable<Boolean> complete1 = failFirst ?
2071 >            () -> fst.cancel(mayInterruptIfRunning) :
2072 >            () -> fst.complete(v1);
2073 >        final Callable<Boolean> complete2 = failFirst ?
2074 >            () -> snd.complete(v1) :
2075 >            () -> snd.cancel(mayInterruptIfRunning);
2076 >
2077 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2078 >        assertTrue(complete1.call());
2079 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2080 >        checkIncomplete(h1);
2081 >        checkIncomplete(h2);
2082 >        assertTrue(complete2.call());
2083 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2084  
2085 <        checkCompletedWithWrappedCancellationException(h);
2086 <        checkCancelled(!fFirst ? f : g);
2087 <        r.assertNotInvoked();
2088 <        checkCompletedNormally(fFirst ? f : g, v1);
2085 >        checkCompletedWithWrappedCancellationException(h1);
2086 >        checkCompletedWithWrappedCancellationException(h2);
2087 >        checkCompletedWithWrappedCancellationException(h3);
2088 >        r1.assertNotInvoked();
2089 >        r2.assertNotInvoked();
2090 >        r3.assertNotInvoked();
2091 >        checkCompletedNormally(failFirst ? snd : fst, v1);
2092 >        checkCancelled(failFirst ? fst : snd);
2093      }}
2094  
2095      /**
# Line 1666 | Line 2105 | public class CompletableFutureTest exten
2105          final CompletableFuture<Integer> g = new CompletableFuture<>();
2106          final FailingRunnable r1 = new FailingRunnable(m);
2107          final FailingRunnable r2 = new FailingRunnable(m);
2108 +        final FailingRunnable r3 = new FailingRunnable(m);
2109  
2110 <        CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2111 <        if (fFirst) {
2112 <            f.complete(v1);
2113 <            g.complete(v2);
2114 <        } else {
2115 <            g.complete(v2);
2116 <            f.complete(v1);
2117 <        }
2118 <        CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2119 <
2120 <        checkCompletedWithWrappedCFException(h1);
2121 <        checkCompletedWithWrappedCFException(h2);
2110 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
2111 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
2112 >        final Integer w1 =  fFirst ? v1 : v2;
2113 >        final Integer w2 = !fFirst ? v1 : v2;
2114 >
2115 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2116 >        assertTrue(fst.complete(w1));
2117 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2118 >        assertTrue(snd.complete(w2));
2119 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2120 >
2121 >        checkCompletedWithWrappedException(h1, r1.ex);
2122 >        checkCompletedWithWrappedException(h2, r2.ex);
2123 >        checkCompletedWithWrappedException(h3, r3.ex);
2124 >        r1.assertInvoked();
2125 >        r2.assertInvoked();
2126 >        r3.assertInvoked();
2127          checkCompletedNormally(f, v1);
2128          checkCompletedNormally(g, v2);
2129      }}
# Line 1752 | Line 2197 | public class CompletableFutureTest exten
2197          rs[0].assertNotInvoked();
2198          rs[1].assertNotInvoked();
2199          f.completeExceptionally(ex);
2200 <        checkCompletedWithWrappedCFException(h0, ex);
2201 <        checkCompletedWithWrappedCFException(h1, ex);
2200 >        checkCompletedWithWrappedException(h0, ex);
2201 >        checkCompletedWithWrappedException(h1, ex);
2202          final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2203          final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2204 <        checkCompletedWithWrappedCFException(h2, ex);
2205 <        checkCompletedWithWrappedCFException(h3, ex);
2204 >        checkCompletedWithWrappedException(h2, ex);
2205 >        checkCompletedWithWrappedException(h3, ex);
2206          g.complete(v1);
2207  
2208          // unspecified behavior - both source completions available
# Line 1767 | Line 2212 | public class CompletableFutureTest exten
2212              assertEquals(inc(v1), h4.join());
2213              rs[4].assertValue(inc(v1));
2214          } catch (CompletionException ok) {
2215 <            checkCompletedWithWrappedCFException(h4, ex);
2215 >            checkCompletedWithWrappedException(h4, ex);
2216              rs[4].assertNotInvoked();
2217          }
2218          try {
2219              assertEquals(inc(v1), h5.join());
2220              rs[5].assertValue(inc(v1));
2221          } catch (CompletionException ok) {
2222 <            checkCompletedWithWrappedCFException(h5, ex);
2222 >            checkCompletedWithWrappedException(h5, ex);
2223              rs[5].assertNotInvoked();
2224          }
2225  
2226 <        checkCompletedWithWrappedCFException(f, ex);
2226 >        checkCompletedExceptionally(f, ex);
2227          checkCompletedNormally(g, v1);
2228 <        checkCompletedWithWrappedCFException(h0, ex);
2229 <        checkCompletedWithWrappedCFException(h1, ex);
2230 <        checkCompletedWithWrappedCFException(h2, ex);
2231 <        checkCompletedWithWrappedCFException(h3, ex);
2232 <        checkCompletedWithWrappedCFException(h4, ex);
2228 >        checkCompletedWithWrappedException(h0, ex);
2229 >        checkCompletedWithWrappedException(h1, ex);
2230 >        checkCompletedWithWrappedException(h2, ex);
2231 >        checkCompletedWithWrappedException(h3, ex);
2232 >        checkCompletedWithWrappedException(h4, ex);
2233          for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2234      }}
2235  
# Line 1801 | Line 2246 | public class CompletableFutureTest exten
2246  
2247          final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2248          final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2249 <        if (fFirst) {
2250 <            f.complete(v1);
1806 <            g.completeExceptionally(ex);
1807 <        } else {
1808 <            g.completeExceptionally(ex);
1809 <            f.complete(v1);
1810 <        }
2249 >        assertTrue(fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2250 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2251          final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2252          final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2253  
# Line 1816 | Line 2256 | public class CompletableFutureTest exten
2256              assertEquals(inc(v1), h0.join());
2257              rs[0].assertValue(inc(v1));
2258          } catch (CompletionException ok) {
2259 <            checkCompletedWithWrappedCFException(h0, ex);
2259 >            checkCompletedWithWrappedException(h0, ex);
2260              rs[0].assertNotInvoked();
2261          }
2262          try {
2263              assertEquals(inc(v1), h1.join());
2264              rs[1].assertValue(inc(v1));
2265          } catch (CompletionException ok) {
2266 <            checkCompletedWithWrappedCFException(h1, ex);
2266 >            checkCompletedWithWrappedException(h1, ex);
2267              rs[1].assertNotInvoked();
2268          }
2269          try {
2270              assertEquals(inc(v1), h2.join());
2271              rs[2].assertValue(inc(v1));
2272          } catch (CompletionException ok) {
2273 <            checkCompletedWithWrappedCFException(h2, ex);
2273 >            checkCompletedWithWrappedException(h2, ex);
2274              rs[2].assertNotInvoked();
2275          }
2276          try {
2277              assertEquals(inc(v1), h3.join());
2278              rs[3].assertValue(inc(v1));
2279          } catch (CompletionException ok) {
2280 <            checkCompletedWithWrappedCFException(h3, ex);
2280 >            checkCompletedWithWrappedException(h3, ex);
2281              rs[3].assertNotInvoked();
2282          }
2283  
2284          checkCompletedNormally(f, v1);
2285 <        checkCompletedWithWrappedCFException(g, ex);
2285 >        checkCompletedExceptionally(g, ex);
2286      }}
2287  
2288      /**
# Line 1913 | Line 2353 | public class CompletableFutureTest exten
2353  
2354          final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2355          final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2356 <        if (fFirst) {
2357 <            f.complete(v1);
1918 <            g.cancel(mayInterruptIfRunning);
1919 <        } else {
1920 <            g.cancel(mayInterruptIfRunning);
1921 <            f.complete(v1);
1922 <        }
2356 >        assertTrue(fFirst ? f.complete(v1) : g.cancel(mayInterruptIfRunning));
2357 >        assertTrue(!fFirst ? f.complete(v1) : g.cancel(mayInterruptIfRunning));
2358          final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2359          final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2360  
# Line 1975 | Line 2410 | public class CompletableFutureTest exten
2410          f.complete(v1);
2411          final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2412          final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2413 <        checkCompletedWithWrappedCFException(h0);
2414 <        checkCompletedWithWrappedCFException(h1);
2415 <        checkCompletedWithWrappedCFException(h2);
2416 <        checkCompletedWithWrappedCFException(h3);
2413 >        checkCompletedWithWrappedException(h0, rs[0].ex);
2414 >        checkCompletedWithWrappedException(h1, rs[1].ex);
2415 >        checkCompletedWithWrappedException(h2, rs[2].ex);
2416 >        checkCompletedWithWrappedException(h3, rs[3].ex);
2417          for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2418  
2419          g.complete(v2);
# Line 1987 | Line 2422 | public class CompletableFutureTest exten
2422          final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2423          final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2424  
2425 <        checkCompletedWithWrappedCFException(h4);
2425 >        checkCompletedWithWrappedException(h4, rs[4].ex);
2426          assertTrue(Objects.equals(v1, rs[4].value) ||
2427                     Objects.equals(v2, rs[4].value));
2428 <        checkCompletedWithWrappedCFException(h5);
2428 >        checkCompletedWithWrappedException(h5, rs[5].ex);
2429          assertTrue(Objects.equals(v1, rs[5].value) ||
2430                     Objects.equals(v2, rs[5].value));
2431  
# Line 2071 | Line 2506 | public class CompletableFutureTest exten
2506          rs[0].assertNotInvoked();
2507          rs[1].assertNotInvoked();
2508          f.completeExceptionally(ex);
2509 <        checkCompletedWithWrappedCFException(h0, ex);
2510 <        checkCompletedWithWrappedCFException(h1, ex);
2509 >        checkCompletedWithWrappedException(h0, ex);
2510 >        checkCompletedWithWrappedException(h1, ex);
2511          final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2512          final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2513 <        checkCompletedWithWrappedCFException(h2, ex);
2514 <        checkCompletedWithWrappedCFException(h3, ex);
2513 >        checkCompletedWithWrappedException(h2, ex);
2514 >        checkCompletedWithWrappedException(h3, ex);
2515  
2516          g.complete(v1);
2517  
# Line 2087 | Line 2522 | public class CompletableFutureTest exten
2522              assertNull(h4.join());
2523              rs[4].assertValue(v1);
2524          } catch (CompletionException ok) {
2525 <            checkCompletedWithWrappedCFException(h4, ex);
2525 >            checkCompletedWithWrappedException(h4, ex);
2526              rs[4].assertNotInvoked();
2527          }
2528          try {
2529              assertNull(h5.join());
2530              rs[5].assertValue(v1);
2531          } catch (CompletionException ok) {
2532 <            checkCompletedWithWrappedCFException(h5, ex);
2532 >            checkCompletedWithWrappedException(h5, ex);
2533              rs[5].assertNotInvoked();
2534          }
2535  
2536 <        checkCompletedWithWrappedCFException(f, ex);
2536 >        checkCompletedExceptionally(f, ex);
2537          checkCompletedNormally(g, v1);
2538 <        checkCompletedWithWrappedCFException(h0, ex);
2539 <        checkCompletedWithWrappedCFException(h1, ex);
2540 <        checkCompletedWithWrappedCFException(h2, ex);
2541 <        checkCompletedWithWrappedCFException(h3, ex);
2542 <        checkCompletedWithWrappedCFException(h4, ex);
2538 >        checkCompletedWithWrappedException(h0, ex);
2539 >        checkCompletedWithWrappedException(h1, ex);
2540 >        checkCompletedWithWrappedException(h2, ex);
2541 >        checkCompletedWithWrappedException(h3, ex);
2542 >        checkCompletedWithWrappedException(h4, ex);
2543          for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2544      }}
2545  
# Line 2121 | Line 2556 | public class CompletableFutureTest exten
2556  
2557          final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2558          final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2559 <        if (fFirst) {
2560 <            f.complete(v1);
2126 <            g.completeExceptionally(ex);
2127 <        } else {
2128 <            g.completeExceptionally(ex);
2129 <            f.complete(v1);
2130 <        }
2559 >        assertTrue(fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2560 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2561          final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2562          final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2563  
# Line 2136 | Line 2566 | public class CompletableFutureTest exten
2566              assertEquals(null, h0.join());
2567              rs[0].assertValue(v1);
2568          } catch (CompletionException ok) {
2569 <            checkCompletedWithWrappedCFException(h0, ex);
2569 >            checkCompletedWithWrappedException(h0, ex);
2570              rs[0].assertNotInvoked();
2571          }
2572          try {
2573              assertEquals(null, h1.join());
2574              rs[1].assertValue(v1);
2575          } catch (CompletionException ok) {
2576 <            checkCompletedWithWrappedCFException(h1, ex);
2576 >            checkCompletedWithWrappedException(h1, ex);
2577              rs[1].assertNotInvoked();
2578          }
2579          try {
2580              assertEquals(null, h2.join());
2581              rs[2].assertValue(v1);
2582          } catch (CompletionException ok) {
2583 <            checkCompletedWithWrappedCFException(h2, ex);
2583 >            checkCompletedWithWrappedException(h2, ex);
2584              rs[2].assertNotInvoked();
2585          }
2586          try {
2587              assertEquals(null, h3.join());
2588              rs[3].assertValue(v1);
2589          } catch (CompletionException ok) {
2590 <            checkCompletedWithWrappedCFException(h3, ex);
2590 >            checkCompletedWithWrappedException(h3, ex);
2591              rs[3].assertNotInvoked();
2592          }
2593  
2594          checkCompletedNormally(f, v1);
2595 <        checkCompletedWithWrappedCFException(g, ex);
2595 >        checkCompletedExceptionally(g, ex);
2596      }}
2597  
2598      /**
# Line 2239 | Line 2669 | public class CompletableFutureTest exten
2669          f.complete(v1);
2670          final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2671          final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2672 <        checkCompletedWithWrappedCFException(h0);
2673 <        checkCompletedWithWrappedCFException(h1);
2674 <        checkCompletedWithWrappedCFException(h2);
2675 <        checkCompletedWithWrappedCFException(h3);
2672 >        checkCompletedWithWrappedException(h0, rs[0].ex);
2673 >        checkCompletedWithWrappedException(h1, rs[1].ex);
2674 >        checkCompletedWithWrappedException(h2, rs[2].ex);
2675 >        checkCompletedWithWrappedException(h3, rs[3].ex);
2676          for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2677  
2678          g.complete(v2);
# Line 2251 | Line 2681 | public class CompletableFutureTest exten
2681          final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2682          final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2683  
2684 <        checkCompletedWithWrappedCFException(h4);
2684 >        checkCompletedWithWrappedException(h4, rs[4].ex);
2685          assertTrue(Objects.equals(v1, rs[4].value) ||
2686                     Objects.equals(v2, rs[4].value));
2687 <        checkCompletedWithWrappedCFException(h5);
2687 >        checkCompletedWithWrappedException(h5, rs[5].ex);
2688          assertTrue(Objects.equals(v1, rs[5].value) ||
2689                     Objects.equals(v2, rs[5].value));
2690  
# Line 2270 | Line 2700 | public class CompletableFutureTest exten
2700          for (ExecutionMode m : ExecutionMode.values())
2701          for (Integer v1 : new Integer[] { 1, null })
2702          for (Integer v2 : new Integer[] { 2, null })
2703 +        for (boolean pushNop : new boolean[] { true, false })
2704      {
2705          final CompletableFuture<Integer> f = new CompletableFuture<>();
2706          final CompletableFuture<Integer> g = new CompletableFuture<>();
# Line 2282 | Line 2713 | public class CompletableFutureTest exten
2713          checkIncomplete(h1);
2714          rs[0].assertNotInvoked();
2715          rs[1].assertNotInvoked();
2716 +        if (pushNop) {          // ad hoc test of intra-completion interference
2717 +            m.thenRun(f, () -> {});
2718 +            m.thenRun(g, () -> {});
2719 +        }
2720          f.complete(v1);
2721          checkCompletedNormally(h0, null);
2722          checkCompletedNormally(h1, null);
# Line 2330 | Line 2765 | public class CompletableFutureTest exten
2765          checkIncomplete(h1);
2766          rs[0].assertNotInvoked();
2767          rs[1].assertNotInvoked();
2768 <        f.completeExceptionally(ex);
2769 <        checkCompletedWithWrappedCFException(h0, ex);
2770 <        checkCompletedWithWrappedCFException(h1, ex);
2768 >        assertTrue(f.completeExceptionally(ex));
2769 >        checkCompletedWithWrappedException(h0, ex);
2770 >        checkCompletedWithWrappedException(h1, ex);
2771          final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2772          final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2773 <        checkCompletedWithWrappedCFException(h2, ex);
2774 <        checkCompletedWithWrappedCFException(h3, ex);
2773 >        checkCompletedWithWrappedException(h2, ex);
2774 >        checkCompletedWithWrappedException(h3, ex);
2775  
2776 <        g.complete(v1);
2776 >        assertTrue(g.complete(v1));
2777  
2778          // unspecified behavior - both source completions available
2779          final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
# Line 2347 | Line 2782 | public class CompletableFutureTest exten
2782              assertNull(h4.join());
2783              rs[4].assertInvoked();
2784          } catch (CompletionException ok) {
2785 <            checkCompletedWithWrappedCFException(h4, ex);
2785 >            checkCompletedWithWrappedException(h4, ex);
2786              rs[4].assertNotInvoked();
2787          }
2788          try {
2789              assertNull(h5.join());
2790              rs[5].assertInvoked();
2791          } catch (CompletionException ok) {
2792 <            checkCompletedWithWrappedCFException(h5, ex);
2792 >            checkCompletedWithWrappedException(h5, ex);
2793              rs[5].assertNotInvoked();
2794          }
2795  
2796 <        checkCompletedWithWrappedCFException(f, ex);
2796 >        checkCompletedExceptionally(f, ex);
2797          checkCompletedNormally(g, v1);
2798 <        checkCompletedWithWrappedCFException(h0, ex);
2799 <        checkCompletedWithWrappedCFException(h1, ex);
2800 <        checkCompletedWithWrappedCFException(h2, ex);
2801 <        checkCompletedWithWrappedCFException(h3, ex);
2802 <        checkCompletedWithWrappedCFException(h4, ex);
2798 >        checkCompletedWithWrappedException(h0, ex);
2799 >        checkCompletedWithWrappedException(h1, ex);
2800 >        checkCompletedWithWrappedException(h2, ex);
2801 >        checkCompletedWithWrappedException(h3, ex);
2802 >        checkCompletedWithWrappedException(h4, ex);
2803          for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2804      }}
2805  
# Line 2381 | Line 2816 | public class CompletableFutureTest exten
2816  
2817          final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2818          final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2819 <        if (fFirst) {
2820 <            f.complete(v1);
2386 <            g.completeExceptionally(ex);
2387 <        } else {
2388 <            g.completeExceptionally(ex);
2389 <            f.complete(v1);
2390 <        }
2819 >        assertTrue( fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2820 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2821          final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2822          final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2823  
# Line 2396 | Line 2826 | public class CompletableFutureTest exten
2826              assertEquals(null, h0.join());
2827              rs[0].assertInvoked();
2828          } catch (CompletionException ok) {
2829 <            checkCompletedWithWrappedCFException(h0, ex);
2829 >            checkCompletedWithWrappedException(h0, ex);
2830              rs[0].assertNotInvoked();
2831          }
2832          try {
2833              assertEquals(null, h1.join());
2834              rs[1].assertInvoked();
2835          } catch (CompletionException ok) {
2836 <            checkCompletedWithWrappedCFException(h1, ex);
2836 >            checkCompletedWithWrappedException(h1, ex);
2837              rs[1].assertNotInvoked();
2838          }
2839          try {
2840              assertEquals(null, h2.join());
2841              rs[2].assertInvoked();
2842          } catch (CompletionException ok) {
2843 <            checkCompletedWithWrappedCFException(h2, ex);
2843 >            checkCompletedWithWrappedException(h2, ex);
2844              rs[2].assertNotInvoked();
2845          }
2846          try {
2847              assertEquals(null, h3.join());
2848              rs[3].assertInvoked();
2849          } catch (CompletionException ok) {
2850 <            checkCompletedWithWrappedCFException(h3, ex);
2850 >            checkCompletedWithWrappedException(h3, ex);
2851              rs[3].assertNotInvoked();
2852          }
2853  
2854          checkCompletedNormally(f, v1);
2855 <        checkCompletedWithWrappedCFException(g, ex);
2855 >        checkCompletedExceptionally(g, ex);
2856      }}
2857  
2858      /**
# Line 2452 | Line 2882 | public class CompletableFutureTest exten
2882          checkCompletedWithWrappedCancellationException(h2);
2883          checkCompletedWithWrappedCancellationException(h3);
2884  
2885 <        g.complete(v1);
2885 >        assertTrue(g.complete(v1));
2886  
2887          // unspecified behavior - both source completions available
2888          final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
# Line 2496 | Line 2926 | public class CompletableFutureTest exten
2926  
2927          final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2928          final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2929 <        f.complete(v1);
2929 >        assertTrue(f.complete(v1));
2930          final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2931          final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2932 <        checkCompletedWithWrappedCFException(h0);
2933 <        checkCompletedWithWrappedCFException(h1);
2934 <        checkCompletedWithWrappedCFException(h2);
2935 <        checkCompletedWithWrappedCFException(h3);
2932 >        checkCompletedWithWrappedException(h0, rs[0].ex);
2933 >        checkCompletedWithWrappedException(h1, rs[1].ex);
2934 >        checkCompletedWithWrappedException(h2, rs[2].ex);
2935 >        checkCompletedWithWrappedException(h3, rs[3].ex);
2936          for (int i = 0; i < 4; i++) rs[i].assertInvoked();
2937 <        g.complete(v2);
2937 >        assertTrue(g.complete(v2));
2938          final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2939          final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2940 <        checkCompletedWithWrappedCFException(h4);
2941 <        checkCompletedWithWrappedCFException(h5);
2940 >        checkCompletedWithWrappedException(h4, rs[4].ex);
2941 >        checkCompletedWithWrappedException(h5, rs[5].ex);
2942  
2943          checkCompletedNormally(f, v1);
2944          checkCompletedNormally(g, v2);
# Line 2525 | Line 2955 | public class CompletableFutureTest exten
2955      {
2956          final CompletableFuture<Integer> f = new CompletableFuture<>();
2957          final CompletableFutureInc r = new CompletableFutureInc(m);
2958 <        if (!createIncomplete) f.complete(v1);
2958 >        if (!createIncomplete) assertTrue(f.complete(v1));
2959          final CompletableFuture<Integer> g = m.thenCompose(f, r);
2960 <        if (createIncomplete) f.complete(v1);
2960 >        if (createIncomplete) assertTrue(f.complete(v1));
2961  
2962          checkCompletedNormally(g, inc(v1));
2963          checkCompletedNormally(f, v1);
2964 <        r.assertInvoked();
2964 >        r.assertValue(v1);
2965      }}
2966  
2967      /**
# Line 2549 | Line 2979 | public class CompletableFutureTest exten
2979          final CompletableFuture<Integer> g = m.thenCompose(f, r);
2980          if (createIncomplete) f.completeExceptionally(ex);
2981  
2982 <        checkCompletedWithWrappedCFException(g, ex);
2983 <        checkCompletedWithWrappedCFException(f, ex);
2982 >        checkCompletedWithWrappedException(g, ex);
2983 >        checkCompletedExceptionally(f, ex);
2984          r.assertNotInvoked();
2985      }}
2986  
# Line 2565 | Line 2995 | public class CompletableFutureTest exten
2995          final CompletableFuture<Integer> f = new CompletableFuture<>();
2996          final FailingCompletableFutureFunction r
2997              = new FailingCompletableFutureFunction(m);
2998 <        if (!createIncomplete) f.complete(v1);
2998 >        if (!createIncomplete) assertTrue(f.complete(v1));
2999          final CompletableFuture<Integer> g = m.thenCompose(f, r);
3000 <        if (createIncomplete) f.complete(v1);
3000 >        if (createIncomplete) assertTrue(f.complete(v1));
3001  
3002 <        checkCompletedWithWrappedCFException(g);
3002 >        checkCompletedWithWrappedException(g, r.ex);
3003          checkCompletedNormally(f, v1);
3004      }}
3005  
# Line 2594 | Line 3024 | public class CompletableFutureTest exten
3024          checkCancelled(f);
3025      }}
3026  
3027 +    /**
3028 +     * thenCompose result completes exceptionally if the result of the action does
3029 +     */
3030 +    public void testThenCompose_actionReturnsFailingFuture() {
3031 +        for (ExecutionMode m : ExecutionMode.values())
3032 +        for (int order = 0; order < 6; order++)
3033 +        for (Integer v1 : new Integer[] { 1, null })
3034 +    {
3035 +        final CFException ex = new CFException();
3036 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
3037 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
3038 +        final CompletableFuture<Integer> h;
3039 +        // Test all permutations of orders
3040 +        switch (order) {
3041 +        case 0:
3042 +            assertTrue(f.complete(v1));
3043 +            assertTrue(g.completeExceptionally(ex));
3044 +            h = m.thenCompose(f, (x -> g));
3045 +            break;
3046 +        case 1:
3047 +            assertTrue(f.complete(v1));
3048 +            h = m.thenCompose(f, (x -> g));
3049 +            assertTrue(g.completeExceptionally(ex));
3050 +            break;
3051 +        case 2:
3052 +            assertTrue(g.completeExceptionally(ex));
3053 +            assertTrue(f.complete(v1));
3054 +            h = m.thenCompose(f, (x -> g));
3055 +            break;
3056 +        case 3:
3057 +            assertTrue(g.completeExceptionally(ex));
3058 +            h = m.thenCompose(f, (x -> g));
3059 +            assertTrue(f.complete(v1));
3060 +            break;
3061 +        case 4:
3062 +            h = m.thenCompose(f, (x -> g));
3063 +            assertTrue(f.complete(v1));
3064 +            assertTrue(g.completeExceptionally(ex));
3065 +            break;
3066 +        case 5:
3067 +            h = m.thenCompose(f, (x -> g));
3068 +            assertTrue(f.complete(v1));
3069 +            assertTrue(g.completeExceptionally(ex));
3070 +            break;
3071 +        default: throw new AssertionError();
3072 +        }
3073 +
3074 +        checkCompletedExceptionally(g, ex);
3075 +        checkCompletedWithWrappedException(h, ex);
3076 +        checkCompletedNormally(f, v1);
3077 +    }}
3078 +
3079      // other static methods
3080  
3081      /**
# Line 2610 | Line 3092 | public class CompletableFutureTest exten
3092       * when all components complete normally
3093       */
3094      public void testAllOf_normal() throws Exception {
3095 <        for (int k = 1; k < 20; ++k) {
3095 >        for (int k = 1; k < 10; k++) {
3096              CompletableFuture<Integer>[] fs
3097                  = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3098 <            for (int i = 0; i < k; ++i)
3098 >            for (int i = 0; i < k; i++)
3099                  fs[i] = new CompletableFuture<>();
3100              CompletableFuture<Void> f = CompletableFuture.allOf(fs);
3101 <            for (int i = 0; i < k; ++i) {
3101 >            for (int i = 0; i < k; i++) {
3102                  checkIncomplete(f);
3103                  checkIncomplete(CompletableFuture.allOf(fs));
3104                  fs[i].complete(one);
# Line 2626 | Line 3108 | public class CompletableFutureTest exten
3108          }
3109      }
3110  
3111 <    public void testAllOf_backwards() throws Exception {
3112 <        for (int k = 1; k < 20; ++k) {
3111 >    public void testAllOf_normal_backwards() throws Exception {
3112 >        for (int k = 1; k < 10; k++) {
3113              CompletableFuture<Integer>[] fs
3114                  = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3115 <            for (int i = 0; i < k; ++i)
3115 >            for (int i = 0; i < k; i++)
3116                  fs[i] = new CompletableFuture<>();
3117              CompletableFuture<Void> f = CompletableFuture.allOf(fs);
3118              for (int i = k - 1; i >= 0; i--) {
# Line 2643 | Line 3125 | public class CompletableFutureTest exten
3125          }
3126      }
3127  
3128 +    public void testAllOf_exceptional() throws Exception {
3129 +        for (int k = 1; k < 10; k++) {
3130 +            CompletableFuture<Integer>[] fs
3131 +                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3132 +            CFException ex = new CFException();
3133 +            for (int i = 0; i < k; i++)
3134 +                fs[i] = new CompletableFuture<>();
3135 +            CompletableFuture<Void> f = CompletableFuture.allOf(fs);
3136 +            for (int i = 0; i < k; i++) {
3137 +                checkIncomplete(f);
3138 +                checkIncomplete(CompletableFuture.allOf(fs));
3139 +                if (i != k / 2) {
3140 +                    fs[i].complete(i);
3141 +                    checkCompletedNormally(fs[i], i);
3142 +                } else {
3143 +                    fs[i].completeExceptionally(ex);
3144 +                    checkCompletedExceptionally(fs[i], ex);
3145 +                }
3146 +            }
3147 +            checkCompletedWithWrappedException(f, ex);
3148 +            checkCompletedWithWrappedException(CompletableFuture.allOf(fs), ex);
3149 +        }
3150 +    }
3151 +
3152      /**
3153       * anyOf(no component futures) returns an incomplete future
3154       */
3155      public void testAnyOf_empty() throws Exception {
3156 +        for (Integer v1 : new Integer[] { 1, null })
3157 +    {
3158          CompletableFuture<Object> f = CompletableFuture.anyOf();
3159          checkIncomplete(f);
3160 <    }
3160 >
3161 >        f.complete(v1);
3162 >        checkCompletedNormally(f, v1);
3163 >    }}
3164  
3165      /**
3166       * anyOf returns a future completed normally with a value when
3167       * a component future does
3168       */
3169      public void testAnyOf_normal() throws Exception {
3170 <        for (int k = 0; k < 10; ++k) {
3170 >        for (int k = 0; k < 10; k++) {
3171              CompletableFuture[] fs = new CompletableFuture[k];
3172 <            for (int i = 0; i < k; ++i)
3172 >            for (int i = 0; i < k; i++)
3173                  fs[i] = new CompletableFuture<>();
3174              CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3175              checkIncomplete(f);
3176 <            for (int i = 0; i < k; ++i) {
3177 <                fs[i].complete(one);
3178 <                checkCompletedNormally(f, one);
3179 <                checkCompletedNormally(CompletableFuture.anyOf(fs), one);
3176 >            for (int i = 0; i < k; i++) {
3177 >                fs[i].complete(i);
3178 >                checkCompletedNormally(f, 0);
3179 >                int x = (int) CompletableFuture.anyOf(fs).join();
3180 >                assertTrue(0 <= x && x <= i);
3181 >            }
3182 >        }
3183 >    }
3184 >    public void testAnyOf_normal_backwards() throws Exception {
3185 >        for (int k = 0; k < 10; k++) {
3186 >            CompletableFuture[] fs = new CompletableFuture[k];
3187 >            for (int i = 0; i < k; i++)
3188 >                fs[i] = new CompletableFuture<>();
3189 >            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3190 >            checkIncomplete(f);
3191 >            for (int i = k - 1; i >= 0; i--) {
3192 >                fs[i].complete(i);
3193 >                checkCompletedNormally(f, k - 1);
3194 >                int x = (int) CompletableFuture.anyOf(fs).join();
3195 >                assertTrue(i <= x && x <= k - 1);
3196              }
3197          }
3198      }
# Line 2674 | Line 3201 | public class CompletableFutureTest exten
3201       * anyOf result completes exceptionally when any component does.
3202       */
3203      public void testAnyOf_exceptional() throws Exception {
3204 <        for (int k = 0; k < 10; ++k) {
3204 >        for (int k = 0; k < 10; k++) {
3205 >            CompletableFuture[] fs = new CompletableFuture[k];
3206 >            CFException[] exs = new CFException[k];
3207 >            for (int i = 0; i < k; i++) {
3208 >                fs[i] = new CompletableFuture<>();
3209 >                exs[i] = new CFException();
3210 >            }
3211 >            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3212 >            checkIncomplete(f);
3213 >            for (int i = 0; i < k; i++) {
3214 >                fs[i].completeExceptionally(exs[i]);
3215 >                checkCompletedWithWrappedException(f, exs[0]);
3216 >                checkCompletedWithWrappedCFException(CompletableFuture.anyOf(fs));
3217 >            }
3218 >        }
3219 >    }
3220 >
3221 >    public void testAnyOf_exceptional_backwards() throws Exception {
3222 >        for (int k = 0; k < 10; k++) {
3223              CompletableFuture[] fs = new CompletableFuture[k];
3224 <            for (int i = 0; i < k; ++i)
3224 >            CFException[] exs = new CFException[k];
3225 >            for (int i = 0; i < k; i++) {
3226                  fs[i] = new CompletableFuture<>();
3227 +                exs[i] = new CFException();
3228 +            }
3229              CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3230              checkIncomplete(f);
3231 <            for (int i = 0; i < k; ++i) {
3232 <                fs[i].completeExceptionally(new CFException());
3233 <                checkCompletedWithWrappedCFException(f);
3231 >            for (int i = k - 1; i >= 0; i--) {
3232 >                fs[i].completeExceptionally(exs[i]);
3233 >                checkCompletedWithWrappedException(f, exs[k - 1]);
3234                  checkCompletedWithWrappedCFException(CompletableFuture.anyOf(fs));
3235              }
3236          }
# Line 2695 | Line 3243 | public class CompletableFutureTest exten
3243          CompletableFuture<Integer> f = new CompletableFuture<>();
3244          CompletableFuture<Integer> g = new CompletableFuture<>();
3245          CompletableFuture<Integer> nullFuture = (CompletableFuture<Integer>)null;
2698        CompletableFuture<?> h;
3246          ThreadExecutor exec = new ThreadExecutor();
3247  
3248          Runnable[] throwingActions = {
3249              () -> CompletableFuture.supplyAsync(null),
3250              () -> CompletableFuture.supplyAsync(null, exec),
3251 <            () -> CompletableFuture.supplyAsync(new IntegerSupplier(ExecutionMode.DEFAULT, 42), null),
3251 >            () -> CompletableFuture.supplyAsync(new IntegerSupplier(ExecutionMode.SYNC, 42), null),
3252  
3253              () -> CompletableFuture.runAsync(null),
3254              () -> CompletableFuture.runAsync(null, exec),
# Line 2792 | Line 3339 | public class CompletableFutureTest exten
3339              () -> CompletableFuture.anyOf(null, f),
3340  
3341              () -> f.obtrudeException(null),
3342 +
3343 +            () -> CompletableFuture.delayedExecutor(1L, SECONDS, null),
3344 +            () -> CompletableFuture.delayedExecutor(1L, null, exec),
3345 +            () -> CompletableFuture.delayedExecutor(1L, null),
3346 +
3347 +            () -> f.orTimeout(1L, null),
3348 +            () -> f.completeOnTimeout(42, 1L, null),
3349 +
3350 +            () -> CompletableFuture.failedFuture(null),
3351 +            () -> CompletableFuture.failedStage(null),
3352          };
3353  
3354          assertThrows(NullPointerException.class, throwingActions);
# Line 2799 | Line 3356 | public class CompletableFutureTest exten
3356      }
3357  
3358      /**
3359 +     * Test submissions to an executor that rejects all tasks.
3360 +     */
3361 +    public void testRejectingExecutor() {
3362 +        for (Integer v : new Integer[] { 1, null })
3363 +    {
3364 +        final CountingRejectingExecutor e = new CountingRejectingExecutor();
3365 +
3366 +        final CompletableFuture<Integer> complete = CompletableFuture.completedFuture(v);
3367 +        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
3368 +
3369 +        List<CompletableFuture<?>> futures = new ArrayList<>();
3370 +
3371 +        List<CompletableFuture<Integer>> srcs = new ArrayList<>();
3372 +        srcs.add(complete);
3373 +        srcs.add(incomplete);
3374 +
3375 +        for (CompletableFuture<Integer> src : srcs) {
3376 +            List<CompletableFuture<?>> fs = new ArrayList<>();
3377 +            fs.add(src.thenRunAsync(() -> {}, e));
3378 +            fs.add(src.thenAcceptAsync((z) -> {}, e));
3379 +            fs.add(src.thenApplyAsync((z) -> z, e));
3380 +
3381 +            fs.add(src.thenCombineAsync(src, (x, y) -> x, e));
3382 +            fs.add(src.thenAcceptBothAsync(src, (x, y) -> {}, e));
3383 +            fs.add(src.runAfterBothAsync(src, () -> {}, e));
3384 +
3385 +            fs.add(src.applyToEitherAsync(src, (z) -> z, e));
3386 +            fs.add(src.acceptEitherAsync(src, (z) -> {}, e));
3387 +            fs.add(src.runAfterEitherAsync(src, () -> {}, e));
3388 +
3389 +            fs.add(src.thenComposeAsync((z) -> null, e));
3390 +            fs.add(src.whenCompleteAsync((z, t) -> {}, e));
3391 +            fs.add(src.handleAsync((z, t) -> null, e));
3392 +
3393 +            for (CompletableFuture<?> future : fs) {
3394 +                if (src.isDone())
3395 +                    checkCompletedWithWrappedException(future, e.ex);
3396 +                else
3397 +                    checkIncomplete(future);
3398 +            }
3399 +            futures.addAll(fs);
3400 +        }
3401 +
3402 +        {
3403 +            List<CompletableFuture<?>> fs = new ArrayList<>();
3404 +
3405 +            fs.add(complete.thenCombineAsync(incomplete, (x, y) -> x, e));
3406 +            fs.add(incomplete.thenCombineAsync(complete, (x, y) -> x, e));
3407 +
3408 +            fs.add(complete.thenAcceptBothAsync(incomplete, (x, y) -> {}, e));
3409 +            fs.add(incomplete.thenAcceptBothAsync(complete, (x, y) -> {}, e));
3410 +
3411 +            fs.add(complete.runAfterBothAsync(incomplete, () -> {}, e));
3412 +            fs.add(incomplete.runAfterBothAsync(complete, () -> {}, e));
3413 +
3414 +            for (CompletableFuture<?> future : fs)
3415 +                checkIncomplete(future);
3416 +            futures.addAll(fs);
3417 +        }
3418 +
3419 +        {
3420 +            List<CompletableFuture<?>> fs = new ArrayList<>();
3421 +
3422 +            fs.add(complete.applyToEitherAsync(incomplete, (z) -> z, e));
3423 +            fs.add(incomplete.applyToEitherAsync(complete, (z) -> z, e));
3424 +
3425 +            fs.add(complete.acceptEitherAsync(incomplete, (z) -> {}, e));
3426 +            fs.add(incomplete.acceptEitherAsync(complete, (z) -> {}, e));
3427 +
3428 +            fs.add(complete.runAfterEitherAsync(incomplete, () -> {}, e));
3429 +            fs.add(incomplete.runAfterEitherAsync(complete, () -> {}, e));
3430 +
3431 +            for (CompletableFuture<?> future : fs)
3432 +                checkCompletedWithWrappedException(future, e.ex);
3433 +            futures.addAll(fs);
3434 +        }
3435 +
3436 +        incomplete.complete(v);
3437 +
3438 +        for (CompletableFuture<?> future : futures)
3439 +            checkCompletedWithWrappedException(future, e.ex);
3440 +
3441 +        assertEquals(futures.size(), e.count.get());
3442 +    }}
3443 +
3444 +    /**
3445 +     * Test submissions to an executor that rejects all tasks, but
3446 +     * should never be invoked because the dependent future is
3447 +     * explicitly completed.
3448 +     */
3449 +    public void testRejectingExecutorNeverInvoked() {
3450 +        for (Integer v : new Integer[] { 1, null })
3451 +    {
3452 +        final CountingRejectingExecutor e = new CountingRejectingExecutor();
3453 +
3454 +        final CompletableFuture<Integer> complete = CompletableFuture.completedFuture(v);
3455 +        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
3456 +
3457 +        List<CompletableFuture<?>> futures = new ArrayList<>();
3458 +
3459 +        List<CompletableFuture<Integer>> srcs = new ArrayList<>();
3460 +        srcs.add(complete);
3461 +        srcs.add(incomplete);
3462 +
3463 +        List<CompletableFuture<?>> fs = new ArrayList<>();
3464 +        fs.add(incomplete.thenRunAsync(() -> {}, e));
3465 +        fs.add(incomplete.thenAcceptAsync((z) -> {}, e));
3466 +        fs.add(incomplete.thenApplyAsync((z) -> z, e));
3467 +
3468 +        fs.add(incomplete.thenCombineAsync(incomplete, (x, y) -> x, e));
3469 +        fs.add(incomplete.thenAcceptBothAsync(incomplete, (x, y) -> {}, e));
3470 +        fs.add(incomplete.runAfterBothAsync(incomplete, () -> {}, e));
3471 +
3472 +        fs.add(incomplete.applyToEitherAsync(incomplete, (z) -> z, e));
3473 +        fs.add(incomplete.acceptEitherAsync(incomplete, (z) -> {}, e));
3474 +        fs.add(incomplete.runAfterEitherAsync(incomplete, () -> {}, e));
3475 +
3476 +        fs.add(incomplete.thenComposeAsync((z) -> null, e));
3477 +        fs.add(incomplete.whenCompleteAsync((z, t) -> {}, e));
3478 +        fs.add(incomplete.handleAsync((z, t) -> null, e));
3479 +
3480 +        fs.add(complete.thenCombineAsync(incomplete, (x, y) -> x, e));
3481 +        fs.add(incomplete.thenCombineAsync(complete, (x, y) -> x, e));
3482 +
3483 +        fs.add(complete.thenAcceptBothAsync(incomplete, (x, y) -> {}, e));
3484 +        fs.add(incomplete.thenAcceptBothAsync(complete, (x, y) -> {}, e));
3485 +
3486 +        fs.add(complete.runAfterBothAsync(incomplete, () -> {}, e));
3487 +        fs.add(incomplete.runAfterBothAsync(complete, () -> {}, e));
3488 +
3489 +        for (CompletableFuture<?> future : fs)
3490 +            checkIncomplete(future);
3491 +
3492 +        for (CompletableFuture<?> future : fs)
3493 +            future.complete(null);
3494 +
3495 +        incomplete.complete(v);
3496 +
3497 +        for (CompletableFuture<?> future : fs)
3498 +            checkCompletedNormally(future, null);
3499 +
3500 +        assertEquals(0, e.count.get());
3501 +    }}
3502 +
3503 +    /**
3504       * toCompletableFuture returns this CompletableFuture.
3505       */
3506      public void testToCompletableFuture() {
# Line 2806 | Line 3508 | public class CompletableFutureTest exten
3508          assertSame(f, f.toCompletableFuture());
3509      }
3510  
3511 +    // jdk9
3512 +
3513      /**
3514 <     * whenComplete action executes on normal completion, propagating
2811 <     * source result.
3514 >     * newIncompleteFuture returns an incomplete CompletableFuture
3515       */
3516 <    public void testWhenComplete_normalCompletion1() {
2814 <        for (ExecutionMode m : ExecutionMode.values())
2815 <        for (boolean createIncomplete : new boolean[] { true, false })
3516 >    public void testNewIncompleteFuture() {
3517          for (Integer v1 : new Integer[] { 1, null })
3518      {
3519 <        final AtomicInteger a = new AtomicInteger(0);
3520 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3521 <        if (!createIncomplete) f.complete(v1);
3522 <        final CompletableFuture<Integer> g = m.whenComplete
3523 <            (f,
2823 <             (Integer x, Throwable t) -> {
2824 <                threadAssertSame(x, v1);
2825 <                threadAssertNull(t);
2826 <                a.getAndIncrement();
2827 <            });
2828 <        if (createIncomplete) f.complete(v1);
2829 <
2830 <        checkCompletedNormally(g, v1);
3519 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3520 >        CompletableFuture<Integer> g = f.newIncompleteFuture();
3521 >        checkIncomplete(f);
3522 >        checkIncomplete(g);
3523 >        f.complete(v1);
3524          checkCompletedNormally(f, v1);
3525 <        assertEquals(1, a.get());
3525 >        checkIncomplete(g);
3526 >        g.complete(v1);
3527 >        checkCompletedNormally(g, v1);
3528 >        assertSame(g.getClass(), CompletableFuture.class);
3529      }}
3530  
3531      /**
3532 <     * whenComplete action executes on exceptional completion, propagating
2837 <     * source result.
3532 >     * completedStage returns a completed CompletionStage
3533       */
3534 <    public void testWhenComplete_exceptionalCompletion() {
3535 <        for (ExecutionMode m : ExecutionMode.values())
3536 <        for (boolean createIncomplete : new boolean[] { true, false })
3534 >    public void testCompletedStage() {
3535 >        AtomicInteger x = new AtomicInteger(0);
3536 >        AtomicReference<Throwable> r = new AtomicReference<Throwable>();
3537 >        CompletionStage<Integer> f = CompletableFuture.completedStage(1);
3538 >        f.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3539 >        assertEquals(x.get(), 1);
3540 >        assertNull(r.get());
3541 >    }
3542 >
3543 >    /**
3544 >     * defaultExecutor by default returns the commonPool if
3545 >     * it supports more than one thread.
3546 >     */
3547 >    public void testDefaultExecutor() {
3548 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3549 >        Executor e = f.defaultExecutor();
3550 >        Executor c = ForkJoinPool.commonPool();
3551 >        if (ForkJoinPool.getCommonPoolParallelism() > 1)
3552 >            assertSame(e, c);
3553 >        else
3554 >            assertNotSame(e, c);
3555 >    }
3556 >
3557 >    /**
3558 >     * failedFuture returns a CompletableFuture completed
3559 >     * exceptionally with the given Exception
3560 >     */
3561 >    public void testFailedFuture() {
3562 >        CFException ex = new CFException();
3563 >        CompletableFuture<Integer> f = CompletableFuture.failedFuture(ex);
3564 >        checkCompletedExceptionally(f, ex);
3565 >    }
3566 >
3567 >    /**
3568 >     * failedFuture(null) throws NPE
3569 >     */
3570 >    public void testFailedFuture_null() {
3571 >        try {
3572 >            CompletableFuture<Integer> f = CompletableFuture.failedFuture(null);
3573 >            shouldThrow();
3574 >        } catch (NullPointerException success) {}
3575 >    }
3576 >
3577 >    /**
3578 >     * copy returns a CompletableFuture that is completed normally,
3579 >     * with the same value, when source is.
3580 >     */
3581 >    public void testCopy() {
3582 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3583 >        CompletableFuture<Integer> g = f.copy();
3584 >        checkIncomplete(f);
3585 >        checkIncomplete(g);
3586 >        f.complete(1);
3587 >        checkCompletedNormally(f, 1);
3588 >        checkCompletedNormally(g, 1);
3589 >    }
3590 >
3591 >    /**
3592 >     * copy returns a CompletableFuture that is completed exceptionally
3593 >     * when source is.
3594 >     */
3595 >    public void testCopy2() {
3596 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3597 >        CompletableFuture<Integer> g = f.copy();
3598 >        checkIncomplete(f);
3599 >        checkIncomplete(g);
3600 >        CFException ex = new CFException();
3601 >        f.completeExceptionally(ex);
3602 >        checkCompletedExceptionally(f, ex);
3603 >        checkCompletedWithWrappedException(g, ex);
3604 >    }
3605 >
3606 >    /**
3607 >     * minimalCompletionStage returns a CompletableFuture that is
3608 >     * completed normally, with the same value, when source is.
3609 >     */
3610 >    public void testMinimalCompletionStage() {
3611 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3612 >        CompletionStage<Integer> g = f.minimalCompletionStage();
3613 >        AtomicInteger x = new AtomicInteger(0);
3614 >        AtomicReference<Throwable> r = new AtomicReference<Throwable>();
3615 >        checkIncomplete(f);
3616 >        g.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3617 >        f.complete(1);
3618 >        checkCompletedNormally(f, 1);
3619 >        assertEquals(x.get(), 1);
3620 >        assertNull(r.get());
3621 >    }
3622 >
3623 >    /**
3624 >     * minimalCompletionStage returns a CompletableFuture that is
3625 >     * completed exceptionally when source is.
3626 >     */
3627 >    public void testMinimalCompletionStage2() {
3628 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3629 >        CompletionStage<Integer> g = f.minimalCompletionStage();
3630 >        AtomicInteger x = new AtomicInteger(0);
3631 >        AtomicReference<Throwable> r = new AtomicReference<Throwable>();
3632 >        g.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3633 >        checkIncomplete(f);
3634 >        CFException ex = new CFException();
3635 >        f.completeExceptionally(ex);
3636 >        checkCompletedExceptionally(f, ex);
3637 >        assertEquals(x.get(), 0);
3638 >        assertEquals(r.get().getCause(), ex);
3639 >    }
3640 >
3641 >    /**
3642 >     * failedStage returns a CompletionStage completed
3643 >     * exceptionally with the given Exception
3644 >     */
3645 >    public void testFailedStage() {
3646 >        CFException ex = new CFException();
3647 >        CompletionStage<Integer> f = CompletableFuture.failedStage(ex);
3648 >        AtomicInteger x = new AtomicInteger(0);
3649 >        AtomicReference<Throwable> r = new AtomicReference<Throwable>();
3650 >        f.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3651 >        assertEquals(x.get(), 0);
3652 >        assertEquals(r.get(), ex);
3653 >    }
3654 >
3655 >    /**
3656 >     * completeAsync completes with value of given supplier
3657 >     */
3658 >    public void testCompleteAsync() {
3659          for (Integer v1 : new Integer[] { 1, null })
3660      {
3661 <        final AtomicInteger a = new AtomicInteger(0);
3662 <        final CFException ex = new CFException();
3663 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3664 <        if (!createIncomplete) f.completeExceptionally(ex);
2848 <        final CompletableFuture<Integer> g = m.whenComplete
2849 <            (f,
2850 <             (Integer x, Throwable t) -> {
2851 <                threadAssertNull(x);
2852 <                threadAssertSame(t, ex);
2853 <                a.getAndIncrement();
2854 <            });
2855 <        if (createIncomplete) f.completeExceptionally(ex);
2856 <        checkCompletedWithWrappedCFException(f, ex);
2857 <        checkCompletedWithWrappedCFException(g, ex);
2858 <        assertEquals(1, a.get());
3661 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3662 >        f.completeAsync(() -> v1);
3663 >        f.join();
3664 >        checkCompletedNormally(f, v1);
3665      }}
3666  
3667      /**
3668 <     * whenComplete action executes on cancelled source, propagating
2863 <     * CancellationException.
3668 >     * completeAsync completes exceptionally if given supplier throws
3669       */
3670 <    public void testWhenComplete_sourceCancelled() {
3671 <        for (ExecutionMode m : ExecutionMode.values())
3672 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3673 <        for (boolean createIncomplete : new boolean[] { true, false })
3670 >    public void testCompleteAsync2() {
3671 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3672 >        CFException ex = new CFException();
3673 >        f.completeAsync(() -> {if (true) throw ex; return 1;});
3674 >        try {
3675 >            f.join();
3676 >            shouldThrow();
3677 >        } catch (CompletionException success) {}
3678 >        checkCompletedWithWrappedException(f, ex);
3679 >    }
3680 >
3681 >    /**
3682 >     * completeAsync with given executor completes with value of given supplier
3683 >     */
3684 >    public void testCompleteAsync3() {
3685 >        for (Integer v1 : new Integer[] { 1, null })
3686      {
3687 <        final AtomicInteger a = new AtomicInteger(0);
3688 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3689 <        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
3690 <        final CompletableFuture<Integer> g = m.whenComplete
3691 <            (f,
3692 <             (Integer x, Throwable t) -> {
3693 <                threadAssertNull(x);
2877 <                threadAssertTrue(t instanceof CancellationException);
2878 <                a.getAndIncrement();
2879 <            });
2880 <        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
3687 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3688 >        ThreadExecutor executor = new ThreadExecutor();
3689 >        f.completeAsync(() -> v1, executor);
3690 >        assertSame(v1, f.join());
3691 >        checkCompletedNormally(f, v1);
3692 >        assertEquals(1, executor.count.get());
3693 >    }}
3694  
3695 <        //try { g.join(); } catch (Throwable t) { throw new Error(t); }
3696 <        checkCompletedWithWrappedCancellationException(g);
3697 <        checkCancelled(f);
3698 <        assertEquals(1, a.get());
3695 >    /**
3696 >     * completeAsync with given executor completes exceptionally if
3697 >     * given supplier throws
3698 >     */
3699 >    public void testCompleteAsync4() {
3700 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3701 >        CFException ex = new CFException();
3702 >        ThreadExecutor executor = new ThreadExecutor();
3703 >        f.completeAsync(() -> {if (true) throw ex; return 1;}, executor);
3704 >        try {
3705 >            f.join();
3706 >            shouldThrow();
3707 >        } catch (CompletionException success) {}
3708 >        checkCompletedWithWrappedException(f, ex);
3709 >        assertEquals(1, executor.count.get());
3710 >    }
3711 >
3712 >    /**
3713 >     * orTimeout completes with TimeoutException if not complete
3714 >     */
3715 >    public void testOrTimeout_timesOut() {
3716 >        long timeoutMillis = timeoutMillis();
3717 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3718 >        long startTime = System.nanoTime();
3719 >        assertSame(f, f.orTimeout(timeoutMillis, MILLISECONDS));
3720 >        checkCompletedWithTimeoutException(f);
3721 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
3722 >    }
3723 >
3724 >    /**
3725 >     * orTimeout completes normally if completed before timeout
3726 >     */
3727 >    public void testOrTimeout_completed() {
3728 >        for (Integer v1 : new Integer[] { 1, null })
3729 >    {
3730 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3731 >        CompletableFuture<Integer> g = new CompletableFuture<>();
3732 >        long startTime = System.nanoTime();
3733 >        f.complete(v1);
3734 >        assertSame(f, f.orTimeout(LONG_DELAY_MS, MILLISECONDS));
3735 >        assertSame(g, g.orTimeout(LONG_DELAY_MS, MILLISECONDS));
3736 >        g.complete(v1);
3737 >        checkCompletedNormally(f, v1);
3738 >        checkCompletedNormally(g, v1);
3739 >        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS / 2);
3740      }}
3741  
3742      /**
3743 <     * If a whenComplete action throws an exception when triggered by
2890 <     * a normal completion, it completes exceptionally
3743 >     * completeOnTimeout completes with given value if not complete
3744       */
3745 <    public void testWhenComplete_actionFailed() {
3746 <        for (boolean createIncomplete : new boolean[] { true, false })
3747 <        for (ExecutionMode m : ExecutionMode.values())
3745 >    public void testCompleteOnTimeout_timesOut() {
3746 >        testInParallel(() -> testCompleteOnTimeout_timesOut(42),
3747 >                       () -> testCompleteOnTimeout_timesOut(null));
3748 >    }
3749 >
3750 >    /**
3751 >     * completeOnTimeout completes with given value if not complete
3752 >     */
3753 >    public void testCompleteOnTimeout_timesOut(Integer v) {
3754 >        long timeoutMillis = timeoutMillis();
3755 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3756 >        long startTime = System.nanoTime();
3757 >        assertSame(f, f.completeOnTimeout(v, timeoutMillis, MILLISECONDS));
3758 >        assertSame(v, f.join());
3759 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
3760 >        f.complete(99);         // should have no effect
3761 >        checkCompletedNormally(f, v);
3762 >    }
3763 >
3764 >    /**
3765 >     * completeOnTimeout has no effect if completed within timeout
3766 >     */
3767 >    public void testCompleteOnTimeout_completed() {
3768          for (Integer v1 : new Integer[] { 1, null })
3769      {
3770 <        final AtomicInteger a = new AtomicInteger(0);
3771 <        final CFException ex = new CFException();
3772 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3773 <        if (!createIncomplete) f.complete(v1);
3774 <        final CompletableFuture<Integer> g = m.whenComplete
3775 <            (f,
3776 <             (Integer x, Throwable t) -> {
2904 <                threadAssertSame(x, v1);
2905 <                threadAssertNull(t);
2906 <                a.getAndIncrement();
2907 <                throw ex;
2908 <            });
2909 <        if (createIncomplete) f.complete(v1);
3770 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3771 >        CompletableFuture<Integer> g = new CompletableFuture<>();
3772 >        long startTime = System.nanoTime();
3773 >        f.complete(v1);
3774 >        assertSame(f, f.completeOnTimeout(-1, LONG_DELAY_MS, MILLISECONDS));
3775 >        assertSame(g, g.completeOnTimeout(-1, LONG_DELAY_MS, MILLISECONDS));
3776 >        g.complete(v1);
3777          checkCompletedNormally(f, v1);
3778 <        checkCompletedWithWrappedCFException(g, ex);
3779 <        assertEquals(1, a.get());
3778 >        checkCompletedNormally(g, v1);
3779 >        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS / 2);
3780      }}
3781  
3782      /**
3783 <     * If a whenComplete action throws an exception when triggered by
2917 <     * a source completion that also throws an exception, the source
2918 <     * exception takes precedence.
3783 >     * delayedExecutor returns an executor that delays submission
3784       */
3785 <    public void testWhenComplete_actionFailedSourceFailed() {
3786 <        for (boolean createIncomplete : new boolean[] { true, false })
3785 >    public void testDelayedExecutor() {
3786 >        testInParallel(() -> testDelayedExecutor(null, null),
3787 >                       () -> testDelayedExecutor(null, 1),
3788 >                       () -> testDelayedExecutor(new ThreadExecutor(), 1),
3789 >                       () -> testDelayedExecutor(new ThreadExecutor(), 1));
3790 >    }
3791 >
3792 >    public void testDelayedExecutor(Executor executor, Integer v) throws Exception {
3793 >        long timeoutMillis = timeoutMillis();
3794 >        // Use an "unreasonably long" long timeout to catch lingering threads
3795 >        long longTimeoutMillis = 1000 * 60 * 60 * 24;
3796 >        final Executor delayer, longDelayer;
3797 >        if (executor == null) {
3798 >            delayer = CompletableFuture.delayedExecutor(timeoutMillis, MILLISECONDS);
3799 >            longDelayer = CompletableFuture.delayedExecutor(longTimeoutMillis, MILLISECONDS);
3800 >        } else {
3801 >            delayer = CompletableFuture.delayedExecutor(timeoutMillis, MILLISECONDS, executor);
3802 >            longDelayer = CompletableFuture.delayedExecutor(longTimeoutMillis, MILLISECONDS, executor);
3803 >        }
3804 >        long startTime = System.nanoTime();
3805 >        CompletableFuture<Integer> f =
3806 >            CompletableFuture.supplyAsync(() -> v, delayer);
3807 >        CompletableFuture<Integer> g =
3808 >            CompletableFuture.supplyAsync(() -> v, longDelayer);
3809 >
3810 >        assertNull(g.getNow(null));
3811 >
3812 >        assertSame(v, f.get(LONG_DELAY_MS, MILLISECONDS));
3813 >        long millisElapsed = millisElapsedSince(startTime);
3814 >        assertTrue(millisElapsed >= timeoutMillis);
3815 >        assertTrue(millisElapsed < LONG_DELAY_MS / 2);
3816 >
3817 >        checkCompletedNormally(f, v);
3818 >
3819 >        checkIncomplete(g);
3820 >        assertTrue(g.cancel(true));
3821 >    }
3822 >
3823 >    //--- tests of implementation details; not part of official tck ---
3824 >
3825 >    Object resultOf(CompletableFuture<?> f) {
3826 >        SecurityManager sm = System.getSecurityManager();
3827 >        if (sm != null) {
3828 >            try {
3829 >                System.setSecurityManager(null);
3830 >            } catch (SecurityException giveUp) {
3831 >                return "Reflection not available";
3832 >            }
3833 >        }
3834 >
3835 >        try {
3836 >            java.lang.reflect.Field resultField
3837 >                = CompletableFuture.class.getDeclaredField("result");
3838 >            resultField.setAccessible(true);
3839 >            return resultField.get(f);
3840 >        } catch (Throwable t) {
3841 >            throw new AssertionError(t);
3842 >        } finally {
3843 >            if (sm != null) System.setSecurityManager(sm);
3844 >        }
3845 >    }
3846 >
3847 >    public void testExceptionPropagationReusesResultObject() {
3848 >        if (!testImplementationDetails) return;
3849          for (ExecutionMode m : ExecutionMode.values())
2923        for (Integer v1 : new Integer[] { 1, null })
3850      {
3851 <        final AtomicInteger a = new AtomicInteger(0);
3852 <        final CFException ex1 = new CFException();
3853 <        final CFException ex2 = new CFException();
2928 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3851 >        final CFException ex = new CFException();
3852 >        final CompletableFuture<Integer> v42 = CompletableFuture.completedFuture(42);
3853 >        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
3854  
3855 <        if (!createIncomplete) f.completeExceptionally(ex1);
3856 <        final CompletableFuture<Integer> g = m.whenComplete
2932 <            (f,
2933 <             (Integer x, Throwable t) -> {
2934 <                threadAssertSame(t, ex1);
2935 <                threadAssertNull(x);
2936 <                a.getAndIncrement();
2937 <                throw ex2;
2938 <            });
2939 <        if (createIncomplete) f.completeExceptionally(ex1);
3855 >        List<Function<CompletableFuture<Integer>, CompletableFuture<?>>> funs
3856 >            = new ArrayList<>();
3857  
3858 <        checkCompletedWithWrappedCFException(f, ex1);
3859 <        checkCompletedWithWrappedCFException(g, ex1);
3860 <        assertEquals(1, a.get());
3858 >        funs.add((y) -> m.thenRun(y, new Noop(m)));
3859 >        funs.add((y) -> m.thenAccept(y, new NoopConsumer(m)));
3860 >        funs.add((y) -> m.thenApply(y, new IncFunction(m)));
3861 >
3862 >        funs.add((y) -> m.runAfterEither(y, incomplete, new Noop(m)));
3863 >        funs.add((y) -> m.acceptEither(y, incomplete, new NoopConsumer(m)));
3864 >        funs.add((y) -> m.applyToEither(y, incomplete, new IncFunction(m)));
3865 >
3866 >        funs.add((y) -> m.runAfterBoth(y, v42, new Noop(m)));
3867 >        funs.add((y) -> m.runAfterBoth(v42, y, new Noop(m)));
3868 >        funs.add((y) -> m.thenAcceptBoth(y, v42, new SubtractAction(m)));
3869 >        funs.add((y) -> m.thenAcceptBoth(v42, y, new SubtractAction(m)));
3870 >        funs.add((y) -> m.thenCombine(y, v42, new SubtractFunction(m)));
3871 >        funs.add((y) -> m.thenCombine(v42, y, new SubtractFunction(m)));
3872 >
3873 >        funs.add((y) -> m.whenComplete(y, (Integer r, Throwable t) -> {}));
3874 >
3875 >        funs.add((y) -> m.thenCompose(y, new CompletableFutureInc(m)));
3876 >
3877 >        funs.add((y) -> CompletableFuture.allOf(new CompletableFuture<?>[] {y}));
3878 >        funs.add((y) -> CompletableFuture.allOf(new CompletableFuture<?>[] {y, v42}));
3879 >        funs.add((y) -> CompletableFuture.allOf(new CompletableFuture<?>[] {v42, y}));
3880 >        funs.add((y) -> CompletableFuture.anyOf(new CompletableFuture<?>[] {y}));
3881 >        funs.add((y) -> CompletableFuture.anyOf(new CompletableFuture<?>[] {y, incomplete}));
3882 >        funs.add((y) -> CompletableFuture.anyOf(new CompletableFuture<?>[] {incomplete, y}));
3883 >
3884 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3885 >                 fun : funs) {
3886 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3887 >            f.completeExceptionally(ex);
3888 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3889 >            checkCompletedWithWrappedException(src, ex);
3890 >            CompletableFuture<?> dep = fun.apply(src);
3891 >            checkCompletedWithWrappedException(dep, ex);
3892 >            assertSame(resultOf(src), resultOf(dep));
3893 >        }
3894 >
3895 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3896 >                 fun : funs) {
3897 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3898 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3899 >            CompletableFuture<?> dep = fun.apply(src);
3900 >            f.completeExceptionally(ex);
3901 >            checkCompletedWithWrappedException(src, ex);
3902 >            checkCompletedWithWrappedException(dep, ex);
3903 >            assertSame(resultOf(src), resultOf(dep));
3904 >        }
3905 >
3906 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3907 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3908 >                 fun : funs) {
3909 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3910 >            f.cancel(mayInterruptIfRunning);
3911 >            checkCancelled(f);
3912 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3913 >            checkCompletedWithWrappedCancellationException(src);
3914 >            CompletableFuture<?> dep = fun.apply(src);
3915 >            checkCompletedWithWrappedCancellationException(dep);
3916 >            assertSame(resultOf(src), resultOf(dep));
3917 >        }
3918 >
3919 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3920 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3921 >                 fun : funs) {
3922 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3923 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3924 >            CompletableFuture<?> dep = fun.apply(src);
3925 >            f.cancel(mayInterruptIfRunning);
3926 >            checkCancelled(f);
3927 >            checkCompletedWithWrappedCancellationException(src);
3928 >            checkCompletedWithWrappedCancellationException(dep);
3929 >            assertSame(resultOf(src), resultOf(dep));
3930 >        }
3931      }}
3932  
3933 +    /**
3934 +     * Minimal completion stages throw UOE for all non-CompletionStage methods
3935 +     */
3936 +    public void testMinimalCompletionStage_minimality() {
3937 +        if (!testImplementationDetails) return;
3938 +        Function<Method, String> toSignature =
3939 +            (method) -> method.getName() + Arrays.toString(method.getParameterTypes());
3940 +        Predicate<Method> isNotStatic =
3941 +            (method) -> (method.getModifiers() & Modifier.STATIC) == 0;
3942 +        List<Method> minimalMethods =
3943 +            Stream.of(Object.class, CompletionStage.class)
3944 +            .flatMap((klazz) -> Stream.of(klazz.getMethods()))
3945 +            .filter(isNotStatic)
3946 +            .collect(Collectors.toList());
3947 +        // Methods from CompletableFuture permitted NOT to throw UOE
3948 +        String[] signatureWhitelist = {
3949 +            "newIncompleteFuture[]",
3950 +            "defaultExecutor[]",
3951 +            "minimalCompletionStage[]",
3952 +            "copy[]",
3953 +        };
3954 +        Set<String> permittedMethodSignatures =
3955 +            Stream.concat(minimalMethods.stream().map(toSignature),
3956 +                          Stream.of(signatureWhitelist))
3957 +            .collect(Collectors.toSet());
3958 +        List<Method> allMethods = Stream.of(CompletableFuture.class.getMethods())
3959 +            .filter(isNotStatic)
3960 +            .filter((method) -> !permittedMethodSignatures.contains(toSignature.apply(method)))
3961 +            .collect(Collectors.toList());
3962 +
3963 +        CompletionStage<Integer> minimalStage =
3964 +            new CompletableFuture<Integer>().minimalCompletionStage();
3965 +
3966 +        List<Method> bugs = new ArrayList<>();
3967 +        for (Method method : allMethods) {
3968 +            Class<?>[] parameterTypes = method.getParameterTypes();
3969 +            Object[] args = new Object[parameterTypes.length];
3970 +            // Manufacture boxed primitives for primitive params
3971 +            for (int i = 0; i < args.length; i++) {
3972 +                Class<?> type = parameterTypes[i];
3973 +                if (parameterTypes[i] == boolean.class)
3974 +                    args[i] = false;
3975 +                else if (parameterTypes[i] == int.class)
3976 +                    args[i] = 0;
3977 +                else if (parameterTypes[i] == long.class)
3978 +                    args[i] = 0L;
3979 +            }
3980 +            try {
3981 +                method.invoke(minimalStage, args);
3982 +                bugs.add(method);
3983 +            }
3984 +            catch (java.lang.reflect.InvocationTargetException expected) {
3985 +                if (! (expected.getCause() instanceof UnsupportedOperationException)) {
3986 +                    bugs.add(method);
3987 +                    // expected.getCause().printStackTrace();
3988 +                }
3989 +            }
3990 +            catch (ReflectiveOperationException bad) { throw new Error(bad); }
3991 +        }
3992 +        if (!bugs.isEmpty())
3993 +            throw new Error("Methods did not throw UOE: " + bugs.toString());
3994 +    }
3995 +
3996 +    static class Monad {
3997 +        static class ZeroException extends RuntimeException {
3998 +            public ZeroException() { super("monadic zero"); }
3999 +        }
4000 +        // "return", "unit"
4001 +        static <T> CompletableFuture<T> unit(T value) {
4002 +            return completedFuture(value);
4003 +        }
4004 +        // monadic zero ?
4005 +        static <T> CompletableFuture<T> zero() {
4006 +            return failedFuture(new ZeroException());
4007 +        }
4008 +        // >=>
4009 +        static <T,U,V> Function<T, CompletableFuture<V>> compose
4010 +            (Function<T, CompletableFuture<U>> f,
4011 +             Function<U, CompletableFuture<V>> g) {
4012 +            return (x) -> f.apply(x).thenCompose(g);
4013 +        }
4014 +
4015 +        static void assertZero(CompletableFuture<?> f) {
4016 +            try {
4017 +                f.getNow(null);
4018 +                throw new AssertionFailedError("should throw");
4019 +            } catch (CompletionException success) {
4020 +                assertTrue(success.getCause() instanceof ZeroException);
4021 +            }
4022 +        }
4023 +
4024 +        static <T> void assertFutureEquals(CompletableFuture<T> f,
4025 +                                           CompletableFuture<T> g) {
4026 +            T fval = null, gval = null;
4027 +            Throwable fex = null, gex = null;
4028 +
4029 +            try { fval = f.get(); }
4030 +            catch (ExecutionException ex) { fex = ex.getCause(); }
4031 +            catch (Throwable ex) { fex = ex; }
4032 +
4033 +            try { gval = g.get(); }
4034 +            catch (ExecutionException ex) { gex = ex.getCause(); }
4035 +            catch (Throwable ex) { gex = ex; }
4036 +
4037 +            if (fex != null || gex != null)
4038 +                assertSame(fex.getClass(), gex.getClass());
4039 +            else
4040 +                assertEquals(fval, gval);
4041 +        }
4042 +
4043 +        static class PlusFuture<T> extends CompletableFuture<T> {
4044 +            AtomicReference<Throwable> firstFailure = new AtomicReference<>(null);
4045 +        }
4046 +
4047 +        /** Implements "monadic plus". */
4048 +        static <T> CompletableFuture<T> plus(CompletableFuture<? extends T> f,
4049 +                                             CompletableFuture<? extends T> g) {
4050 +            PlusFuture<T> plus = new PlusFuture<T>();
4051 +            BiConsumer<T, Throwable> action = (T result, Throwable ex) -> {
4052 +                try {
4053 +                    if (ex == null) {
4054 +                        if (plus.complete(result))
4055 +                            if (plus.firstFailure.get() != null)
4056 +                                plus.firstFailure.set(null);
4057 +                    }
4058 +                    else if (plus.firstFailure.compareAndSet(null, ex)) {
4059 +                        if (plus.isDone())
4060 +                            plus.firstFailure.set(null);
4061 +                    }
4062 +                    else {
4063 +                        // first failure has precedence
4064 +                        Throwable first = plus.firstFailure.getAndSet(null);
4065 +
4066 +                        // may fail with "Self-suppression not permitted"
4067 +                        try { first.addSuppressed(ex); }
4068 +                        catch (Exception ignored) {}
4069 +
4070 +                        plus.completeExceptionally(first);
4071 +                    }
4072 +                } catch (Throwable unexpected) {
4073 +                    plus.completeExceptionally(unexpected);
4074 +                }
4075 +            };
4076 +            f.whenComplete(action);
4077 +            g.whenComplete(action);
4078 +            return plus;
4079 +        }
4080 +    }
4081 +
4082 +    /**
4083 +     * CompletableFuture is an additive monad - sort of.
4084 +     * https://en.wikipedia.org/wiki/Monad_(functional_programming)#Additive_monads
4085 +     */
4086 +    public void testAdditiveMonad() throws Throwable {
4087 +        Function<Long, CompletableFuture<Long>> unit = Monad::unit;
4088 +        CompletableFuture<Long> zero = Monad.zero();
4089 +
4090 +        // Some mutually non-commutative functions
4091 +        Function<Long, CompletableFuture<Long>> triple
4092 +            = (x) -> Monad.unit(3 * x);
4093 +        Function<Long, CompletableFuture<Long>> inc
4094 +            = (x) -> Monad.unit(x + 1);
4095 +
4096 +        // unit is a right identity: m >>= unit === m
4097 +        Monad.assertFutureEquals(inc.apply(5L).thenCompose(unit),
4098 +                                 inc.apply(5L));
4099 +        // unit is a left identity: (unit x) >>= f === f x
4100 +        Monad.assertFutureEquals(unit.apply(5L).thenCompose(inc),
4101 +                                 inc.apply(5L));
4102 +
4103 +        // associativity: (m >>= f) >>= g === m >>= ( \x -> (f x >>= g) )
4104 +        Monad.assertFutureEquals(
4105 +            unit.apply(5L).thenCompose(inc).thenCompose(triple),
4106 +            unit.apply(5L).thenCompose((x) -> inc.apply(x).thenCompose(triple)));
4107 +
4108 +        // The case for CompletableFuture as an additive monad is weaker...
4109 +
4110 +        // zero is a monadic zero
4111 +        Monad.assertZero(zero);
4112 +
4113 +        // left zero: zero >>= f === zero
4114 +        Monad.assertZero(zero.thenCompose(inc));
4115 +        // right zero: f >>= (\x -> zero) === zero
4116 +        Monad.assertZero(inc.apply(5L).thenCompose((x) -> zero));
4117 +
4118 +        // f plus zero === f
4119 +        Monad.assertFutureEquals(Monad.unit(5L),
4120 +                                 Monad.plus(Monad.unit(5L), zero));
4121 +        // zero plus f === f
4122 +        Monad.assertFutureEquals(Monad.unit(5L),
4123 +                                 Monad.plus(zero, Monad.unit(5L)));
4124 +        // zero plus zero === zero
4125 +        Monad.assertZero(Monad.plus(zero, zero));
4126 +        {
4127 +            CompletableFuture<Long> f = Monad.plus(Monad.unit(5L),
4128 +                                                   Monad.unit(8L));
4129 +            // non-determinism
4130 +            assertTrue(f.get() == 5L || f.get() == 8L);
4131 +        }
4132 +
4133 +        CompletableFuture<Long> godot = new CompletableFuture<>();
4134 +        // f plus godot === f (doesn't wait for godot)
4135 +        Monad.assertFutureEquals(Monad.unit(5L),
4136 +                                 Monad.plus(Monad.unit(5L), godot));
4137 +        // godot plus f === f (doesn't wait for godot)
4138 +        Monad.assertFutureEquals(Monad.unit(5L),
4139 +                                 Monad.plus(godot, Monad.unit(5L)));
4140 +    }
4141 +
4142 +    /**
4143 +     * A single CompletableFuture with many dependents.
4144 +     * A demo of scalability - runtime is O(n).
4145 +     */
4146 +    public void testManyDependents() throws Throwable {
4147 +        final int n = expensiveTests ? 1_000_000 : 10;
4148 +        final CompletableFuture<Void> head = new CompletableFuture<>();
4149 +        final CompletableFuture<Void> complete = CompletableFuture.completedFuture((Void)null);
4150 +        final AtomicInteger count = new AtomicInteger(0);
4151 +        for (int i = 0; i < n; i++) {
4152 +            head.thenRun(() -> count.getAndIncrement());
4153 +            head.thenAccept((x) -> count.getAndIncrement());
4154 +            head.thenApply((x) -> count.getAndIncrement());
4155 +
4156 +            head.runAfterBoth(complete, () -> count.getAndIncrement());
4157 +            head.thenAcceptBoth(complete, (x, y) -> count.getAndIncrement());
4158 +            head.thenCombine(complete, (x, y) -> count.getAndIncrement());
4159 +            complete.runAfterBoth(head, () -> count.getAndIncrement());
4160 +            complete.thenAcceptBoth(head, (x, y) -> count.getAndIncrement());
4161 +            complete.thenCombine(head, (x, y) -> count.getAndIncrement());
4162 +
4163 +            head.runAfterEither(new CompletableFuture<Void>(), () -> count.getAndIncrement());
4164 +            head.acceptEither(new CompletableFuture<Void>(), (x) -> count.getAndIncrement());
4165 +            head.applyToEither(new CompletableFuture<Void>(), (x) -> count.getAndIncrement());
4166 +            new CompletableFuture<Void>().runAfterEither(head, () -> count.getAndIncrement());
4167 +            new CompletableFuture<Void>().acceptEither(head, (x) -> count.getAndIncrement());
4168 +            new CompletableFuture<Void>().applyToEither(head, (x) -> count.getAndIncrement());
4169 +        }
4170 +        head.complete(null);
4171 +        assertEquals(5 * 3 * n, count.get());
4172 +    }
4173 +
4174 +    /** ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest tck */
4175 +    public void testCoCompletionGarbageRetention() throws Throwable {
4176 +        final int n = expensiveTests ? 1_000_000 : 10;
4177 +        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
4178 +        CompletableFuture<Integer> f;
4179 +        for (int i = 0; i < n; i++) {
4180 +            f = new CompletableFuture<>();
4181 +            f.runAfterEither(incomplete, () -> {});
4182 +            f.complete(null);
4183 +
4184 +            f = new CompletableFuture<>();
4185 +            f.acceptEither(incomplete, (x) -> {});
4186 +            f.complete(null);
4187 +
4188 +            f = new CompletableFuture<>();
4189 +            f.applyToEither(incomplete, (x) -> x);
4190 +            f.complete(null);
4191 +
4192 +            f = new CompletableFuture<>();
4193 +            CompletableFuture.anyOf(new CompletableFuture<?>[] { f, incomplete });
4194 +            f.complete(null);
4195 +        }
4196 +
4197 +        for (int i = 0; i < n; i++) {
4198 +            f = new CompletableFuture<>();
4199 +            incomplete.runAfterEither(f, () -> {});
4200 +            f.complete(null);
4201 +
4202 +            f = new CompletableFuture<>();
4203 +            incomplete.acceptEither(f, (x) -> {});
4204 +            f.complete(null);
4205 +
4206 +            f = new CompletableFuture<>();
4207 +            incomplete.applyToEither(f, (x) -> x);
4208 +            f.complete(null);
4209 +
4210 +            f = new CompletableFuture<>();
4211 +            CompletableFuture.anyOf(new CompletableFuture<?>[] { incomplete, f });
4212 +            f.complete(null);
4213 +        }
4214 +    }
4215 +
4216 +    /*
4217 +     * Tests below currently fail in stress mode due to memory retention.
4218 +     * ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest tck
4219 +     */
4220 +
4221 +    /** Checks for garbage retention with anyOf. */
4222 +    public void testAnyOfGarbageRetention() throws Throwable {
4223 +        for (Integer v : new Integer[] { 1, null })
4224 +    {
4225 +        final int n = expensiveTests ? 100_000 : 10;
4226 +        CompletableFuture<Integer>[] fs
4227 +            = (CompletableFuture<Integer>[]) new CompletableFuture<?>[100];
4228 +        for (int i = 0; i < fs.length; i++)
4229 +            fs[i] = new CompletableFuture<>();
4230 +        fs[fs.length - 1].complete(v);
4231 +        for (int i = 0; i < n; i++)
4232 +            checkCompletedNormally(CompletableFuture.anyOf(fs), v);
4233 +    }}
4234 +
4235 +    /** Checks for garbage retention with allOf. */
4236 +    public void testCancelledAllOfGarbageRetention() throws Throwable {
4237 +        final int n = expensiveTests ? 100_000 : 10;
4238 +        CompletableFuture<Integer>[] fs
4239 +            = (CompletableFuture<Integer>[]) new CompletableFuture<?>[100];
4240 +        for (int i = 0; i < fs.length; i++)
4241 +            fs[i] = new CompletableFuture<>();
4242 +        for (int i = 0; i < n; i++)
4243 +            assertTrue(CompletableFuture.allOf(fs).cancel(false));
4244 +    }
4245 +
4246 + //     static <U> U join(CompletionStage<U> stage) {
4247 + //         CompletableFuture<U> f = new CompletableFuture<>();
4248 + //         stage.whenComplete((v, ex) -> {
4249 + //             if (ex != null) f.completeExceptionally(ex); else f.complete(v);
4250 + //         });
4251 + //         return f.join();
4252 + //     }
4253 +
4254 + //     static <U> boolean isDone(CompletionStage<U> stage) {
4255 + //         CompletableFuture<U> f = new CompletableFuture<>();
4256 + //         stage.whenComplete((v, ex) -> {
4257 + //             if (ex != null) f.completeExceptionally(ex); else f.complete(v);
4258 + //         });
4259 + //         return f.isDone();
4260 + //     }
4261 +
4262 + //     static <U> U join2(CompletionStage<U> stage) {
4263 + //         return stage.toCompletableFuture().copy().join();
4264 + //     }
4265 +
4266 + //     static <U> boolean isDone2(CompletionStage<U> stage) {
4267 + //         return stage.toCompletableFuture().copy().isDone();
4268 + //     }
4269 +
4270   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines