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.64 by jsr166, Fri Jun 6 17:08:48 2014 UTC vs.
Revision 1.152 by jsr166, Sun Jun 26 19:03:27 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  
# Line 516 | Line 564 | public class CompletableFutureTest exten
564          }
565      }
566  
567 +    static final boolean defaultExecutorIsCommonPool
568 +        = ForkJoinPool.getCommonPoolParallelism() > 1;
569 +
570      /**
571       * Permits the testing of parallel code for the 3 different
572       * execution modes without copy/pasting all the test methods.
573       */
574      enum ExecutionMode {
575 <        DEFAULT {
575 >        SYNC {
576              public void checkExecutionMode() {
577                  assertFalse(ThreadExecutor.startedCurrentThread());
578                  assertNull(ForkJoinTask.getPool());
# Line 597 | Line 648 | public class CompletableFutureTest exten
648  
649          ASYNC {
650              public void checkExecutionMode() {
651 <                assertSame(ForkJoinPool.commonPool(),
652 <                           ForkJoinTask.getPool());
651 >                assertEquals(defaultExecutorIsCommonPool,
652 >                             (ForkJoinPool.commonPool() == ForkJoinTask.getPool()));
653              }
654              public CompletableFuture<Void> runAsync(Runnable a) {
655                  return CompletableFuture.runAsync(a);
# Line 794 | Line 845 | public class CompletableFutureTest exten
845      {
846          final AtomicInteger a = new AtomicInteger(0);
847          final CompletableFuture<Integer> f = new CompletableFuture<>();
848 <        if (!createIncomplete) f.complete(v1);
848 >        if (!createIncomplete) assertTrue(f.complete(v1));
849          final CompletableFuture<Integer> g = f.exceptionally
850              ((Throwable t) -> {
800                // Should not be called
851                  a.getAndIncrement();
852 <                throw new AssertionError();
852 >                threadFail("should not be called");
853 >                return null;            // unreached
854              });
855 <        if (createIncomplete) f.complete(v1);
855 >        if (createIncomplete) assertTrue(f.complete(v1));
856  
857          checkCompletedNormally(g, v1);
858          checkCompletedNormally(f, v1);
859          assertEquals(0, a.get());
860      }}
861  
811
862      /**
863       * exceptionally action completes with function value on source
864       * exception
# Line 823 | Line 873 | public class CompletableFutureTest exten
873          if (!createIncomplete) f.completeExceptionally(ex);
874          final CompletableFuture<Integer> g = f.exceptionally
875              ((Throwable t) -> {
876 <                ExecutionMode.DEFAULT.checkExecutionMode();
876 >                ExecutionMode.SYNC.checkExecutionMode();
877                  threadAssertSame(t, ex);
878                  a.getAndIncrement();
879                  return v1;
# Line 834 | Line 884 | public class CompletableFutureTest exten
884          assertEquals(1, a.get());
885      }}
886  
887 +    /**
888 +     * If an "exceptionally action" throws an exception, it completes
889 +     * exceptionally with that exception
890 +     */
891      public void testExceptionally_exceptionalCompletionActionFailed() {
892          for (boolean createIncomplete : new boolean[] { true, false })
839        for (Integer v1 : new Integer[] { 1, null })
893      {
894          final AtomicInteger a = new AtomicInteger(0);
895          final CFException ex1 = new CFException();
# Line 845 | Line 898 | public class CompletableFutureTest exten
898          if (!createIncomplete) f.completeExceptionally(ex1);
899          final CompletableFuture<Integer> g = f.exceptionally
900              ((Throwable t) -> {
901 <                ExecutionMode.DEFAULT.checkExecutionMode();
901 >                ExecutionMode.SYNC.checkExecutionMode();
902 >                threadAssertSame(t, ex1);
903 >                a.getAndIncrement();
904 >                throw ex2;
905 >            });
906 >        if (createIncomplete) f.completeExceptionally(ex1);
907 >
908 >        checkCompletedWithWrappedException(g, ex2);
909 >        checkCompletedExceptionally(f, ex1);
910 >        assertEquals(1, a.get());
911 >    }}
912 >
913 >    /**
914 >     * whenComplete action executes on normal completion, propagating
915 >     * source result.
916 >     */
917 >    public void testWhenComplete_normalCompletion() {
918 >        for (ExecutionMode m : ExecutionMode.values())
919 >        for (boolean createIncomplete : new boolean[] { true, false })
920 >        for (Integer v1 : new Integer[] { 1, null })
921 >    {
922 >        final AtomicInteger a = new AtomicInteger(0);
923 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
924 >        if (!createIncomplete) assertTrue(f.complete(v1));
925 >        final CompletableFuture<Integer> g = m.whenComplete
926 >            (f,
927 >             (Integer result, Throwable t) -> {
928 >                m.checkExecutionMode();
929 >                threadAssertSame(result, v1);
930 >                threadAssertNull(t);
931 >                a.getAndIncrement();
932 >            });
933 >        if (createIncomplete) assertTrue(f.complete(v1));
934 >
935 >        checkCompletedNormally(g, v1);
936 >        checkCompletedNormally(f, v1);
937 >        assertEquals(1, a.get());
938 >    }}
939 >
940 >    /**
941 >     * whenComplete action executes on exceptional completion, propagating
942 >     * source result.
943 >     */
944 >    public void testWhenComplete_exceptionalCompletion() {
945 >        for (ExecutionMode m : ExecutionMode.values())
946 >        for (boolean createIncomplete : new boolean[] { true, false })
947 >    {
948 >        final AtomicInteger a = new AtomicInteger(0);
949 >        final CFException ex = new CFException();
950 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
951 >        if (!createIncomplete) f.completeExceptionally(ex);
952 >        final CompletableFuture<Integer> g = m.whenComplete
953 >            (f,
954 >             (Integer result, Throwable t) -> {
955 >                m.checkExecutionMode();
956 >                threadAssertNull(result);
957 >                threadAssertSame(t, ex);
958 >                a.getAndIncrement();
959 >            });
960 >        if (createIncomplete) f.completeExceptionally(ex);
961 >
962 >        checkCompletedWithWrappedException(g, ex);
963 >        checkCompletedExceptionally(f, ex);
964 >        assertEquals(1, a.get());
965 >    }}
966 >
967 >    /**
968 >     * whenComplete action executes on cancelled source, propagating
969 >     * CancellationException.
970 >     */
971 >    public void testWhenComplete_sourceCancelled() {
972 >        for (ExecutionMode m : ExecutionMode.values())
973 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
974 >        for (boolean createIncomplete : new boolean[] { true, false })
975 >    {
976 >        final AtomicInteger a = new AtomicInteger(0);
977 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
978 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
979 >        final CompletableFuture<Integer> g = m.whenComplete
980 >            (f,
981 >             (Integer result, Throwable t) -> {
982 >                m.checkExecutionMode();
983 >                threadAssertNull(result);
984 >                threadAssertTrue(t instanceof CancellationException);
985 >                a.getAndIncrement();
986 >            });
987 >        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
988 >
989 >        checkCompletedWithWrappedCancellationException(g);
990 >        checkCancelled(f);
991 >        assertEquals(1, a.get());
992 >    }}
993 >
994 >    /**
995 >     * If a whenComplete action throws an exception when triggered by
996 >     * a normal completion, it completes exceptionally
997 >     */
998 >    public void testWhenComplete_sourceCompletedNormallyActionFailed() {
999 >        for (boolean createIncomplete : new boolean[] { true, false })
1000 >        for (ExecutionMode m : ExecutionMode.values())
1001 >        for (Integer v1 : new Integer[] { 1, null })
1002 >    {
1003 >        final AtomicInteger a = new AtomicInteger(0);
1004 >        final CFException ex = new CFException();
1005 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1006 >        if (!createIncomplete) assertTrue(f.complete(v1));
1007 >        final CompletableFuture<Integer> g = m.whenComplete
1008 >            (f,
1009 >             (Integer result, Throwable t) -> {
1010 >                m.checkExecutionMode();
1011 >                threadAssertSame(result, v1);
1012 >                threadAssertNull(t);
1013 >                a.getAndIncrement();
1014 >                throw ex;
1015 >            });
1016 >        if (createIncomplete) assertTrue(f.complete(v1));
1017 >
1018 >        checkCompletedWithWrappedException(g, ex);
1019 >        checkCompletedNormally(f, v1);
1020 >        assertEquals(1, a.get());
1021 >    }}
1022 >
1023 >    /**
1024 >     * If a whenComplete action throws an exception when triggered by
1025 >     * a source completion that also throws an exception, the source
1026 >     * exception takes precedence (unlike handle)
1027 >     */
1028 >    public void testWhenComplete_sourceFailedActionFailed() {
1029 >        for (boolean createIncomplete : new boolean[] { true, false })
1030 >        for (ExecutionMode m : ExecutionMode.values())
1031 >    {
1032 >        final AtomicInteger a = new AtomicInteger(0);
1033 >        final CFException ex1 = new CFException();
1034 >        final CFException ex2 = new CFException();
1035 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1036 >
1037 >        if (!createIncomplete) f.completeExceptionally(ex1);
1038 >        final CompletableFuture<Integer> g = m.whenComplete
1039 >            (f,
1040 >             (Integer result, Throwable t) -> {
1041 >                m.checkExecutionMode();
1042                  threadAssertSame(t, ex1);
1043 +                threadAssertNull(result);
1044                  a.getAndIncrement();
1045                  throw ex2;
1046              });
1047          if (createIncomplete) f.completeExceptionally(ex1);
1048  
1049 <        checkCompletedWithWrappedCFException(g, ex2);
1049 >        checkCompletedWithWrappedException(g, ex1);
1050 >        checkCompletedExceptionally(f, ex1);
1051 >        if (testImplementationDetails) {
1052 >            assertEquals(1, ex1.getSuppressed().length);
1053 >            assertSame(ex2, ex1.getSuppressed()[0]);
1054 >        }
1055          assertEquals(1, a.get());
1056      }}
1057  
# Line 867 | Line 1066 | public class CompletableFutureTest exten
1066      {
1067          final CompletableFuture<Integer> f = new CompletableFuture<>();
1068          final AtomicInteger a = new AtomicInteger(0);
1069 <        if (!createIncomplete) f.complete(v1);
1069 >        if (!createIncomplete) assertTrue(f.complete(v1));
1070          final CompletableFuture<Integer> g = m.handle
1071              (f,
1072 <             (Integer x, Throwable t) -> {
1072 >             (Integer result, Throwable t) -> {
1073                  m.checkExecutionMode();
1074 <                threadAssertSame(x, v1);
1074 >                threadAssertSame(result, v1);
1075                  threadAssertNull(t);
1076                  a.getAndIncrement();
1077                  return inc(v1);
1078              });
1079 <        if (createIncomplete) f.complete(v1);
1079 >        if (createIncomplete) assertTrue(f.complete(v1));
1080  
1081          checkCompletedNormally(g, inc(v1));
1082          checkCompletedNormally(f, v1);
# Line 899 | Line 1098 | public class CompletableFutureTest exten
1098          if (!createIncomplete) f.completeExceptionally(ex);
1099          final CompletableFuture<Integer> g = m.handle
1100              (f,
1101 <             (Integer x, Throwable t) -> {
1101 >             (Integer result, Throwable t) -> {
1102                  m.checkExecutionMode();
1103 <                threadAssertNull(x);
1103 >                threadAssertNull(result);
1104                  threadAssertSame(t, ex);
1105                  a.getAndIncrement();
1106                  return v1;
# Line 909 | Line 1108 | public class CompletableFutureTest exten
1108          if (createIncomplete) f.completeExceptionally(ex);
1109  
1110          checkCompletedNormally(g, v1);
1111 <        checkCompletedWithWrappedCFException(f, ex);
1111 >        checkCompletedExceptionally(f, ex);
1112          assertEquals(1, a.get());
1113      }}
1114  
# Line 928 | Line 1127 | public class CompletableFutureTest exten
1127          if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1128          final CompletableFuture<Integer> g = m.handle
1129              (f,
1130 <             (Integer x, Throwable t) -> {
1130 >             (Integer result, Throwable t) -> {
1131                  m.checkExecutionMode();
1132 <                threadAssertNull(x);
1132 >                threadAssertNull(result);
1133                  threadAssertTrue(t instanceof CancellationException);
1134                  a.getAndIncrement();
1135                  return v1;
# Line 943 | Line 1142 | public class CompletableFutureTest exten
1142      }}
1143  
1144      /**
1145 <     * handle result completes exceptionally if action does
1145 >     * If a "handle action" throws an exception when triggered by
1146 >     * a normal completion, it completes exceptionally
1147       */
1148 <    public void testHandle_sourceFailedActionFailed() {
1148 >    public void testHandle_sourceCompletedNormallyActionFailed() {
1149          for (ExecutionMode m : ExecutionMode.values())
1150          for (boolean createIncomplete : new boolean[] { true, false })
1151 +        for (Integer v1 : new Integer[] { 1, null })
1152      {
1153          final CompletableFuture<Integer> f = new CompletableFuture<>();
1154          final AtomicInteger a = new AtomicInteger(0);
1155 <        final CFException ex1 = new CFException();
1156 <        final CFException ex2 = new CFException();
956 <        if (!createIncomplete) f.completeExceptionally(ex1);
1155 >        final CFException ex = new CFException();
1156 >        if (!createIncomplete) assertTrue(f.complete(v1));
1157          final CompletableFuture<Integer> g = m.handle
1158              (f,
1159 <             (Integer x, Throwable t) -> {
1159 >             (Integer result, Throwable t) -> {
1160                  m.checkExecutionMode();
1161 <                threadAssertNull(x);
1162 <                threadAssertSame(ex1, t);
1161 >                threadAssertSame(result, v1);
1162 >                threadAssertNull(t);
1163                  a.getAndIncrement();
1164 <                throw ex2;
1164 >                throw ex;
1165              });
1166 <        if (createIncomplete) f.completeExceptionally(ex1);
1166 >        if (createIncomplete) assertTrue(f.complete(v1));
1167  
1168 <        checkCompletedWithWrappedCFException(g, ex2);
1169 <        checkCompletedWithWrappedCFException(f, ex1);
1168 >        checkCompletedWithWrappedException(g, ex);
1169 >        checkCompletedNormally(f, v1);
1170          assertEquals(1, a.get());
1171      }}
1172  
1173 <    public void testHandle_sourceCompletedNormallyActionFailed() {
1174 <        for (ExecutionMode m : ExecutionMode.values())
1173 >    /**
1174 >     * If a "handle action" throws an exception when triggered by
1175 >     * a source completion that also throws an exception, the action
1176 >     * exception takes precedence (unlike whenComplete)
1177 >     */
1178 >    public void testHandle_sourceFailedActionFailed() {
1179          for (boolean createIncomplete : new boolean[] { true, false })
1180 <        for (Integer v1 : new Integer[] { 1, null })
1180 >        for (ExecutionMode m : ExecutionMode.values())
1181      {
978        final CompletableFuture<Integer> f = new CompletableFuture<>();
1182          final AtomicInteger a = new AtomicInteger(0);
1183 <        final CFException ex = new CFException();
1184 <        if (!createIncomplete) f.complete(v1);
1183 >        final CFException ex1 = new CFException();
1184 >        final CFException ex2 = new CFException();
1185 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1186 >
1187 >        if (!createIncomplete) f.completeExceptionally(ex1);
1188          final CompletableFuture<Integer> g = m.handle
1189              (f,
1190 <             (Integer x, Throwable t) -> {
1190 >             (Integer result, Throwable t) -> {
1191                  m.checkExecutionMode();
1192 <                threadAssertSame(x, v1);
1193 <                threadAssertNull(t);
1192 >                threadAssertNull(result);
1193 >                threadAssertSame(ex1, t);
1194                  a.getAndIncrement();
1195 <                throw ex;
1195 >                throw ex2;
1196              });
1197 <        if (createIncomplete) f.complete(v1);
1197 >        if (createIncomplete) f.completeExceptionally(ex1);
1198  
1199 <        checkCompletedWithWrappedCFException(g, ex);
1200 <        checkCompletedNormally(f, v1);
1199 >        checkCompletedWithWrappedException(g, ex2);
1200 >        checkCompletedExceptionally(f, ex1);
1201          assertEquals(1, a.get());
1202      }}
1203  
# Line 1024 | Line 1230 | public class CompletableFutureTest exten
1230      {
1231          final FailingRunnable r = new FailingRunnable(m);
1232          final CompletableFuture<Void> f = m.runAsync(r);
1233 <        checkCompletedWithWrappedCFException(f);
1233 >        checkCompletedWithWrappedException(f, r.ex);
1234          r.assertInvoked();
1235      }}
1236  
# Line 1058 | Line 1264 | public class CompletableFutureTest exten
1264      {
1265          FailingSupplier r = new FailingSupplier(m);
1266          CompletableFuture<Integer> f = m.supplyAsync(r);
1267 <        checkCompletedWithWrappedCFException(f);
1267 >        checkCompletedWithWrappedException(f, r.ex);
1268          r.assertInvoked();
1269      }}
1270  
# Line 1069 | Line 1275 | public class CompletableFutureTest exten
1275       */
1276      public void testThenRun_normalCompletion() {
1277          for (ExecutionMode m : ExecutionMode.values())
1072        for (boolean createIncomplete : new boolean[] { true, false })
1278          for (Integer v1 : new Integer[] { 1, null })
1279      {
1280          final CompletableFuture<Integer> f = new CompletableFuture<>();
1281 <        final Noop r = new Noop(m);
1282 <        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 <        }
1281 >        final Noop[] rs = new Noop[6];
1282 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1283  
1284 <        checkCompletedNormally(g, null);
1284 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1285 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1286 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1287 >        checkIncomplete(h0);
1288 >        checkIncomplete(h1);
1289 >        checkIncomplete(h2);
1290 >        assertTrue(f.complete(v1));
1291 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1292 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1293 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1294 >
1295 >        checkCompletedNormally(h0, null);
1296 >        checkCompletedNormally(h1, null);
1297 >        checkCompletedNormally(h2, null);
1298 >        checkCompletedNormally(h3, null);
1299 >        checkCompletedNormally(h4, null);
1300 >        checkCompletedNormally(h5, null);
1301          checkCompletedNormally(f, v1);
1302 <        r.assertInvoked();
1302 >        for (Noop r : rs) r.assertInvoked();
1303      }}
1304  
1305      /**
# Line 1092 | Line 1308 | public class CompletableFutureTest exten
1308       */
1309      public void testThenRun_exceptionalCompletion() {
1310          for (ExecutionMode m : ExecutionMode.values())
1095        for (boolean createIncomplete : new boolean[] { true, false })
1311      {
1312          final CFException ex = new CFException();
1313          final CompletableFuture<Integer> f = new CompletableFuture<>();
1314 <        final Noop r = new Noop(m);
1315 <        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 <        }
1314 >        final Noop[] rs = new Noop[6];
1315 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1316  
1317 <        checkCompletedWithWrappedCFException(g, ex);
1318 <        checkCompletedWithWrappedCFException(f, ex);
1319 <        r.assertNotInvoked();
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.completeExceptionally(ex));
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 >        checkCompletedWithWrappedException(h0, ex);
1329 >        checkCompletedWithWrappedException(h1, ex);
1330 >        checkCompletedWithWrappedException(h2, ex);
1331 >        checkCompletedWithWrappedException(h3, ex);
1332 >        checkCompletedWithWrappedException(h4, ex);
1333 >        checkCompletedWithWrappedException(h5, ex);
1334 >        checkCompletedExceptionally(f, ex);
1335 >        for (Noop r : rs) r.assertNotInvoked();
1336      }}
1337  
1338      /**
# Line 1114 | Line 1340 | public class CompletableFutureTest exten
1340       */
1341      public void testThenRun_sourceCancelled() {
1342          for (ExecutionMode m : ExecutionMode.values())
1117        for (boolean createIncomplete : new boolean[] { true, false })
1343          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1344      {
1345          final CompletableFuture<Integer> f = new CompletableFuture<>();
1346 <        final Noop r = new Noop(m);
1347 <        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 <        }
1346 >        final Noop[] rs = new Noop[6];
1347 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1348  
1349 <        checkCompletedWithWrappedCancellationException(g);
1349 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1350 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1351 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1352 >        checkIncomplete(h0);
1353 >        checkIncomplete(h1);
1354 >        checkIncomplete(h2);
1355 >        assertTrue(f.cancel(mayInterruptIfRunning));
1356 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1357 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1358 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1359 >
1360 >        checkCompletedWithWrappedCancellationException(h0);
1361 >        checkCompletedWithWrappedCancellationException(h1);
1362 >        checkCompletedWithWrappedCancellationException(h2);
1363 >        checkCompletedWithWrappedCancellationException(h3);
1364 >        checkCompletedWithWrappedCancellationException(h4);
1365 >        checkCompletedWithWrappedCancellationException(h5);
1366          checkCancelled(f);
1367 <        r.assertNotInvoked();
1367 >        for (Noop r : rs) r.assertNotInvoked();
1368      }}
1369  
1370      /**
# Line 1136 | Line 1372 | public class CompletableFutureTest exten
1372       */
1373      public void testThenRun_actionFailed() {
1374          for (ExecutionMode m : ExecutionMode.values())
1139        for (boolean createIncomplete : new boolean[] { true, false })
1375          for (Integer v1 : new Integer[] { 1, null })
1376      {
1377          final CompletableFuture<Integer> f = new CompletableFuture<>();
1378 <        final FailingRunnable r = new FailingRunnable(m);
1379 <        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 <        }
1378 >        final FailingRunnable[] rs = new FailingRunnable[6];
1379 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingRunnable(m);
1380  
1381 <        checkCompletedWithWrappedCFException(g);
1381 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1382 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1383 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1384 >        assertTrue(f.complete(v1));
1385 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1386 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1387 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1388 >
1389 >        checkCompletedWithWrappedException(h0, rs[0].ex);
1390 >        checkCompletedWithWrappedException(h1, rs[1].ex);
1391 >        checkCompletedWithWrappedException(h2, rs[2].ex);
1392 >        checkCompletedWithWrappedException(h3, rs[3].ex);
1393 >        checkCompletedWithWrappedException(h4, rs[4].ex);
1394 >        checkCompletedWithWrappedException(h5, rs[5].ex);
1395          checkCompletedNormally(f, v1);
1396      }}
1397  
# Line 1157 | Line 1400 | public class CompletableFutureTest exten
1400       */
1401      public void testThenApply_normalCompletion() {
1402          for (ExecutionMode m : ExecutionMode.values())
1160        for (boolean createIncomplete : new boolean[] { true, false })
1403          for (Integer v1 : new Integer[] { 1, null })
1404      {
1405          final CompletableFuture<Integer> f = new CompletableFuture<>();
1406 <        final IncFunction r = new IncFunction(m);
1407 <        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 <        }
1406 >        final IncFunction[] rs = new IncFunction[4];
1407 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1408  
1409 <        checkCompletedNormally(g, inc(v1));
1409 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1410 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1411 >        checkIncomplete(h0);
1412 >        checkIncomplete(h1);
1413 >        assertTrue(f.complete(v1));
1414 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1415 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1416 >
1417 >        checkCompletedNormally(h0, inc(v1));
1418 >        checkCompletedNormally(h1, inc(v1));
1419 >        checkCompletedNormally(h2, inc(v1));
1420 >        checkCompletedNormally(h3, inc(v1));
1421          checkCompletedNormally(f, v1);
1422 <        r.assertInvoked();
1422 >        for (IncFunction r : rs) r.assertValue(inc(v1));
1423      }}
1424  
1425      /**
# Line 1180 | Line 1428 | public class CompletableFutureTest exten
1428       */
1429      public void testThenApply_exceptionalCompletion() {
1430          for (ExecutionMode m : ExecutionMode.values())
1183        for (boolean createIncomplete : new boolean[] { true, false })
1431      {
1432          final CFException ex = new CFException();
1433          final CompletableFuture<Integer> f = new CompletableFuture<>();
1434 <        final IncFunction r = new IncFunction(m);
1435 <        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 <        }
1434 >        final IncFunction[] rs = new IncFunction[4];
1435 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1436  
1437 <        checkCompletedWithWrappedCFException(g, ex);
1438 <        checkCompletedWithWrappedCFException(f, ex);
1439 <        r.assertNotInvoked();
1437 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1438 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1439 >        assertTrue(f.completeExceptionally(ex));
1440 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1441 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1442 >
1443 >        checkCompletedWithWrappedException(h0, ex);
1444 >        checkCompletedWithWrappedException(h1, ex);
1445 >        checkCompletedWithWrappedException(h2, ex);
1446 >        checkCompletedWithWrappedException(h3, ex);
1447 >        checkCompletedExceptionally(f, ex);
1448 >        for (IncFunction r : rs) r.assertNotInvoked();
1449      }}
1450  
1451      /**
# Line 1202 | Line 1453 | public class CompletableFutureTest exten
1453       */
1454      public void testThenApply_sourceCancelled() {
1455          for (ExecutionMode m : ExecutionMode.values())
1205        for (boolean createIncomplete : new boolean[] { true, false })
1456          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1457      {
1458          final CompletableFuture<Integer> f = new CompletableFuture<>();
1459 <        final IncFunction r = new IncFunction(m);
1460 <        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 <        }
1459 >        final IncFunction[] rs = new IncFunction[4];
1460 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1461  
1462 <        checkCompletedWithWrappedCancellationException(g);
1462 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1463 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1464 >        assertTrue(f.cancel(mayInterruptIfRunning));
1465 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1466 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1467 >
1468 >        checkCompletedWithWrappedCancellationException(h0);
1469 >        checkCompletedWithWrappedCancellationException(h1);
1470 >        checkCompletedWithWrappedCancellationException(h2);
1471 >        checkCompletedWithWrappedCancellationException(h3);
1472          checkCancelled(f);
1473 <        r.assertNotInvoked();
1473 >        for (IncFunction r : rs) r.assertNotInvoked();
1474      }}
1475  
1476      /**
# Line 1224 | Line 1478 | public class CompletableFutureTest exten
1478       */
1479      public void testThenApply_actionFailed() {
1480          for (ExecutionMode m : ExecutionMode.values())
1227        for (boolean createIncomplete : new boolean[] { true, false })
1481          for (Integer v1 : new Integer[] { 1, null })
1482      {
1483          final CompletableFuture<Integer> f = new CompletableFuture<>();
1484 <        final FailingFunction r = new FailingFunction(m);
1485 <        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 <        }
1484 >        final FailingFunction[] rs = new FailingFunction[4];
1485 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingFunction(m);
1486  
1487 <        checkCompletedWithWrappedCFException(g);
1487 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1488 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1489 >        assertTrue(f.complete(v1));
1490 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1491 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1492 >
1493 >        checkCompletedWithWrappedException(h0, rs[0].ex);
1494 >        checkCompletedWithWrappedException(h1, rs[1].ex);
1495 >        checkCompletedWithWrappedException(h2, rs[2].ex);
1496 >        checkCompletedWithWrappedException(h3, rs[3].ex);
1497          checkCompletedNormally(f, v1);
1498      }}
1499  
# Line 1245 | Line 1502 | public class CompletableFutureTest exten
1502       */
1503      public void testThenAccept_normalCompletion() {
1504          for (ExecutionMode m : ExecutionMode.values())
1248        for (boolean createIncomplete : new boolean[] { true, false })
1505          for (Integer v1 : new Integer[] { 1, null })
1506      {
1507          final CompletableFuture<Integer> f = new CompletableFuture<>();
1508 <        final NoopConsumer r = new NoopConsumer(m);
1509 <        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 <        }
1508 >        final NoopConsumer[] rs = new NoopConsumer[4];
1509 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1510  
1511 <        checkCompletedNormally(g, null);
1512 <        r.assertValue(v1);
1511 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1512 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1513 >        checkIncomplete(h0);
1514 >        checkIncomplete(h1);
1515 >        assertTrue(f.complete(v1));
1516 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1517 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1518 >
1519 >        checkCompletedNormally(h0, null);
1520 >        checkCompletedNormally(h1, null);
1521 >        checkCompletedNormally(h2, null);
1522 >        checkCompletedNormally(h3, null);
1523          checkCompletedNormally(f, v1);
1524 +        for (NoopConsumer r : rs) r.assertValue(v1);
1525      }}
1526  
1527      /**
# Line 1268 | Line 1530 | public class CompletableFutureTest exten
1530       */
1531      public void testThenAccept_exceptionalCompletion() {
1532          for (ExecutionMode m : ExecutionMode.values())
1271        for (boolean createIncomplete : new boolean[] { true, false })
1533      {
1534          final CFException ex = new CFException();
1535          final CompletableFuture<Integer> f = new CompletableFuture<>();
1536 <        final NoopConsumer r = new NoopConsumer(m);
1537 <        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 <        }
1536 >        final NoopConsumer[] rs = new NoopConsumer[4];
1537 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1538  
1539 <        checkCompletedWithWrappedCFException(g, ex);
1540 <        checkCompletedWithWrappedCFException(f, ex);
1541 <        r.assertNotInvoked();
1539 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1540 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1541 >        assertTrue(f.completeExceptionally(ex));
1542 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1543 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1544 >
1545 >        checkCompletedWithWrappedException(h0, ex);
1546 >        checkCompletedWithWrappedException(h1, ex);
1547 >        checkCompletedWithWrappedException(h2, ex);
1548 >        checkCompletedWithWrappedException(h3, ex);
1549 >        checkCompletedExceptionally(f, ex);
1550 >        for (NoopConsumer r : rs) r.assertNotInvoked();
1551      }}
1552  
1553      /**
# Line 1290 | Line 1555 | public class CompletableFutureTest exten
1555       */
1556      public void testThenAccept_sourceCancelled() {
1557          for (ExecutionMode m : ExecutionMode.values())
1293        for (boolean createIncomplete : new boolean[] { true, false })
1558          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1559      {
1560          final CompletableFuture<Integer> f = new CompletableFuture<>();
1561 <        final NoopConsumer r = new NoopConsumer(m);
1562 <        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 <        }
1561 >        final NoopConsumer[] rs = new NoopConsumer[4];
1562 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1563  
1564 <        checkCompletedWithWrappedCancellationException(g);
1564 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1565 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1566 >        assertTrue(f.cancel(mayInterruptIfRunning));
1567 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1568 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1569 >
1570 >        checkCompletedWithWrappedCancellationException(h0);
1571 >        checkCompletedWithWrappedCancellationException(h1);
1572 >        checkCompletedWithWrappedCancellationException(h2);
1573 >        checkCompletedWithWrappedCancellationException(h3);
1574          checkCancelled(f);
1575 <        r.assertNotInvoked();
1575 >        for (NoopConsumer r : rs) r.assertNotInvoked();
1576      }}
1577  
1578      /**
# Line 1312 | Line 1580 | public class CompletableFutureTest exten
1580       */
1581      public void testThenAccept_actionFailed() {
1582          for (ExecutionMode m : ExecutionMode.values())
1315        for (boolean createIncomplete : new boolean[] { true, false })
1583          for (Integer v1 : new Integer[] { 1, null })
1584      {
1585          final CompletableFuture<Integer> f = new CompletableFuture<>();
1586 <        final FailingConsumer r = new FailingConsumer(m);
1587 <        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 <        }
1586 >        final FailingConsumer[] rs = new FailingConsumer[4];
1587 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingConsumer(m);
1588  
1589 <        checkCompletedWithWrappedCFException(g);
1589 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1590 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1591 >        assertTrue(f.complete(v1));
1592 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1593 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1594 >
1595 >        checkCompletedWithWrappedException(h0, rs[0].ex);
1596 >        checkCompletedWithWrappedException(h1, rs[1].ex);
1597 >        checkCompletedWithWrappedException(h2, rs[2].ex);
1598 >        checkCompletedWithWrappedException(h3, rs[3].ex);
1599          checkCompletedNormally(f, v1);
1600      }}
1601  
# Line 1334 | Line 1605 | public class CompletableFutureTest exten
1605       */
1606      public void testThenCombine_normalCompletion() {
1607          for (ExecutionMode m : ExecutionMode.values())
1337        for (boolean createIncomplete : new boolean[] { true, false })
1608          for (boolean fFirst : new boolean[] { true, false })
1609          for (Integer v1 : new Integer[] { 1, null })
1610          for (Integer v2 : new Integer[] { 2, null })
1611      {
1612          final CompletableFuture<Integer> f = new CompletableFuture<>();
1613          final CompletableFuture<Integer> g = new CompletableFuture<>();
1614 <        final SubtractFunction r = new SubtractFunction(m);
1614 >        final SubtractFunction[] rs = new SubtractFunction[6];
1615 >        for (int i = 0; i < rs.length; i++) rs[i] = new SubtractFunction(m);
1616  
1617 <        if (fFirst) f.complete(v1); else g.complete(v2);
1618 <        if (!createIncomplete)
1619 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1620 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1621 <        if (createIncomplete) {
1622 <            checkIncomplete(h);
1623 <            r.assertNotInvoked();
1624 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1625 <        }
1617 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1618 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1619 >        final Integer w1 =  fFirst ? v1 : v2;
1620 >        final Integer w2 = !fFirst ? v1 : v2;
1621 >
1622 >        final CompletableFuture<Integer> h0 = m.thenCombine(f, g, rs[0]);
1623 >        final CompletableFuture<Integer> h1 = m.thenCombine(fst, fst, rs[1]);
1624 >        assertTrue(fst.complete(w1));
1625 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, rs[2]);
1626 >        final CompletableFuture<Integer> h3 = m.thenCombine(fst, fst, rs[3]);
1627 >        checkIncomplete(h0); rs[0].assertNotInvoked();
1628 >        checkIncomplete(h2); rs[2].assertNotInvoked();
1629 >        checkCompletedNormally(h1, subtract(w1, w1));
1630 >        checkCompletedNormally(h3, subtract(w1, w1));
1631 >        rs[1].assertValue(subtract(w1, w1));
1632 >        rs[3].assertValue(subtract(w1, w1));
1633 >        assertTrue(snd.complete(w2));
1634 >        final CompletableFuture<Integer> h4 = m.thenCombine(f, g, rs[4]);
1635 >
1636 >        checkCompletedNormally(h0, subtract(v1, v2));
1637 >        checkCompletedNormally(h2, subtract(v1, v2));
1638 >        checkCompletedNormally(h4, subtract(v1, v2));
1639 >        rs[0].assertValue(subtract(v1, v2));
1640 >        rs[2].assertValue(subtract(v1, v2));
1641 >        rs[4].assertValue(subtract(v1, v2));
1642  
1356        checkCompletedNormally(h, subtract(v1, v2));
1643          checkCompletedNormally(f, v1);
1644          checkCompletedNormally(g, v2);
1359        r.assertInvoked();
1645      }}
1646  
1647      /**
1648       * thenCombine result completes exceptionally after exceptional
1649       * completion of either source
1650       */
1651 <    public void testThenCombine_exceptionalCompletion() {
1651 >    public void testThenCombine_exceptionalCompletion() throws Throwable {
1652          for (ExecutionMode m : ExecutionMode.values())
1368        for (boolean createIncomplete : new boolean[] { true, false })
1653          for (boolean fFirst : new boolean[] { true, false })
1654 +        for (boolean failFirst : new boolean[] { true, false })
1655          for (Integer v1 : new Integer[] { 1, null })
1656      {
1657          final CompletableFuture<Integer> f = new CompletableFuture<>();
1658          final CompletableFuture<Integer> g = new CompletableFuture<>();
1659          final CFException ex = new CFException();
1660 <        final SubtractFunction r = new SubtractFunction(m);
1661 <
1662 <        (fFirst ? f : g).complete(v1);
1663 <        if (!createIncomplete)
1664 <            (!fFirst ? f : g).completeExceptionally(ex);
1665 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1666 <        if (createIncomplete) {
1667 <            checkIncomplete(h);
1668 <            (!fFirst ? f : g).completeExceptionally(ex);
1669 <        }
1670 <
1671 <        checkCompletedWithWrappedCFException(h, ex);
1672 <        r.assertNotInvoked();
1673 <        checkCompletedNormally(fFirst ? f : g, v1);
1674 <        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1660 >        final SubtractFunction r1 = new SubtractFunction(m);
1661 >        final SubtractFunction r2 = new SubtractFunction(m);
1662 >        final SubtractFunction r3 = new SubtractFunction(m);
1663 >
1664 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1665 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1666 >        final Callable<Boolean> complete1 = failFirst ?
1667 >            () -> fst.completeExceptionally(ex) :
1668 >            () -> fst.complete(v1);
1669 >        final Callable<Boolean> complete2 = failFirst ?
1670 >            () -> snd.complete(v1) :
1671 >            () -> snd.completeExceptionally(ex);
1672 >
1673 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1674 >        assertTrue(complete1.call());
1675 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1676 >        checkIncomplete(h1);
1677 >        checkIncomplete(h2);
1678 >        assertTrue(complete2.call());
1679 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1680 >
1681 >        checkCompletedWithWrappedException(h1, ex);
1682 >        checkCompletedWithWrappedException(h2, ex);
1683 >        checkCompletedWithWrappedException(h3, ex);
1684 >        r1.assertNotInvoked();
1685 >        r2.assertNotInvoked();
1686 >        r3.assertNotInvoked();
1687 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1688 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
1689      }}
1690  
1691      /**
1692       * thenCombine result completes exceptionally if either source cancelled
1693       */
1694 <    public void testThenCombine_sourceCancelled() {
1694 >    public void testThenCombine_sourceCancelled() throws Throwable {
1695          for (ExecutionMode m : ExecutionMode.values())
1696          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1398        for (boolean createIncomplete : new boolean[] { true, false })
1697          for (boolean fFirst : new boolean[] { true, false })
1698 +        for (boolean failFirst : new boolean[] { true, false })
1699          for (Integer v1 : new Integer[] { 1, null })
1700      {
1701          final CompletableFuture<Integer> f = new CompletableFuture<>();
1702          final CompletableFuture<Integer> g = new CompletableFuture<>();
1703 <        final SubtractFunction r = new SubtractFunction(m);
1704 <
1705 <        (fFirst ? f : g).complete(v1);
1706 <        if (!createIncomplete)
1707 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1708 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1709 <        if (createIncomplete) {
1710 <            checkIncomplete(h);
1711 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1712 <        }
1703 >        final SubtractFunction r1 = new SubtractFunction(m);
1704 >        final SubtractFunction r2 = new SubtractFunction(m);
1705 >        final SubtractFunction r3 = new SubtractFunction(m);
1706 >
1707 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1708 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1709 >        final Callable<Boolean> complete1 = failFirst ?
1710 >            () -> fst.cancel(mayInterruptIfRunning) :
1711 >            () -> fst.complete(v1);
1712 >        final Callable<Boolean> complete2 = failFirst ?
1713 >            () -> snd.complete(v1) :
1714 >            () -> snd.cancel(mayInterruptIfRunning);
1715 >
1716 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1717 >        assertTrue(complete1.call());
1718 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1719 >        checkIncomplete(h1);
1720 >        checkIncomplete(h2);
1721 >        assertTrue(complete2.call());
1722 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1723  
1724 <        checkCompletedWithWrappedCancellationException(h);
1725 <        checkCancelled(!fFirst ? f : g);
1726 <        r.assertNotInvoked();
1727 <        checkCompletedNormally(fFirst ? f : g, v1);
1724 >        checkCompletedWithWrappedCancellationException(h1);
1725 >        checkCompletedWithWrappedCancellationException(h2);
1726 >        checkCompletedWithWrappedCancellationException(h3);
1727 >        r1.assertNotInvoked();
1728 >        r2.assertNotInvoked();
1729 >        r3.assertNotInvoked();
1730 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1731 >        checkCancelled(failFirst ? fst : snd);
1732      }}
1733  
1734      /**
# Line 1429 | Line 1742 | public class CompletableFutureTest exten
1742      {
1743          final CompletableFuture<Integer> f = new CompletableFuture<>();
1744          final CompletableFuture<Integer> g = new CompletableFuture<>();
1745 <        final FailingBiFunction r = new FailingBiFunction(m);
1746 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1747 <
1748 <        if (fFirst) {
1749 <            f.complete(v1);
1750 <            g.complete(v2);
1751 <        } else {
1752 <            g.complete(v2);
1753 <            f.complete(v1);
1754 <        }
1755 <
1756 <        checkCompletedWithWrappedCFException(h);
1745 >        final FailingBiFunction r1 = new FailingBiFunction(m);
1746 >        final FailingBiFunction r2 = new FailingBiFunction(m);
1747 >        final FailingBiFunction r3 = new FailingBiFunction(m);
1748 >
1749 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1750 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1751 >        final Integer w1 =  fFirst ? v1 : v2;
1752 >        final Integer w2 = !fFirst ? v1 : v2;
1753 >
1754 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1755 >        assertTrue(fst.complete(w1));
1756 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1757 >        assertTrue(snd.complete(w2));
1758 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1759 >
1760 >        checkCompletedWithWrappedException(h1, r1.ex);
1761 >        checkCompletedWithWrappedException(h2, r2.ex);
1762 >        checkCompletedWithWrappedException(h3, r3.ex);
1763 >        r1.assertInvoked();
1764 >        r2.assertInvoked();
1765 >        r3.assertInvoked();
1766          checkCompletedNormally(f, v1);
1767          checkCompletedNormally(g, v2);
1768      }}
# Line 1451 | Line 1773 | public class CompletableFutureTest exten
1773       */
1774      public void testThenAcceptBoth_normalCompletion() {
1775          for (ExecutionMode m : ExecutionMode.values())
1454        for (boolean createIncomplete : new boolean[] { true, false })
1776          for (boolean fFirst : new boolean[] { true, false })
1777          for (Integer v1 : new Integer[] { 1, null })
1778          for (Integer v2 : new Integer[] { 2, null })
1779      {
1780          final CompletableFuture<Integer> f = new CompletableFuture<>();
1781          final CompletableFuture<Integer> g = new CompletableFuture<>();
1782 <        final SubtractAction r = new SubtractAction(m);
1783 <
1784 <        if (fFirst) f.complete(v1); else g.complete(v2);
1785 <        if (!createIncomplete)
1786 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1787 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1788 <        if (createIncomplete) {
1789 <            checkIncomplete(h);
1790 <            r.assertNotInvoked();
1791 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1792 <        }
1782 >        final SubtractAction r1 = new SubtractAction(m);
1783 >        final SubtractAction r2 = new SubtractAction(m);
1784 >        final SubtractAction r3 = new SubtractAction(m);
1785 >
1786 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1787 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1788 >        final Integer w1 =  fFirst ? v1 : v2;
1789 >        final Integer w2 = !fFirst ? v1 : v2;
1790 >
1791 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1792 >        assertTrue(fst.complete(w1));
1793 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1794 >        checkIncomplete(h1);
1795 >        checkIncomplete(h2);
1796 >        r1.assertNotInvoked();
1797 >        r2.assertNotInvoked();
1798 >        assertTrue(snd.complete(w2));
1799 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1800  
1801 <        checkCompletedNormally(h, null);
1802 <        r.assertValue(subtract(v1, v2));
1801 >        checkCompletedNormally(h1, null);
1802 >        checkCompletedNormally(h2, null);
1803 >        checkCompletedNormally(h3, null);
1804 >        r1.assertValue(subtract(v1, v2));
1805 >        r2.assertValue(subtract(v1, v2));
1806 >        r3.assertValue(subtract(v1, v2));
1807          checkCompletedNormally(f, v1);
1808          checkCompletedNormally(g, v2);
1809      }}
# Line 1480 | Line 1812 | public class CompletableFutureTest exten
1812       * thenAcceptBoth result completes exceptionally after exceptional
1813       * completion of either source
1814       */
1815 <    public void testThenAcceptBoth_exceptionalCompletion() {
1815 >    public void testThenAcceptBoth_exceptionalCompletion() throws Throwable {
1816          for (ExecutionMode m : ExecutionMode.values())
1485        for (boolean createIncomplete : new boolean[] { true, false })
1817          for (boolean fFirst : new boolean[] { true, false })
1818 +        for (boolean failFirst : new boolean[] { true, false })
1819          for (Integer v1 : new Integer[] { 1, null })
1820      {
1821          final CompletableFuture<Integer> f = new CompletableFuture<>();
1822          final CompletableFuture<Integer> g = new CompletableFuture<>();
1823          final CFException ex = new CFException();
1824 <        final SubtractAction r = new SubtractAction(m);
1825 <
1826 <        (fFirst ? f : g).complete(v1);
1827 <        if (!createIncomplete)
1828 <            (!fFirst ? f : g).completeExceptionally(ex);
1829 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1830 <        if (createIncomplete) {
1831 <            checkIncomplete(h);
1832 <            (!fFirst ? f : g).completeExceptionally(ex);
1833 <        }
1834 <
1835 <        checkCompletedWithWrappedCFException(h, ex);
1836 <        r.assertNotInvoked();
1837 <        checkCompletedNormally(fFirst ? f : g, v1);
1838 <        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1824 >        final SubtractAction r1 = new SubtractAction(m);
1825 >        final SubtractAction r2 = new SubtractAction(m);
1826 >        final SubtractAction r3 = new SubtractAction(m);
1827 >
1828 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1829 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1830 >        final Callable<Boolean> complete1 = failFirst ?
1831 >            () -> fst.completeExceptionally(ex) :
1832 >            () -> fst.complete(v1);
1833 >        final Callable<Boolean> complete2 = failFirst ?
1834 >            () -> snd.complete(v1) :
1835 >            () -> snd.completeExceptionally(ex);
1836 >
1837 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1838 >        assertTrue(complete1.call());
1839 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1840 >        checkIncomplete(h1);
1841 >        checkIncomplete(h2);
1842 >        assertTrue(complete2.call());
1843 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1844 >
1845 >        checkCompletedWithWrappedException(h1, ex);
1846 >        checkCompletedWithWrappedException(h2, ex);
1847 >        checkCompletedWithWrappedException(h3, ex);
1848 >        r1.assertNotInvoked();
1849 >        r2.assertNotInvoked();
1850 >        r3.assertNotInvoked();
1851 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1852 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
1853      }}
1854  
1855      /**
1856       * thenAcceptBoth result completes exceptionally if either source cancelled
1857       */
1858 <    public void testThenAcceptBoth_sourceCancelled() {
1858 >    public void testThenAcceptBoth_sourceCancelled() throws Throwable {
1859          for (ExecutionMode m : ExecutionMode.values())
1860          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1515        for (boolean createIncomplete : new boolean[] { true, false })
1861          for (boolean fFirst : new boolean[] { true, false })
1862 +        for (boolean failFirst : new boolean[] { true, false })
1863          for (Integer v1 : new Integer[] { 1, null })
1864      {
1865          final CompletableFuture<Integer> f = new CompletableFuture<>();
1866          final CompletableFuture<Integer> g = new CompletableFuture<>();
1867 <        final SubtractAction r = new SubtractAction(m);
1868 <
1869 <        (fFirst ? f : g).complete(v1);
1870 <        if (!createIncomplete)
1871 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1872 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1873 <        if (createIncomplete) {
1874 <            checkIncomplete(h);
1875 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1876 <        }
1867 >        final SubtractAction r1 = new SubtractAction(m);
1868 >        final SubtractAction r2 = new SubtractAction(m);
1869 >        final SubtractAction r3 = new SubtractAction(m);
1870 >
1871 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1872 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1873 >        final Callable<Boolean> complete1 = failFirst ?
1874 >            () -> fst.cancel(mayInterruptIfRunning) :
1875 >            () -> fst.complete(v1);
1876 >        final Callable<Boolean> complete2 = failFirst ?
1877 >            () -> snd.complete(v1) :
1878 >            () -> snd.cancel(mayInterruptIfRunning);
1879 >
1880 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1881 >        assertTrue(complete1.call());
1882 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1883 >        checkIncomplete(h1);
1884 >        checkIncomplete(h2);
1885 >        assertTrue(complete2.call());
1886 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1887  
1888 <        checkCompletedWithWrappedCancellationException(h);
1889 <        checkCancelled(!fFirst ? f : g);
1890 <        r.assertNotInvoked();
1891 <        checkCompletedNormally(fFirst ? f : g, v1);
1888 >        checkCompletedWithWrappedCancellationException(h1);
1889 >        checkCompletedWithWrappedCancellationException(h2);
1890 >        checkCompletedWithWrappedCancellationException(h3);
1891 >        r1.assertNotInvoked();
1892 >        r2.assertNotInvoked();
1893 >        r3.assertNotInvoked();
1894 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1895 >        checkCancelled(failFirst ? fst : snd);
1896      }}
1897  
1898      /**
# Line 1546 | Line 1906 | public class CompletableFutureTest exten
1906      {
1907          final CompletableFuture<Integer> f = new CompletableFuture<>();
1908          final CompletableFuture<Integer> g = new CompletableFuture<>();
1909 <        final FailingBiConsumer r = new FailingBiConsumer(m);
1910 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1911 <
1912 <        if (fFirst) {
1913 <            f.complete(v1);
1914 <            g.complete(v2);
1915 <        } else {
1916 <            g.complete(v2);
1917 <            f.complete(v1);
1918 <        }
1919 <
1920 <        checkCompletedWithWrappedCFException(h);
1909 >        final FailingBiConsumer r1 = new FailingBiConsumer(m);
1910 >        final FailingBiConsumer r2 = new FailingBiConsumer(m);
1911 >        final FailingBiConsumer r3 = new FailingBiConsumer(m);
1912 >
1913 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1914 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1915 >        final Integer w1 =  fFirst ? v1 : v2;
1916 >        final Integer w2 = !fFirst ? v1 : v2;
1917 >
1918 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1919 >        assertTrue(fst.complete(w1));
1920 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1921 >        assertTrue(snd.complete(w2));
1922 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1923 >
1924 >        checkCompletedWithWrappedException(h1, r1.ex);
1925 >        checkCompletedWithWrappedException(h2, r2.ex);
1926 >        checkCompletedWithWrappedException(h3, r3.ex);
1927 >        r1.assertInvoked();
1928 >        r2.assertInvoked();
1929 >        r3.assertInvoked();
1930          checkCompletedNormally(f, v1);
1931          checkCompletedNormally(g, v2);
1932      }}
# Line 1568 | Line 1937 | public class CompletableFutureTest exten
1937       */
1938      public void testRunAfterBoth_normalCompletion() {
1939          for (ExecutionMode m : ExecutionMode.values())
1571        for (boolean createIncomplete : new boolean[] { true, false })
1940          for (boolean fFirst : new boolean[] { true, false })
1941          for (Integer v1 : new Integer[] { 1, null })
1942          for (Integer v2 : new Integer[] { 2, null })
1943      {
1944          final CompletableFuture<Integer> f = new CompletableFuture<>();
1945          final CompletableFuture<Integer> g = new CompletableFuture<>();
1946 <        final Noop r = new Noop(m);
1947 <
1948 <        if (fFirst) f.complete(v1); else g.complete(v2);
1949 <        if (!createIncomplete)
1950 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1951 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1952 <        if (createIncomplete) {
1953 <            checkIncomplete(h);
1954 <            r.assertNotInvoked();
1955 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1956 <        }
1946 >        final Noop r1 = new Noop(m);
1947 >        final Noop r2 = new Noop(m);
1948 >        final Noop r3 = new Noop(m);
1949 >
1950 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1951 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1952 >        final Integer w1 =  fFirst ? v1 : v2;
1953 >        final Integer w2 = !fFirst ? v1 : v2;
1954 >
1955 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
1956 >        assertTrue(fst.complete(w1));
1957 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
1958 >        checkIncomplete(h1);
1959 >        checkIncomplete(h2);
1960 >        r1.assertNotInvoked();
1961 >        r2.assertNotInvoked();
1962 >        assertTrue(snd.complete(w2));
1963 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
1964  
1965 <        checkCompletedNormally(h, null);
1966 <        r.assertInvoked();
1965 >        checkCompletedNormally(h1, null);
1966 >        checkCompletedNormally(h2, null);
1967 >        checkCompletedNormally(h3, null);
1968 >        r1.assertInvoked();
1969 >        r2.assertInvoked();
1970 >        r3.assertInvoked();
1971          checkCompletedNormally(f, v1);
1972          checkCompletedNormally(g, v2);
1973      }}
# Line 1597 | Line 1976 | public class CompletableFutureTest exten
1976       * runAfterBoth result completes exceptionally after exceptional
1977       * completion of either source
1978       */
1979 <    public void testRunAfterBoth_exceptionalCompletion() {
1979 >    public void testRunAfterBoth_exceptionalCompletion() throws Throwable {
1980          for (ExecutionMode m : ExecutionMode.values())
1602        for (boolean createIncomplete : new boolean[] { true, false })
1981          for (boolean fFirst : new boolean[] { true, false })
1982 +        for (boolean failFirst : new boolean[] { true, false })
1983          for (Integer v1 : new Integer[] { 1, null })
1984      {
1985          final CompletableFuture<Integer> f = new CompletableFuture<>();
1986          final CompletableFuture<Integer> g = new CompletableFuture<>();
1987          final CFException ex = new CFException();
1988 <        final Noop r = new Noop(m);
1989 <
1990 <        (fFirst ? f : g).complete(v1);
1991 <        if (!createIncomplete)
1992 <            (!fFirst ? f : g).completeExceptionally(ex);
1993 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1994 <        if (createIncomplete) {
1995 <            checkIncomplete(h);
1996 <            (!fFirst ? f : g).completeExceptionally(ex);
1997 <        }
1998 <
1999 <        checkCompletedWithWrappedCFException(h, ex);
2000 <        r.assertNotInvoked();
2001 <        checkCompletedNormally(fFirst ? f : g, v1);
2002 <        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1988 >        final Noop r1 = new Noop(m);
1989 >        final Noop r2 = new Noop(m);
1990 >        final Noop r3 = new Noop(m);
1991 >
1992 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1993 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1994 >        final Callable<Boolean> complete1 = failFirst ?
1995 >            () -> fst.completeExceptionally(ex) :
1996 >            () -> fst.complete(v1);
1997 >        final Callable<Boolean> complete2 = failFirst ?
1998 >            () -> snd.complete(v1) :
1999 >            () -> snd.completeExceptionally(ex);
2000 >
2001 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2002 >        assertTrue(complete1.call());
2003 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2004 >        checkIncomplete(h1);
2005 >        checkIncomplete(h2);
2006 >        assertTrue(complete2.call());
2007 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2008 >
2009 >        checkCompletedWithWrappedException(h1, ex);
2010 >        checkCompletedWithWrappedException(h2, ex);
2011 >        checkCompletedWithWrappedException(h3, ex);
2012 >        r1.assertNotInvoked();
2013 >        r2.assertNotInvoked();
2014 >        r3.assertNotInvoked();
2015 >        checkCompletedNormally(failFirst ? snd : fst, v1);
2016 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
2017      }}
2018  
2019      /**
2020       * runAfterBoth result completes exceptionally if either source cancelled
2021       */
2022 <    public void testRunAfterBoth_sourceCancelled() {
2022 >    public void testRunAfterBoth_sourceCancelled() throws Throwable {
2023          for (ExecutionMode m : ExecutionMode.values())
2024          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1632        for (boolean createIncomplete : new boolean[] { true, false })
2025          for (boolean fFirst : new boolean[] { true, false })
2026 +        for (boolean failFirst : new boolean[] { true, false })
2027          for (Integer v1 : new Integer[] { 1, null })
2028      {
2029          final CompletableFuture<Integer> f = new CompletableFuture<>();
2030          final CompletableFuture<Integer> g = new CompletableFuture<>();
2031 <        final Noop r = new Noop(m);
2032 <
2033 <
2034 <        (fFirst ? f : g).complete(v1);
2035 <        if (!createIncomplete)
2036 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
2037 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2038 <        if (createIncomplete) {
2039 <            checkIncomplete(h);
2040 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
2041 <        }
2031 >        final Noop r1 = new Noop(m);
2032 >        final Noop r2 = new Noop(m);
2033 >        final Noop r3 = new Noop(m);
2034 >
2035 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
2036 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
2037 >        final Callable<Boolean> complete1 = failFirst ?
2038 >            () -> fst.cancel(mayInterruptIfRunning) :
2039 >            () -> fst.complete(v1);
2040 >        final Callable<Boolean> complete2 = failFirst ?
2041 >            () -> snd.complete(v1) :
2042 >            () -> snd.cancel(mayInterruptIfRunning);
2043 >
2044 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2045 >        assertTrue(complete1.call());
2046 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2047 >        checkIncomplete(h1);
2048 >        checkIncomplete(h2);
2049 >        assertTrue(complete2.call());
2050 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2051  
2052 <        checkCompletedWithWrappedCancellationException(h);
2053 <        checkCancelled(!fFirst ? f : g);
2054 <        r.assertNotInvoked();
2055 <        checkCompletedNormally(fFirst ? f : g, v1);
2052 >        checkCompletedWithWrappedCancellationException(h1);
2053 >        checkCompletedWithWrappedCancellationException(h2);
2054 >        checkCompletedWithWrappedCancellationException(h3);
2055 >        r1.assertNotInvoked();
2056 >        r2.assertNotInvoked();
2057 >        r3.assertNotInvoked();
2058 >        checkCompletedNormally(failFirst ? snd : fst, v1);
2059 >        checkCancelled(failFirst ? fst : snd);
2060      }}
2061  
2062      /**
# Line 1666 | Line 2072 | public class CompletableFutureTest exten
2072          final CompletableFuture<Integer> g = new CompletableFuture<>();
2073          final FailingRunnable r1 = new FailingRunnable(m);
2074          final FailingRunnable r2 = new FailingRunnable(m);
2075 +        final FailingRunnable r3 = new FailingRunnable(m);
2076  
2077 <        CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2078 <        if (fFirst) {
2079 <            f.complete(v1);
2080 <            g.complete(v2);
2081 <        } else {
2082 <            g.complete(v2);
2083 <            f.complete(v1);
2084 <        }
2085 <        CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2086 <
2087 <        checkCompletedWithWrappedCFException(h1);
2088 <        checkCompletedWithWrappedCFException(h2);
2077 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
2078 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
2079 >        final Integer w1 =  fFirst ? v1 : v2;
2080 >        final Integer w2 = !fFirst ? v1 : v2;
2081 >
2082 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2083 >        assertTrue(fst.complete(w1));
2084 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2085 >        assertTrue(snd.complete(w2));
2086 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2087 >
2088 >        checkCompletedWithWrappedException(h1, r1.ex);
2089 >        checkCompletedWithWrappedException(h2, r2.ex);
2090 >        checkCompletedWithWrappedException(h3, r3.ex);
2091 >        r1.assertInvoked();
2092 >        r2.assertInvoked();
2093 >        r3.assertInvoked();
2094          checkCompletedNormally(f, v1);
2095          checkCompletedNormally(g, v2);
2096      }}
# Line 1752 | Line 2164 | public class CompletableFutureTest exten
2164          rs[0].assertNotInvoked();
2165          rs[1].assertNotInvoked();
2166          f.completeExceptionally(ex);
2167 <        checkCompletedWithWrappedCFException(h0, ex);
2168 <        checkCompletedWithWrappedCFException(h1, ex);
2167 >        checkCompletedWithWrappedException(h0, ex);
2168 >        checkCompletedWithWrappedException(h1, ex);
2169          final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2170          final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2171 <        checkCompletedWithWrappedCFException(h2, ex);
2172 <        checkCompletedWithWrappedCFException(h3, ex);
2171 >        checkCompletedWithWrappedException(h2, ex);
2172 >        checkCompletedWithWrappedException(h3, ex);
2173          g.complete(v1);
2174  
2175          // unspecified behavior - both source completions available
# Line 1765 | Line 2177 | public class CompletableFutureTest exten
2177          final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2178          try {
2179              assertEquals(inc(v1), h4.join());
2180 <            rs[4].assertInvoked();
2180 >            rs[4].assertValue(inc(v1));
2181          } catch (CompletionException ok) {
2182 <            checkCompletedWithWrappedCFException(h4, ex);
2182 >            checkCompletedWithWrappedException(h4, ex);
2183              rs[4].assertNotInvoked();
2184          }
2185          try {
2186              assertEquals(inc(v1), h5.join());
2187 <            rs[5].assertInvoked();
2187 >            rs[5].assertValue(inc(v1));
2188          } catch (CompletionException ok) {
2189 <            checkCompletedWithWrappedCFException(h5, ex);
2189 >            checkCompletedWithWrappedException(h5, ex);
2190              rs[5].assertNotInvoked();
2191          }
2192  
2193 <        checkCompletedWithWrappedCFException(f, ex);
2193 >        checkCompletedExceptionally(f, ex);
2194          checkCompletedNormally(g, v1);
2195 <        checkCompletedWithWrappedCFException(h0, ex);
2196 <        checkCompletedWithWrappedCFException(h1, ex);
2197 <        checkCompletedWithWrappedCFException(h2, ex);
2198 <        checkCompletedWithWrappedCFException(h3, ex);
2199 <        checkCompletedWithWrappedCFException(h4, ex);
2195 >        checkCompletedWithWrappedException(h0, ex);
2196 >        checkCompletedWithWrappedException(h1, ex);
2197 >        checkCompletedWithWrappedException(h2, ex);
2198 >        checkCompletedWithWrappedException(h3, ex);
2199 >        checkCompletedWithWrappedException(h4, ex);
2200          for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2201      }}
2202  
2203 +    public void testApplyToEither_exceptionalCompletion2() {
2204 +        for (ExecutionMode m : ExecutionMode.values())
2205 +        for (boolean fFirst : new boolean[] { true, false })
2206 +        for (Integer v1 : new Integer[] { 1, null })
2207 +    {
2208 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
2209 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
2210 +        final CFException ex = new CFException();
2211 +        final IncFunction[] rs = new IncFunction[6];
2212 +        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2213 +
2214 +        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2215 +        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2216 +        assertTrue(fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2217 +        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2218 +        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2219 +        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2220 +
2221 +        // unspecified behavior - both source completions available
2222 +        try {
2223 +            assertEquals(inc(v1), h0.join());
2224 +            rs[0].assertValue(inc(v1));
2225 +        } catch (CompletionException ok) {
2226 +            checkCompletedWithWrappedException(h0, ex);
2227 +            rs[0].assertNotInvoked();
2228 +        }
2229 +        try {
2230 +            assertEquals(inc(v1), h1.join());
2231 +            rs[1].assertValue(inc(v1));
2232 +        } catch (CompletionException ok) {
2233 +            checkCompletedWithWrappedException(h1, ex);
2234 +            rs[1].assertNotInvoked();
2235 +        }
2236 +        try {
2237 +            assertEquals(inc(v1), h2.join());
2238 +            rs[2].assertValue(inc(v1));
2239 +        } catch (CompletionException ok) {
2240 +            checkCompletedWithWrappedException(h2, ex);
2241 +            rs[2].assertNotInvoked();
2242 +        }
2243 +        try {
2244 +            assertEquals(inc(v1), h3.join());
2245 +            rs[3].assertValue(inc(v1));
2246 +        } catch (CompletionException ok) {
2247 +            checkCompletedWithWrappedException(h3, ex);
2248 +            rs[3].assertNotInvoked();
2249 +        }
2250 +
2251 +        checkCompletedNormally(f, v1);
2252 +        checkCompletedExceptionally(g, ex);
2253 +    }}
2254 +
2255      /**
2256       * applyToEither result completes exceptionally if either source cancelled
2257       */
# Line 1821 | Line 2285 | public class CompletableFutureTest exten
2285          final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2286          try {
2287              assertEquals(inc(v1), h4.join());
2288 <            rs[4].assertInvoked();
2288 >            rs[4].assertValue(inc(v1));
2289          } catch (CompletionException ok) {
2290              checkCompletedWithWrappedCancellationException(h4);
2291              rs[4].assertNotInvoked();
2292          }
2293          try {
2294              assertEquals(inc(v1), h5.join());
2295 <            rs[5].assertInvoked();
2295 >            rs[5].assertValue(inc(v1));
2296          } catch (CompletionException ok) {
2297              checkCompletedWithWrappedCancellationException(h5);
2298              rs[5].assertNotInvoked();
# Line 1843 | Line 2307 | public class CompletableFutureTest exten
2307          for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2308      }}
2309  
2310 +    public void testApplyToEither_sourceCancelled2() {
2311 +        for (ExecutionMode m : ExecutionMode.values())
2312 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2313 +        for (boolean fFirst : new boolean[] { true, false })
2314 +        for (Integer v1 : new Integer[] { 1, null })
2315 +    {
2316 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
2317 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
2318 +        final IncFunction[] rs = new IncFunction[6];
2319 +        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2320 +
2321 +        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2322 +        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2323 +        assertTrue(fFirst ? f.complete(v1) : g.cancel(mayInterruptIfRunning));
2324 +        assertTrue(!fFirst ? f.complete(v1) : g.cancel(mayInterruptIfRunning));
2325 +        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2326 +        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2327 +
2328 +        // unspecified behavior - both source completions available
2329 +        try {
2330 +            assertEquals(inc(v1), h0.join());
2331 +            rs[0].assertValue(inc(v1));
2332 +        } catch (CompletionException ok) {
2333 +            checkCompletedWithWrappedCancellationException(h0);
2334 +            rs[0].assertNotInvoked();
2335 +        }
2336 +        try {
2337 +            assertEquals(inc(v1), h1.join());
2338 +            rs[1].assertValue(inc(v1));
2339 +        } catch (CompletionException ok) {
2340 +            checkCompletedWithWrappedCancellationException(h1);
2341 +            rs[1].assertNotInvoked();
2342 +        }
2343 +        try {
2344 +            assertEquals(inc(v1), h2.join());
2345 +            rs[2].assertValue(inc(v1));
2346 +        } catch (CompletionException ok) {
2347 +            checkCompletedWithWrappedCancellationException(h2);
2348 +            rs[2].assertNotInvoked();
2349 +        }
2350 +        try {
2351 +            assertEquals(inc(v1), h3.join());
2352 +            rs[3].assertValue(inc(v1));
2353 +        } catch (CompletionException ok) {
2354 +            checkCompletedWithWrappedCancellationException(h3);
2355 +            rs[3].assertNotInvoked();
2356 +        }
2357 +
2358 +        checkCompletedNormally(f, v1);
2359 +        checkCancelled(g);
2360 +    }}
2361 +
2362      /**
2363       * applyToEither result completes exceptionally if action does
2364       */
# Line 1861 | Line 2377 | public class CompletableFutureTest exten
2377          f.complete(v1);
2378          final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2379          final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2380 <        checkCompletedWithWrappedCFException(h0);
2381 <        checkCompletedWithWrappedCFException(h1);
2382 <        checkCompletedWithWrappedCFException(h2);
2383 <        checkCompletedWithWrappedCFException(h3);
2380 >        checkCompletedWithWrappedException(h0, rs[0].ex);
2381 >        checkCompletedWithWrappedException(h1, rs[1].ex);
2382 >        checkCompletedWithWrappedException(h2, rs[2].ex);
2383 >        checkCompletedWithWrappedException(h3, rs[3].ex);
2384          for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2385  
2386          g.complete(v2);
# Line 1873 | Line 2389 | public class CompletableFutureTest exten
2389          final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2390          final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2391  
2392 <        checkCompletedWithWrappedCFException(h4);
2392 >        checkCompletedWithWrappedException(h4, rs[4].ex);
2393          assertTrue(Objects.equals(v1, rs[4].value) ||
2394                     Objects.equals(v2, rs[4].value));
2395 <        checkCompletedWithWrappedCFException(h5);
2395 >        checkCompletedWithWrappedException(h5, rs[5].ex);
2396          assertTrue(Objects.equals(v1, rs[5].value) ||
2397                     Objects.equals(v2, rs[5].value));
2398  
# Line 1957 | Line 2473 | public class CompletableFutureTest exten
2473          rs[0].assertNotInvoked();
2474          rs[1].assertNotInvoked();
2475          f.completeExceptionally(ex);
2476 <        checkCompletedWithWrappedCFException(h0, ex);
2477 <        checkCompletedWithWrappedCFException(h1, ex);
2476 >        checkCompletedWithWrappedException(h0, ex);
2477 >        checkCompletedWithWrappedException(h1, ex);
2478          final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2479          final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2480 <        checkCompletedWithWrappedCFException(h2, ex);
2481 <        checkCompletedWithWrappedCFException(h3, ex);
2480 >        checkCompletedWithWrappedException(h2, ex);
2481 >        checkCompletedWithWrappedException(h3, ex);
2482  
2483          g.complete(v1);
2484  
# Line 1973 | Line 2489 | public class CompletableFutureTest exten
2489              assertNull(h4.join());
2490              rs[4].assertValue(v1);
2491          } catch (CompletionException ok) {
2492 <            checkCompletedWithWrappedCFException(h4, ex);
2492 >            checkCompletedWithWrappedException(h4, ex);
2493              rs[4].assertNotInvoked();
2494          }
2495          try {
2496              assertNull(h5.join());
2497              rs[5].assertValue(v1);
2498          } catch (CompletionException ok) {
2499 <            checkCompletedWithWrappedCFException(h5, ex);
2499 >            checkCompletedWithWrappedException(h5, ex);
2500              rs[5].assertNotInvoked();
2501          }
2502  
2503 <        checkCompletedWithWrappedCFException(f, ex);
2503 >        checkCompletedExceptionally(f, ex);
2504          checkCompletedNormally(g, v1);
2505 <        checkCompletedWithWrappedCFException(h0, ex);
2506 <        checkCompletedWithWrappedCFException(h1, ex);
2507 <        checkCompletedWithWrappedCFException(h2, ex);
2508 <        checkCompletedWithWrappedCFException(h3, ex);
2509 <        checkCompletedWithWrappedCFException(h4, ex);
2505 >        checkCompletedWithWrappedException(h0, ex);
2506 >        checkCompletedWithWrappedException(h1, ex);
2507 >        checkCompletedWithWrappedException(h2, ex);
2508 >        checkCompletedWithWrappedException(h3, ex);
2509 >        checkCompletedWithWrappedException(h4, ex);
2510          for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2511      }}
2512  
2513 +    public void testAcceptEither_exceptionalCompletion2() {
2514 +        for (ExecutionMode m : ExecutionMode.values())
2515 +        for (boolean fFirst : new boolean[] { true, false })
2516 +        for (Integer v1 : new Integer[] { 1, null })
2517 +    {
2518 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
2519 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
2520 +        final CFException ex = new CFException();
2521 +        final NoopConsumer[] rs = new NoopConsumer[6];
2522 +        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2523 +
2524 +        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2525 +        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2526 +        assertTrue(fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2527 +        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2528 +        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2529 +        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2530 +
2531 +        // unspecified behavior - both source completions available
2532 +        try {
2533 +            assertEquals(null, h0.join());
2534 +            rs[0].assertValue(v1);
2535 +        } catch (CompletionException ok) {
2536 +            checkCompletedWithWrappedException(h0, ex);
2537 +            rs[0].assertNotInvoked();
2538 +        }
2539 +        try {
2540 +            assertEquals(null, h1.join());
2541 +            rs[1].assertValue(v1);
2542 +        } catch (CompletionException ok) {
2543 +            checkCompletedWithWrappedException(h1, ex);
2544 +            rs[1].assertNotInvoked();
2545 +        }
2546 +        try {
2547 +            assertEquals(null, h2.join());
2548 +            rs[2].assertValue(v1);
2549 +        } catch (CompletionException ok) {
2550 +            checkCompletedWithWrappedException(h2, ex);
2551 +            rs[2].assertNotInvoked();
2552 +        }
2553 +        try {
2554 +            assertEquals(null, h3.join());
2555 +            rs[3].assertValue(v1);
2556 +        } catch (CompletionException ok) {
2557 +            checkCompletedWithWrappedException(h3, ex);
2558 +            rs[3].assertNotInvoked();
2559 +        }
2560 +
2561 +        checkCompletedNormally(f, v1);
2562 +        checkCompletedExceptionally(g, ex);
2563 +    }}
2564 +
2565      /**
2566       * acceptEither result completes exceptionally if either source cancelled
2567       */
# Line 2068 | Line 2636 | public class CompletableFutureTest exten
2636          f.complete(v1);
2637          final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2638          final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2639 <        checkCompletedWithWrappedCFException(h0);
2640 <        checkCompletedWithWrappedCFException(h1);
2641 <        checkCompletedWithWrappedCFException(h2);
2642 <        checkCompletedWithWrappedCFException(h3);
2639 >        checkCompletedWithWrappedException(h0, rs[0].ex);
2640 >        checkCompletedWithWrappedException(h1, rs[1].ex);
2641 >        checkCompletedWithWrappedException(h2, rs[2].ex);
2642 >        checkCompletedWithWrappedException(h3, rs[3].ex);
2643          for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2644  
2645          g.complete(v2);
# Line 2080 | Line 2648 | public class CompletableFutureTest exten
2648          final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2649          final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2650  
2651 <        checkCompletedWithWrappedCFException(h4);
2651 >        checkCompletedWithWrappedException(h4, rs[4].ex);
2652          assertTrue(Objects.equals(v1, rs[4].value) ||
2653                     Objects.equals(v2, rs[4].value));
2654 <        checkCompletedWithWrappedCFException(h5);
2654 >        checkCompletedWithWrappedException(h5, rs[5].ex);
2655          assertTrue(Objects.equals(v1, rs[5].value) ||
2656                     Objects.equals(v2, rs[5].value));
2657  
# Line 2095 | Line 2663 | public class CompletableFutureTest exten
2663       * runAfterEither result completes normally after normal completion
2664       * of either source
2665       */
2666 <    public void testRunAfterEither_normalCompletion1() {
2666 >    public void testRunAfterEither_normalCompletion() {
2667          for (ExecutionMode m : ExecutionMode.values())
2668          for (Integer v1 : new Integer[] { 1, null })
2669          for (Integer v2 : new Integer[] { 2, null })
2670      {
2671          final CompletableFuture<Integer> f = new CompletableFuture<>();
2672          final CompletableFuture<Integer> g = new CompletableFuture<>();
2673 <        final Noop r = new Noop(m);
2674 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2673 >        final Noop[] rs = new Noop[6];
2674 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2675  
2676 +        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2677 +        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2678 +        checkIncomplete(h0);
2679 +        checkIncomplete(h1);
2680 +        rs[0].assertNotInvoked();
2681 +        rs[1].assertNotInvoked();
2682          f.complete(v1);
2683 <        checkCompletedNormally(h, null);
2684 <        r.assertInvoked();
2685 <        g.complete(v2);
2686 <
2687 <        checkCompletedNormally(f, v1);
2688 <        checkCompletedNormally(g, v2);
2689 <        checkCompletedNormally(h, null);
2690 <        r.assertInvoked();
2691 <    }}
2692 <
2119 <    public void testRunAfterEither_normalCompletion2() {
2120 <        for (ExecutionMode m : ExecutionMode.values())
2121 <        for (Integer v1 : new Integer[] { 1, null })
2122 <        for (Integer v2 : new Integer[] { 2, null })
2123 <    {
2124 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2125 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2126 <        final Noop r = new Noop(m);
2127 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2683 >        checkCompletedNormally(h0, null);
2684 >        checkCompletedNormally(h1, null);
2685 >        rs[0].assertInvoked();
2686 >        rs[1].assertInvoked();
2687 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2688 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2689 >        checkCompletedNormally(h2, null);
2690 >        checkCompletedNormally(h3, null);
2691 >        rs[2].assertInvoked();
2692 >        rs[3].assertInvoked();
2693  
2694          g.complete(v2);
2130        checkCompletedNormally(h, null);
2131        r.assertInvoked();
2132        f.complete(v1);
2695  
2696 <        checkCompletedNormally(f, v1);
2697 <        checkCompletedNormally(g, v2);
2136 <        checkCompletedNormally(h, null);
2137 <        r.assertInvoked();
2138 <        }}
2139 <
2140 <    public void testRunAfterEither_normalCompletion3() {
2141 <        for (ExecutionMode m : ExecutionMode.values())
2142 <        for (Integer v1 : new Integer[] { 1, null })
2143 <        for (Integer v2 : new Integer[] { 2, null })
2144 <    {
2145 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2146 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2147 <        final Noop r = new Noop(m);
2696 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2697 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2698  
2149        f.complete(v1);
2150        g.complete(v2);
2151        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2152
2153        checkCompletedNormally(h, null);
2699          checkCompletedNormally(f, v1);
2700          checkCompletedNormally(g, v2);
2701 <        r.assertInvoked();
2701 >        checkCompletedNormally(h0, null);
2702 >        checkCompletedNormally(h1, null);
2703 >        checkCompletedNormally(h2, null);
2704 >        checkCompletedNormally(h3, null);
2705 >        checkCompletedNormally(h4, null);
2706 >        checkCompletedNormally(h5, null);
2707 >        for (int i = 0; i < 6; i++) rs[i].assertInvoked();
2708      }}
2709  
2710      /**
2711       * runAfterEither result completes exceptionally after exceptional
2712       * completion of either source
2713       */
2714 <    public void testRunAfterEither_exceptionalCompletion1() {
2164 <        for (ExecutionMode m : ExecutionMode.values())
2165 <        for (Integer v1 : new Integer[] { 1, null })
2166 <    {
2167 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2168 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2169 <        final Noop r = new Noop(m);
2170 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2171 <        final CFException ex = new CFException();
2172 <
2173 <        f.completeExceptionally(ex);
2174 <        checkCompletedWithWrappedCFException(h, ex);
2175 <        g.complete(v1);
2176 <
2177 <        r.assertNotInvoked();
2178 <        checkCompletedNormally(g, v1);
2179 <        checkCompletedWithWrappedCFException(f, ex);
2180 <        checkCompletedWithWrappedCFException(h, ex);
2181 <    }}
2182 <
2183 <    public void testRunAfterEither_exceptionalCompletion2() {
2714 >    public void testRunAfterEither_exceptionalCompletion() {
2715          for (ExecutionMode m : ExecutionMode.values())
2716          for (Integer v1 : new Integer[] { 1, null })
2717      {
2718          final CompletableFuture<Integer> f = new CompletableFuture<>();
2719          final CompletableFuture<Integer> g = new CompletableFuture<>();
2189        final Noop r = new Noop(m);
2190        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2720          final CFException ex = new CFException();
2721 +        final Noop[] rs = new Noop[6];
2722 +        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2723  
2724 <        g.completeExceptionally(ex);
2725 <        checkCompletedWithWrappedCFException(h, ex);
2726 <        f.complete(v1);
2727 <
2728 <        r.assertNotInvoked();
2729 <        checkCompletedNormally(f, v1);
2730 <        checkCompletedWithWrappedCFException(g, ex);
2731 <        checkCompletedWithWrappedCFException(h, ex);
2732 <    }}
2733 <
2734 <    public void testRunAfterEither_exceptionalCompletion3() {
2735 <        for (ExecutionMode m : ExecutionMode.values())
2736 <        for (Integer v1 : new Integer[] { 1, null })
2206 <    {
2207 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2208 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2209 <        final Noop r = new Noop(m);
2210 <        final CFException ex = new CFException();
2724 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2725 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2726 >        checkIncomplete(h0);
2727 >        checkIncomplete(h1);
2728 >        rs[0].assertNotInvoked();
2729 >        rs[1].assertNotInvoked();
2730 >        assertTrue(f.completeExceptionally(ex));
2731 >        checkCompletedWithWrappedException(h0, ex);
2732 >        checkCompletedWithWrappedException(h1, ex);
2733 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2734 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2735 >        checkCompletedWithWrappedException(h2, ex);
2736 >        checkCompletedWithWrappedException(h3, ex);
2737  
2738 <        g.completeExceptionally(ex);
2213 <        f.complete(v1);
2214 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2738 >        assertTrue(g.complete(v1));
2739  
2740 <        // unspecified behavior
2741 <        Integer v;
2740 >        // unspecified behavior - both source completions available
2741 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2742 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2743          try {
2744 <            assertNull(h.join());
2745 <            r.assertInvoked();
2744 >            assertNull(h4.join());
2745 >            rs[4].assertInvoked();
2746          } catch (CompletionException ok) {
2747 <            checkCompletedWithWrappedCFException(h, ex);
2748 <            r.assertNotInvoked();
2747 >            checkCompletedWithWrappedException(h4, ex);
2748 >            rs[4].assertNotInvoked();
2749          }
2225
2226        checkCompletedWithWrappedCFException(g, ex);
2227        checkCompletedNormally(f, v1);
2228    }}
2229
2230    public void testRunAfterEither_exceptionalCompletion4() {
2231        for (ExecutionMode m : ExecutionMode.values())
2232        for (Integer v1 : new Integer[] { 1, null })
2233    {
2234        final CompletableFuture<Integer> f = new CompletableFuture<>();
2235        final CompletableFuture<Integer> g = new CompletableFuture<>();
2236        final Noop r = new Noop(m);
2237        final CFException ex = new CFException();
2238
2239        f.completeExceptionally(ex);
2240        g.complete(v1);
2241        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2242
2243        // unspecified behavior
2244        Integer v;
2750          try {
2751 <            assertNull(h.join());
2752 <            r.assertInvoked();
2751 >            assertNull(h5.join());
2752 >            rs[5].assertInvoked();
2753          } catch (CompletionException ok) {
2754 <            checkCompletedWithWrappedCFException(h, ex);
2755 <            r.assertNotInvoked();
2754 >            checkCompletedWithWrappedException(h5, ex);
2755 >            rs[5].assertNotInvoked();
2756          }
2757  
2758 <        checkCompletedWithWrappedCFException(f, ex);
2758 >        checkCompletedExceptionally(f, ex);
2759          checkCompletedNormally(g, v1);
2760 +        checkCompletedWithWrappedException(h0, ex);
2761 +        checkCompletedWithWrappedException(h1, ex);
2762 +        checkCompletedWithWrappedException(h2, ex);
2763 +        checkCompletedWithWrappedException(h3, ex);
2764 +        checkCompletedWithWrappedException(h4, ex);
2765 +        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2766      }}
2767  
2768 <    /**
2258 <     * runAfterEither result completes exceptionally if action does
2259 <     */
2260 <    public void testRunAfterEither_actionFailed1() {
2768 >    public void testRunAfterEither_exceptionalCompletion2() {
2769          for (ExecutionMode m : ExecutionMode.values())
2770 +        for (boolean fFirst : new boolean[] { true, false })
2771          for (Integer v1 : new Integer[] { 1, null })
2263        for (Integer v2 : new Integer[] { 2, null })
2772      {
2773          final CompletableFuture<Integer> f = new CompletableFuture<>();
2774          final CompletableFuture<Integer> g = new CompletableFuture<>();
2775 <        final FailingRunnable r = new FailingRunnable(m);
2776 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2775 >        final CFException ex = new CFException();
2776 >        final Noop[] rs = new Noop[6];
2777 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2778  
2779 <        f.complete(v1);
2780 <        checkCompletedWithWrappedCFException(h);
2781 <        g.complete(v2);
2782 <        checkCompletedNormally(f, v1);
2783 <        checkCompletedNormally(g, v2);
2784 <    }}
2779 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2780 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2781 >        assertTrue( fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2782 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2783 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2784 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2785  
2786 <    public void testRunAfterEither_actionFailed2() {
2787 <        for (ExecutionMode m : ExecutionMode.values())
2788 <        for (Integer v1 : new Integer[] { 1, null })
2789 <        for (Integer v2 : new Integer[] { 2, null })
2790 <    {
2791 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2792 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2793 <        final FailingRunnable r = new FailingRunnable(m);
2794 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2786 >        // unspecified behavior - both source completions available
2787 >        try {
2788 >            assertEquals(null, h0.join());
2789 >            rs[0].assertInvoked();
2790 >        } catch (CompletionException ok) {
2791 >            checkCompletedWithWrappedException(h0, ex);
2792 >            rs[0].assertNotInvoked();
2793 >        }
2794 >        try {
2795 >            assertEquals(null, h1.join());
2796 >            rs[1].assertInvoked();
2797 >        } catch (CompletionException ok) {
2798 >            checkCompletedWithWrappedException(h1, ex);
2799 >            rs[1].assertNotInvoked();
2800 >        }
2801 >        try {
2802 >            assertEquals(null, h2.join());
2803 >            rs[2].assertInvoked();
2804 >        } catch (CompletionException ok) {
2805 >            checkCompletedWithWrappedException(h2, ex);
2806 >            rs[2].assertNotInvoked();
2807 >        }
2808 >        try {
2809 >            assertEquals(null, h3.join());
2810 >            rs[3].assertInvoked();
2811 >        } catch (CompletionException ok) {
2812 >            checkCompletedWithWrappedException(h3, ex);
2813 >            rs[3].assertNotInvoked();
2814 >        }
2815  
2287        g.complete(v2);
2288        checkCompletedWithWrappedCFException(h);
2289        f.complete(v1);
2816          checkCompletedNormally(f, v1);
2817 <        checkCompletedNormally(g, v2);
2817 >        checkCompletedExceptionally(g, ex);
2818      }}
2819  
2820      /**
2821       * runAfterEither result completes exceptionally if either source cancelled
2822       */
2823 <    public void testRunAfterEither_sourceCancelled1() {
2298 <        for (ExecutionMode m : ExecutionMode.values())
2299 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2300 <        for (Integer v1 : new Integer[] { 1, null })
2301 <    {
2302 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2303 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2304 <        final Noop r = new Noop(m);
2305 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2306 <
2307 <        assertTrue(f.cancel(mayInterruptIfRunning));
2308 <        checkCompletedWithWrappedCancellationException(h);
2309 <        g.complete(v1);
2310 <
2311 <        checkCancelled(f);
2312 <        r.assertNotInvoked();
2313 <        checkCompletedNormally(g, v1);
2314 <        checkCompletedWithWrappedCancellationException(h);
2315 <    }}
2316 <
2317 <    public void testRunAfterEither_sourceCancelled2() {
2823 >    public void testRunAfterEither_sourceCancelled() {
2824          for (ExecutionMode m : ExecutionMode.values())
2825          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2826          for (Integer v1 : new Integer[] { 1, null })
2827      {
2828          final CompletableFuture<Integer> f = new CompletableFuture<>();
2829          final CompletableFuture<Integer> g = new CompletableFuture<>();
2830 <        final Noop r = new Noop(m);
2831 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2326 <
2327 <        assertTrue(g.cancel(mayInterruptIfRunning));
2328 <        checkCompletedWithWrappedCancellationException(h);
2329 <        f.complete(v1);
2330 <
2331 <        checkCancelled(g);
2332 <        r.assertNotInvoked();
2333 <        checkCompletedNormally(f, v1);
2334 <        checkCompletedWithWrappedCancellationException(h);
2335 <    }}
2830 >        final Noop[] rs = new Noop[6];
2831 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2832  
2833 <    public void testRunAfterEither_sourceCancelled3() {
2834 <        for (ExecutionMode m : ExecutionMode.values())
2835 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2836 <        for (Integer v1 : new Integer[] { 1, null })
2837 <    {
2838 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2839 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2840 <        final Noop r = new Noop(m);
2833 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2834 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2835 >        checkIncomplete(h0);
2836 >        checkIncomplete(h1);
2837 >        rs[0].assertNotInvoked();
2838 >        rs[1].assertNotInvoked();
2839 >        f.cancel(mayInterruptIfRunning);
2840 >        checkCompletedWithWrappedCancellationException(h0);
2841 >        checkCompletedWithWrappedCancellationException(h1);
2842 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2843 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2844 >        checkCompletedWithWrappedCancellationException(h2);
2845 >        checkCompletedWithWrappedCancellationException(h3);
2846  
2847 <        assertTrue(g.cancel(mayInterruptIfRunning));
2347 <        f.complete(v1);
2348 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2847 >        assertTrue(g.complete(v1));
2848  
2849 <        // unspecified behavior
2850 <        Integer v;
2849 >        // unspecified behavior - both source completions available
2850 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2851 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2852 >        try {
2853 >            assertNull(h4.join());
2854 >            rs[4].assertInvoked();
2855 >        } catch (CompletionException ok) {
2856 >            checkCompletedWithWrappedCancellationException(h4);
2857 >            rs[4].assertNotInvoked();
2858 >        }
2859          try {
2860 <            assertNull(h.join());
2861 <            r.assertInvoked();
2860 >            assertNull(h5.join());
2861 >            rs[5].assertInvoked();
2862          } catch (CompletionException ok) {
2863 <            checkCompletedWithWrappedCancellationException(h);
2864 <            r.assertNotInvoked();
2863 >            checkCompletedWithWrappedCancellationException(h5);
2864 >            rs[5].assertNotInvoked();
2865          }
2866  
2867 <        checkCancelled(g);
2868 <        checkCompletedNormally(f, v1);
2867 >        checkCancelled(f);
2868 >        checkCompletedNormally(g, v1);
2869 >        checkCompletedWithWrappedCancellationException(h0);
2870 >        checkCompletedWithWrappedCancellationException(h1);
2871 >        checkCompletedWithWrappedCancellationException(h2);
2872 >        checkCompletedWithWrappedCancellationException(h3);
2873 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2874      }}
2875  
2876 <    public void testRunAfterEither_sourceCancelled4() {
2876 >    /**
2877 >     * runAfterEither result completes exceptionally if action does
2878 >     */
2879 >    public void testRunAfterEither_actionFailed() {
2880          for (ExecutionMode m : ExecutionMode.values())
2366        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2881          for (Integer v1 : new Integer[] { 1, null })
2882 +        for (Integer v2 : new Integer[] { 2, null })
2883      {
2884          final CompletableFuture<Integer> f = new CompletableFuture<>();
2885          final CompletableFuture<Integer> g = new CompletableFuture<>();
2886 <        final Noop r = new Noop(m);
2886 >        final FailingRunnable[] rs = new FailingRunnable[6];
2887 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingRunnable(m);
2888  
2889 <        assertTrue(f.cancel(mayInterruptIfRunning));
2890 <        g.complete(v1);
2891 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2889 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2890 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2891 >        assertTrue(f.complete(v1));
2892 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2893 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2894 >        checkCompletedWithWrappedException(h0, rs[0].ex);
2895 >        checkCompletedWithWrappedException(h1, rs[1].ex);
2896 >        checkCompletedWithWrappedException(h2, rs[2].ex);
2897 >        checkCompletedWithWrappedException(h3, rs[3].ex);
2898 >        for (int i = 0; i < 4; i++) rs[i].assertInvoked();
2899 >        assertTrue(g.complete(v2));
2900 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2901 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2902 >        checkCompletedWithWrappedException(h4, rs[4].ex);
2903 >        checkCompletedWithWrappedException(h5, rs[5].ex);
2904  
2905 <        // unspecified behavior
2906 <        Integer v;
2907 <        try {
2380 <            assertNull(h.join());
2381 <            r.assertInvoked();
2382 <        } catch (CompletionException ok) {
2383 <            checkCompletedWithWrappedCancellationException(h);
2384 <            r.assertNotInvoked();
2385 <        }
2386 <
2387 <        checkCancelled(f);
2388 <        checkCompletedNormally(g, v1);
2905 >        checkCompletedNormally(f, v1);
2906 >        checkCompletedNormally(g, v2);
2907 >        for (int i = 0; i < 6; i++) rs[i].assertInvoked();
2908      }}
2909  
2910      /**
# Line 2398 | Line 2917 | public class CompletableFutureTest exten
2917      {
2918          final CompletableFuture<Integer> f = new CompletableFuture<>();
2919          final CompletableFutureInc r = new CompletableFutureInc(m);
2920 <        if (!createIncomplete) f.complete(v1);
2920 >        if (!createIncomplete) assertTrue(f.complete(v1));
2921          final CompletableFuture<Integer> g = m.thenCompose(f, r);
2922 <        if (createIncomplete) f.complete(v1);
2922 >        if (createIncomplete) assertTrue(f.complete(v1));
2923  
2924          checkCompletedNormally(g, inc(v1));
2925          checkCompletedNormally(f, v1);
2926 <        r.assertInvoked();
2926 >        r.assertValue(v1);
2927      }}
2928  
2929      /**
# Line 2422 | Line 2941 | public class CompletableFutureTest exten
2941          final CompletableFuture<Integer> g = m.thenCompose(f, r);
2942          if (createIncomplete) f.completeExceptionally(ex);
2943  
2944 <        checkCompletedWithWrappedCFException(g, ex);
2945 <        checkCompletedWithWrappedCFException(f, ex);
2944 >        checkCompletedWithWrappedException(g, ex);
2945 >        checkCompletedExceptionally(f, ex);
2946          r.assertNotInvoked();
2947      }}
2948  
# Line 2438 | Line 2957 | public class CompletableFutureTest exten
2957          final CompletableFuture<Integer> f = new CompletableFuture<>();
2958          final FailingCompletableFutureFunction r
2959              = new FailingCompletableFutureFunction(m);
2960 <        if (!createIncomplete) f.complete(v1);
2960 >        if (!createIncomplete) assertTrue(f.complete(v1));
2961          final CompletableFuture<Integer> g = m.thenCompose(f, r);
2962 <        if (createIncomplete) f.complete(v1);
2962 >        if (createIncomplete) assertTrue(f.complete(v1));
2963  
2964 <        checkCompletedWithWrappedCFException(g);
2964 >        checkCompletedWithWrappedException(g, r.ex);
2965          checkCompletedNormally(f, v1);
2966      }}
2967  
# Line 2467 | Line 2986 | public class CompletableFutureTest exten
2986          checkCancelled(f);
2987      }}
2988  
2989 +    /**
2990 +     * thenCompose result completes exceptionally if the result of the action does
2991 +     */
2992 +    public void testThenCompose_actionReturnsFailingFuture() {
2993 +        for (ExecutionMode m : ExecutionMode.values())
2994 +        for (int order = 0; order < 6; order++)
2995 +        for (Integer v1 : new Integer[] { 1, null })
2996 +    {
2997 +        final CFException ex = new CFException();
2998 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
2999 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
3000 +        final CompletableFuture<Integer> h;
3001 +        // Test all permutations of orders
3002 +        switch (order) {
3003 +        case 0:
3004 +            assertTrue(f.complete(v1));
3005 +            assertTrue(g.completeExceptionally(ex));
3006 +            h = m.thenCompose(f, (x -> g));
3007 +            break;
3008 +        case 1:
3009 +            assertTrue(f.complete(v1));
3010 +            h = m.thenCompose(f, (x -> g));
3011 +            assertTrue(g.completeExceptionally(ex));
3012 +            break;
3013 +        case 2:
3014 +            assertTrue(g.completeExceptionally(ex));
3015 +            assertTrue(f.complete(v1));
3016 +            h = m.thenCompose(f, (x -> g));
3017 +            break;
3018 +        case 3:
3019 +            assertTrue(g.completeExceptionally(ex));
3020 +            h = m.thenCompose(f, (x -> g));
3021 +            assertTrue(f.complete(v1));
3022 +            break;
3023 +        case 4:
3024 +            h = m.thenCompose(f, (x -> g));
3025 +            assertTrue(f.complete(v1));
3026 +            assertTrue(g.completeExceptionally(ex));
3027 +            break;
3028 +        case 5:
3029 +            h = m.thenCompose(f, (x -> g));
3030 +            assertTrue(f.complete(v1));
3031 +            assertTrue(g.completeExceptionally(ex));
3032 +            break;
3033 +        default: throw new AssertionError();
3034 +        }
3035 +
3036 +        checkCompletedExceptionally(g, ex);
3037 +        checkCompletedWithWrappedException(h, ex);
3038 +        checkCompletedNormally(f, v1);
3039 +    }}
3040 +
3041      // other static methods
3042  
3043      /**
# Line 2483 | Line 3054 | public class CompletableFutureTest exten
3054       * when all components complete normally
3055       */
3056      public void testAllOf_normal() throws Exception {
3057 <        for (int k = 1; k < 20; ++k) {
3057 >        for (int k = 1; k < 10; k++) {
3058              CompletableFuture<Integer>[] fs
3059                  = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3060 <            for (int i = 0; i < k; ++i)
3060 >            for (int i = 0; i < k; i++)
3061                  fs[i] = new CompletableFuture<>();
3062              CompletableFuture<Void> f = CompletableFuture.allOf(fs);
3063 <            for (int i = 0; i < k; ++i) {
3063 >            for (int i = 0; i < k; i++) {
3064                  checkIncomplete(f);
3065                  checkIncomplete(CompletableFuture.allOf(fs));
3066                  fs[i].complete(one);
# Line 2499 | Line 3070 | public class CompletableFutureTest exten
3070          }
3071      }
3072  
3073 <    public void testAllOf_backwards() throws Exception {
3074 <        for (int k = 1; k < 20; ++k) {
3073 >    public void testAllOf_normal_backwards() throws Exception {
3074 >        for (int k = 1; k < 10; k++) {
3075              CompletableFuture<Integer>[] fs
3076                  = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3077 <            for (int i = 0; i < k; ++i)
3077 >            for (int i = 0; i < k; i++)
3078                  fs[i] = new CompletableFuture<>();
3079              CompletableFuture<Void> f = CompletableFuture.allOf(fs);
3080              for (int i = k - 1; i >= 0; i--) {
# Line 2516 | Line 3087 | public class CompletableFutureTest exten
3087          }
3088      }
3089  
3090 +    public void testAllOf_exceptional() throws Exception {
3091 +        for (int k = 1; k < 10; k++) {
3092 +            CompletableFuture<Integer>[] fs
3093 +                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3094 +            CFException ex = new CFException();
3095 +            for (int i = 0; i < k; i++)
3096 +                fs[i] = new CompletableFuture<>();
3097 +            CompletableFuture<Void> f = CompletableFuture.allOf(fs);
3098 +            for (int i = 0; i < k; i++) {
3099 +                checkIncomplete(f);
3100 +                checkIncomplete(CompletableFuture.allOf(fs));
3101 +                if (i != k / 2) {
3102 +                    fs[i].complete(i);
3103 +                    checkCompletedNormally(fs[i], i);
3104 +                } else {
3105 +                    fs[i].completeExceptionally(ex);
3106 +                    checkCompletedExceptionally(fs[i], ex);
3107 +                }
3108 +            }
3109 +            checkCompletedWithWrappedException(f, ex);
3110 +            checkCompletedWithWrappedException(CompletableFuture.allOf(fs), ex);
3111 +        }
3112 +    }
3113 +
3114      /**
3115       * anyOf(no component futures) returns an incomplete future
3116       */
3117      public void testAnyOf_empty() throws Exception {
3118 +        for (Integer v1 : new Integer[] { 1, null })
3119 +    {
3120          CompletableFuture<Object> f = CompletableFuture.anyOf();
3121          checkIncomplete(f);
3122 <    }
3122 >
3123 >        f.complete(v1);
3124 >        checkCompletedNormally(f, v1);
3125 >    }}
3126  
3127      /**
3128       * anyOf returns a future completed normally with a value when
3129       * a component future does
3130       */
3131      public void testAnyOf_normal() throws Exception {
3132 <        for (int k = 0; k < 10; ++k) {
3132 >        for (int k = 0; k < 10; k++) {
3133              CompletableFuture[] fs = new CompletableFuture[k];
3134 <            for (int i = 0; i < k; ++i)
3134 >            for (int i = 0; i < k; i++)
3135                  fs[i] = new CompletableFuture<>();
3136              CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3137              checkIncomplete(f);
3138 <            for (int i = 0; i < k; ++i) {
3139 <                fs[i].complete(one);
3140 <                checkCompletedNormally(f, one);
3141 <                checkCompletedNormally(CompletableFuture.anyOf(fs), one);
3138 >            for (int i = 0; i < k; i++) {
3139 >                fs[i].complete(i);
3140 >                checkCompletedNormally(f, 0);
3141 >                int x = (int) CompletableFuture.anyOf(fs).join();
3142 >                assertTrue(0 <= x && x <= i);
3143 >            }
3144 >        }
3145 >    }
3146 >    public void testAnyOf_normal_backwards() throws Exception {
3147 >        for (int k = 0; k < 10; k++) {
3148 >            CompletableFuture[] fs = new CompletableFuture[k];
3149 >            for (int i = 0; i < k; i++)
3150 >                fs[i] = new CompletableFuture<>();
3151 >            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3152 >            checkIncomplete(f);
3153 >            for (int i = k - 1; i >= 0; i--) {
3154 >                fs[i].complete(i);
3155 >                checkCompletedNormally(f, k - 1);
3156 >                int x = (int) CompletableFuture.anyOf(fs).join();
3157 >                assertTrue(i <= x && x <= k - 1);
3158              }
3159          }
3160      }
# Line 2547 | Line 3163 | public class CompletableFutureTest exten
3163       * anyOf result completes exceptionally when any component does.
3164       */
3165      public void testAnyOf_exceptional() throws Exception {
3166 <        for (int k = 0; k < 10; ++k) {
3166 >        for (int k = 0; k < 10; k++) {
3167              CompletableFuture[] fs = new CompletableFuture[k];
3168 <            for (int i = 0; i < k; ++i)
3168 >            CFException[] exs = new CFException[k];
3169 >            for (int i = 0; i < k; i++) {
3170                  fs[i] = new CompletableFuture<>();
3171 +                exs[i] = new CFException();
3172 +            }
3173              CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3174              checkIncomplete(f);
3175 <            for (int i = 0; i < k; ++i) {
3176 <                fs[i].completeExceptionally(new CFException());
3177 <                checkCompletedWithWrappedCFException(f);
3175 >            for (int i = 0; i < k; i++) {
3176 >                fs[i].completeExceptionally(exs[i]);
3177 >                checkCompletedWithWrappedException(f, exs[0]);
3178 >                checkCompletedWithWrappedCFException(CompletableFuture.anyOf(fs));
3179 >            }
3180 >        }
3181 >    }
3182 >
3183 >    public void testAnyOf_exceptional_backwards() throws Exception {
3184 >        for (int k = 0; k < 10; k++) {
3185 >            CompletableFuture[] fs = new CompletableFuture[k];
3186 >            CFException[] exs = new CFException[k];
3187 >            for (int i = 0; i < k; i++) {
3188 >                fs[i] = new CompletableFuture<>();
3189 >                exs[i] = new CFException();
3190 >            }
3191 >            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3192 >            checkIncomplete(f);
3193 >            for (int i = k - 1; i >= 0; i--) {
3194 >                fs[i].completeExceptionally(exs[i]);
3195 >                checkCompletedWithWrappedException(f, exs[k - 1]);
3196                  checkCompletedWithWrappedCFException(CompletableFuture.anyOf(fs));
3197              }
3198          }
# Line 2568 | Line 3205 | public class CompletableFutureTest exten
3205          CompletableFuture<Integer> f = new CompletableFuture<>();
3206          CompletableFuture<Integer> g = new CompletableFuture<>();
3207          CompletableFuture<Integer> nullFuture = (CompletableFuture<Integer>)null;
2571        CompletableFuture<?> h;
3208          ThreadExecutor exec = new ThreadExecutor();
3209  
3210          Runnable[] throwingActions = {
3211              () -> CompletableFuture.supplyAsync(null),
3212              () -> CompletableFuture.supplyAsync(null, exec),
3213 <            () -> CompletableFuture.supplyAsync(new IntegerSupplier(ExecutionMode.DEFAULT, 42), null),
3213 >            () -> CompletableFuture.supplyAsync(new IntegerSupplier(ExecutionMode.SYNC, 42), null),
3214  
3215              () -> CompletableFuture.runAsync(null),
3216              () -> CompletableFuture.runAsync(null, exec),
# Line 2665 | Line 3301 | public class CompletableFutureTest exten
3301              () -> CompletableFuture.anyOf(null, f),
3302  
3303              () -> f.obtrudeException(null),
3304 +
3305 +            () -> CompletableFuture.delayedExecutor(1L, SECONDS, null),
3306 +            () -> CompletableFuture.delayedExecutor(1L, null, exec),
3307 +            () -> CompletableFuture.delayedExecutor(1L, null),
3308 +
3309 +            () -> f.orTimeout(1L, null),
3310 +            () -> f.completeOnTimeout(42, 1L, null),
3311 +
3312 +            () -> CompletableFuture.failedFuture(null),
3313 +            () -> CompletableFuture.failedStage(null),
3314          };
3315  
3316          assertThrows(NullPointerException.class, throwingActions);
# Line 2672 | Line 3318 | public class CompletableFutureTest exten
3318      }
3319  
3320      /**
3321 +     * Test submissions to an executor that rejects all tasks.
3322 +     */
3323 +    public void testRejectingExecutor() {
3324 +        final RejectedExecutionException ex = new RejectedExecutionException();
3325 +        final Executor e = (Runnable r) -> { throw ex; };
3326 +
3327 +        for (Integer v : new Integer[] { 1, null }) {
3328 +
3329 +        final CompletableFuture<Integer> complete = CompletableFuture.completedFuture(v);
3330 +        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
3331 +
3332 +        List<CompletableFuture<?>> futures = new ArrayList<>();
3333 +
3334 +        List<CompletableFuture<Integer>> srcs = new ArrayList<>();
3335 +        srcs.add(complete);
3336 +        srcs.add(incomplete);
3337 +
3338 +        for (CompletableFuture<Integer> src : srcs) {
3339 +            List<CompletableFuture<?>> fs = new ArrayList<>();
3340 +            fs.add(src.thenRunAsync(() -> {}, e));
3341 +            fs.add(src.thenAcceptAsync((z) -> {}, e));
3342 +            fs.add(src.thenApplyAsync((z) -> z, e));
3343 +
3344 +            fs.add(src.thenCombineAsync(src, (x, y) -> x, e));
3345 +            fs.add(src.thenAcceptBothAsync(src, (x, y) -> {}, e));
3346 +            fs.add(src.runAfterBothAsync(src, () -> {}, e));
3347 +
3348 +            fs.add(src.applyToEitherAsync(src, (z) -> z, e));
3349 +            fs.add(src.acceptEitherAsync(src, (z) -> {}, e));
3350 +            fs.add(src.runAfterEitherAsync(src, () -> {}, e));
3351 +
3352 +            fs.add(src.thenComposeAsync((z) -> null, e));
3353 +            fs.add(src.whenCompleteAsync((z, t) -> {}, e));
3354 +            fs.add(src.handleAsync((z, t) -> null, e));
3355 +
3356 +            for (CompletableFuture<?> future : fs) {
3357 +                if (src.isDone())
3358 +                    checkCompletedWithWrappedException(future, ex);
3359 +                else
3360 +                    checkIncomplete(future);
3361 +            }
3362 +            futures.addAll(fs);
3363 +        }
3364 +
3365 +        {
3366 +            List<CompletableFuture<?>> fs = new ArrayList<>();
3367 +
3368 +            fs.add(complete.thenCombineAsync(incomplete, (x, y) -> x, e));
3369 +            fs.add(incomplete.thenCombineAsync(complete, (x, y) -> x, e));
3370 +
3371 +            fs.add(complete.thenAcceptBothAsync(incomplete, (x, y) -> {}, e));
3372 +            fs.add(incomplete.thenAcceptBothAsync(complete, (x, y) -> {}, e));
3373 +
3374 +            fs.add(complete.runAfterBothAsync(incomplete, () -> {}, e));
3375 +            fs.add(incomplete.runAfterBothAsync(complete, () -> {}, e));
3376 +
3377 +            for (CompletableFuture<?> future : fs)
3378 +                checkIncomplete(future);
3379 +            futures.addAll(fs);
3380 +        }
3381 +
3382 +        {
3383 +            List<CompletableFuture<?>> fs = new ArrayList<>();
3384 +
3385 +            fs.add(complete.applyToEitherAsync(incomplete, (z) -> z, e));
3386 +            fs.add(incomplete.applyToEitherAsync(complete, (z) -> z, e));
3387 +
3388 +            fs.add(complete.acceptEitherAsync(incomplete, (z) -> {}, e));
3389 +            fs.add(incomplete.acceptEitherAsync(complete, (z) -> {}, e));
3390 +
3391 +            fs.add(complete.runAfterEitherAsync(incomplete, () -> {}, e));
3392 +            fs.add(incomplete.runAfterEitherAsync(complete, () -> {}, e));
3393 +
3394 +            for (CompletableFuture<?> future : fs)
3395 +                checkCompletedWithWrappedException(future, ex);
3396 +            futures.addAll(fs);
3397 +        }
3398 +
3399 +        incomplete.complete(v);
3400 +
3401 +        for (CompletableFuture<?> future : futures)
3402 +            checkCompletedWithWrappedException(future, ex);
3403 +        }
3404 +    }
3405 +
3406 +    /**
3407       * toCompletableFuture returns this CompletableFuture.
3408       */
3409      public void testToCompletableFuture() {
# Line 2679 | Line 3411 | public class CompletableFutureTest exten
3411          assertSame(f, f.toCompletableFuture());
3412      }
3413  
3414 +    // jdk9
3415 +
3416      /**
3417 <     * whenComplete action executes on normal completion, propagating
2684 <     * source result.
3417 >     * newIncompleteFuture returns an incomplete CompletableFuture
3418       */
3419 <    public void testWhenComplete_normalCompletion1() {
2687 <        for (ExecutionMode m : ExecutionMode.values())
2688 <        for (boolean createIncomplete : new boolean[] { true, false })
3419 >    public void testNewIncompleteFuture() {
3420          for (Integer v1 : new Integer[] { 1, null })
3421      {
3422 <        final AtomicInteger a = new AtomicInteger(0);
3423 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3424 <        if (!createIncomplete) f.complete(v1);
3425 <        final CompletableFuture<Integer> g = m.whenComplete
3426 <            (f,
2696 <             (Integer x, Throwable t) -> {
2697 <                threadAssertSame(x, v1);
2698 <                threadAssertNull(t);
2699 <                a.getAndIncrement();
2700 <            });
2701 <        if (createIncomplete) f.complete(v1);
2702 <
2703 <        checkCompletedNormally(g, v1);
3422 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3423 >        CompletableFuture<Integer> g = f.newIncompleteFuture();
3424 >        checkIncomplete(f);
3425 >        checkIncomplete(g);
3426 >        f.complete(v1);
3427          checkCompletedNormally(f, v1);
3428 <        assertEquals(1, a.get());
3428 >        checkIncomplete(g);
3429 >        g.complete(v1);
3430 >        checkCompletedNormally(g, v1);
3431 >        assertSame(g.getClass(), CompletableFuture.class);
3432      }}
3433  
3434      /**
3435 <     * whenComplete action executes on exceptional completion, propagating
2710 <     * source result.
3435 >     * completedStage returns a completed CompletionStage
3436       */
3437 <    public void testWhenComplete_exceptionalCompletion() {
3438 <        for (ExecutionMode m : ExecutionMode.values())
3439 <        for (boolean createIncomplete : new boolean[] { true, false })
3437 >    public void testCompletedStage() {
3438 >        AtomicInteger x = new AtomicInteger(0);
3439 >        AtomicReference<Throwable> r = new AtomicReference<Throwable>();
3440 >        CompletionStage<Integer> f = CompletableFuture.completedStage(1);
3441 >        f.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3442 >        assertEquals(x.get(), 1);
3443 >        assertNull(r.get());
3444 >    }
3445 >
3446 >    /**
3447 >     * defaultExecutor by default returns the commonPool if
3448 >     * it supports more than one thread.
3449 >     */
3450 >    public void testDefaultExecutor() {
3451 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3452 >        Executor e = f.defaultExecutor();
3453 >        Executor c = ForkJoinPool.commonPool();
3454 >        if (ForkJoinPool.getCommonPoolParallelism() > 1)
3455 >            assertSame(e, c);
3456 >        else
3457 >            assertNotSame(e, c);
3458 >    }
3459 >
3460 >    /**
3461 >     * failedFuture returns a CompletableFuture completed
3462 >     * exceptionally with the given Exception
3463 >     */
3464 >    public void testFailedFuture() {
3465 >        CFException ex = new CFException();
3466 >        CompletableFuture<Integer> f = CompletableFuture.failedFuture(ex);
3467 >        checkCompletedExceptionally(f, ex);
3468 >    }
3469 >
3470 >    /**
3471 >     * failedFuture(null) throws NPE
3472 >     */
3473 >    public void testFailedFuture_null() {
3474 >        try {
3475 >            CompletableFuture<Integer> f = CompletableFuture.failedFuture(null);
3476 >            shouldThrow();
3477 >        } catch (NullPointerException success) {}
3478 >    }
3479 >
3480 >    /**
3481 >     * copy returns a CompletableFuture that is completed normally,
3482 >     * with the same value, when source is.
3483 >     */
3484 >    public void testCopy() {
3485 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3486 >        CompletableFuture<Integer> g = f.copy();
3487 >        checkIncomplete(f);
3488 >        checkIncomplete(g);
3489 >        f.complete(1);
3490 >        checkCompletedNormally(f, 1);
3491 >        checkCompletedNormally(g, 1);
3492 >    }
3493 >
3494 >    /**
3495 >     * copy returns a CompletableFuture that is completed exceptionally
3496 >     * when source is.
3497 >     */
3498 >    public void testCopy2() {
3499 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3500 >        CompletableFuture<Integer> g = f.copy();
3501 >        checkIncomplete(f);
3502 >        checkIncomplete(g);
3503 >        CFException ex = new CFException();
3504 >        f.completeExceptionally(ex);
3505 >        checkCompletedExceptionally(f, ex);
3506 >        checkCompletedWithWrappedException(g, ex);
3507 >    }
3508 >
3509 >    /**
3510 >     * minimalCompletionStage returns a CompletableFuture that is
3511 >     * completed normally, with the same value, when source is.
3512 >     */
3513 >    public void testMinimalCompletionStage() {
3514 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3515 >        CompletionStage<Integer> g = f.minimalCompletionStage();
3516 >        AtomicInteger x = new AtomicInteger(0);
3517 >        AtomicReference<Throwable> r = new AtomicReference<Throwable>();
3518 >        checkIncomplete(f);
3519 >        g.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3520 >        f.complete(1);
3521 >        checkCompletedNormally(f, 1);
3522 >        assertEquals(x.get(), 1);
3523 >        assertNull(r.get());
3524 >    }
3525 >
3526 >    /**
3527 >     * minimalCompletionStage returns a CompletableFuture that is
3528 >     * completed exceptionally when source is.
3529 >     */
3530 >    public void testMinimalCompletionStage2() {
3531 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3532 >        CompletionStage<Integer> g = f.minimalCompletionStage();
3533 >        AtomicInteger x = new AtomicInteger(0);
3534 >        AtomicReference<Throwable> r = new AtomicReference<Throwable>();
3535 >        g.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3536 >        checkIncomplete(f);
3537 >        CFException ex = new CFException();
3538 >        f.completeExceptionally(ex);
3539 >        checkCompletedExceptionally(f, ex);
3540 >        assertEquals(x.get(), 0);
3541 >        assertEquals(r.get().getCause(), ex);
3542 >    }
3543 >
3544 >    /**
3545 >     * failedStage returns a CompletionStage completed
3546 >     * exceptionally with the given Exception
3547 >     */
3548 >    public void testFailedStage() {
3549 >        CFException ex = new CFException();
3550 >        CompletionStage<Integer> f = CompletableFuture.failedStage(ex);
3551 >        AtomicInteger x = new AtomicInteger(0);
3552 >        AtomicReference<Throwable> r = new AtomicReference<Throwable>();
3553 >        f.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3554 >        assertEquals(x.get(), 0);
3555 >        assertEquals(r.get(), ex);
3556 >    }
3557 >
3558 >    /**
3559 >     * completeAsync completes with value of given supplier
3560 >     */
3561 >    public void testCompleteAsync() {
3562          for (Integer v1 : new Integer[] { 1, null })
3563      {
3564 <        final AtomicInteger a = new AtomicInteger(0);
3565 <        final CFException ex = new CFException();
3566 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3567 <        if (!createIncomplete) f.completeExceptionally(ex);
2721 <        final CompletableFuture<Integer> g = m.whenComplete
2722 <            (f,
2723 <             (Integer x, Throwable t) -> {
2724 <                threadAssertNull(x);
2725 <                threadAssertSame(t, ex);
2726 <                a.getAndIncrement();
2727 <            });
2728 <        if (createIncomplete) f.completeExceptionally(ex);
2729 <        checkCompletedWithWrappedCFException(f, ex);
2730 <        checkCompletedWithWrappedCFException(g, ex);
2731 <        assertEquals(1, a.get());
3564 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3565 >        f.completeAsync(() -> v1);
3566 >        f.join();
3567 >        checkCompletedNormally(f, v1);
3568      }}
3569  
3570      /**
3571 <     * whenComplete action executes on cancelled source, propagating
2736 <     * CancellationException.
3571 >     * completeAsync completes exceptionally if given supplier throws
3572       */
3573 <    public void testWhenComplete_sourceCancelled() {
3574 <        for (ExecutionMode m : ExecutionMode.values())
3575 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3576 <        for (boolean createIncomplete : new boolean[] { true, false })
3573 >    public void testCompleteAsync2() {
3574 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3575 >        CFException ex = new CFException();
3576 >        f.completeAsync(() -> {if (true) throw ex; return 1;});
3577 >        try {
3578 >            f.join();
3579 >            shouldThrow();
3580 >        } catch (CompletionException success) {}
3581 >        checkCompletedWithWrappedException(f, ex);
3582 >    }
3583 >
3584 >    /**
3585 >     * completeAsync with given executor completes with value of given supplier
3586 >     */
3587 >    public void testCompleteAsync3() {
3588 >        for (Integer v1 : new Integer[] { 1, null })
3589      {
3590 <        final AtomicInteger a = new AtomicInteger(0);
3591 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3592 <        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
3593 <        final CompletableFuture<Integer> g = m.whenComplete
3594 <            (f,
3595 <             (Integer x, Throwable t) -> {
3596 <                threadAssertNull(x);
2750 <                threadAssertTrue(t instanceof CancellationException);
2751 <                a.getAndIncrement();
2752 <            });
2753 <        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
3590 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3591 >        ThreadExecutor executor = new ThreadExecutor();
3592 >        f.completeAsync(() -> v1, executor);
3593 >        assertSame(v1, f.join());
3594 >        checkCompletedNormally(f, v1);
3595 >        assertEquals(1, executor.count.get());
3596 >    }}
3597  
3598 <        //try { g.join(); } catch (Throwable t) { throw new Error(t); }
3599 <        checkCompletedWithWrappedCancellationException(g);
3600 <        checkCancelled(f);
3601 <        assertEquals(1, a.get());
3598 >    /**
3599 >     * completeAsync with given executor completes exceptionally if
3600 >     * given supplier throws
3601 >     */
3602 >    public void testCompleteAsync4() {
3603 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3604 >        CFException ex = new CFException();
3605 >        ThreadExecutor executor = new ThreadExecutor();
3606 >        f.completeAsync(() -> {if (true) throw ex; return 1;}, executor);
3607 >        try {
3608 >            f.join();
3609 >            shouldThrow();
3610 >        } catch (CompletionException success) {}
3611 >        checkCompletedWithWrappedException(f, ex);
3612 >        assertEquals(1, executor.count.get());
3613 >    }
3614 >
3615 >    /**
3616 >     * orTimeout completes with TimeoutException if not complete
3617 >     */
3618 >    public void testOrTimeout_timesOut() {
3619 >        long timeoutMillis = timeoutMillis();
3620 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3621 >        long startTime = System.nanoTime();
3622 >        assertSame(f, f.orTimeout(timeoutMillis, MILLISECONDS));
3623 >        checkCompletedWithTimeoutException(f);
3624 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
3625 >    }
3626 >
3627 >    /**
3628 >     * orTimeout completes normally if completed before timeout
3629 >     */
3630 >    public void testOrTimeout_completed() {
3631 >        for (Integer v1 : new Integer[] { 1, null })
3632 >    {
3633 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3634 >        CompletableFuture<Integer> g = new CompletableFuture<>();
3635 >        long startTime = System.nanoTime();
3636 >        f.complete(v1);
3637 >        assertSame(f, f.orTimeout(LONG_DELAY_MS, MILLISECONDS));
3638 >        assertSame(g, g.orTimeout(LONG_DELAY_MS, MILLISECONDS));
3639 >        g.complete(v1);
3640 >        checkCompletedNormally(f, v1);
3641 >        checkCompletedNormally(g, v1);
3642 >        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS / 2);
3643      }}
3644  
3645      /**
3646 <     * If a whenComplete action throws an exception when triggered by
2763 <     * a normal completion, it completes exceptionally
3646 >     * completeOnTimeout completes with given value if not complete
3647       */
3648 <    public void testWhenComplete_actionFailed() {
3649 <        for (boolean createIncomplete : new boolean[] { true, false })
3650 <        for (ExecutionMode m : ExecutionMode.values())
3648 >    public void testCompleteOnTimeout_timesOut() {
3649 >        testInParallel(() -> testCompleteOnTimeout_timesOut(42),
3650 >                       () -> testCompleteOnTimeout_timesOut(null));
3651 >    }
3652 >
3653 >    /**
3654 >     * completeOnTimeout completes with given value if not complete
3655 >     */
3656 >    public void testCompleteOnTimeout_timesOut(Integer v) {
3657 >        long timeoutMillis = timeoutMillis();
3658 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3659 >        long startTime = System.nanoTime();
3660 >        assertSame(f, f.completeOnTimeout(v, timeoutMillis, MILLISECONDS));
3661 >        assertSame(v, f.join());
3662 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
3663 >        f.complete(99);         // should have no effect
3664 >        checkCompletedNormally(f, v);
3665 >    }
3666 >
3667 >    /**
3668 >     * completeOnTimeout has no effect if completed within timeout
3669 >     */
3670 >    public void testCompleteOnTimeout_completed() {
3671          for (Integer v1 : new Integer[] { 1, null })
3672      {
3673 <        final AtomicInteger a = new AtomicInteger(0);
3674 <        final CFException ex = new CFException();
3675 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3676 <        if (!createIncomplete) f.complete(v1);
3677 <        final CompletableFuture<Integer> g = m.whenComplete
3678 <            (f,
3679 <             (Integer x, Throwable t) -> {
2777 <                threadAssertSame(x, v1);
2778 <                threadAssertNull(t);
2779 <                a.getAndIncrement();
2780 <                throw ex;
2781 <            });
2782 <        if (createIncomplete) f.complete(v1);
3673 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3674 >        CompletableFuture<Integer> g = new CompletableFuture<>();
3675 >        long startTime = System.nanoTime();
3676 >        f.complete(v1);
3677 >        assertSame(f, f.completeOnTimeout(-1, LONG_DELAY_MS, MILLISECONDS));
3678 >        assertSame(g, g.completeOnTimeout(-1, LONG_DELAY_MS, MILLISECONDS));
3679 >        g.complete(v1);
3680          checkCompletedNormally(f, v1);
3681 <        checkCompletedWithWrappedCFException(g, ex);
3682 <        assertEquals(1, a.get());
3681 >        checkCompletedNormally(g, v1);
3682 >        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS / 2);
3683      }}
3684  
3685      /**
3686 <     * If a whenComplete action throws an exception when triggered by
2790 <     * a source completion that also throws an exception, the source
2791 <     * exception takes precedence.
3686 >     * delayedExecutor returns an executor that delays submission
3687       */
3688 <    public void testWhenComplete_actionFailedSourceFailed() {
3689 <        for (boolean createIncomplete : new boolean[] { true, false })
3688 >    public void testDelayedExecutor() {
3689 >        testInParallel(() -> testDelayedExecutor(null, null),
3690 >                       () -> testDelayedExecutor(null, 1),
3691 >                       () -> testDelayedExecutor(new ThreadExecutor(), 1),
3692 >                       () -> testDelayedExecutor(new ThreadExecutor(), 1));
3693 >    }
3694 >
3695 >    public void testDelayedExecutor(Executor executor, Integer v) throws Exception {
3696 >        long timeoutMillis = timeoutMillis();
3697 >        // Use an "unreasonably long" long timeout to catch lingering threads
3698 >        long longTimeoutMillis = 1000 * 60 * 60 * 24;
3699 >        final Executor delayer, longDelayer;
3700 >        if (executor == null) {
3701 >            delayer = CompletableFuture.delayedExecutor(timeoutMillis, MILLISECONDS);
3702 >            longDelayer = CompletableFuture.delayedExecutor(longTimeoutMillis, MILLISECONDS);
3703 >        } else {
3704 >            delayer = CompletableFuture.delayedExecutor(timeoutMillis, MILLISECONDS, executor);
3705 >            longDelayer = CompletableFuture.delayedExecutor(longTimeoutMillis, MILLISECONDS, executor);
3706 >        }
3707 >        long startTime = System.nanoTime();
3708 >        CompletableFuture<Integer> f =
3709 >            CompletableFuture.supplyAsync(() -> v, delayer);
3710 >        CompletableFuture<Integer> g =
3711 >            CompletableFuture.supplyAsync(() -> v, longDelayer);
3712 >
3713 >        assertNull(g.getNow(null));
3714 >
3715 >        assertSame(v, f.get(LONG_DELAY_MS, MILLISECONDS));
3716 >        long millisElapsed = millisElapsedSince(startTime);
3717 >        assertTrue(millisElapsed >= timeoutMillis);
3718 >        assertTrue(millisElapsed < LONG_DELAY_MS / 2);
3719 >
3720 >        checkCompletedNormally(f, v);
3721 >
3722 >        checkIncomplete(g);
3723 >        assertTrue(g.cancel(true));
3724 >    }
3725 >
3726 >    //--- tests of implementation details; not part of official tck ---
3727 >
3728 >    Object resultOf(CompletableFuture<?> f) {
3729 >        SecurityManager sm = System.getSecurityManager();
3730 >        if (sm != null) {
3731 >            try {
3732 >                System.setSecurityManager(null);
3733 >            } catch (SecurityException giveUp) {
3734 >                return "Reflection not available";
3735 >            }
3736 >        }
3737 >
3738 >        try {
3739 >            java.lang.reflect.Field resultField
3740 >                = CompletableFuture.class.getDeclaredField("result");
3741 >            resultField.setAccessible(true);
3742 >            return resultField.get(f);
3743 >        } catch (Throwable t) {
3744 >            throw new AssertionError(t);
3745 >        } finally {
3746 >            if (sm != null) System.setSecurityManager(sm);
3747 >        }
3748 >    }
3749 >
3750 >    public void testExceptionPropagationReusesResultObject() {
3751 >        if (!testImplementationDetails) return;
3752          for (ExecutionMode m : ExecutionMode.values())
2796        for (Integer v1 : new Integer[] { 1, null })
3753      {
3754 <        final AtomicInteger a = new AtomicInteger(0);
3755 <        final CFException ex1 = new CFException();
3756 <        final CFException ex2 = new CFException();
2801 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3754 >        final CFException ex = new CFException();
3755 >        final CompletableFuture<Integer> v42 = CompletableFuture.completedFuture(42);
3756 >        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
3757  
3758 <        if (!createIncomplete) f.completeExceptionally(ex1);
3759 <        final CompletableFuture<Integer> g = m.whenComplete
2805 <            (f,
2806 <             (Integer x, Throwable t) -> {
2807 <                threadAssertSame(t, ex1);
2808 <                threadAssertNull(x);
2809 <                a.getAndIncrement();
2810 <                throw ex2;
2811 <            });
2812 <        if (createIncomplete) f.completeExceptionally(ex1);
3758 >        List<Function<CompletableFuture<Integer>, CompletableFuture<?>>> funs
3759 >            = new ArrayList<>();
3760  
3761 <        checkCompletedWithWrappedCFException(f, ex1);
3762 <        checkCompletedWithWrappedCFException(g, ex1);
3763 <        assertEquals(1, a.get());
3761 >        funs.add((y) -> m.thenRun(y, new Noop(m)));
3762 >        funs.add((y) -> m.thenAccept(y, new NoopConsumer(m)));
3763 >        funs.add((y) -> m.thenApply(y, new IncFunction(m)));
3764 >
3765 >        funs.add((y) -> m.runAfterEither(y, incomplete, new Noop(m)));
3766 >        funs.add((y) -> m.acceptEither(y, incomplete, new NoopConsumer(m)));
3767 >        funs.add((y) -> m.applyToEither(y, incomplete, new IncFunction(m)));
3768 >
3769 >        funs.add((y) -> m.runAfterBoth(y, v42, new Noop(m)));
3770 >        funs.add((y) -> m.runAfterBoth(v42, y, new Noop(m)));
3771 >        funs.add((y) -> m.thenAcceptBoth(y, v42, new SubtractAction(m)));
3772 >        funs.add((y) -> m.thenAcceptBoth(v42, y, new SubtractAction(m)));
3773 >        funs.add((y) -> m.thenCombine(y, v42, new SubtractFunction(m)));
3774 >        funs.add((y) -> m.thenCombine(v42, y, new SubtractFunction(m)));
3775 >
3776 >        funs.add((y) -> m.whenComplete(y, (Integer r, Throwable t) -> {}));
3777 >
3778 >        funs.add((y) -> m.thenCompose(y, new CompletableFutureInc(m)));
3779 >
3780 >        funs.add((y) -> CompletableFuture.allOf(new CompletableFuture<?>[] {y}));
3781 >        funs.add((y) -> CompletableFuture.allOf(new CompletableFuture<?>[] {y, v42}));
3782 >        funs.add((y) -> CompletableFuture.allOf(new CompletableFuture<?>[] {v42, y}));
3783 >        funs.add((y) -> CompletableFuture.anyOf(new CompletableFuture<?>[] {y}));
3784 >        funs.add((y) -> CompletableFuture.anyOf(new CompletableFuture<?>[] {y, incomplete}));
3785 >        funs.add((y) -> CompletableFuture.anyOf(new CompletableFuture<?>[] {incomplete, y}));
3786 >
3787 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3788 >                 fun : funs) {
3789 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3790 >            f.completeExceptionally(ex);
3791 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3792 >            checkCompletedWithWrappedException(src, ex);
3793 >            CompletableFuture<?> dep = fun.apply(src);
3794 >            checkCompletedWithWrappedException(dep, ex);
3795 >            assertSame(resultOf(src), resultOf(dep));
3796 >        }
3797 >
3798 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3799 >                 fun : funs) {
3800 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3801 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3802 >            CompletableFuture<?> dep = fun.apply(src);
3803 >            f.completeExceptionally(ex);
3804 >            checkCompletedWithWrappedException(src, ex);
3805 >            checkCompletedWithWrappedException(dep, ex);
3806 >            assertSame(resultOf(src), resultOf(dep));
3807 >        }
3808 >
3809 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3810 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3811 >                 fun : funs) {
3812 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3813 >            f.cancel(mayInterruptIfRunning);
3814 >            checkCancelled(f);
3815 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3816 >            checkCompletedWithWrappedCancellationException(src);
3817 >            CompletableFuture<?> dep = fun.apply(src);
3818 >            checkCompletedWithWrappedCancellationException(dep);
3819 >            assertSame(resultOf(src), resultOf(dep));
3820 >        }
3821 >
3822 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3823 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3824 >                 fun : funs) {
3825 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3826 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3827 >            CompletableFuture<?> dep = fun.apply(src);
3828 >            f.cancel(mayInterruptIfRunning);
3829 >            checkCancelled(f);
3830 >            checkCompletedWithWrappedCancellationException(src);
3831 >            checkCompletedWithWrappedCancellationException(dep);
3832 >            assertSame(resultOf(src), resultOf(dep));
3833 >        }
3834      }}
3835  
3836 +    /**
3837 +     * Minimal completion stages throw UOE for all non-CompletionStage methods
3838 +     */
3839 +    public void testMinimalCompletionStage_minimality() {
3840 +        if (!testImplementationDetails) return;
3841 +        Function<Method, String> toSignature =
3842 +            (method) -> method.getName() + Arrays.toString(method.getParameterTypes());
3843 +        Predicate<Method> isNotStatic =
3844 +            (method) -> (method.getModifiers() & Modifier.STATIC) == 0;
3845 +        List<Method> minimalMethods =
3846 +            Stream.of(Object.class, CompletionStage.class)
3847 +            .flatMap((klazz) -> Stream.of(klazz.getMethods()))
3848 +            .filter(isNotStatic)
3849 +            .collect(Collectors.toList());
3850 +        // Methods from CompletableFuture permitted NOT to throw UOE
3851 +        String[] signatureWhitelist = {
3852 +            "newIncompleteFuture[]",
3853 +            "defaultExecutor[]",
3854 +            "minimalCompletionStage[]",
3855 +            "copy[]",
3856 +        };
3857 +        Set<String> permittedMethodSignatures =
3858 +            Stream.concat(minimalMethods.stream().map(toSignature),
3859 +                          Stream.of(signatureWhitelist))
3860 +            .collect(Collectors.toSet());
3861 +        List<Method> allMethods = Stream.of(CompletableFuture.class.getMethods())
3862 +            .filter(isNotStatic)
3863 +            .filter((method) -> !permittedMethodSignatures.contains(toSignature.apply(method)))
3864 +            .collect(Collectors.toList());
3865 +
3866 +        CompletionStage<Integer> minimalStage =
3867 +            new CompletableFuture<Integer>().minimalCompletionStage();
3868 +
3869 +        List<Method> bugs = new ArrayList<>();
3870 +        for (Method method : allMethods) {
3871 +            Class<?>[] parameterTypes = method.getParameterTypes();
3872 +            Object[] args = new Object[parameterTypes.length];
3873 +            // Manufacture boxed primitives for primitive params
3874 +            for (int i = 0; i < args.length; i++) {
3875 +                Class<?> type = parameterTypes[i];
3876 +                if (parameterTypes[i] == boolean.class)
3877 +                    args[i] = false;
3878 +                else if (parameterTypes[i] == int.class)
3879 +                    args[i] = 0;
3880 +                else if (parameterTypes[i] == long.class)
3881 +                    args[i] = 0L;
3882 +            }
3883 +            try {
3884 +                method.invoke(minimalStage, args);
3885 +                bugs.add(method);
3886 +            }
3887 +            catch (java.lang.reflect.InvocationTargetException expected) {
3888 +                if (! (expected.getCause() instanceof UnsupportedOperationException)) {
3889 +                    bugs.add(method);
3890 +                    // expected.getCause().printStackTrace();
3891 +                }
3892 +            }
3893 +            catch (ReflectiveOperationException bad) { throw new Error(bad); }
3894 +        }
3895 +        if (!bugs.isEmpty())
3896 +            throw new Error("Methods did not throw UOE: " + bugs.toString());
3897 +    }
3898 +
3899 +    static class Monad {
3900 +        static class ZeroException extends RuntimeException {
3901 +            public ZeroException() { super("monadic zero"); }
3902 +        }
3903 +        // "return", "unit"
3904 +        static <T> CompletableFuture<T> unit(T value) {
3905 +            return completedFuture(value);
3906 +        }
3907 +        // monadic zero ?
3908 +        static <T> CompletableFuture<T> zero() {
3909 +            return failedFuture(new ZeroException());
3910 +        }
3911 +        // >=>
3912 +        static <T,U,V> Function<T, CompletableFuture<V>> compose
3913 +            (Function<T, CompletableFuture<U>> f,
3914 +             Function<U, CompletableFuture<V>> g) {
3915 +            return (x) -> f.apply(x).thenCompose(g);
3916 +        }
3917 +
3918 +        static void assertZero(CompletableFuture<?> f) {
3919 +            try {
3920 +                f.getNow(null);
3921 +                throw new AssertionFailedError("should throw");
3922 +            } catch (CompletionException success) {
3923 +                assertTrue(success.getCause() instanceof ZeroException);
3924 +            }
3925 +        }
3926 +
3927 +        static <T> void assertFutureEquals(CompletableFuture<T> f,
3928 +                                           CompletableFuture<T> g) {
3929 +            T fval = null, gval = null;
3930 +            Throwable fex = null, gex = null;
3931 +
3932 +            try { fval = f.get(); }
3933 +            catch (ExecutionException ex) { fex = ex.getCause(); }
3934 +            catch (Throwable ex) { fex = ex; }
3935 +
3936 +            try { gval = g.get(); }
3937 +            catch (ExecutionException ex) { gex = ex.getCause(); }
3938 +            catch (Throwable ex) { gex = ex; }
3939 +
3940 +            if (fex != null || gex != null)
3941 +                assertSame(fex.getClass(), gex.getClass());
3942 +            else
3943 +                assertEquals(fval, gval);
3944 +        }
3945 +
3946 +        static class PlusFuture<T> extends CompletableFuture<T> {
3947 +            AtomicReference<Throwable> firstFailure = new AtomicReference<>(null);
3948 +        }
3949 +
3950 +        /** Implements "monadic plus". */
3951 +        static <T> CompletableFuture<T> plus(CompletableFuture<? extends T> f,
3952 +                                             CompletableFuture<? extends T> g) {
3953 +            PlusFuture<T> plus = new PlusFuture<T>();
3954 +            BiConsumer<T, Throwable> action = (T result, Throwable ex) -> {
3955 +                try {
3956 +                    if (ex == null) {
3957 +                        if (plus.complete(result))
3958 +                            if (plus.firstFailure.get() != null)
3959 +                                plus.firstFailure.set(null);
3960 +                    }
3961 +                    else if (plus.firstFailure.compareAndSet(null, ex)) {
3962 +                        if (plus.isDone())
3963 +                            plus.firstFailure.set(null);
3964 +                    }
3965 +                    else {
3966 +                        // first failure has precedence
3967 +                        Throwable first = plus.firstFailure.getAndSet(null);
3968 +
3969 +                        // may fail with "Self-suppression not permitted"
3970 +                        try { first.addSuppressed(ex); }
3971 +                        catch (Exception ignored) {}
3972 +
3973 +                        plus.completeExceptionally(first);
3974 +                    }
3975 +                } catch (Throwable unexpected) {
3976 +                    plus.completeExceptionally(unexpected);
3977 +                }
3978 +            };
3979 +            f.whenComplete(action);
3980 +            g.whenComplete(action);
3981 +            return plus;
3982 +        }
3983 +    }
3984 +
3985 +    /**
3986 +     * CompletableFuture is an additive monad - sort of.
3987 +     * https://en.wikipedia.org/wiki/Monad_(functional_programming)#Additive_monads
3988 +     */
3989 +    public void testAdditiveMonad() throws Throwable {
3990 +        Function<Long, CompletableFuture<Long>> unit = Monad::unit;
3991 +        CompletableFuture<Long> zero = Monad.zero();
3992 +
3993 +        // Some mutually non-commutative functions
3994 +        Function<Long, CompletableFuture<Long>> triple
3995 +            = (x) -> Monad.unit(3 * x);
3996 +        Function<Long, CompletableFuture<Long>> inc
3997 +            = (x) -> Monad.unit(x + 1);
3998 +
3999 +        // unit is a right identity: m >>= unit === m
4000 +        Monad.assertFutureEquals(inc.apply(5L).thenCompose(unit),
4001 +                                 inc.apply(5L));
4002 +        // unit is a left identity: (unit x) >>= f === f x
4003 +        Monad.assertFutureEquals(unit.apply(5L).thenCompose(inc),
4004 +                                 inc.apply(5L));
4005 +
4006 +        // associativity: (m >>= f) >>= g === m >>= ( \x -> (f x >>= g) )
4007 +        Monad.assertFutureEquals(
4008 +            unit.apply(5L).thenCompose(inc).thenCompose(triple),
4009 +            unit.apply(5L).thenCompose((x) -> inc.apply(x).thenCompose(triple)));
4010 +
4011 +        // The case for CompletableFuture as an additive monad is weaker...
4012 +
4013 +        // zero is a monadic zero
4014 +        Monad.assertZero(zero);
4015 +
4016 +        // left zero: zero >>= f === zero
4017 +        Monad.assertZero(zero.thenCompose(inc));
4018 +        // right zero: f >>= (\x -> zero) === zero
4019 +        Monad.assertZero(inc.apply(5L).thenCompose((x) -> zero));
4020 +
4021 +        // f plus zero === f
4022 +        Monad.assertFutureEquals(Monad.unit(5L),
4023 +                                 Monad.plus(Monad.unit(5L), zero));
4024 +        // zero plus f === f
4025 +        Monad.assertFutureEquals(Monad.unit(5L),
4026 +                                 Monad.plus(zero, Monad.unit(5L)));
4027 +        // zero plus zero === zero
4028 +        Monad.assertZero(Monad.plus(zero, zero));
4029 +        {
4030 +            CompletableFuture<Long> f = Monad.plus(Monad.unit(5L),
4031 +                                                   Monad.unit(8L));
4032 +            // non-determinism
4033 +            assertTrue(f.get() == 5L || f.get() == 8L);
4034 +        }
4035 +
4036 +        CompletableFuture<Long> godot = new CompletableFuture<>();
4037 +        // f plus godot === f (doesn't wait for godot)
4038 +        Monad.assertFutureEquals(Monad.unit(5L),
4039 +                                 Monad.plus(Monad.unit(5L), godot));
4040 +        // godot plus f === f (doesn't wait for godot)
4041 +        Monad.assertFutureEquals(Monad.unit(5L),
4042 +                                 Monad.plus(godot, Monad.unit(5L)));
4043 +    }
4044 +
4045 +    /**
4046 +     * A single CompletableFuture with many dependents.
4047 +     * A demo of scalability - runtime is O(n).
4048 +     */
4049 +    public void testManyDependents() throws Throwable {
4050 +        final int n = 1_000;
4051 +        final CompletableFuture<Void> head = new CompletableFuture<>();
4052 +        final CompletableFuture<Void> complete = CompletableFuture.completedFuture((Void)null);
4053 +        final AtomicInteger count = new AtomicInteger(0);
4054 +        for (int i = 0; i < n; i++) {
4055 +            head.thenRun(() -> count.getAndIncrement());
4056 +            head.thenAccept((x) -> count.getAndIncrement());
4057 +            head.thenApply((x) -> count.getAndIncrement());
4058 +
4059 +            head.runAfterBoth(complete, () -> count.getAndIncrement());
4060 +            head.thenAcceptBoth(complete, (x, y) -> count.getAndIncrement());
4061 +            head.thenCombine(complete, (x, y) -> count.getAndIncrement());
4062 +            complete.runAfterBoth(head, () -> count.getAndIncrement());
4063 +            complete.thenAcceptBoth(head, (x, y) -> count.getAndIncrement());
4064 +            complete.thenCombine(head, (x, y) -> count.getAndIncrement());
4065 +
4066 +            head.runAfterEither(new CompletableFuture<Void>(), () -> count.getAndIncrement());
4067 +            head.acceptEither(new CompletableFuture<Void>(), (x) -> count.getAndIncrement());
4068 +            head.applyToEither(new CompletableFuture<Void>(), (x) -> count.getAndIncrement());
4069 +            new CompletableFuture<Void>().runAfterEither(head, () -> count.getAndIncrement());
4070 +            new CompletableFuture<Void>().acceptEither(head, (x) -> count.getAndIncrement());
4071 +            new CompletableFuture<Void>().applyToEither(head, (x) -> count.getAndIncrement());
4072 +        }
4073 +        head.complete(null);
4074 +        assertEquals(5 * 3 * n, count.get());
4075 +    }
4076 +
4077 + //     static <U> U join(CompletionStage<U> stage) {
4078 + //         CompletableFuture<U> f = new CompletableFuture<>();
4079 + //         stage.whenComplete((v, ex) -> {
4080 + //             if (ex != null) f.completeExceptionally(ex); else f.complete(v);
4081 + //         });
4082 + //         return f.join();
4083 + //     }
4084 +
4085 + //     static <U> boolean isDone(CompletionStage<U> stage) {
4086 + //         CompletableFuture<U> f = new CompletableFuture<>();
4087 + //         stage.whenComplete((v, ex) -> {
4088 + //             if (ex != null) f.completeExceptionally(ex); else f.complete(v);
4089 + //         });
4090 + //         return f.isDone();
4091 + //     }
4092 +
4093 + //     static <U> U join2(CompletionStage<U> stage) {
4094 + //         return stage.toCompletableFuture().copy().join();
4095 + //     }
4096 +
4097 + //     static <U> boolean isDone2(CompletionStage<U> stage) {
4098 + //         return stage.toCompletableFuture().copy().isDone();
4099 + //     }
4100 +
4101   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines