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.17 by jsr166, Thu Apr 4 04:16:02 2013 UTC vs.
Revision 1.64 by jsr166, Fri Jun 6 17:08:48 2014 UTC

# Line 16 | Line 16 | import java.util.concurrent.ExecutionExc
16   import java.util.concurrent.Future;
17   import java.util.concurrent.CompletableFuture;
18   import java.util.concurrent.CompletionException;
19 + import java.util.concurrent.CompletionStage;
20 + import java.util.concurrent.ForkJoinPool;
21 + import java.util.concurrent.ForkJoinTask;
22   import java.util.concurrent.TimeoutException;
23   import java.util.concurrent.atomic.AtomicInteger;
24   import static java.util.concurrent.TimeUnit.MILLISECONDS;
# Line 55 | Line 58 | public class CompletableFutureTest exten
58  
59      <T> void checkCompletedNormally(CompletableFuture<T> f, T value) {
60          try {
61 +            assertEquals(value, f.get(LONG_DELAY_MS, MILLISECONDS));
62 +        } catch (Throwable fail) { threadUnexpectedException(fail); }
63 +        try {
64              assertEquals(value, f.join());
65          } catch (Throwable fail) { threadUnexpectedException(fail); }
66          try {
# Line 63 | Line 69 | public class CompletableFutureTest exten
69          try {
70              assertEquals(value, f.get());
71          } catch (Throwable fail) { threadUnexpectedException(fail); }
66        try {
67            assertEquals(value, f.get(0L, SECONDS));
68        } catch (Throwable fail) { threadUnexpectedException(fail); }
72          assertTrue(f.isDone());
73          assertFalse(f.isCancelled());
74 +        assertFalse(f.isCompletedExceptionally());
75          assertTrue(f.toString().contains("[Completed normally]"));
76      }
77  
78      void checkCompletedWithWrappedCFException(CompletableFuture<?> f) {
79          try {
80 +            f.get(LONG_DELAY_MS, MILLISECONDS);
81 +            shouldThrow();
82 +        } catch (ExecutionException success) {
83 +            assertTrue(success.getCause() instanceof CFException);
84 +        } catch (Throwable fail) { threadUnexpectedException(fail); }
85 +        try {
86              f.join();
87              shouldThrow();
88          } catch (CompletionException success) {
# Line 90 | Line 100 | public class CompletableFutureTest exten
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 +    }
107 +
108 +    void checkCompletedWithWrappedCFException(CompletableFuture<?> f,
109 +                                              CFException ex) {
110          try {
111 <            f.get(0L, SECONDS);
111 >            f.get(LONG_DELAY_MS, MILLISECONDS);
112              shouldThrow();
113          } catch (ExecutionException success) {
114 <            assertTrue(success.getCause() instanceof CFException);
114 >            assertSame(ex, success.getCause());
115 >        } catch (Throwable fail) { threadUnexpectedException(fail); }
116 >        try {
117 >            f.join();
118 >            shouldThrow();
119 >        } catch (CompletionException success) {
120 >            assertSame(ex, success.getCause());
121 >        }
122 >        try {
123 >            f.getNow(null);
124 >            shouldThrow();
125 >        } catch (CompletionException success) {
126 >            assertSame(ex, success.getCause());
127 >        }
128 >        try {
129 >            f.get();
130 >            shouldThrow();
131 >        } catch (ExecutionException success) {
132 >            assertSame(ex, success.getCause());
133          } catch (Throwable fail) { threadUnexpectedException(fail); }
134          assertTrue(f.isDone());
135          assertFalse(f.isCancelled());
# Line 103 | Line 138 | public class CompletableFutureTest exten
138  
139      void checkCancelled(CompletableFuture<?> f) {
140          try {
141 +            f.get(LONG_DELAY_MS, MILLISECONDS);
142 +            shouldThrow();
143 +        } catch (CancellationException success) {
144 +        } catch (Throwable fail) { threadUnexpectedException(fail); }
145 +        try {
146              f.join();
147              shouldThrow();
148          } catch (CancellationException success) {}
# Line 115 | Line 155 | public class CompletableFutureTest exten
155              shouldThrow();
156          } catch (CancellationException success) {
157          } catch (Throwable fail) { threadUnexpectedException(fail); }
118        try {
119            f.get(0L, SECONDS);
120            shouldThrow();
121        } catch (CancellationException success) {
122        } 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      }
163  
164      void checkCompletedWithWrappedCancellationException(CompletableFuture<?> f) {
165          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) {
# Line 144 | Line 186 | public class CompletableFutureTest exten
186          } catch (ExecutionException success) {
187              assertTrue(success.getCause() instanceof CancellationException);
188          } catch (Throwable fail) { threadUnexpectedException(fail); }
147        try {
148            f.get(0L, SECONDS);
149            shouldThrow();
150        } catch (ExecutionException success) {
151            assertTrue(success.getCause() instanceof CancellationException);
152        } catch (Throwable fail) { threadUnexpectedException(fail); }
189          assertTrue(f.isDone());
190          assertFalse(f.isCancelled());
191 +        assertTrue(f.isCompletedExceptionally());
192          assertTrue(f.toString().contains("[Completed exceptionally]"));
193      }
194  
# Line 160 | Line 197 | public class CompletableFutureTest exten
197       * by methods isDone, isCancelled, and getNow
198       */
199      public void testConstructor() {
200 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
200 >        CompletableFuture<Integer> f = new CompletableFuture<>();
201          checkIncomplete(f);
202      }
203  
# Line 169 | Line 206 | public class CompletableFutureTest exten
206       * isCancelled, join, get, and getNow
207       */
208      public void testComplete() {
209 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
209 >        CompletableFuture<Integer> f = new CompletableFuture<>();
210          checkIncomplete(f);
211          f.complete(one);
212          checkCompletedNormally(f, one);
# Line 180 | Line 217 | public class CompletableFutureTest exten
217       * methods isDone, isCancelled, join, get, and getNow
218       */
219      public void testCompleteExceptionally() {
220 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
220 >        CompletableFuture<Integer> f = new CompletableFuture<>();
221          checkIncomplete(f);
222          f.completeExceptionally(new CFException());
223          checkCompletedWithWrappedCFException(f);
# Line 191 | Line 228 | public class CompletableFutureTest exten
228       * methods isDone, isCancelled, join, get, and getNow
229       */
230      public void testCancel() {
231 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
231 >        CompletableFuture<Integer> f = new CompletableFuture<>();
232          checkIncomplete(f);
233          assertTrue(f.cancel(true));
234          checkCancelled(f);
# Line 201 | Line 238 | public class CompletableFutureTest exten
238       * obtrudeValue forces completion with given value
239       */
240      public void testObtrudeValue() {
241 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
241 >        CompletableFuture<Integer> f = new CompletableFuture<>();
242          checkIncomplete(f);
243          f.complete(one);
244          checkCompletedNormally(f, one);
# Line 209 | Line 246 | public class CompletableFutureTest exten
246          checkCompletedNormally(f, three);
247          f.obtrudeValue(two);
248          checkCompletedNormally(f, two);
249 <        f = new CompletableFuture<Integer>();
249 >        f = new CompletableFuture<>();
250          f.obtrudeValue(three);
251          checkCompletedNormally(f, three);
252 <        f = new CompletableFuture<Integer>();
252 >        f.obtrudeValue(null);
253 >        checkCompletedNormally(f, null);
254 >        f = new CompletableFuture<>();
255          f.completeExceptionally(new CFException());
256          f.obtrudeValue(four);
257          checkCompletedNormally(f, four);
# Line 222 | Line 261 | public class CompletableFutureTest exten
261       * obtrudeException forces completion with given exception
262       */
263      public void testObtrudeException() {
264 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
264 >        CompletableFuture<Integer> f = new CompletableFuture<>();
265          checkIncomplete(f);
266          f.complete(one);
267          checkCompletedNormally(f, one);
268          f.obtrudeException(new CFException());
269          checkCompletedWithWrappedCFException(f);
270 <        f = new CompletableFuture<Integer>();
270 >        f = new CompletableFuture<>();
271          f.obtrudeException(new CFException());
272          checkCompletedWithWrappedCFException(f);
273 <        f = new CompletableFuture<Integer>();
273 >        f = new CompletableFuture<>();
274          f.completeExceptionally(new CFException());
275          f.obtrudeValue(four);
276          checkCompletedNormally(f, four);
# Line 243 | Line 282 | public class CompletableFutureTest exten
282       * getNumberOfDependents returns number of dependent tasks
283       */
284      public void testGetNumberOfDependents() {
285 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
286 <        assertEquals(f.getNumberOfDependents(), 0);
287 <        CompletableFuture g = f.thenRun(new Noop());
288 <        assertEquals(f.getNumberOfDependents(), 1);
289 <        assertEquals(g.getNumberOfDependents(), 0);
290 <        CompletableFuture h = f.thenRun(new Noop());
291 <        assertEquals(f.getNumberOfDependents(), 2);
285 >        CompletableFuture<Integer> f = new CompletableFuture<>();
286 >        assertEquals(0, f.getNumberOfDependents());
287 >        CompletableFuture g = f.thenRun(new Noop(ExecutionMode.DEFAULT));
288 >        assertEquals(1, f.getNumberOfDependents());
289 >        assertEquals(0, g.getNumberOfDependents());
290 >        CompletableFuture h = f.thenRun(new Noop(ExecutionMode.DEFAULT));
291 >        assertEquals(2, f.getNumberOfDependents());
292          f.complete(1);
293          checkCompletedNormally(g, null);
294 <        assertEquals(f.getNumberOfDependents(), 0);
295 <        assertEquals(g.getNumberOfDependents(), 0);
294 >        assertEquals(0, f.getNumberOfDependents());
295 >        assertEquals(0, g.getNumberOfDependents());
296      }
297  
259
298      /**
299       * toString indicates current completion state
300       */
# Line 282 | Line 320 | public class CompletableFutureTest exten
320          checkCompletedNormally(f, "test");
321      }
322  
323 <    static final Supplier<Integer> supplyOne =
324 <        () -> Integer.valueOf(1);
325 <    static final Function<Integer, Integer> inc =
326 <        (Integer x) -> Integer.valueOf(x.intValue() + 1);
327 <    static final BiFunction<Integer, Integer, Integer> add =
328 <        (Integer x, Integer y) -> Integer.valueOf(x.intValue() + y.intValue());
329 <    static final class IncAction implements Consumer<Integer> {
292 <        int value;
293 <        public void accept(Integer x) { value = x.intValue() + 1; }
294 <    }
295 <    static final class AddAction implements BiConsumer<Integer, Integer> {
296 <        int value;
297 <        public void accept(Integer x, Integer y) {
298 <            value = x.intValue() + y.intValue();
323 >    abstract class CheckedAction {
324 >        int invocationCount = 0;
325 >        final ExecutionMode m;
326 >        CheckedAction(ExecutionMode m) { this.m = m; }
327 >        void invoked() {
328 >            m.checkExecutionMode();
329 >            assertEquals(0, invocationCount++);
330          }
331 <    }
332 <    static final class Noop implements Runnable {
302 <        boolean ran;
303 <        public void run() { ran = true; }
304 <    }
305 <
306 <    static final class FailingSupplier implements Supplier<Integer> {
307 <        boolean ran;
308 <        public Integer get() { ran = true; throw new CFException(); }
309 <    }
310 <    static final class FailingConsumer implements Consumer<Integer> {
311 <        boolean ran;
312 <        public void accept(Integer x) { ran = true; throw new CFException(); }
313 <    }
314 <    static final class FailingBiConsumer implements BiConsumer<Integer, Integer> {
315 <        boolean ran;
316 <        public void accept(Integer x, Integer y) { ran = true; throw new CFException(); }
317 <    }
318 <    static final class FailingFunction implements Function<Integer, Integer> {
319 <        boolean ran;
320 <        public Integer apply(Integer x) { ran = true; throw new CFException(); }
321 <    }
322 <    static final class FailingBiFunction implements BiFunction<Integer, Integer, Integer> {
323 <        boolean ran;
324 <        public Integer apply(Integer x, Integer y) { ran = true; throw new CFException(); }
325 <    }
326 <    static final class FailingNoop implements Runnable {
327 <        boolean ran;
328 <        public void run() { ran = true; throw new CFException(); }
331 >        void assertNotInvoked() { assertEquals(0, invocationCount); }
332 >        void assertInvoked() { assertEquals(1, invocationCount); }
333      }
334  
335 <    static final class CompletableFutureInc implements Function<Integer, CompletableFuture<Integer>> {
336 <        public CompletableFuture<Integer> apply(Integer x) {
337 <            CompletableFuture<Integer> f = new CompletableFuture<Integer>();
338 <            f.complete(Integer.valueOf(x.intValue() + 1));
339 <            return f;
335 >    abstract class CheckedIntegerAction extends CheckedAction {
336 >        Integer value;
337 >        CheckedIntegerAction(ExecutionMode m) { super(m); }
338 >        void assertValue(Integer expected) {
339 >            assertInvoked();
340 >            assertEquals(expected, value);
341          }
342      }
343  
344 <    static final class FailingCompletableFutureFunction implements Function<Integer, CompletableFuture<Integer>> {
345 <        boolean ran;
346 <        public CompletableFuture<Integer> apply(Integer x) {
347 <            ran = true; throw new CFException();
344 >    class IntegerSupplier extends CheckedAction
345 >        implements Supplier<Integer>
346 >    {
347 >        final Integer value;
348 >        IntegerSupplier(ExecutionMode m, Integer value) {
349 >            super(m);
350 >            this.value = value;
351          }
352 <    }
353 <
354 <    // Used for explicit executor tests
347 <    static final class ThreadExecutor implements Executor {
348 <        AtomicInteger count = new AtomicInteger(0);
349 <
350 <        public void execute(Runnable r) {
351 <            count.getAndIncrement();
352 <            new Thread(r).start();
352 >        public Integer get() {
353 >            invoked();
354 >            return value;
355          }
356      }
357  
358 <    static final class ExceptionToInteger implements Function<Throwable, Integer> {
359 <        public Integer apply(Throwable x) { return Integer.valueOf(3); }
358 >    // A function that handles and produces null values as well.
359 >    static Integer inc(Integer x) {
360 >        return (x == null) ? null : x + 1;
361      }
362  
363 <    static final class IntegerHandler implements BiFunction<Integer, Throwable, Integer> {
364 <        boolean ran;
365 <        public Integer apply(Integer x, Throwable t) {
366 <            ran = true;
367 <            return (t == null) ? two : three;
363 >    class NoopConsumer extends CheckedIntegerAction
364 >        implements Consumer<Integer>
365 >    {
366 >        NoopConsumer(ExecutionMode m) { super(m); }
367 >        public void accept(Integer x) {
368 >            invoked();
369 >            value = x;
370          }
371      }
372  
373 <
374 <    /**
375 <     * exceptionally action completes with function value on source
376 <     * exception;  otherwise with source value
377 <     */
378 <    public void testExceptionally() {
379 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
380 <        ExceptionToInteger r = new ExceptionToInteger();
376 <        CompletableFuture<Integer> g = f.exceptionally(r);
377 <        f.completeExceptionally(new CFException());
378 <        checkCompletedNormally(g, three);
379 <
380 <        f = new CompletableFuture<Integer>();
381 <        r = new ExceptionToInteger();
382 <        g = f.exceptionally(r);
383 <        f.complete(one);
384 <        checkCompletedNormally(g, one);
385 <    }
386 <
387 <    /**
388 <     * handle action completes normally with function value on either
389 <     * normal or exceptional completion of source
390 <     */
391 <    public void testHandle() {
392 <        CompletableFuture<Integer> f, g;
393 <        IntegerHandler r;
394 <
395 <        f = new CompletableFuture<Integer>();
396 <        f.completeExceptionally(new CFException());
397 <        g = f.handle(r = new IntegerHandler());
398 <        assertTrue(r.ran);
399 <        checkCompletedNormally(g, three);
400 <
401 <        f = new CompletableFuture<Integer>();
402 <        g = f.handle(r = new IntegerHandler());
403 <        assertFalse(r.ran);
404 <        f.completeExceptionally(new CFException());
405 <        checkCompletedNormally(g, three);
406 <        assertTrue(r.ran);
407 <
408 <        f = new CompletableFuture<Integer>();
409 <        f.complete(one);
410 <        g = f.handle(r = new IntegerHandler());
411 <        assertTrue(r.ran);
412 <        checkCompletedNormally(g, two);
413 <
414 <        f = new CompletableFuture<Integer>();
415 <        g = f.handle(r = new IntegerHandler());
416 <        assertFalse(r.ran);
417 <        f.complete(one);
418 <        assertTrue(r.ran);
419 <        checkCompletedNormally(g, two);
420 <    }
421 <
422 <    /**
423 <     * runAsync completes after running Runnable
424 <     */
425 <    public void testRunAsync() {
426 <        Noop r = new Noop();
427 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r);
428 <        assertNull(f.join());
429 <        assertTrue(r.ran);
430 <        checkCompletedNormally(f, null);
431 <    }
432 <
433 <    /**
434 <     * runAsync with executor completes after running Runnable
435 <     */
436 <    public void testRunAsync2() {
437 <        Noop r = new Noop();
438 <        ThreadExecutor exec = new ThreadExecutor();
439 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r, exec);
440 <        assertNull(f.join());
441 <        assertTrue(r.ran);
442 <        checkCompletedNormally(f, null);
443 <        assertEquals(1, exec.count.get());
444 <    }
445 <
446 <    /**
447 <     * failing runAsync completes exceptionally after running Runnable
448 <     */
449 <    public void testRunAsync3() {
450 <        FailingNoop r = new FailingNoop();
451 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r);
452 <        checkCompletedWithWrappedCFException(f);
453 <        assertTrue(r.ran);
454 <    }
455 <
456 <    /**
457 <     * supplyAsync completes with result of supplier
458 <     */
459 <    public void testSupplyAsync() {
460 <        CompletableFuture<Integer> f;
461 <        f = CompletableFuture.supplyAsync(supplyOne);
462 <        assertEquals(f.join(), one);
463 <        checkCompletedNormally(f, one);
464 <    }
465 <
466 <    /**
467 <     * supplyAsync with executor completes with result of supplier
468 <     */
469 <    public void testSupplyAsync2() {
470 <        CompletableFuture<Integer> f;
471 <        f = CompletableFuture.supplyAsync(supplyOne, new ThreadExecutor());
472 <        assertEquals(f.join(), one);
473 <        checkCompletedNormally(f, one);
474 <    }
475 <
476 <    /**
477 <     * Failing supplyAsync completes exceptionally
478 <     */
479 <    public void testSupplyAsync3() {
480 <        FailingSupplier r = new FailingSupplier();
481 <        CompletableFuture<Integer> f = CompletableFuture.supplyAsync(r);
482 <        checkCompletedWithWrappedCFException(f);
483 <        assertTrue(r.ran);
484 <    }
485 <
486 <    // seq completion methods
487 <
488 <    /**
489 <     * thenRun result completes normally after normal completion of source
490 <     */
491 <    public void testThenRun() {
492 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
493 <        Noop r = new Noop();
494 <        CompletableFuture<Void> g = f.thenRun(r);
495 <        f.complete(null);
496 <        checkCompletedNormally(g, null);
497 <        // reordered version
498 <        f = new CompletableFuture<Integer>();
499 <        f.complete(null);
500 <        r = new Noop();
501 <        g = f.thenRun(r);
502 <        checkCompletedNormally(g, null);
503 <    }
504 <
505 <    /**
506 <     * thenRun result completes exceptionally after exceptional
507 <     * completion of source
508 <     */
509 <    public void testThenRun2() {
510 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
511 <        Noop r = new Noop();
512 <        CompletableFuture<Void> g = f.thenRun(r);
513 <        f.completeExceptionally(new CFException());
514 <        checkCompletedWithWrappedCFException(g);
515 <    }
516 <
517 <    /**
518 <     * thenRun result completes exceptionally if action does
519 <     */
520 <    public void testThenRun3() {
521 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
522 <        FailingNoop r = new FailingNoop();
523 <        CompletableFuture<Void> g = f.thenRun(r);
524 <        f.complete(null);
525 <        checkCompletedWithWrappedCFException(g);
526 <    }
527 <
528 <    /**
529 <     * thenRun result completes exceptionally if source cancelled
530 <     */
531 <    public void testThenRun4() {
532 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
533 <        Noop r = new Noop();
534 <        CompletableFuture<Void> g = f.thenRun(r);
535 <        assertTrue(f.cancel(true));
536 <        checkCompletedWithWrappedCancellationException(g);
537 <    }
538 <
539 <    /**
540 <     * thenApply result completes normally after normal completion of source
541 <     */
542 <    public void testThenApply() {
543 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
544 <        CompletableFuture<Integer> g = f.thenApply(inc);
545 <        f.complete(one);
546 <        checkCompletedNormally(g, two);
547 <    }
548 <
549 <    /**
550 <     * thenApply result completes exceptionally after exceptional
551 <     * completion of source
552 <     */
553 <    public void testThenApply2() {
554 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
555 <        CompletableFuture<Integer> g = f.thenApply(inc);
556 <        f.completeExceptionally(new CFException());
557 <        checkCompletedWithWrappedCFException(g);
373 >    class IncFunction extends CheckedIntegerAction
374 >        implements Function<Integer,Integer>
375 >    {
376 >        IncFunction(ExecutionMode m) { super(m); }
377 >        public Integer apply(Integer x) {
378 >            invoked();
379 >            return value = inc(x);
380 >        }
381      }
382  
383 <    /**
384 <     * thenApply result completes exceptionally if action does
385 <     */
386 <    public void testThenApply3() {
387 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
388 <        CompletableFuture<Integer> g = f.thenApply(new FailingFunction());
566 <        f.complete(one);
567 <        checkCompletedWithWrappedCFException(g);
383 >    // Choose non-commutative actions for better coverage
384 >    // A non-commutative function that handles and produces null values as well.
385 >    static Integer subtract(Integer x, Integer y) {
386 >        return (x == null && y == null) ? null :
387 >            ((x == null) ? 42 : x.intValue())
388 >            - ((y == null) ? 99 : y.intValue());
389      }
390  
391 <    /**
392 <     * thenApply result completes exceptionally if source cancelled
393 <     */
394 <    public void testThenApply4() {
395 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
396 <        CompletableFuture<Integer> g = f.thenApply(inc);
397 <        assertTrue(f.cancel(true));
398 <        checkCompletedWithWrappedCancellationException(g);
391 >    class SubtractAction extends CheckedIntegerAction
392 >        implements BiConsumer<Integer, Integer>
393 >    {
394 >        SubtractAction(ExecutionMode m) { super(m); }
395 >        public void accept(Integer x, Integer y) {
396 >            invoked();
397 >            value = subtract(x, y);
398 >        }
399      }
400  
401 <    /**
402 <     * thenAccept result completes normally after normal completion of source
403 <     */
404 <    public void testThenAccept() {
405 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
406 <        IncAction r = new IncAction();
407 <        CompletableFuture<Void> g = f.thenAccept(r);
408 <        f.complete(one);
588 <        checkCompletedNormally(g, null);
589 <        assertEquals(r.value, 2);
401 >    class SubtractFunction extends CheckedIntegerAction
402 >        implements BiFunction<Integer, Integer, Integer>
403 >    {
404 >        SubtractFunction(ExecutionMode m) { super(m); }
405 >        public Integer apply(Integer x, Integer y) {
406 >            invoked();
407 >            return value = subtract(x, y);
408 >        }
409      }
410  
411 <    /**
412 <     * thenAccept result completes exceptionally after exceptional
413 <     * completion of source
414 <     */
415 <    public void testThenAccept2() {
597 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
598 <        IncAction r = new IncAction();
599 <        CompletableFuture<Void> g = f.thenAccept(r);
600 <        f.completeExceptionally(new CFException());
601 <        checkCompletedWithWrappedCFException(g);
411 >    class Noop extends CheckedAction implements Runnable {
412 >        Noop(ExecutionMode m) { super(m); }
413 >        public void run() {
414 >            invoked();
415 >        }
416      }
417  
418 <    /**
419 <     * thenAccept result completes exceptionally if action does
420 <     */
421 <    public void testThenAccept3() {
422 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
423 <        FailingConsumer r = new FailingConsumer();
424 <        CompletableFuture<Void> g = f.thenAccept(r);
425 <        f.complete(one);
612 <        checkCompletedWithWrappedCFException(g);
613 <        assertTrue(r.ran);
418 >    class FailingSupplier extends CheckedAction
419 >        implements Supplier<Integer>
420 >    {
421 >        FailingSupplier(ExecutionMode m) { super(m); }
422 >        public Integer get() {
423 >            invoked();
424 >            throw new CFException();
425 >        }
426      }
427  
428 <    /**
429 <     * thenAccept result completes exceptionally if source cancelled
430 <     */
431 <    public void testThenAccept4() {
432 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
433 <        IncAction r = new IncAction();
434 <        CompletableFuture<Void> g = f.thenAccept(r);
435 <        assertTrue(f.cancel(true));
436 <        checkCompletedWithWrappedCancellationException(g);
428 >    class FailingConsumer extends CheckedIntegerAction
429 >        implements Consumer<Integer>
430 >    {
431 >        FailingConsumer(ExecutionMode m) { super(m); }
432 >        public void accept(Integer x) {
433 >            invoked();
434 >            value = x;
435 >            throw new CFException();
436 >        }
437      }
438  
439 <
440 <    /**
441 <     * thenCombine result completes normally after normal completion of sources
442 <     */
443 <    public void testThenCombine() {
444 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
445 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
446 <        CompletableFuture<Integer> g = f.thenCombine(f2, add);
447 <        f.complete(one);
636 <        checkIncomplete(g);
637 <        f2.complete(two);
638 <        checkCompletedNormally(g, three);
639 <
640 <        f = new CompletableFuture<Integer>();
641 <        f.complete(one);
642 <        f2 = new CompletableFuture<Integer>();
643 <        g = f.thenCombine(f2, add);
644 <        checkIncomplete(g);
645 <        f2.complete(two);
646 <        checkCompletedNormally(g, three);
439 >    class FailingBiConsumer extends CheckedIntegerAction
440 >        implements BiConsumer<Integer, Integer>
441 >    {
442 >        FailingBiConsumer(ExecutionMode m) { super(m); }
443 >        public void accept(Integer x, Integer y) {
444 >            invoked();
445 >            value = subtract(x, y);
446 >            throw new CFException();
447 >        }
448      }
449  
450 <    /**
451 <     * thenCombine result completes exceptionally after exceptional
452 <     * completion of either source
453 <     */
454 <    public void testThenCombine2() {
455 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
456 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
457 <        CompletableFuture<Integer> g = f.thenCombine(f2, add);
458 <        f.completeExceptionally(new CFException());
658 <        f2.complete(two);
659 <        checkCompletedWithWrappedCFException(g);
660 <
661 <        f = new CompletableFuture<Integer>();
662 <        f.complete(one);
663 <        f2 = new CompletableFuture<Integer>();
664 <        g = f.thenCombine(f2, add);
665 <        f2.completeExceptionally(new CFException());
666 <        checkCompletedWithWrappedCFException(g);
450 >    class FailingFunction extends CheckedIntegerAction
451 >        implements Function<Integer, Integer>
452 >    {
453 >        FailingFunction(ExecutionMode m) { super(m); }
454 >        public Integer apply(Integer x) {
455 >            invoked();
456 >            value = x;
457 >            throw new CFException();
458 >        }
459      }
460  
461 <    /**
462 <     * thenCombine result completes exceptionally if action does
463 <     */
464 <    public void testThenCombine3() {
465 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
466 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
467 <        FailingBiFunction r = new FailingBiFunction();
468 <        CompletableFuture<Integer> g = f.thenCombine(f2, r);
469 <        f.complete(one);
678 <        checkIncomplete(g);
679 <        f2.complete(two);
680 <        checkCompletedWithWrappedCFException(g);
461 >    class FailingBiFunction extends CheckedIntegerAction
462 >        implements BiFunction<Integer, Integer, Integer>
463 >    {
464 >        FailingBiFunction(ExecutionMode m) { super(m); }
465 >        public Integer apply(Integer x, Integer y) {
466 >            invoked();
467 >            value = subtract(x, y);
468 >            throw new CFException();
469 >        }
470      }
471  
472 <    /**
473 <     * thenCombine result completes exceptionally if either source cancelled
474 <     */
475 <    public void testThenCombine4() {
476 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
477 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
689 <        CompletableFuture<Integer> g = f.thenCombine(f2, add);
690 <        assertTrue(f.cancel(true));
691 <        f2.complete(two);
692 <        checkCompletedWithWrappedCancellationException(g);
693 <        f = new CompletableFuture<Integer>();
694 <        f2 = new CompletableFuture<Integer>();
695 <        g = f.thenCombine(f2, add);
696 <        f.complete(one);
697 <        assertTrue(f2.cancel(true));
698 <        checkCompletedWithWrappedCancellationException(g);
472 >    class FailingRunnable extends CheckedAction implements Runnable {
473 >        FailingRunnable(ExecutionMode m) { super(m); }
474 >        public void run() {
475 >            invoked();
476 >            throw new CFException();
477 >        }
478      }
479  
701    /**
702     * thenAcceptBoth result completes normally after normal
703     * completion of sources
704     */
705    public void testThenAcceptBoth() {
706        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
707        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
708        AddAction r = new AddAction();
709        CompletableFuture<Void> g = f.thenAcceptBoth(f2, r);
710        f.complete(one);
711        checkIncomplete(g);
712        f2.complete(two);
713        checkCompletedNormally(g, null);
714        assertEquals(r.value, 3);
480  
481 <        r = new AddAction();
482 <        f = new CompletableFuture<Integer>();
483 <        f.complete(one);
484 <        f2 = new CompletableFuture<Integer>();
485 <        g = f.thenAcceptBoth(f2, r);
486 <        checkIncomplete(g);
487 <        f2.complete(two);
488 <        checkCompletedNormally(g, null);
489 <        assertEquals(r.value, 3);
481 >    class CompletableFutureInc extends CheckedIntegerAction
482 >        implements Function<Integer, CompletableFuture<Integer>>
483 >    {
484 >        CompletableFutureInc(ExecutionMode m) { super(m); }
485 >        public CompletableFuture<Integer> apply(Integer x) {
486 >            invoked();
487 >            value = x;
488 >            CompletableFuture<Integer> f = new CompletableFuture<>();
489 >            f.complete(inc(x));
490 >            return f;
491 >        }
492      }
493  
494 <    /**
495 <     * thenAcceptBoth result completes exceptionally after exceptional
496 <     * completion of either source
497 <     */
498 <    public void testThenAcceptBoth2() {
499 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
500 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
501 <        AddAction r = new AddAction();
502 <        CompletableFuture<Void> g = f.thenAcceptBoth(f2, r);
736 <        f.completeExceptionally(new CFException());
737 <        f2.complete(two);
738 <        checkCompletedWithWrappedCFException(g);
739 <
740 <        r = new AddAction();
741 <        f = new CompletableFuture<Integer>();
742 <        f.complete(one);
743 <        f2 = new CompletableFuture<Integer>();
744 <        g = f.thenAcceptBoth(f2, r);
745 <        f2.completeExceptionally(new CFException());
746 <        checkCompletedWithWrappedCFException(g);
494 >    class FailingCompletableFutureFunction extends CheckedIntegerAction
495 >        implements Function<Integer, CompletableFuture<Integer>>
496 >    {
497 >        FailingCompletableFutureFunction(ExecutionMode m) { super(m); }
498 >        public CompletableFuture<Integer> apply(Integer x) {
499 >            invoked();
500 >            value = x;
501 >            throw new CFException();
502 >        }
503      }
504  
505 <    /**
506 <     * thenAcceptBoth result completes exceptionally if action does
507 <     */
508 <    public void testThenAcceptBoth3() {
509 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
510 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
511 <        FailingBiConsumer r = new FailingBiConsumer();
756 <        CompletableFuture<Void> g = f.thenAcceptBoth(f2, r);
757 <        f.complete(one);
758 <        checkIncomplete(g);
759 <        f2.complete(two);
760 <        checkCompletedWithWrappedCFException(g);
761 <    }
505 >    // Used for explicit executor tests
506 >    static final class ThreadExecutor implements Executor {
507 >        final AtomicInteger count = new AtomicInteger(0);
508 >        static final ThreadGroup tg = new ThreadGroup("ThreadExecutor");
509 >        static boolean startedCurrentThread() {
510 >            return Thread.currentThread().getThreadGroup() == tg;
511 >        }
512  
513 <    /**
514 <     * thenAcceptBoth result completes exceptionally if either source cancelled
515 <     */
516 <    public void testThenAcceptBoth4() {
767 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
768 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
769 <        AddAction r = new AddAction();
770 <        CompletableFuture<Void> g = f.thenAcceptBoth(f2, r);
771 <        assertTrue(f.cancel(true));
772 <        f2.complete(two);
773 <        checkCompletedWithWrappedCancellationException(g);
774 <        f = new CompletableFuture<Integer>();
775 <        f2 = new CompletableFuture<Integer>();
776 <        r = new AddAction();
777 <        g = f.thenAcceptBoth(f2, r);
778 <        f.complete(one);
779 <        assertTrue(f2.cancel(true));
780 <        checkCompletedWithWrappedCancellationException(g);
513 >        public void execute(Runnable r) {
514 >            count.getAndIncrement();
515 >            new Thread(tg, r).start();
516 >        }
517      }
518  
519      /**
520 <     * runAfterBoth result completes normally after normal
521 <     * completion of sources
520 >     * Permits the testing of parallel code for the 3 different
521 >     * execution modes without copy/pasting all the test methods.
522       */
523 <    public void testRunAfterBoth() {
524 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
525 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
526 <        Noop r = new Noop();
527 <        CompletableFuture<Void> g = f.runAfterBoth(f2, r);
528 <        f.complete(one);
529 <        checkIncomplete(g);
530 <        f2.complete(two);
531 <        checkCompletedNormally(g, null);
532 <        assertTrue(r.ran);
533 <
534 <        r = new Noop();
535 <        f = new CompletableFuture<Integer>();
536 <        f.complete(one);
537 <        f2 = new CompletableFuture<Integer>();
538 <        g = f.runAfterBoth(f2, r);
539 <        checkIncomplete(g);
540 <        f2.complete(two);
541 <        checkCompletedNormally(g, null);
542 <        assertTrue(r.ran);
543 <    }
523 >    enum ExecutionMode {
524 >        DEFAULT {
525 >            public void checkExecutionMode() {
526 >                assertFalse(ThreadExecutor.startedCurrentThread());
527 >                assertNull(ForkJoinTask.getPool());
528 >            }
529 >            public CompletableFuture<Void> runAsync(Runnable a) {
530 >                throw new UnsupportedOperationException();
531 >            }
532 >            public <U> CompletableFuture<U> supplyAsync(Supplier<U> a) {
533 >                throw new UnsupportedOperationException();
534 >            }
535 >            public <T> CompletableFuture<Void> thenRun
536 >                (CompletableFuture<T> f, Runnable a) {
537 >                return f.thenRun(a);
538 >            }
539 >            public <T> CompletableFuture<Void> thenAccept
540 >                (CompletableFuture<T> f, Consumer<? super T> a) {
541 >                return f.thenAccept(a);
542 >            }
543 >            public <T,U> CompletableFuture<U> thenApply
544 >                (CompletableFuture<T> f, Function<? super T,U> a) {
545 >                return f.thenApply(a);
546 >            }
547 >            public <T,U> CompletableFuture<U> thenCompose
548 >                (CompletableFuture<T> f,
549 >                 Function<? super T,? extends CompletionStage<U>> a) {
550 >                return f.thenCompose(a);
551 >            }
552 >            public <T,U> CompletableFuture<U> handle
553 >                (CompletableFuture<T> f,
554 >                 BiFunction<? super T,Throwable,? extends U> a) {
555 >                return f.handle(a);
556 >            }
557 >            public <T> CompletableFuture<T> whenComplete
558 >                (CompletableFuture<T> f,
559 >                 BiConsumer<? super T,? super Throwable> a) {
560 >                return f.whenComplete(a);
561 >            }
562 >            public <T,U> CompletableFuture<Void> runAfterBoth
563 >                (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
564 >                return f.runAfterBoth(g, a);
565 >            }
566 >            public <T,U> CompletableFuture<Void> thenAcceptBoth
567 >                (CompletableFuture<T> f,
568 >                 CompletionStage<? extends U> g,
569 >                 BiConsumer<? super T,? super U> a) {
570 >                return f.thenAcceptBoth(g, a);
571 >            }
572 >            public <T,U,V> CompletableFuture<V> thenCombine
573 >                (CompletableFuture<T> f,
574 >                 CompletionStage<? extends U> g,
575 >                 BiFunction<? super T,? super U,? extends V> a) {
576 >                return f.thenCombine(g, a);
577 >            }
578 >            public <T> CompletableFuture<Void> runAfterEither
579 >                (CompletableFuture<T> f,
580 >                 CompletionStage<?> g,
581 >                 java.lang.Runnable a) {
582 >                return f.runAfterEither(g, a);
583 >            }
584 >            public <T> CompletableFuture<Void> acceptEither
585 >                (CompletableFuture<T> f,
586 >                 CompletionStage<? extends T> g,
587 >                 Consumer<? super T> a) {
588 >                return f.acceptEither(g, a);
589 >            }
590 >            public <T,U> CompletableFuture<U> applyToEither
591 >                (CompletableFuture<T> f,
592 >                 CompletionStage<? extends T> g,
593 >                 Function<? super T,U> a) {
594 >                return f.applyToEither(g, a);
595 >            }
596 >        },
597  
598 <    /**
599 <     * runAfterBoth result completes exceptionally after exceptional
600 <     * completion of either source
601 <     */
602 <    public void testRunAfterBoth2() {
603 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
604 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
605 <        Noop r = new Noop();
606 <        CompletableFuture<Void> g = f.runAfterBoth(f2, r);
607 <        f.completeExceptionally(new CFException());
608 <        f2.complete(two);
609 <        checkCompletedWithWrappedCFException(g);
598 >        ASYNC {
599 >            public void checkExecutionMode() {
600 >                assertSame(ForkJoinPool.commonPool(),
601 >                           ForkJoinTask.getPool());
602 >            }
603 >            public CompletableFuture<Void> runAsync(Runnable a) {
604 >                return CompletableFuture.runAsync(a);
605 >            }
606 >            public <U> CompletableFuture<U> supplyAsync(Supplier<U> a) {
607 >                return CompletableFuture.supplyAsync(a);
608 >            }
609 >            public <T> CompletableFuture<Void> thenRun
610 >                (CompletableFuture<T> f, Runnable a) {
611 >                return f.thenRunAsync(a);
612 >            }
613 >            public <T> CompletableFuture<Void> thenAccept
614 >                (CompletableFuture<T> f, Consumer<? super T> a) {
615 >                return f.thenAcceptAsync(a);
616 >            }
617 >            public <T,U> CompletableFuture<U> thenApply
618 >                (CompletableFuture<T> f, Function<? super T,U> a) {
619 >                return f.thenApplyAsync(a);
620 >            }
621 >            public <T,U> CompletableFuture<U> thenCompose
622 >                (CompletableFuture<T> f,
623 >                 Function<? super T,? extends CompletionStage<U>> a) {
624 >                return f.thenComposeAsync(a);
625 >            }
626 >            public <T,U> CompletableFuture<U> handle
627 >                (CompletableFuture<T> f,
628 >                 BiFunction<? super T,Throwable,? extends U> a) {
629 >                return f.handleAsync(a);
630 >            }
631 >            public <T> CompletableFuture<T> whenComplete
632 >                (CompletableFuture<T> f,
633 >                 BiConsumer<? super T,? super Throwable> a) {
634 >                return f.whenCompleteAsync(a);
635 >            }
636 >            public <T,U> CompletableFuture<Void> runAfterBoth
637 >                (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
638 >                return f.runAfterBothAsync(g, a);
639 >            }
640 >            public <T,U> CompletableFuture<Void> thenAcceptBoth
641 >                (CompletableFuture<T> f,
642 >                 CompletionStage<? extends U> g,
643 >                 BiConsumer<? super T,? super U> a) {
644 >                return f.thenAcceptBothAsync(g, a);
645 >            }
646 >            public <T,U,V> CompletableFuture<V> thenCombine
647 >                (CompletableFuture<T> f,
648 >                 CompletionStage<? extends U> g,
649 >                 BiFunction<? super T,? super U,? extends V> a) {
650 >                return f.thenCombineAsync(g, a);
651 >            }
652 >            public <T> CompletableFuture<Void> runAfterEither
653 >                (CompletableFuture<T> f,
654 >                 CompletionStage<?> g,
655 >                 java.lang.Runnable a) {
656 >                return f.runAfterEitherAsync(g, a);
657 >            }
658 >            public <T> CompletableFuture<Void> acceptEither
659 >                (CompletableFuture<T> f,
660 >                 CompletionStage<? extends T> g,
661 >                 Consumer<? super T> a) {
662 >                return f.acceptEitherAsync(g, a);
663 >            }
664 >            public <T,U> CompletableFuture<U> applyToEither
665 >                (CompletableFuture<T> f,
666 >                 CompletionStage<? extends T> g,
667 >                 Function<? super T,U> a) {
668 >                return f.applyToEitherAsync(g, a);
669 >            }
670 >        },
671  
672 <        r = new Noop();
673 <        f = new CompletableFuture<Integer>();
674 <        f.complete(one);
675 <        f2 = new CompletableFuture<Integer>();
676 <        g = f.runAfterBoth(f2, r);
677 <        f2.completeExceptionally(new CFException());
678 <        checkCompletedWithWrappedCFException(g);
679 <    }
672 >        EXECUTOR {
673 >            public void checkExecutionMode() {
674 >                assertTrue(ThreadExecutor.startedCurrentThread());
675 >            }
676 >            public CompletableFuture<Void> runAsync(Runnable a) {
677 >                return CompletableFuture.runAsync(a, new ThreadExecutor());
678 >            }
679 >            public <U> CompletableFuture<U> supplyAsync(Supplier<U> a) {
680 >                return CompletableFuture.supplyAsync(a, new ThreadExecutor());
681 >            }
682 >            public <T> CompletableFuture<Void> thenRun
683 >                (CompletableFuture<T> f, Runnable a) {
684 >                return f.thenRunAsync(a, new ThreadExecutor());
685 >            }
686 >            public <T> CompletableFuture<Void> thenAccept
687 >                (CompletableFuture<T> f, Consumer<? super T> a) {
688 >                return f.thenAcceptAsync(a, new ThreadExecutor());
689 >            }
690 >            public <T,U> CompletableFuture<U> thenApply
691 >                (CompletableFuture<T> f, Function<? super T,U> a) {
692 >                return f.thenApplyAsync(a, new ThreadExecutor());
693 >            }
694 >            public <T,U> CompletableFuture<U> thenCompose
695 >                (CompletableFuture<T> f,
696 >                 Function<? super T,? extends CompletionStage<U>> a) {
697 >                return f.thenComposeAsync(a, new ThreadExecutor());
698 >            }
699 >            public <T,U> CompletableFuture<U> handle
700 >                (CompletableFuture<T> f,
701 >                 BiFunction<? super T,Throwable,? extends U> a) {
702 >                return f.handleAsync(a, new ThreadExecutor());
703 >            }
704 >            public <T> CompletableFuture<T> whenComplete
705 >                (CompletableFuture<T> f,
706 >                 BiConsumer<? super T,? super Throwable> a) {
707 >                return f.whenCompleteAsync(a, new ThreadExecutor());
708 >            }
709 >            public <T,U> CompletableFuture<Void> runAfterBoth
710 >                (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
711 >                return f.runAfterBothAsync(g, a, new ThreadExecutor());
712 >            }
713 >            public <T,U> CompletableFuture<Void> thenAcceptBoth
714 >                (CompletableFuture<T> f,
715 >                 CompletionStage<? extends U> g,
716 >                 BiConsumer<? super T,? super U> a) {
717 >                return f.thenAcceptBothAsync(g, a, new ThreadExecutor());
718 >            }
719 >            public <T,U,V> CompletableFuture<V> thenCombine
720 >                (CompletableFuture<T> f,
721 >                 CompletionStage<? extends U> g,
722 >                 BiFunction<? super T,? super U,? extends V> a) {
723 >                return f.thenCombineAsync(g, a, new ThreadExecutor());
724 >            }
725 >            public <T> CompletableFuture<Void> runAfterEither
726 >                (CompletableFuture<T> f,
727 >                 CompletionStage<?> g,
728 >                 java.lang.Runnable a) {
729 >                return f.runAfterEitherAsync(g, a, new ThreadExecutor());
730 >            }
731 >            public <T> CompletableFuture<Void> acceptEither
732 >                (CompletableFuture<T> f,
733 >                 CompletionStage<? extends T> g,
734 >                 Consumer<? super T> a) {
735 >                return f.acceptEitherAsync(g, a, new ThreadExecutor());
736 >            }
737 >            public <T,U> CompletableFuture<U> applyToEither
738 >                (CompletableFuture<T> f,
739 >                 CompletionStage<? extends T> g,
740 >                 Function<? super T,U> a) {
741 >                return f.applyToEitherAsync(g, a, new ThreadExecutor());
742 >            }
743 >        };
744  
745 <    /**
746 <     * runAfterBoth result completes exceptionally if action does
747 <     */
748 <    public void testRunAfterBoth3() {
749 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
750 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
751 <        FailingNoop r = new FailingNoop();
752 <        CompletableFuture<Void> g = f.runAfterBoth(f2, r);
753 <        f.complete(one);
754 <        checkIncomplete(g);
755 <        f2.complete(two);
756 <        checkCompletedWithWrappedCFException(g);
757 <    }
745 >        public abstract void checkExecutionMode();
746 >        public abstract CompletableFuture<Void> runAsync(Runnable a);
747 >        public abstract <U> CompletableFuture<U> supplyAsync(Supplier<U> a);
748 >        public abstract <T> CompletableFuture<Void> thenRun
749 >            (CompletableFuture<T> f, Runnable a);
750 >        public abstract <T> CompletableFuture<Void> thenAccept
751 >            (CompletableFuture<T> f, Consumer<? super T> a);
752 >        public abstract <T,U> CompletableFuture<U> thenApply
753 >            (CompletableFuture<T> f, Function<? super T,U> a);
754 >        public abstract <T,U> CompletableFuture<U> thenCompose
755 >            (CompletableFuture<T> f,
756 >             Function<? super T,? extends CompletionStage<U>> a);
757 >        public abstract <T,U> CompletableFuture<U> handle
758 >            (CompletableFuture<T> f,
759 >             BiFunction<? super T,Throwable,? extends U> a);
760 >        public abstract <T> CompletableFuture<T> whenComplete
761 >            (CompletableFuture<T> f,
762 >             BiConsumer<? super T,? super Throwable> a);
763 >        public abstract <T,U> CompletableFuture<Void> runAfterBoth
764 >            (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a);
765 >        public abstract <T,U> CompletableFuture<Void> thenAcceptBoth
766 >            (CompletableFuture<T> f,
767 >             CompletionStage<? extends U> g,
768 >             BiConsumer<? super T,? super U> a);
769 >        public abstract <T,U,V> CompletableFuture<V> thenCombine
770 >            (CompletableFuture<T> f,
771 >             CompletionStage<? extends U> g,
772 >             BiFunction<? super T,? super U,? extends V> a);
773 >        public abstract <T> CompletableFuture<Void> runAfterEither
774 >            (CompletableFuture<T> f,
775 >             CompletionStage<?> g,
776 >             java.lang.Runnable a);
777 >        public abstract <T> CompletableFuture<Void> acceptEither
778 >            (CompletableFuture<T> f,
779 >             CompletionStage<? extends T> g,
780 >             Consumer<? super T> a);
781 >        public abstract <T,U> CompletableFuture<U> applyToEither
782 >            (CompletableFuture<T> f,
783 >             CompletionStage<? extends T> g,
784 >             Function<? super T,U> a);
785 >    }
786 >
787 >    /**
788 >     * exceptionally action is not invoked when source completes
789 >     * normally, and source result is propagated
790 >     */
791 >    public void testExceptionally_normalCompletion() {
792 >        for (boolean createIncomplete : new boolean[] { true, false })
793 >        for (Integer v1 : new Integer[] { 1, null })
794 >    {
795 >        final AtomicInteger a = new AtomicInteger(0);
796 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
797 >        if (!createIncomplete) f.complete(v1);
798 >        final CompletableFuture<Integer> g = f.exceptionally
799 >            ((Throwable t) -> {
800 >                // Should not be called
801 >                a.getAndIncrement();
802 >                throw new AssertionError();
803 >            });
804 >        if (createIncomplete) f.complete(v1);
805 >
806 >        checkCompletedNormally(g, v1);
807 >        checkCompletedNormally(f, v1);
808 >        assertEquals(0, a.get());
809 >    }}
810  
845    /**
846     * runAfterBoth result completes exceptionally if either source cancelled
847     */
848    public void testRunAfterBoth4() {
849        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
850        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
851        Noop r = new Noop();
852        CompletableFuture<Void> g = f.runAfterBoth(f2, r);
853        assertTrue(f.cancel(true));
854        f2.complete(two);
855        checkCompletedWithWrappedCancellationException(g);
856        f = new CompletableFuture<Integer>();
857        f2 = new CompletableFuture<Integer>();
858        r = new Noop();
859        g = f.runAfterBoth(f2, r);
860        f.complete(one);
861        assertTrue(f2.cancel(true));
862        checkCompletedWithWrappedCancellationException(g);
863    }
811  
812      /**
813 <     * applyToEither result completes normally after normal completion
814 <     * of either source
813 >     * exceptionally action completes with function value on source
814 >     * exception
815       */
816 <    public void testApplyToEither() {
817 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
818 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
819 <        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
820 <        f.complete(one);
821 <        checkCompletedNormally(g, two);
822 <        f2.complete(one);
823 <        checkCompletedNormally(g, two);
824 <
825 <        f = new CompletableFuture<Integer>();
826 <        f.complete(one);
827 <        f2 = new CompletableFuture<Integer>();
828 <        g = f.applyToEither(f2, inc);
829 <        checkCompletedNormally(g, two);
830 <    }
816 >    public void testExceptionally_exceptionalCompletion() {
817 >        for (boolean createIncomplete : new boolean[] { true, false })
818 >        for (Integer v1 : new Integer[] { 1, null })
819 >    {
820 >        final AtomicInteger a = new AtomicInteger(0);
821 >        final CFException ex = new CFException();
822 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
823 >        if (!createIncomplete) f.completeExceptionally(ex);
824 >        final CompletableFuture<Integer> g = f.exceptionally
825 >            ((Throwable t) -> {
826 >                ExecutionMode.DEFAULT.checkExecutionMode();
827 >                threadAssertSame(t, ex);
828 >                a.getAndIncrement();
829 >                return v1;
830 >            });
831 >        if (createIncomplete) f.completeExceptionally(ex);
832 >
833 >        checkCompletedNormally(g, v1);
834 >        assertEquals(1, a.get());
835 >    }}
836 >
837 >    public void testExceptionally_exceptionalCompletionActionFailed() {
838 >        for (boolean createIncomplete : new boolean[] { true, false })
839 >        for (Integer v1 : new Integer[] { 1, null })
840 >    {
841 >        final AtomicInteger a = new AtomicInteger(0);
842 >        final CFException ex1 = new CFException();
843 >        final CFException ex2 = new CFException();
844 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
845 >        if (!createIncomplete) f.completeExceptionally(ex1);
846 >        final CompletableFuture<Integer> g = f.exceptionally
847 >            ((Throwable t) -> {
848 >                ExecutionMode.DEFAULT.checkExecutionMode();
849 >                threadAssertSame(t, ex1);
850 >                a.getAndIncrement();
851 >                throw ex2;
852 >            });
853 >        if (createIncomplete) f.completeExceptionally(ex1);
854 >
855 >        checkCompletedWithWrappedCFException(g, ex2);
856 >        assertEquals(1, a.get());
857 >    }}
858 >
859 >    /**
860 >     * handle action completes normally with function value on normal
861 >     * completion of source
862 >     */
863 >    public void testHandle_normalCompletion() {
864 >        for (ExecutionMode m : ExecutionMode.values())
865 >        for (boolean createIncomplete : new boolean[] { true, false })
866 >        for (Integer v1 : new Integer[] { 1, null })
867 >    {
868 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
869 >        final AtomicInteger a = new AtomicInteger(0);
870 >        if (!createIncomplete) f.complete(v1);
871 >        final CompletableFuture<Integer> g = m.handle
872 >            (f,
873 >             (Integer x, Throwable t) -> {
874 >                m.checkExecutionMode();
875 >                threadAssertSame(x, v1);
876 >                threadAssertNull(t);
877 >                a.getAndIncrement();
878 >                return inc(v1);
879 >            });
880 >        if (createIncomplete) f.complete(v1);
881 >
882 >        checkCompletedNormally(g, inc(v1));
883 >        checkCompletedNormally(f, v1);
884 >        assertEquals(1, a.get());
885 >    }}
886  
887      /**
888 <     * applyToEither result completes exceptionally after exceptional
889 <     * completion of either source
888 >     * handle action completes normally with function value on
889 >     * exceptional completion of source
890       */
891 <    public void testApplyToEither2() {
892 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
893 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
894 <        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
895 <        f.completeExceptionally(new CFException());
896 <        f2.complete(one);
897 <        checkCompletedWithWrappedCFException(g);
898 <
899 <        f = new CompletableFuture<Integer>();
900 <        f2 = new CompletableFuture<Integer>();
901 <        f2.completeExceptionally(new CFException());
902 <        g = f.applyToEither(f2, inc);
903 <        checkCompletedWithWrappedCFException(g);
904 <    }
891 >    public void testHandle_exceptionalCompletion() {
892 >        for (ExecutionMode m : ExecutionMode.values())
893 >        for (boolean createIncomplete : new boolean[] { true, false })
894 >        for (Integer v1 : new Integer[] { 1, null })
895 >    {
896 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
897 >        final AtomicInteger a = new AtomicInteger(0);
898 >        final CFException ex = new CFException();
899 >        if (!createIncomplete) f.completeExceptionally(ex);
900 >        final CompletableFuture<Integer> g = m.handle
901 >            (f,
902 >             (Integer x, Throwable t) -> {
903 >                m.checkExecutionMode();
904 >                threadAssertNull(x);
905 >                threadAssertSame(t, ex);
906 >                a.getAndIncrement();
907 >                return v1;
908 >            });
909 >        if (createIncomplete) f.completeExceptionally(ex);
910 >
911 >        checkCompletedNormally(g, v1);
912 >        checkCompletedWithWrappedCFException(f, ex);
913 >        assertEquals(1, a.get());
914 >    }}
915 >
916 >    /**
917 >     * handle action completes normally with function value on
918 >     * cancelled source
919 >     */
920 >    public void testHandle_sourceCancelled() {
921 >        for (ExecutionMode m : ExecutionMode.values())
922 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
923 >        for (boolean createIncomplete : new boolean[] { true, false })
924 >        for (Integer v1 : new Integer[] { 1, null })
925 >    {
926 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
927 >        final AtomicInteger a = new AtomicInteger(0);
928 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
929 >        final CompletableFuture<Integer> g = m.handle
930 >            (f,
931 >             (Integer x, Throwable t) -> {
932 >                m.checkExecutionMode();
933 >                threadAssertNull(x);
934 >                threadAssertTrue(t instanceof CancellationException);
935 >                a.getAndIncrement();
936 >                return v1;
937 >            });
938 >        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
939  
940 <    /**
941 <     * applyToEither result completes exceptionally if action does
942 <     */
943 <    public void testApplyToEither3() {
908 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
909 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
910 <        FailingFunction r = new FailingFunction();
911 <        CompletableFuture<Integer> g = f.applyToEither(f2, r);
912 <        f2.complete(two);
913 <        checkCompletedWithWrappedCFException(g);
914 <    }
940 >        checkCompletedNormally(g, v1);
941 >        checkCancelled(f);
942 >        assertEquals(1, a.get());
943 >    }}
944  
945      /**
946 <     * applyToEither result completes exceptionally if either source cancelled
946 >     * handle result completes exceptionally if action does
947       */
948 <    public void testApplyToEither4() {
949 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
950 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
951 <        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
952 <        assertTrue(f.cancel(true));
953 <        checkCompletedWithWrappedCancellationException(g);
954 <        f = new CompletableFuture<Integer>();
955 <        f2 = new CompletableFuture<Integer>();
956 <        assertTrue(f2.cancel(true));
957 <        checkCompletedWithWrappedCancellationException(g);
958 <    }
948 >    public void testHandle_sourceFailedActionFailed() {
949 >        for (ExecutionMode m : ExecutionMode.values())
950 >        for (boolean createIncomplete : new boolean[] { true, false })
951 >    {
952 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
953 >        final AtomicInteger a = new AtomicInteger(0);
954 >        final CFException ex1 = new CFException();
955 >        final CFException ex2 = new CFException();
956 >        if (!createIncomplete) f.completeExceptionally(ex1);
957 >        final CompletableFuture<Integer> g = m.handle
958 >            (f,
959 >             (Integer x, Throwable t) -> {
960 >                m.checkExecutionMode();
961 >                threadAssertNull(x);
962 >                threadAssertSame(ex1, t);
963 >                a.getAndIncrement();
964 >                throw ex2;
965 >            });
966 >        if (createIncomplete) f.completeExceptionally(ex1);
967 >
968 >        checkCompletedWithWrappedCFException(g, ex2);
969 >        checkCompletedWithWrappedCFException(f, ex1);
970 >        assertEquals(1, a.get());
971 >    }}
972 >
973 >    public void testHandle_sourceCompletedNormallyActionFailed() {
974 >        for (ExecutionMode m : ExecutionMode.values())
975 >        for (boolean createIncomplete : new boolean[] { true, false })
976 >        for (Integer v1 : new Integer[] { 1, null })
977 >    {
978 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
979 >        final AtomicInteger a = new AtomicInteger(0);
980 >        final CFException ex = new CFException();
981 >        if (!createIncomplete) f.complete(v1);
982 >        final CompletableFuture<Integer> g = m.handle
983 >            (f,
984 >             (Integer x, Throwable t) -> {
985 >                m.checkExecutionMode();
986 >                threadAssertSame(x, v1);
987 >                threadAssertNull(t);
988 >                a.getAndIncrement();
989 >                throw ex;
990 >            });
991 >        if (createIncomplete) f.complete(v1);
992 >
993 >        checkCompletedWithWrappedCFException(g, ex);
994 >        checkCompletedNormally(f, v1);
995 >        assertEquals(1, a.get());
996 >    }}
997  
998      /**
999 <     * acceptEither result completes normally after normal completion
933 <     * of either source
999 >     * runAsync completes after running Runnable
1000       */
1001 <    public void testAcceptEither() {
1002 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1003 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1004 <        IncAction r = new IncAction();
1005 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
1006 <        f.complete(one);
1007 <        checkCompletedNormally(g, null);
1008 <        f2.complete(one);
1009 <        checkCompletedNormally(g, null);
1010 <        assertEquals(r.value, 2);
1011 <
1012 <        r = new IncAction();
1013 <        f = new CompletableFuture<Integer>();
948 <        f.complete(one);
949 <        f2 = new CompletableFuture<Integer>();
950 <        g = f.acceptEither(f2, r);
951 <        checkCompletedNormally(g, null);
952 <        assertEquals(r.value, 2);
953 <    }
1001 >    public void testRunAsync_normalCompletion() {
1002 >        ExecutionMode[] executionModes = {
1003 >            ExecutionMode.ASYNC,
1004 >            ExecutionMode.EXECUTOR,
1005 >        };
1006 >        for (ExecutionMode m : executionModes)
1007 >    {
1008 >        final Noop r = new Noop(m);
1009 >        final CompletableFuture<Void> f = m.runAsync(r);
1010 >        assertNull(f.join());
1011 >        checkCompletedNormally(f, null);
1012 >        r.assertInvoked();
1013 >    }}
1014  
1015      /**
1016 <     * acceptEither result completes exceptionally after exceptional
957 <     * completion of either source
1016 >     * failing runAsync completes exceptionally after running Runnable
1017       */
1018 <    public void testAcceptEither2() {
1019 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1020 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1021 <        IncAction r = new IncAction();
1022 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
1023 <        f.completeExceptionally(new CFException());
1024 <        f2.complete(one);
1025 <        checkCompletedWithWrappedCFException(g);
1026 <
1027 <        r = new IncAction();
1028 <        f = new CompletableFuture<Integer>();
1029 <        f2 = new CompletableFuture<Integer>();
971 <        f2.completeExceptionally(new CFException());
972 <        g = f.acceptEither(f2, r);
973 <        checkCompletedWithWrappedCFException(g);
974 <    }
1018 >    public void testRunAsync_exceptionalCompletion() {
1019 >        ExecutionMode[] executionModes = {
1020 >            ExecutionMode.ASYNC,
1021 >            ExecutionMode.EXECUTOR,
1022 >        };
1023 >        for (ExecutionMode m : executionModes)
1024 >    {
1025 >        final FailingRunnable r = new FailingRunnable(m);
1026 >        final CompletableFuture<Void> f = m.runAsync(r);
1027 >        checkCompletedWithWrappedCFException(f);
1028 >        r.assertInvoked();
1029 >    }}
1030  
1031      /**
1032 <     * acceptEither result completes exceptionally if action does
1032 >     * supplyAsync completes with result of supplier
1033       */
1034 <    public void testAcceptEither3() {
1035 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1036 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1037 <        FailingConsumer r = new FailingConsumer();
1038 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
1039 <        f2.complete(two);
1040 <        checkCompletedWithWrappedCFException(g);
1041 <    }
1034 >    public void testSupplyAsync_normalCompletion() {
1035 >        ExecutionMode[] executionModes = {
1036 >            ExecutionMode.ASYNC,
1037 >            ExecutionMode.EXECUTOR,
1038 >        };
1039 >        for (ExecutionMode m : executionModes)
1040 >        for (Integer v1 : new Integer[] { 1, null })
1041 >    {
1042 >        final IntegerSupplier r = new IntegerSupplier(m, v1);
1043 >        final CompletableFuture<Integer> f = m.supplyAsync(r);
1044 >        assertSame(v1, f.join());
1045 >        checkCompletedNormally(f, v1);
1046 >        r.assertInvoked();
1047 >    }}
1048  
1049      /**
1050 <     * acceptEither result completes exceptionally if either source cancelled
1050 >     * Failing supplyAsync completes exceptionally
1051       */
1052 <    public void testAcceptEither4() {
1053 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1054 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1055 <        IncAction r = new IncAction();
1056 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
1057 <        assertTrue(f.cancel(true));
1058 <        checkCompletedWithWrappedCancellationException(g);
1059 <        f = new CompletableFuture<Integer>();
1060 <        f2 = new CompletableFuture<Integer>();
1061 <        assertTrue(f2.cancel(true));
1062 <        checkCompletedWithWrappedCancellationException(g);
1063 <    }
1052 >    public void testSupplyAsync_exceptionalCompletion() {
1053 >        ExecutionMode[] executionModes = {
1054 >            ExecutionMode.ASYNC,
1055 >            ExecutionMode.EXECUTOR,
1056 >        };
1057 >        for (ExecutionMode m : executionModes)
1058 >    {
1059 >        FailingSupplier r = new FailingSupplier(m);
1060 >        CompletableFuture<Integer> f = m.supplyAsync(r);
1061 >        checkCompletedWithWrappedCFException(f);
1062 >        r.assertInvoked();
1063 >    }}
1064  
1065 +    // seq completion methods
1066  
1067      /**
1068 <     * runAfterEither result completes normally after normal completion
1007 <     * of either source
1068 >     * thenRun result completes normally after normal completion of source
1069       */
1070 <    public void testRunAfterEither() {
1071 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1072 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1073 <        Noop r = new Noop();
1074 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
1075 <        f.complete(one);
1076 <        checkCompletedNormally(g, null);
1077 <        f2.complete(one);
1078 <        checkCompletedNormally(g, null);
1079 <        assertTrue(r.ran);
1070 >    public void testThenRun_normalCompletion() {
1071 >        for (ExecutionMode m : ExecutionMode.values())
1072 >        for (boolean createIncomplete : new boolean[] { true, false })
1073 >        for (Integer v1 : new Integer[] { 1, null })
1074 >    {
1075 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1076 >        final Noop r = new Noop(m);
1077 >        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 >        }
1083  
1020        r = new Noop();
1021        f = new CompletableFuture<Integer>();
1022        f.complete(one);
1023        f2 = new CompletableFuture<Integer>();
1024        g = f.runAfterEither(f2, r);
1084          checkCompletedNormally(g, null);
1085 <        assertTrue(r.ran);
1086 <    }
1087 <
1029 <    /**
1030 <     * runAfterEither result completes exceptionally after exceptional
1031 <     * completion of either source
1032 <     */
1033 <    public void testRunAfterEither2() {
1034 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1035 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1036 <        Noop r = new Noop();
1037 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
1038 <        f.completeExceptionally(new CFException());
1039 <        f2.complete(one);
1040 <        checkCompletedWithWrappedCFException(g);
1041 <
1042 <        r = new Noop();
1043 <        f = new CompletableFuture<Integer>();
1044 <        f2 = new CompletableFuture<Integer>();
1045 <        f2.completeExceptionally(new CFException());
1046 <        g = f.runAfterEither(f2, r);
1047 <        checkCompletedWithWrappedCFException(g);
1048 <    }
1049 <
1050 <    /**
1051 <     * runAfterEither result completes exceptionally if action does
1052 <     */
1053 <    public void testRunAfterEither3() {
1054 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1055 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1056 <        FailingNoop r = new FailingNoop();
1057 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
1058 <        f2.complete(two);
1059 <        checkCompletedWithWrappedCFException(g);
1060 <    }
1061 <
1062 <    /**
1063 <     * runAfterEither result completes exceptionally if either source cancelled
1064 <     */
1065 <    public void testRunAfterEither4() {
1066 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1067 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1068 <        Noop r = new Noop();
1069 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
1070 <        assertTrue(f.cancel(true));
1071 <        checkCompletedWithWrappedCancellationException(g);
1072 <        f = new CompletableFuture<Integer>();
1073 <        f2 = new CompletableFuture<Integer>();
1074 <        assertTrue(f2.cancel(true));
1075 <        checkCompletedWithWrappedCancellationException(g);
1076 <    }
1085 >        checkCompletedNormally(f, v1);
1086 >        r.assertInvoked();
1087 >    }}
1088  
1089      /**
1090 <     * thenCompose result completes normally after normal completion of source
1080 <     */
1081 <    public void testThenCompose() {
1082 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1083 <        CompletableFutureInc r = new CompletableFutureInc();
1084 <        CompletableFuture<Integer> g = f.thenCompose(r);
1085 <        f.complete(one);
1086 <        checkCompletedNormally(g, two);
1087 <    }
1088 <
1089 <    /**
1090 <     * thenCompose result completes exceptionally after exceptional
1090 >     * thenRun result completes exceptionally after exceptional
1091       * completion of source
1092       */
1093 <    public void testThenCompose2() {
1094 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1095 <        CompletableFutureInc r = new CompletableFutureInc();
1096 <        CompletableFuture<Integer> g = f.thenCompose(r);
1097 <        f.completeExceptionally(new CFException());
1098 <        checkCompletedWithWrappedCFException(g);
1099 <    }
1100 <
1101 <    /**
1102 <     * thenCompose result completes exceptionally if action does
1103 <     */
1104 <    public void testThenCompose3() {
1105 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1106 <        FailingCompletableFutureFunction r = new FailingCompletableFutureFunction();
1107 <        CompletableFuture<Integer> g = f.thenCompose(r);
1108 <        f.complete(one);
1109 <        checkCompletedWithWrappedCFException(g);
1110 <    }
1111 <
1112 <    /**
1113 <     * thenCompose result completes exceptionally if source cancelled
1114 <     */
1115 <    public void testThenCompose4() {
1116 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1117 <        CompletableFutureInc r = new CompletableFutureInc();
1118 <        CompletableFuture<Integer> g = f.thenCompose(r);
1119 <        assertTrue(f.cancel(true));
1120 <        checkCompletedWithWrappedCancellationException(g);
1121 <    }
1122 <
1093 >    public void testThenRun_exceptionalCompletion() {
1094 >        for (ExecutionMode m : ExecutionMode.values())
1095 >        for (boolean createIncomplete : new boolean[] { true, false })
1096 >    {
1097 >        final CFException ex = new CFException();
1098 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1099 >        final Noop r = new Noop(m);
1100 >        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 >        }
1106  
1107 <    // asyncs
1107 >        checkCompletedWithWrappedCFException(g, ex);
1108 >        checkCompletedWithWrappedCFException(f, ex);
1109 >        r.assertNotInvoked();
1110 >    }}
1111  
1112      /**
1113 <     * thenRunAsync result completes normally after normal completion of source
1128 <     */
1129 <    public void testThenRunAsync() {
1130 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1131 <        Noop r = new Noop();
1132 <        CompletableFuture<Void> g = f.thenRunAsync(r);
1133 <        f.complete(null);
1134 <        checkCompletedNormally(g, null);
1135 <
1136 <        // reordered version
1137 <        f = new CompletableFuture<Integer>();
1138 <        f.complete(null);
1139 <        r = new Noop();
1140 <        g = f.thenRunAsync(r);
1141 <        checkCompletedNormally(g, null);
1142 <    }
1143 <
1144 <    /**
1145 <     * thenRunAsync result completes exceptionally after exceptional
1146 <     * completion of source
1113 >     * thenRun result completes exceptionally if source cancelled
1114       */
1115 <    public void testThenRunAsync2() {
1116 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1117 <        Noop r = new Noop();
1118 <        CompletableFuture<Void> g = f.thenRunAsync(r);
1119 <        f.completeExceptionally(new CFException());
1120 <        try {
1121 <            g.join();
1122 <            shouldThrow();
1123 <        } catch (Exception ok) {
1115 >    public void testThenRun_sourceCancelled() {
1116 >        for (ExecutionMode m : ExecutionMode.values())
1117 >        for (boolean createIncomplete : new boolean[] { true, false })
1118 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1119 >    {
1120 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1121 >        final Noop r = new Noop(m);
1122 >        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          }
1158        checkCompletedWithWrappedCFException(g);
1159    }
1128  
1161    /**
1162     * thenRunAsync result completes exceptionally if action does
1163     */
1164    public void testThenRunAsync3() {
1165        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1166        FailingNoop r = new FailingNoop();
1167        CompletableFuture<Void> g = f.thenRunAsync(r);
1168        f.complete(null);
1169        checkCompletedWithWrappedCFException(g);
1170    }
1171
1172    /**
1173     * thenRunAsync result completes exceptionally if source cancelled
1174     */
1175    public void testThenRunAsync4() {
1176        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1177        Noop r = new Noop();
1178        CompletableFuture<Void> g = f.thenRunAsync(r);
1179        assertTrue(f.cancel(true));
1129          checkCompletedWithWrappedCancellationException(g);
1130 <    }
1130 >        checkCancelled(f);
1131 >        r.assertNotInvoked();
1132 >    }}
1133  
1134      /**
1135 <     * thenApplyAsync result completes normally after normal completion of source
1135 >     * thenRun result completes exceptionally if action does
1136       */
1137 <    public void testThenApplyAsync() {
1138 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1139 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
1140 <        f.complete(one);
1141 <        checkCompletedNormally(g, two);
1142 <    }
1137 >    public void testThenRun_actionFailed() {
1138 >        for (ExecutionMode m : ExecutionMode.values())
1139 >        for (boolean createIncomplete : new boolean[] { true, false })
1140 >        for (Integer v1 : new Integer[] { 1, null })
1141 >    {
1142 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1143 >        final FailingRunnable r = new FailingRunnable(m);
1144 >        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 >        }
1150  
1193    /**
1194     * thenApplyAsync result completes exceptionally after exceptional
1195     * completion of source
1196     */
1197    public void testThenApplyAsync2() {
1198        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1199        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
1200        f.completeExceptionally(new CFException());
1151          checkCompletedWithWrappedCFException(g);
1152 <    }
1152 >        checkCompletedNormally(f, v1);
1153 >    }}
1154  
1155      /**
1156 <     * thenApplyAsync result completes exceptionally if action does
1156 >     * thenApply result completes normally after normal completion of source
1157       */
1158 <    public void testThenApplyAsync3() {
1159 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1160 <        FailingFunction r = new FailingFunction();
1161 <        CompletableFuture<Integer> g = f.thenApplyAsync(r);
1162 <        f.complete(null);
1163 <        checkCompletedWithWrappedCFException(g);
1164 <    }
1158 >    public void testThenApply_normalCompletion() {
1159 >        for (ExecutionMode m : ExecutionMode.values())
1160 >        for (boolean createIncomplete : new boolean[] { true, false })
1161 >        for (Integer v1 : new Integer[] { 1, null })
1162 >    {
1163 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1164 >        final IncFunction r = new IncFunction(m);
1165 >        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 >        }
1171  
1172 <    /**
1173 <     * thenApplyAsync result completes exceptionally if source cancelled
1174 <     */
1175 <    public void testThenApplyAsync4() {
1219 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1220 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
1221 <        assertTrue(f.cancel(true));
1222 <        checkCompletedWithWrappedCancellationException(g);
1223 <    }
1172 >        checkCompletedNormally(g, inc(v1));
1173 >        checkCompletedNormally(f, v1);
1174 >        r.assertInvoked();
1175 >    }}
1176  
1177      /**
1178 <     * thenAcceptAsync result completes normally after normal
1178 >     * thenApply result completes exceptionally after exceptional
1179       * completion of source
1180       */
1181 <    public void testThenAcceptAsync() {
1182 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1183 <        IncAction r = new IncAction();
1184 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
1185 <        f.complete(one);
1186 <        checkCompletedNormally(g, null);
1187 <        assertEquals(r.value, 2);
1188 <    }
1181 >    public void testThenApply_exceptionalCompletion() {
1182 >        for (ExecutionMode m : ExecutionMode.values())
1183 >        for (boolean createIncomplete : new boolean[] { true, false })
1184 >    {
1185 >        final CFException ex = new CFException();
1186 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1187 >        final IncFunction r = new IncFunction(m);
1188 >        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 >        }
1194  
1195 <    /**
1196 <     * thenAcceptAsync result completes exceptionally after exceptional
1197 <     * completion of source
1198 <     */
1242 <    public void testThenAcceptAsync2() {
1243 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1244 <        IncAction r = new IncAction();
1245 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
1246 <        f.completeExceptionally(new CFException());
1247 <        checkCompletedWithWrappedCFException(g);
1248 <    }
1195 >        checkCompletedWithWrappedCFException(g, ex);
1196 >        checkCompletedWithWrappedCFException(f, ex);
1197 >        r.assertNotInvoked();
1198 >    }}
1199  
1200      /**
1201 <     * thenAcceptAsync result completes exceptionally if action does
1201 >     * thenApply result completes exceptionally if source cancelled
1202       */
1203 <    public void testThenAcceptAsync3() {
1204 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1205 <        FailingConsumer r = new FailingConsumer();
1206 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
1207 <        f.complete(null);
1208 <        checkCompletedWithWrappedCFException(g);
1209 <    }
1203 >    public void testThenApply_sourceCancelled() {
1204 >        for (ExecutionMode m : ExecutionMode.values())
1205 >        for (boolean createIncomplete : new boolean[] { true, false })
1206 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1207 >    {
1208 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1209 >        final IncFunction r = new IncFunction(m);
1210 >        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 >        }
1216  
1261    /**
1262     * thenAcceptAsync result completes exceptionally if source cancelled
1263     */
1264    public void testThenAcceptAsync4() {
1265        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1266        IncAction r = new IncAction();
1267        CompletableFuture<Void> g = f.thenAcceptAsync(r);
1268        assertTrue(f.cancel(true));
1217          checkCompletedWithWrappedCancellationException(g);
1218 <    }
1219 <    /**
1220 <     * thenCombineAsync result completes normally after normal
1273 <     * completion of sources
1274 <     */
1275 <    public void testThenCombineAsync() {
1276 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1277 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1278 <        CompletableFuture<Integer> g = f.thenCombineAsync(f2, add);
1279 <        f.complete(one);
1280 <        checkIncomplete(g);
1281 <        f2.complete(two);
1282 <        checkCompletedNormally(g, three);
1283 <    }
1218 >        checkCancelled(f);
1219 >        r.assertNotInvoked();
1220 >    }}
1221  
1222      /**
1223 <     * thenCombineAsync result completes exceptionally after exceptional
1287 <     * completion of source
1223 >     * thenApply result completes exceptionally if action does
1224       */
1225 <    public void testThenCombineAsync2() {
1226 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1227 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1228 <        CompletableFuture<Integer> g = f.thenCombineAsync(f2, add);
1229 <        f.completeExceptionally(new CFException());
1230 <        f2.complete(two);
1231 <        checkCompletedWithWrappedCFException(g);
1232 <
1233 <        f = new CompletableFuture<Integer>();
1234 <        f2 = new CompletableFuture<Integer>();
1235 <        g = f.thenCombineAsync(f2, add);
1236 <        f.complete(one);
1237 <        f2.completeExceptionally(new CFException());
1302 <        checkCompletedWithWrappedCFException(g);
1303 <    }
1225 >    public void testThenApply_actionFailed() {
1226 >        for (ExecutionMode m : ExecutionMode.values())
1227 >        for (boolean createIncomplete : new boolean[] { true, false })
1228 >        for (Integer v1 : new Integer[] { 1, null })
1229 >    {
1230 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1231 >        final FailingFunction r = new FailingFunction(m);
1232 >        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 >        }
1238  
1305    /**
1306     * thenCombineAsync result completes exceptionally if action does
1307     */
1308    public void testThenCombineAsync3() {
1309        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1310        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1311        FailingBiFunction r = new FailingBiFunction();
1312        CompletableFuture<Integer> g = f.thenCombineAsync(f2, r);
1313        f.complete(one);
1314        checkIncomplete(g);
1315        f2.complete(two);
1239          checkCompletedWithWrappedCFException(g);
1240 <    }
1240 >        checkCompletedNormally(f, v1);
1241 >    }}
1242  
1243      /**
1244 <     * thenCombineAsync result completes exceptionally if either source cancelled
1244 >     * thenAccept result completes normally after normal completion of source
1245       */
1246 <    public void testThenCombineAsync4() {
1247 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1248 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1249 <        CompletableFuture<Integer> g = f.thenCombineAsync(f2, add);
1250 <        assertTrue(f.cancel(true));
1251 <        f2.complete(two);
1252 <        checkCompletedWithWrappedCancellationException(g);
1253 <
1254 <        f = new CompletableFuture<Integer>();
1255 <        f2 = new CompletableFuture<Integer>();
1256 <        g = f.thenCombineAsync(f2, add);
1257 <        f.complete(one);
1258 <        assertTrue(f2.cancel(true));
1335 <        checkCompletedWithWrappedCancellationException(g);
1336 <    }
1246 >    public void testThenAccept_normalCompletion() {
1247 >        for (ExecutionMode m : ExecutionMode.values())
1248 >        for (boolean createIncomplete : new boolean[] { true, false })
1249 >        for (Integer v1 : new Integer[] { 1, null })
1250 >    {
1251 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1252 >        final NoopConsumer r = new NoopConsumer(m);
1253 >        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 >        }
1259  
1338    /**
1339     * thenAcceptBothAsync result completes normally after normal
1340     * completion of sources
1341     */
1342    public void testThenAcceptBothAsync() {
1343        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1344        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1345        AddAction r = new AddAction();
1346        CompletableFuture<Void> g = f.thenAcceptBothAsync(f2, r);
1347        f.complete(one);
1348        checkIncomplete(g);
1349        f2.complete(two);
1260          checkCompletedNormally(g, null);
1261 <        assertEquals(r.value, 3);
1262 <    }
1261 >        r.assertValue(v1);
1262 >        checkCompletedNormally(f, v1);
1263 >    }}
1264  
1265      /**
1266 <     * thenAcceptBothAsync result completes exceptionally after exceptional
1266 >     * thenAccept result completes exceptionally after exceptional
1267       * completion of source
1268       */
1269 <    public void testThenAcceptBothAsync2() {
1270 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1271 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1272 <        AddAction r = new AddAction();
1273 <        CompletableFuture<Void> g = f.thenAcceptBothAsync(f2, r);
1274 <        f.completeExceptionally(new CFException());
1275 <        f2.complete(two);
1276 <        checkCompletedWithWrappedCFException(g);
1277 <
1278 <        r = new AddAction();
1279 <        f = new CompletableFuture<Integer>();
1280 <        f2 = new CompletableFuture<Integer>();
1281 <        g = f.thenAcceptBothAsync(f2, r);
1371 <        f.complete(one);
1372 <        f2.completeExceptionally(new CFException());
1373 <        checkCompletedWithWrappedCFException(g);
1374 <    }
1269 >    public void testThenAccept_exceptionalCompletion() {
1270 >        for (ExecutionMode m : ExecutionMode.values())
1271 >        for (boolean createIncomplete : new boolean[] { true, false })
1272 >    {
1273 >        final CFException ex = new CFException();
1274 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1275 >        final NoopConsumer r = new NoopConsumer(m);
1276 >        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 >        }
1282  
1283 <    /**
1284 <     * thenAcceptBothAsync result completes exceptionally if action does
1285 <     */
1286 <    public void testThenAcceptBothAsync3() {
1380 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1381 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1382 <        FailingBiConsumer r = new FailingBiConsumer();
1383 <        CompletableFuture<Void> g = f.thenAcceptBothAsync(f2, r);
1384 <        f.complete(one);
1385 <        checkIncomplete(g);
1386 <        f2.complete(two);
1387 <        checkCompletedWithWrappedCFException(g);
1388 <    }
1283 >        checkCompletedWithWrappedCFException(g, ex);
1284 >        checkCompletedWithWrappedCFException(f, ex);
1285 >        r.assertNotInvoked();
1286 >    }}
1287  
1288      /**
1289 <     * thenAcceptBothAsync result completes exceptionally if either source cancelled
1289 >     * thenAccept result completes exceptionally if source cancelled
1290       */
1291 <    public void testThenAcceptBothAsync4() {
1292 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1293 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1294 <        AddAction r = new AddAction();
1295 <        CompletableFuture<Void> g = f.thenAcceptBothAsync(f2, r);
1296 <        assertTrue(f.cancel(true));
1297 <        f2.complete(two);
1298 <        checkCompletedWithWrappedCancellationException(g);
1291 >    public void testThenAccept_sourceCancelled() {
1292 >        for (ExecutionMode m : ExecutionMode.values())
1293 >        for (boolean createIncomplete : new boolean[] { true, false })
1294 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1295 >    {
1296 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1297 >        final NoopConsumer r = new NoopConsumer(m);
1298 >        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 >        }
1304  
1402        r = new AddAction();
1403        f = new CompletableFuture<Integer>();
1404        f2 = new CompletableFuture<Integer>();
1405        g = f.thenAcceptBothAsync(f2, r);
1406        f.complete(one);
1407        assertTrue(f2.cancel(true));
1305          checkCompletedWithWrappedCancellationException(g);
1306 <    }
1307 <
1308 <    /**
1412 <     * runAfterBothAsync result completes normally after normal
1413 <     * completion of sources
1414 <     */
1415 <    public void testRunAfterBothAsync() {
1416 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1417 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1418 <        Noop r = new Noop();
1419 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r);
1420 <        f.complete(one);
1421 <        checkIncomplete(g);
1422 <        f2.complete(two);
1423 <        checkCompletedNormally(g, null);
1424 <        assertTrue(r.ran);
1425 <    }
1306 >        checkCancelled(f);
1307 >        r.assertNotInvoked();
1308 >    }}
1309  
1310      /**
1311 <     * runAfterBothAsync result completes exceptionally after exceptional
1429 <     * completion of source
1311 >     * thenAccept result completes exceptionally if action does
1312       */
1313 <    public void testRunAfterBothAsync2() {
1314 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1315 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1316 <        Noop r = new Noop();
1317 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r);
1318 <        f.completeExceptionally(new CFException());
1319 <        f2.complete(two);
1320 <        checkCompletedWithWrappedCFException(g);
1313 >    public void testThenAccept_actionFailed() {
1314 >        for (ExecutionMode m : ExecutionMode.values())
1315 >        for (boolean createIncomplete : new boolean[] { true, false })
1316 >        for (Integer v1 : new Integer[] { 1, null })
1317 >    {
1318 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1319 >        final FailingConsumer r = new FailingConsumer(m);
1320 >        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 >        }
1326  
1440        r = new Noop();
1441        f = new CompletableFuture<Integer>();
1442        f2 = new CompletableFuture<Integer>();
1443        g = f.runAfterBothAsync(f2, r);
1444        f.complete(one);
1445        f2.completeExceptionally(new CFException());
1327          checkCompletedWithWrappedCFException(g);
1328 <    }
1328 >        checkCompletedNormally(f, v1);
1329 >    }}
1330  
1331      /**
1332 <     * runAfterBothAsync result completes exceptionally if action does
1332 >     * thenCombine result completes normally after normal completion
1333 >     * of sources
1334       */
1335 <    public void testRunAfterBothAsync3() {
1336 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1337 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1338 <        FailingNoop r = new FailingNoop();
1339 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r);
1340 <        f.complete(one);
1341 <        checkIncomplete(g);
1342 <        f2.complete(two);
1343 <        checkCompletedWithWrappedCFException(g);
1344 <    }
1335 >    public void testThenCombine_normalCompletion() {
1336 >        for (ExecutionMode m : ExecutionMode.values())
1337 >        for (boolean createIncomplete : new boolean[] { true, false })
1338 >        for (boolean fFirst : new boolean[] { true, false })
1339 >        for (Integer v1 : new Integer[] { 1, null })
1340 >        for (Integer v2 : new Integer[] { 2, null })
1341 >    {
1342 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1343 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1344 >        final SubtractFunction r = new SubtractFunction(m);
1345 >
1346 >        if (fFirst) f.complete(v1); else g.complete(v2);
1347 >        if (!createIncomplete)
1348 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1349 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1350 >        if (createIncomplete) {
1351 >            checkIncomplete(h);
1352 >            r.assertNotInvoked();
1353 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1354 >        }
1355  
1356 <    /**
1357 <     * runAfterBothAsync result completes exceptionally if either source cancelled
1358 <     */
1359 <    public void testRunAfterBothAsync4() {
1360 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1468 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1469 <        Noop r = new Noop();
1470 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r);
1471 <        assertTrue(f.cancel(true));
1472 <        f2.complete(two);
1473 <        checkCompletedWithWrappedCancellationException(g);
1474 <
1475 <        r = new Noop();
1476 <        f = new CompletableFuture<Integer>();
1477 <        f2 = new CompletableFuture<Integer>();
1478 <        g = f.runAfterBothAsync(f2, r);
1479 <        f.complete(one);
1480 <        assertTrue(f2.cancel(true));
1481 <        checkCompletedWithWrappedCancellationException(g);
1482 <    }
1356 >        checkCompletedNormally(h, subtract(v1, v2));
1357 >        checkCompletedNormally(f, v1);
1358 >        checkCompletedNormally(g, v2);
1359 >        r.assertInvoked();
1360 >    }}
1361  
1362      /**
1363 <     * applyToEitherAsync result completes normally after normal
1364 <     * completion of sources
1363 >     * thenCombine result completes exceptionally after exceptional
1364 >     * completion of either source
1365       */
1366 <    public void testApplyToEitherAsync() {
1367 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1368 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1369 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
1370 <        f.complete(one);
1371 <        checkCompletedNormally(g, two);
1366 >    public void testThenCombine_exceptionalCompletion() {
1367 >        for (ExecutionMode m : ExecutionMode.values())
1368 >        for (boolean createIncomplete : new boolean[] { true, false })
1369 >        for (boolean fFirst : new boolean[] { true, false })
1370 >        for (Integer v1 : new Integer[] { 1, null })
1371 >    {
1372 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1373 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1374 >        final CFException ex = new CFException();
1375 >        final SubtractFunction r = new SubtractFunction(m);
1376 >
1377 >        (fFirst ? f : g).complete(v1);
1378 >        if (!createIncomplete)
1379 >            (!fFirst ? f : g).completeExceptionally(ex);
1380 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1381 >        if (createIncomplete) {
1382 >            checkIncomplete(h);
1383 >            (!fFirst ? f : g).completeExceptionally(ex);
1384 >        }
1385  
1386 <        f = new CompletableFuture<Integer>();
1387 <        f.complete(one);
1388 <        f2 = new CompletableFuture<Integer>();
1389 <        g = f.applyToEitherAsync(f2, inc);
1390 <        checkCompletedNormally(g, two);
1500 <    }
1386 >        checkCompletedWithWrappedCFException(h, ex);
1387 >        r.assertNotInvoked();
1388 >        checkCompletedNormally(fFirst ? f : g, v1);
1389 >        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1390 >    }}
1391  
1392      /**
1393 <     * applyToEitherAsync result completes exceptionally after exceptional
1504 <     * completion of source
1393 >     * thenCombine result completes exceptionally if either source cancelled
1394       */
1395 <    public void testApplyToEitherAsync2() {
1396 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1397 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1398 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
1399 <        f.completeExceptionally(new CFException());
1400 <        checkCompletedWithWrappedCFException(g);
1401 <
1402 <        f = new CompletableFuture<Integer>();
1403 <        f2 = new CompletableFuture<Integer>();
1404 <        f2.completeExceptionally(new CFException());
1405 <        g = f.applyToEitherAsync(f2, inc);
1406 <        f.complete(one);
1407 <        checkCompletedWithWrappedCFException(g);
1408 <    }
1395 >    public void testThenCombine_sourceCancelled() {
1396 >        for (ExecutionMode m : ExecutionMode.values())
1397 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1398 >        for (boolean createIncomplete : new boolean[] { true, false })
1399 >        for (boolean fFirst : new boolean[] { true, false })
1400 >        for (Integer v1 : new Integer[] { 1, null })
1401 >    {
1402 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1403 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1404 >        final SubtractFunction r = new SubtractFunction(m);
1405 >
1406 >        (fFirst ? f : g).complete(v1);
1407 >        if (!createIncomplete)
1408 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1409 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1410 >        if (createIncomplete) {
1411 >            checkIncomplete(h);
1412 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1413 >        }
1414  
1415 <    /**
1416 <     * applyToEitherAsync result completes exceptionally if action does
1417 <     */
1418 <    public void testApplyToEitherAsync3() {
1419 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1526 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1527 <        FailingFunction r = new FailingFunction();
1528 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, r);
1529 <        f.complete(one);
1530 <        checkCompletedWithWrappedCFException(g);
1531 <    }
1415 >        checkCompletedWithWrappedCancellationException(h);
1416 >        checkCancelled(!fFirst ? f : g);
1417 >        r.assertNotInvoked();
1418 >        checkCompletedNormally(fFirst ? f : g, v1);
1419 >    }}
1420  
1421      /**
1422 <     * applyToEitherAsync result completes exceptionally if either source cancelled
1422 >     * thenCombine result completes exceptionally if action does
1423       */
1424 <    public void testApplyToEitherAsync4() {
1425 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1426 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1427 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
1428 <        assertTrue(f.cancel(true));
1429 <        checkCompletedWithWrappedCancellationException(g);
1424 >    public void testThenCombine_actionFailed() {
1425 >        for (ExecutionMode m : ExecutionMode.values())
1426 >        for (boolean fFirst : new boolean[] { true, false })
1427 >        for (Integer v1 : new Integer[] { 1, null })
1428 >        for (Integer v2 : new Integer[] { 2, null })
1429 >    {
1430 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1431 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1432 >        final FailingBiFunction r = new FailingBiFunction(m);
1433 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1434 >
1435 >        if (fFirst) {
1436 >            f.complete(v1);
1437 >            g.complete(v2);
1438 >        } else {
1439 >            g.complete(v2);
1440 >            f.complete(v1);
1441 >        }
1442  
1443 <        f = new CompletableFuture<Integer>();
1444 <        f2 = new CompletableFuture<Integer>();
1445 <        assertTrue(f2.cancel(true));
1446 <        g = f.applyToEitherAsync(f2, inc);
1547 <        checkCompletedWithWrappedCancellationException(g);
1548 <    }
1443 >        checkCompletedWithWrappedCFException(h);
1444 >        checkCompletedNormally(f, v1);
1445 >        checkCompletedNormally(g, v2);
1446 >    }}
1447  
1448      /**
1449 <     * acceptEitherAsync result completes normally after normal
1449 >     * thenAcceptBoth result completes normally after normal
1450       * completion of sources
1451       */
1452 <    public void testAcceptEitherAsync() {
1453 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1454 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1455 <        IncAction r = new IncAction();
1456 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
1457 <        f.complete(one);
1458 <        checkCompletedNormally(g, null);
1459 <        assertEquals(r.value, 2);
1452 >    public void testThenAcceptBoth_normalCompletion() {
1453 >        for (ExecutionMode m : ExecutionMode.values())
1454 >        for (boolean createIncomplete : new boolean[] { true, false })
1455 >        for (boolean fFirst : new boolean[] { true, false })
1456 >        for (Integer v1 : new Integer[] { 1, null })
1457 >        for (Integer v2 : new Integer[] { 2, null })
1458 >    {
1459 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1460 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1461 >        final SubtractAction r = new SubtractAction(m);
1462 >
1463 >        if (fFirst) f.complete(v1); else g.complete(v2);
1464 >        if (!createIncomplete)
1465 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1466 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1467 >        if (createIncomplete) {
1468 >            checkIncomplete(h);
1469 >            r.assertNotInvoked();
1470 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1471 >        }
1472  
1473 <        r = new IncAction();
1474 <        f = new CompletableFuture<Integer>();
1475 <        f.complete(one);
1476 <        f2 = new CompletableFuture<Integer>();
1477 <        g = f.acceptEitherAsync(f2, r);
1568 <        checkCompletedNormally(g, null);
1569 <        assertEquals(r.value, 2);
1570 <    }
1473 >        checkCompletedNormally(h, null);
1474 >        r.assertValue(subtract(v1, v2));
1475 >        checkCompletedNormally(f, v1);
1476 >        checkCompletedNormally(g, v2);
1477 >    }}
1478  
1479      /**
1480 <     * acceptEitherAsync result completes exceptionally after exceptional
1481 <     * completion of source
1480 >     * thenAcceptBoth result completes exceptionally after exceptional
1481 >     * completion of either source
1482       */
1483 <    public void testAcceptEitherAsync2() {
1484 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1485 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1486 <        IncAction r = new IncAction();
1487 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
1488 <        f.completeExceptionally(new CFException());
1489 <        checkCompletedWithWrappedCFException(g);
1483 >    public void testThenAcceptBoth_exceptionalCompletion() {
1484 >        for (ExecutionMode m : ExecutionMode.values())
1485 >        for (boolean createIncomplete : new boolean[] { true, false })
1486 >        for (boolean fFirst : new boolean[] { true, false })
1487 >        for (Integer v1 : new Integer[] { 1, null })
1488 >    {
1489 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1490 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1491 >        final CFException ex = new CFException();
1492 >        final SubtractAction r = new SubtractAction(m);
1493 >
1494 >        (fFirst ? f : g).complete(v1);
1495 >        if (!createIncomplete)
1496 >            (!fFirst ? f : g).completeExceptionally(ex);
1497 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1498 >        if (createIncomplete) {
1499 >            checkIncomplete(h);
1500 >            (!fFirst ? f : g).completeExceptionally(ex);
1501 >        }
1502  
1503 <        r = new IncAction();
1504 <        f = new CompletableFuture<Integer>();
1505 <        f2 = new CompletableFuture<Integer>();
1506 <        f2.completeExceptionally(new CFException());
1507 <        g = f.acceptEitherAsync(f2, r);
1589 <        f.complete(one);
1590 <        checkCompletedWithWrappedCFException(g);
1591 <    }
1503 >        checkCompletedWithWrappedCFException(h, ex);
1504 >        r.assertNotInvoked();
1505 >        checkCompletedNormally(fFirst ? f : g, v1);
1506 >        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1507 >    }}
1508  
1509      /**
1510 <     * acceptEitherAsync result completes exceptionally if action does
1595 <     */
1596 <    public void testAcceptEitherAsync3() {
1597 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1598 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1599 <        FailingConsumer r = new FailingConsumer();
1600 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
1601 <        f.complete(one);
1602 <        checkCompletedWithWrappedCFException(g);
1603 <    }
1604 <
1605 <    /**
1606 <     * acceptEitherAsync result completes exceptionally if either
1607 <     * source cancelled
1510 >     * thenAcceptBoth result completes exceptionally if either source cancelled
1511       */
1512 <    public void testAcceptEitherAsync4() {
1513 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1514 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1515 <        IncAction r = new IncAction();
1516 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
1517 <        assertTrue(f.cancel(true));
1518 <        checkCompletedWithWrappedCancellationException(g);
1512 >    public void testThenAcceptBoth_sourceCancelled() {
1513 >        for (ExecutionMode m : ExecutionMode.values())
1514 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1515 >        for (boolean createIncomplete : new boolean[] { true, false })
1516 >        for (boolean fFirst : new boolean[] { true, false })
1517 >        for (Integer v1 : new Integer[] { 1, null })
1518 >    {
1519 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1520 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1521 >        final SubtractAction r = new SubtractAction(m);
1522 >
1523 >        (fFirst ? f : g).complete(v1);
1524 >        if (!createIncomplete)
1525 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1526 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1527 >        if (createIncomplete) {
1528 >            checkIncomplete(h);
1529 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1530 >        }
1531  
1532 <        r = new IncAction();
1533 <        f = new CompletableFuture<Integer>();
1534 <        f2 = new CompletableFuture<Integer>();
1535 <        assertTrue(f2.cancel(true));
1536 <        g = f.acceptEitherAsync(f2, r);
1622 <        checkCompletedWithWrappedCancellationException(g);
1623 <    }
1532 >        checkCompletedWithWrappedCancellationException(h);
1533 >        checkCancelled(!fFirst ? f : g);
1534 >        r.assertNotInvoked();
1535 >        checkCompletedNormally(fFirst ? f : g, v1);
1536 >    }}
1537  
1538      /**
1539 <     * runAfterEitherAsync result completes normally after normal
1627 <     * completion of sources
1539 >     * thenAcceptBoth result completes exceptionally if action does
1540       */
1541 <    public void testRunAfterEitherAsync() {
1542 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1543 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1544 <        Noop r = new Noop();
1545 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
1546 <        f.complete(one);
1547 <        checkCompletedNormally(g, null);
1548 <        assertTrue(r.ran);
1541 >    public void testThenAcceptBoth_actionFailed() {
1542 >        for (ExecutionMode m : ExecutionMode.values())
1543 >        for (boolean fFirst : new boolean[] { true, false })
1544 >        for (Integer v1 : new Integer[] { 1, null })
1545 >        for (Integer v2 : new Integer[] { 2, null })
1546 >    {
1547 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1548 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1549 >        final FailingBiConsumer r = new FailingBiConsumer(m);
1550 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1551 >
1552 >        if (fFirst) {
1553 >            f.complete(v1);
1554 >            g.complete(v2);
1555 >        } else {
1556 >            g.complete(v2);
1557 >            f.complete(v1);
1558 >        }
1559  
1560 <        r = new Noop();
1561 <        f = new CompletableFuture<Integer>();
1562 <        f.complete(one);
1563 <        f2 = new CompletableFuture<Integer>();
1642 <        g = f.runAfterEitherAsync(f2, r);
1643 <        checkCompletedNormally(g, null);
1644 <        assertTrue(r.ran);
1645 <    }
1560 >        checkCompletedWithWrappedCFException(h);
1561 >        checkCompletedNormally(f, v1);
1562 >        checkCompletedNormally(g, v2);
1563 >    }}
1564  
1565      /**
1566 <     * runAfterEitherAsync result completes exceptionally after exceptional
1567 <     * completion of source
1566 >     * runAfterBoth result completes normally after normal
1567 >     * completion of sources
1568       */
1569 <    public void testRunAfterEitherAsync2() {
1570 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1571 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1572 <        Noop r = new Noop();
1573 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
1574 <        f.completeExceptionally(new CFException());
1575 <        checkCompletedWithWrappedCFException(g);
1576 <
1577 <        r = new Noop();
1578 <        f = new CompletableFuture<Integer>();
1579 <        f2 = new CompletableFuture<Integer>();
1580 <        f2.completeExceptionally(new CFException());
1581 <        g = f.runAfterEitherAsync(f2, r);
1582 <        f.complete(one);
1583 <        checkCompletedWithWrappedCFException(g);
1584 <    }
1569 >    public void testRunAfterBoth_normalCompletion() {
1570 >        for (ExecutionMode m : ExecutionMode.values())
1571 >        for (boolean createIncomplete : new boolean[] { true, false })
1572 >        for (boolean fFirst : new boolean[] { true, false })
1573 >        for (Integer v1 : new Integer[] { 1, null })
1574 >        for (Integer v2 : new Integer[] { 2, null })
1575 >    {
1576 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1577 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1578 >        final Noop r = new Noop(m);
1579 >
1580 >        if (fFirst) f.complete(v1); else g.complete(v2);
1581 >        if (!createIncomplete)
1582 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1583 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1584 >        if (createIncomplete) {
1585 >            checkIncomplete(h);
1586 >            r.assertNotInvoked();
1587 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1588 >        }
1589  
1590 <    /**
1591 <     * runAfterEitherAsync result completes exceptionally if action does
1592 <     */
1593 <    public void testRunAfterEitherAsync3() {
1594 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1673 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1674 <        FailingNoop r = new FailingNoop();
1675 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
1676 <        f.complete(one);
1677 <        checkCompletedWithWrappedCFException(g);
1678 <    }
1590 >        checkCompletedNormally(h, null);
1591 >        r.assertInvoked();
1592 >        checkCompletedNormally(f, v1);
1593 >        checkCompletedNormally(g, v2);
1594 >    }}
1595  
1596      /**
1597 <     * runAfterEitherAsync result completes exceptionally if either
1598 <     * source cancelled
1597 >     * runAfterBoth result completes exceptionally after exceptional
1598 >     * completion of either source
1599       */
1600 <    public void testRunAfterEitherAsync4() {
1601 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1602 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1603 <        Noop r = new Noop();
1604 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
1605 <        assertTrue(f.cancel(true));
1606 <        checkCompletedWithWrappedCancellationException(g);
1607 <
1608 <        r = new Noop();
1609 <        f = new CompletableFuture<Integer>();
1610 <        f2 = new CompletableFuture<Integer>();
1611 <        assertTrue(f2.cancel(true));
1612 <        g = f.runAfterEitherAsync(f2, r);
1613 <        checkCompletedWithWrappedCancellationException(g);
1614 <    }
1600 >    public void testRunAfterBoth_exceptionalCompletion() {
1601 >        for (ExecutionMode m : ExecutionMode.values())
1602 >        for (boolean createIncomplete : new boolean[] { true, false })
1603 >        for (boolean fFirst : new boolean[] { true, false })
1604 >        for (Integer v1 : new Integer[] { 1, null })
1605 >    {
1606 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1607 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1608 >        final CFException ex = new CFException();
1609 >        final Noop r = new Noop(m);
1610 >
1611 >        (fFirst ? f : g).complete(v1);
1612 >        if (!createIncomplete)
1613 >            (!fFirst ? f : g).completeExceptionally(ex);
1614 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1615 >        if (createIncomplete) {
1616 >            checkIncomplete(h);
1617 >            (!fFirst ? f : g).completeExceptionally(ex);
1618 >        }
1619  
1620 <    /**
1621 <     * thenComposeAsync result completes normally after normal
1622 <     * completion of source
1623 <     */
1624 <    public void testThenComposeAsync() {
1705 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1706 <        CompletableFutureInc r = new CompletableFutureInc();
1707 <        CompletableFuture<Integer> g = f.thenComposeAsync(r);
1708 <        f.complete(one);
1709 <        checkCompletedNormally(g, two);
1710 <    }
1620 >        checkCompletedWithWrappedCFException(h, ex);
1621 >        r.assertNotInvoked();
1622 >        checkCompletedNormally(fFirst ? f : g, v1);
1623 >        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1624 >    }}
1625  
1626      /**
1627 <     * thenComposeAsync result completes exceptionally after
1714 <     * exceptional completion of source
1627 >     * runAfterBoth result completes exceptionally if either source cancelled
1628       */
1629 <    public void testThenComposeAsync2() {
1630 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1631 <        CompletableFutureInc r = new CompletableFutureInc();
1632 <        CompletableFuture<Integer> g = f.thenComposeAsync(r);
1633 <        f.completeExceptionally(new CFException());
1634 <        checkCompletedWithWrappedCFException(g);
1635 <    }
1629 >    public void testRunAfterBoth_sourceCancelled() {
1630 >        for (ExecutionMode m : ExecutionMode.values())
1631 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1632 >        for (boolean createIncomplete : new boolean[] { true, false })
1633 >        for (boolean fFirst : new boolean[] { true, false })
1634 >        for (Integer v1 : new Integer[] { 1, null })
1635 >    {
1636 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1637 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1638 >        final Noop r = new Noop(m);
1639 >
1640 >
1641 >        (fFirst ? f : g).complete(v1);
1642 >        if (!createIncomplete)
1643 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1644 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1645 >        if (createIncomplete) {
1646 >            checkIncomplete(h);
1647 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1648 >        }
1649  
1650 <    /**
1651 <     * thenComposeAsync result completes exceptionally if action does
1652 <     */
1653 <    public void testThenComposeAsync3() {
1654 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1729 <        FailingCompletableFutureFunction r = new FailingCompletableFutureFunction();
1730 <        CompletableFuture<Integer> g = f.thenComposeAsync(r);
1731 <        f.complete(one);
1732 <        checkCompletedWithWrappedCFException(g);
1733 <    }
1650 >        checkCompletedWithWrappedCancellationException(h);
1651 >        checkCancelled(!fFirst ? f : g);
1652 >        r.assertNotInvoked();
1653 >        checkCompletedNormally(fFirst ? f : g, v1);
1654 >    }}
1655  
1656      /**
1657 <     * thenComposeAsync result completes exceptionally if source cancelled
1657 >     * runAfterBoth result completes exceptionally if action does
1658       */
1659 <    public void testThenComposeAsync4() {
1660 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1661 <        CompletableFutureInc r = new CompletableFutureInc();
1662 <        CompletableFuture<Integer> g = f.thenComposeAsync(r);
1663 <        assertTrue(f.cancel(true));
1664 <        checkCompletedWithWrappedCancellationException(g);
1665 <    }
1666 <
1659 >    public void testRunAfterBoth_actionFailed() {
1660 >        for (ExecutionMode m : ExecutionMode.values())
1661 >        for (boolean fFirst : new boolean[] { true, false })
1662 >        for (Integer v1 : new Integer[] { 1, null })
1663 >        for (Integer v2 : new Integer[] { 2, null })
1664 >    {
1665 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1666 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1667 >        final FailingRunnable r1 = new FailingRunnable(m);
1668 >        final FailingRunnable r2 = new FailingRunnable(m);
1669 >
1670 >        CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
1671 >        if (fFirst) {
1672 >            f.complete(v1);
1673 >            g.complete(v2);
1674 >        } else {
1675 >            g.complete(v2);
1676 >            f.complete(v1);
1677 >        }
1678 >        CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
1679  
1680 <    // async with explicit executors
1680 >        checkCompletedWithWrappedCFException(h1);
1681 >        checkCompletedWithWrappedCFException(h2);
1682 >        checkCompletedNormally(f, v1);
1683 >        checkCompletedNormally(g, v2);
1684 >    }}
1685  
1686      /**
1687 <     * thenRunAsync result completes normally after normal completion of source
1687 >     * applyToEither result completes normally after normal completion
1688 >     * of either source
1689       */
1690 <    public void testThenRunAsyncE() {
1691 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1692 <        Noop r = new Noop();
1693 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
1694 <        f.complete(null);
1695 <        checkCompletedNormally(g, null);
1696 <
1697 <        // reordered version
1698 <        f = new CompletableFuture<Integer>();
1699 <        f.complete(null);
1700 <        r = new Noop();
1701 <        g = f.thenRunAsync(r, new ThreadExecutor());
1702 <        checkCompletedNormally(g, null);
1703 <    }
1690 >    public void testApplyToEither_normalCompletion() {
1691 >        for (ExecutionMode m : ExecutionMode.values())
1692 >        for (Integer v1 : new Integer[] { 1, null })
1693 >        for (Integer v2 : new Integer[] { 2, null })
1694 >    {
1695 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1696 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1697 >        final IncFunction[] rs = new IncFunction[6];
1698 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1699 >
1700 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
1701 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
1702 >        checkIncomplete(h0);
1703 >        checkIncomplete(h1);
1704 >        rs[0].assertNotInvoked();
1705 >        rs[1].assertNotInvoked();
1706 >        f.complete(v1);
1707 >        checkCompletedNormally(h0, inc(v1));
1708 >        checkCompletedNormally(h1, inc(v1));
1709 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
1710 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
1711 >        checkCompletedNormally(h2, inc(v1));
1712 >        checkCompletedNormally(h3, inc(v1));
1713 >        g.complete(v2);
1714 >
1715 >        // unspecified behavior - both source completions available
1716 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
1717 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
1718 >        rs[4].assertValue(h4.join());
1719 >        rs[5].assertValue(h5.join());
1720 >        assertTrue(Objects.equals(inc(v1), h4.join()) ||
1721 >                   Objects.equals(inc(v2), h4.join()));
1722 >        assertTrue(Objects.equals(inc(v1), h5.join()) ||
1723 >                   Objects.equals(inc(v2), h5.join()));
1724 >
1725 >        checkCompletedNormally(f, v1);
1726 >        checkCompletedNormally(g, v2);
1727 >        checkCompletedNormally(h0, inc(v1));
1728 >        checkCompletedNormally(h1, inc(v1));
1729 >        checkCompletedNormally(h2, inc(v1));
1730 >        checkCompletedNormally(h3, inc(v1));
1731 >        for (int i = 0; i < 4; i++) rs[i].assertValue(inc(v1));
1732 >    }}
1733  
1734      /**
1735 <     * thenRunAsync result completes exceptionally after exceptional
1736 <     * completion of source
1735 >     * applyToEither result completes exceptionally after exceptional
1736 >     * completion of either source
1737       */
1738 <    public void testThenRunAsync2E() {
1739 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1740 <        Noop r = new Noop();
1741 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
1742 <        f.completeExceptionally(new CFException());
1738 >    public void testApplyToEither_exceptionalCompletion() {
1739 >        for (ExecutionMode m : ExecutionMode.values())
1740 >        for (Integer v1 : new Integer[] { 1, null })
1741 >    {
1742 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1743 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1744 >        final CFException ex = new CFException();
1745 >        final IncFunction[] rs = new IncFunction[6];
1746 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1747 >
1748 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
1749 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
1750 >        checkIncomplete(h0);
1751 >        checkIncomplete(h1);
1752 >        rs[0].assertNotInvoked();
1753 >        rs[1].assertNotInvoked();
1754 >        f.completeExceptionally(ex);
1755 >        checkCompletedWithWrappedCFException(h0, ex);
1756 >        checkCompletedWithWrappedCFException(h1, ex);
1757 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
1758 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
1759 >        checkCompletedWithWrappedCFException(h2, ex);
1760 >        checkCompletedWithWrappedCFException(h3, ex);
1761 >        g.complete(v1);
1762 >
1763 >        // unspecified behavior - both source completions available
1764 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
1765 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
1766          try {
1767 <            g.join();
1768 <            shouldThrow();
1769 <        } catch (Exception ok) {
1767 >            assertEquals(inc(v1), h4.join());
1768 >            rs[4].assertInvoked();
1769 >        } catch (CompletionException ok) {
1770 >            checkCompletedWithWrappedCFException(h4, ex);
1771 >            rs[4].assertNotInvoked();
1772 >        }
1773 >        try {
1774 >            assertEquals(inc(v1), h5.join());
1775 >            rs[5].assertInvoked();
1776 >        } catch (CompletionException ok) {
1777 >            checkCompletedWithWrappedCFException(h5, ex);
1778 >            rs[5].assertNotInvoked();
1779          }
1781        checkCompletedWithWrappedCFException(g);
1782    }
1783
1784    /**
1785     * thenRunAsync result completes exceptionally if action does
1786     */
1787    public void testThenRunAsync3E() {
1788        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1789        FailingNoop r = new FailingNoop();
1790        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
1791        f.complete(null);
1792        checkCompletedWithWrappedCFException(g);
1793    }
1794
1795    /**
1796     * thenRunAsync result completes exceptionally if source cancelled
1797     */
1798    public void testThenRunAsync4E() {
1799        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1800        Noop r = new Noop();
1801        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
1802        assertTrue(f.cancel(true));
1803        checkCompletedWithWrappedCancellationException(g);
1804    }
1805
1806    /**
1807     * thenApplyAsync result completes normally after normal completion of source
1808     */
1809    public void testThenApplyAsyncE() {
1810        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1811        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
1812        f.complete(one);
1813        checkCompletedNormally(g, two);
1814    }
1815
1816    /**
1817     * thenApplyAsync result completes exceptionally after exceptional
1818     * completion of source
1819     */
1820    public void testThenApplyAsync2E() {
1821        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1822        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
1823        f.completeExceptionally(new CFException());
1824        checkCompletedWithWrappedCFException(g);
1825    }
1826
1827    /**
1828     * thenApplyAsync result completes exceptionally if action does
1829     */
1830    public void testThenApplyAsync3E() {
1831        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1832        FailingFunction r = new FailingFunction();
1833        CompletableFuture<Integer> g = f.thenApplyAsync(r, new ThreadExecutor());
1834        f.complete(null);
1835        checkCompletedWithWrappedCFException(g);
1836    }
1837
1838    /**
1839     * thenApplyAsync result completes exceptionally if source cancelled
1840     */
1841    public void testThenApplyAsync4E() {
1842        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1843        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
1844        assertTrue(f.cancel(true));
1845        checkCompletedWithWrappedCancellationException(g);
1846    }
1847
1848    /**
1849     * thenAcceptAsync result completes normally after normal
1850     * completion of source
1851     */
1852    public void testThenAcceptAsyncE() {
1853        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1854        IncAction r = new IncAction();
1855        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
1856        f.complete(one);
1857        checkCompletedNormally(g, null);
1858        assertEquals(r.value, 2);
1859    }
1860
1861    /**
1862     * thenAcceptAsync result completes exceptionally after exceptional
1863     * completion of source
1864     */
1865    public void testThenAcceptAsync2E() {
1866        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1867        IncAction r = new IncAction();
1868        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
1869        f.completeExceptionally(new CFException());
1870        checkCompletedWithWrappedCFException(g);
1871    }
1872
1873    /**
1874     * thenAcceptAsync result completes exceptionally if action does
1875     */
1876    public void testThenAcceptAsync3E() {
1877        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1878        FailingConsumer r = new FailingConsumer();
1879        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
1880        f.complete(null);
1881        checkCompletedWithWrappedCFException(g);
1882    }
1883
1884    /**
1885     * thenAcceptAsync result completes exceptionally if source cancelled
1886     */
1887    public void testThenAcceptAsync4E() {
1888        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1889        IncAction r = new IncAction();
1890        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
1891        assertTrue(f.cancel(true));
1892        checkCompletedWithWrappedCancellationException(g);
1893    }
1894    /**
1895     * thenCombineAsync result completes normally after normal
1896     * completion of sources
1897     */
1898    public void testThenCombineAsyncE() {
1899        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1900        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1901        CompletableFuture<Integer> g = f.thenCombineAsync(f2, add, new ThreadExecutor());
1902        f.complete(one);
1903        checkIncomplete(g);
1904        f2.complete(two);
1905        checkCompletedNormally(g, three);
1906    }
1907
1908    /**
1909     * thenCombineAsync result completes exceptionally after exceptional
1910     * completion of source
1911     */
1912    public void testThenCombineAsync2E() {
1913        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1914        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1915        CompletableFuture<Integer> g = f.thenCombineAsync(f2, add, new ThreadExecutor());
1916        f.completeExceptionally(new CFException());
1917        f2.complete(two);
1918        checkCompletedWithWrappedCFException(g);
1919
1920        f = new CompletableFuture<Integer>();
1921        f2 = new CompletableFuture<Integer>();
1922        g = f.thenCombineAsync(f2, add, new ThreadExecutor());
1923        f.complete(one);
1924        f2.completeExceptionally(new CFException());
1925        checkCompletedWithWrappedCFException(g);
1926    }
1780  
1781 <    /**
1782 <     * thenCombineAsync result completes exceptionally if action does
1783 <     */
1784 <    public void testThenCombineAsync3E() {
1785 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1786 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1787 <        FailingBiFunction r = new FailingBiFunction();
1788 <        CompletableFuture<Integer> g = f.thenCombineAsync(f2, r, new ThreadExecutor());
1789 <        f.complete(one);
1937 <        checkIncomplete(g);
1938 <        f2.complete(two);
1939 <        checkCompletedWithWrappedCFException(g);
1940 <    }
1781 >        checkCompletedWithWrappedCFException(f, ex);
1782 >        checkCompletedNormally(g, v1);
1783 >        checkCompletedWithWrappedCFException(h0, ex);
1784 >        checkCompletedWithWrappedCFException(h1, ex);
1785 >        checkCompletedWithWrappedCFException(h2, ex);
1786 >        checkCompletedWithWrappedCFException(h3, ex);
1787 >        checkCompletedWithWrappedCFException(h4, ex);
1788 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
1789 >    }}
1790  
1791      /**
1792 <     * thenCombineAsync result completes exceptionally if either source cancelled
1792 >     * applyToEither result completes exceptionally if either source cancelled
1793       */
1794 <    public void testThenCombineAsync4E() {
1795 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1796 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1797 <        CompletableFuture<Integer> g = f.thenCombineAsync(f2, add, new ThreadExecutor());
1798 <        assertTrue(f.cancel(true));
1799 <        f2.complete(two);
1800 <        checkCompletedWithWrappedCancellationException(g);
1801 <
1802 <        f = new CompletableFuture<Integer>();
1803 <        f2 = new CompletableFuture<Integer>();
1804 <        g = f.thenCombineAsync(f2, add, new ThreadExecutor());
1805 <        f.complete(one);
1806 <        assertTrue(f2.cancel(true));
1807 <        checkCompletedWithWrappedCancellationException(g);
1808 <    }
1794 >    public void testApplyToEither_sourceCancelled() {
1795 >        for (ExecutionMode m : ExecutionMode.values())
1796 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1797 >        for (Integer v1 : new Integer[] { 1, null })
1798 >    {
1799 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1800 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1801 >        final IncFunction[] rs = new IncFunction[6];
1802 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1803 >
1804 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
1805 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
1806 >        checkIncomplete(h0);
1807 >        checkIncomplete(h1);
1808 >        rs[0].assertNotInvoked();
1809 >        rs[1].assertNotInvoked();
1810 >        f.cancel(mayInterruptIfRunning);
1811 >        checkCompletedWithWrappedCancellationException(h0);
1812 >        checkCompletedWithWrappedCancellationException(h1);
1813 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
1814 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
1815 >        checkCompletedWithWrappedCancellationException(h2);
1816 >        checkCompletedWithWrappedCancellationException(h3);
1817 >        g.complete(v1);
1818 >
1819 >        // unspecified behavior - both source completions available
1820 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
1821 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
1822 >        try {
1823 >            assertEquals(inc(v1), h4.join());
1824 >            rs[4].assertInvoked();
1825 >        } catch (CompletionException ok) {
1826 >            checkCompletedWithWrappedCancellationException(h4);
1827 >            rs[4].assertNotInvoked();
1828 >        }
1829 >        try {
1830 >            assertEquals(inc(v1), h5.join());
1831 >            rs[5].assertInvoked();
1832 >        } catch (CompletionException ok) {
1833 >            checkCompletedWithWrappedCancellationException(h5);
1834 >            rs[5].assertNotInvoked();
1835 >        }
1836  
1837 <    /**
1838 <     * thenAcceptBothAsync result completes normally after normal
1839 <     * completion of sources
1840 <     */
1841 <    public void testThenAcceptBothAsyncE() {
1842 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1843 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1844 <        AddAction r = new AddAction();
1969 <        CompletableFuture<Void> g = f.thenAcceptBothAsync(f2, r, new ThreadExecutor());
1970 <        f.complete(one);
1971 <        checkIncomplete(g);
1972 <        f2.complete(two);
1973 <        checkCompletedNormally(g, null);
1974 <        assertEquals(r.value, 3);
1975 <    }
1837 >        checkCancelled(f);
1838 >        checkCompletedNormally(g, v1);
1839 >        checkCompletedWithWrappedCancellationException(h0);
1840 >        checkCompletedWithWrappedCancellationException(h1);
1841 >        checkCompletedWithWrappedCancellationException(h2);
1842 >        checkCompletedWithWrappedCancellationException(h3);
1843 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
1844 >    }}
1845  
1846      /**
1847 <     * thenAcceptBothAsync result completes exceptionally after exceptional
1979 <     * completion of source
1847 >     * applyToEither result completes exceptionally if action does
1848       */
1849 <    public void testThenAcceptBothAsync2E() {
1850 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1851 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1852 <        AddAction r = new AddAction();
1853 <        CompletableFuture<Void> g = f.thenAcceptBothAsync(f2, r, new ThreadExecutor());
1854 <        f.completeExceptionally(new CFException());
1855 <        f2.complete(two);
1856 <        checkCompletedWithWrappedCFException(g);
1857 <
1858 <        r = new AddAction();
1859 <        f = new CompletableFuture<Integer>();
1860 <        f2 = new CompletableFuture<Integer>();
1861 <        g = f.thenAcceptBothAsync(f2, r, new ThreadExecutor());
1862 <        f.complete(one);
1863 <        f2.completeExceptionally(new CFException());
1864 <        checkCompletedWithWrappedCFException(g);
1865 <    }
1849 >    public void testApplyToEither_actionFailed() {
1850 >        for (ExecutionMode m : ExecutionMode.values())
1851 >        for (Integer v1 : new Integer[] { 1, null })
1852 >        for (Integer v2 : new Integer[] { 2, null })
1853 >    {
1854 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1855 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1856 >        final FailingFunction[] rs = new FailingFunction[6];
1857 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingFunction(m);
1858 >
1859 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
1860 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
1861 >        f.complete(v1);
1862 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
1863 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
1864 >        checkCompletedWithWrappedCFException(h0);
1865 >        checkCompletedWithWrappedCFException(h1);
1866 >        checkCompletedWithWrappedCFException(h2);
1867 >        checkCompletedWithWrappedCFException(h3);
1868 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
1869 >
1870 >        g.complete(v2);
1871 >
1872 >        // unspecified behavior - both source completions available
1873 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
1874 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
1875 >
1876 >        checkCompletedWithWrappedCFException(h4);
1877 >        assertTrue(Objects.equals(v1, rs[4].value) ||
1878 >                   Objects.equals(v2, rs[4].value));
1879 >        checkCompletedWithWrappedCFException(h5);
1880 >        assertTrue(Objects.equals(v1, rs[5].value) ||
1881 >                   Objects.equals(v2, rs[5].value));
1882 >
1883 >        checkCompletedNormally(f, v1);
1884 >        checkCompletedNormally(g, v2);
1885 >    }}
1886  
1887      /**
1888 <     * thenAcceptBothAsync result completes exceptionally if action does
1888 >     * acceptEither result completes normally after normal completion
1889 >     * of either source
1890       */
1891 <    public void testThenAcceptBothAsync3E() {
1892 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1893 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1894 <        FailingBiConsumer r = new FailingBiConsumer();
1895 <        CompletableFuture<Void> g = f.thenAcceptBothAsync(f2, r, new ThreadExecutor());
1896 <        f.complete(one);
1897 <        checkIncomplete(g);
1898 <        f2.complete(two);
1899 <        checkCompletedWithWrappedCFException(g);
1900 <    }
1891 >    public void testAcceptEither_normalCompletion() {
1892 >        for (ExecutionMode m : ExecutionMode.values())
1893 >        for (Integer v1 : new Integer[] { 1, null })
1894 >        for (Integer v2 : new Integer[] { 2, null })
1895 >    {
1896 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1897 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1898 >        final NoopConsumer[] rs = new NoopConsumer[6];
1899 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1900 >
1901 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
1902 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
1903 >        checkIncomplete(h0);
1904 >        checkIncomplete(h1);
1905 >        rs[0].assertNotInvoked();
1906 >        rs[1].assertNotInvoked();
1907 >        f.complete(v1);
1908 >        checkCompletedNormally(h0, null);
1909 >        checkCompletedNormally(h1, null);
1910 >        rs[0].assertValue(v1);
1911 >        rs[1].assertValue(v1);
1912 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
1913 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
1914 >        checkCompletedNormally(h2, null);
1915 >        checkCompletedNormally(h3, null);
1916 >        rs[2].assertValue(v1);
1917 >        rs[3].assertValue(v1);
1918 >        g.complete(v2);
1919 >
1920 >        // unspecified behavior - both source completions available
1921 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
1922 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
1923 >        checkCompletedNormally(h4, null);
1924 >        checkCompletedNormally(h5, null);
1925 >        assertTrue(Objects.equals(v1, rs[4].value) ||
1926 >                   Objects.equals(v2, rs[4].value));
1927 >        assertTrue(Objects.equals(v1, rs[5].value) ||
1928 >                   Objects.equals(v2, rs[5].value));
1929 >
1930 >        checkCompletedNormally(f, v1);
1931 >        checkCompletedNormally(g, v2);
1932 >        checkCompletedNormally(h0, null);
1933 >        checkCompletedNormally(h1, null);
1934 >        checkCompletedNormally(h2, null);
1935 >        checkCompletedNormally(h3, null);
1936 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
1937 >    }}
1938  
1939      /**
1940 <     * thenAcceptBothAsync result completes exceptionally if either source cancelled
1940 >     * acceptEither result completes exceptionally after exceptional
1941 >     * completion of either source
1942       */
1943 <    public void testThenAcceptBothAsync4E() {
1944 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1945 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1946 <        AddAction r = new AddAction();
1947 <        CompletableFuture<Void> g = f.thenAcceptBothAsync(f2, r, new ThreadExecutor());
1948 <        assertTrue(f.cancel(true));
1949 <        f2.complete(two);
1950 <        checkCompletedWithWrappedCancellationException(g);
1951 <
1952 <        r = new AddAction();
1953 <        f = new CompletableFuture<Integer>();
1954 <        f2 = new CompletableFuture<Integer>();
1955 <        g = f.thenAcceptBothAsync(f2, r, new ThreadExecutor());
1956 <        f.complete(one);
1957 <        assertTrue(f2.cancel(true));
1958 <        checkCompletedWithWrappedCancellationException(g);
1959 <    }
1943 >    public void testAcceptEither_exceptionalCompletion() {
1944 >        for (ExecutionMode m : ExecutionMode.values())
1945 >        for (Integer v1 : new Integer[] { 1, null })
1946 >    {
1947 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1948 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1949 >        final CFException ex = new CFException();
1950 >        final NoopConsumer[] rs = new NoopConsumer[6];
1951 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1952 >
1953 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
1954 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
1955 >        checkIncomplete(h0);
1956 >        checkIncomplete(h1);
1957 >        rs[0].assertNotInvoked();
1958 >        rs[1].assertNotInvoked();
1959 >        f.completeExceptionally(ex);
1960 >        checkCompletedWithWrappedCFException(h0, ex);
1961 >        checkCompletedWithWrappedCFException(h1, ex);
1962 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
1963 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
1964 >        checkCompletedWithWrappedCFException(h2, ex);
1965 >        checkCompletedWithWrappedCFException(h3, ex);
1966 >
1967 >        g.complete(v1);
1968 >
1969 >        // unspecified behavior - both source completions available
1970 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
1971 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
1972 >        try {
1973 >            assertNull(h4.join());
1974 >            rs[4].assertValue(v1);
1975 >        } catch (CompletionException ok) {
1976 >            checkCompletedWithWrappedCFException(h4, ex);
1977 >            rs[4].assertNotInvoked();
1978 >        }
1979 >        try {
1980 >            assertNull(h5.join());
1981 >            rs[5].assertValue(v1);
1982 >        } catch (CompletionException ok) {
1983 >            checkCompletedWithWrappedCFException(h5, ex);
1984 >            rs[5].assertNotInvoked();
1985 >        }
1986  
1987 <    /**
1988 <     * runAfterBothAsync result completes normally after normal
1989 <     * completion of sources
1990 <     */
1991 <    public void testRunAfterBothAsyncE() {
1992 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1993 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1994 <        Noop r = new Noop();
1995 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2043 <        f.complete(one);
2044 <        checkIncomplete(g);
2045 <        f2.complete(two);
2046 <        checkCompletedNormally(g, null);
2047 <        assertTrue(r.ran);
2048 <    }
1987 >        checkCompletedWithWrappedCFException(f, ex);
1988 >        checkCompletedNormally(g, v1);
1989 >        checkCompletedWithWrappedCFException(h0, ex);
1990 >        checkCompletedWithWrappedCFException(h1, ex);
1991 >        checkCompletedWithWrappedCFException(h2, ex);
1992 >        checkCompletedWithWrappedCFException(h3, ex);
1993 >        checkCompletedWithWrappedCFException(h4, ex);
1994 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
1995 >    }}
1996  
1997      /**
1998 <     * runAfterBothAsync result completes exceptionally after exceptional
2052 <     * completion of source
1998 >     * acceptEither result completes exceptionally if either source cancelled
1999       */
2000 <    public void testRunAfterBothAsync2E() {
2001 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2002 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2003 <        Noop r = new Noop();
2004 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2005 <        f.completeExceptionally(new CFException());
2006 <        f2.complete(two);
2007 <        checkCompletedWithWrappedCFException(g);
2000 >    public void testAcceptEither_sourceCancelled() {
2001 >        for (ExecutionMode m : ExecutionMode.values())
2002 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2003 >        for (Integer v1 : new Integer[] { 1, null })
2004 >    {
2005 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2006 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2007 >        final NoopConsumer[] rs = new NoopConsumer[6];
2008 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2009 >
2010 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2011 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2012 >        checkIncomplete(h0);
2013 >        checkIncomplete(h1);
2014 >        rs[0].assertNotInvoked();
2015 >        rs[1].assertNotInvoked();
2016 >        f.cancel(mayInterruptIfRunning);
2017 >        checkCompletedWithWrappedCancellationException(h0);
2018 >        checkCompletedWithWrappedCancellationException(h1);
2019 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2020 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2021 >        checkCompletedWithWrappedCancellationException(h2);
2022 >        checkCompletedWithWrappedCancellationException(h3);
2023 >
2024 >        g.complete(v1);
2025 >
2026 >        // unspecified behavior - both source completions available
2027 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2028 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2029 >        try {
2030 >            assertNull(h4.join());
2031 >            rs[4].assertValue(v1);
2032 >        } catch (CompletionException ok) {
2033 >            checkCompletedWithWrappedCancellationException(h4);
2034 >            rs[4].assertNotInvoked();
2035 >        }
2036 >        try {
2037 >            assertNull(h5.join());
2038 >            rs[5].assertValue(v1);
2039 >        } catch (CompletionException ok) {
2040 >            checkCompletedWithWrappedCancellationException(h5);
2041 >            rs[5].assertNotInvoked();
2042 >        }
2043  
2044 <        r = new Noop();
2045 <        f = new CompletableFuture<Integer>();
2046 <        f2 = new CompletableFuture<Integer>();
2047 <        g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2048 <        f.complete(one);
2049 <        f2.completeExceptionally(new CFException());
2050 <        checkCompletedWithWrappedCFException(g);
2051 <    }
2044 >        checkCancelled(f);
2045 >        checkCompletedNormally(g, v1);
2046 >        checkCompletedWithWrappedCancellationException(h0);
2047 >        checkCompletedWithWrappedCancellationException(h1);
2048 >        checkCompletedWithWrappedCancellationException(h2);
2049 >        checkCompletedWithWrappedCancellationException(h3);
2050 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2051 >    }}
2052  
2053      /**
2054 <     * runAfterBothAsync result completes exceptionally if action does
2054 >     * acceptEither result completes exceptionally if action does
2055       */
2056 <    public void testRunAfterBothAsync3E() {
2057 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2058 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2059 <        FailingNoop r = new FailingNoop();
2060 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2061 <        f.complete(one);
2062 <        checkIncomplete(g);
2063 <        f2.complete(two);
2064 <        checkCompletedWithWrappedCFException(g);
2065 <    }
2056 >    public void testAcceptEither_actionFailed() {
2057 >        for (ExecutionMode m : ExecutionMode.values())
2058 >        for (Integer v1 : new Integer[] { 1, null })
2059 >        for (Integer v2 : new Integer[] { 2, null })
2060 >    {
2061 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2062 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2063 >        final FailingConsumer[] rs = new FailingConsumer[6];
2064 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingConsumer(m);
2065 >
2066 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2067 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2068 >        f.complete(v1);
2069 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2070 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2071 >        checkCompletedWithWrappedCFException(h0);
2072 >        checkCompletedWithWrappedCFException(h1);
2073 >        checkCompletedWithWrappedCFException(h2);
2074 >        checkCompletedWithWrappedCFException(h3);
2075 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2076 >
2077 >        g.complete(v2);
2078 >
2079 >        // unspecified behavior - both source completions available
2080 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2081 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2082 >
2083 >        checkCompletedWithWrappedCFException(h4);
2084 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2085 >                   Objects.equals(v2, rs[4].value));
2086 >        checkCompletedWithWrappedCFException(h5);
2087 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2088 >                   Objects.equals(v2, rs[5].value));
2089 >
2090 >        checkCompletedNormally(f, v1);
2091 >        checkCompletedNormally(g, v2);
2092 >    }}
2093  
2094      /**
2095 <     * runAfterBothAsync result completes exceptionally if either source cancelled
2095 >     * runAfterEither result completes normally after normal completion
2096 >     * of either source
2097       */
2098 <    public void testRunAfterBothAsync4E() {
2099 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2100 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2101 <        Noop r = new Noop();
2102 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2103 <        assertTrue(f.cancel(true));
2104 <        f2.complete(two);
2105 <        checkCompletedWithWrappedCancellationException(g);
2106 <
2107 <        r = new Noop();
2108 <        f = new CompletableFuture<Integer>();
2109 <        f2 = new CompletableFuture<Integer>();
2110 <        g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2111 <        f.complete(one);
2112 <        assertTrue(f2.cancel(true));
2113 <        checkCompletedWithWrappedCancellationException(g);
2114 <    }
2098 >    public void testRunAfterEither_normalCompletion1() {
2099 >        for (ExecutionMode m : ExecutionMode.values())
2100 >        for (Integer v1 : new Integer[] { 1, null })
2101 >        for (Integer v2 : new Integer[] { 2, null })
2102 >    {
2103 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2104 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2105 >        final Noop r = new Noop(m);
2106 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2107 >
2108 >        f.complete(v1);
2109 >        checkCompletedNormally(h, null);
2110 >        r.assertInvoked();
2111 >        g.complete(v2);
2112 >
2113 >        checkCompletedNormally(f, v1);
2114 >        checkCompletedNormally(g, v2);
2115 >        checkCompletedNormally(h, null);
2116 >        r.assertInvoked();
2117 >    }}
2118 >
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);
2128 >
2129 >        g.complete(v2);
2130 >        checkCompletedNormally(h, null);
2131 >        r.assertInvoked();
2132 >        f.complete(v1);
2133 >
2134 >        checkCompletedNormally(f, v1);
2135 >        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);
2148 >
2149 >        f.complete(v1);
2150 >        g.complete(v2);
2151 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2152 >
2153 >        checkCompletedNormally(h, null);
2154 >        checkCompletedNormally(f, v1);
2155 >        checkCompletedNormally(g, v2);
2156 >        r.assertInvoked();
2157 >    }}
2158  
2159      /**
2160 <     * applyToEitherAsync result completes normally after normal
2161 <     * completion of sources
2160 >     * runAfterEither result completes exceptionally after exceptional
2161 >     * completion of either source
2162       */
2163 <    public void testApplyToEitherAsyncE() {
2164 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2165 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2166 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2167 <        f.complete(one);
2168 <        checkCompletedNormally(g, two);
2163 >    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() {
2184 >        for (ExecutionMode m : ExecutionMode.values())
2185 >        for (Integer v1 : new Integer[] { 1, null })
2186 >    {
2187 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2188 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2189 >        final Noop r = new Noop(m);
2190 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2191 >        final CFException ex = new CFException();
2192 >
2193 >        g.completeExceptionally(ex);
2194 >        checkCompletedWithWrappedCFException(h, ex);
2195 >        f.complete(v1);
2196 >
2197 >        r.assertNotInvoked();
2198 >        checkCompletedNormally(f, v1);
2199 >        checkCompletedWithWrappedCFException(g, ex);
2200 >        checkCompletedWithWrappedCFException(h, ex);
2201 >    }}
2202 >
2203 >    public void testRunAfterEither_exceptionalCompletion3() {
2204 >        for (ExecutionMode m : ExecutionMode.values())
2205 >        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();
2211 >
2212 >        g.completeExceptionally(ex);
2213 >        f.complete(v1);
2214 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2215  
2216 <        f = new CompletableFuture<Integer>();
2217 <        f.complete(one);
2218 <        f2 = new CompletableFuture<Integer>();
2219 <        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2220 <        checkCompletedNormally(g, two);
2221 <    }
2216 >        // unspecified behavior
2217 >        Integer v;
2218 >        try {
2219 >            assertNull(h.join());
2220 >            r.assertInvoked();
2221 >        } catch (CompletionException ok) {
2222 >            checkCompletedWithWrappedCFException(h, ex);
2223 >            r.assertNotInvoked();
2224 >        }
2225  
2226 <    /**
2227 <     * applyToEitherAsync result completes exceptionally after exceptional
2228 <     * completion of source
2229 <     */
2230 <    public void testApplyToEitherAsync2E() {
2231 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2232 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2233 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2234 <        f.completeExceptionally(new CFException());
2235 <        checkCompletedWithWrappedCFException(g);
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 <        f = new CompletableFuture<Integer>();
2244 <        f2 = new CompletableFuture<Integer>();
2245 <        f2.completeExceptionally(new CFException());
2246 <        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2247 <        f.complete(one);
2248 <        checkCompletedWithWrappedCFException(g);
2249 <    }
2243 >        // unspecified behavior
2244 >        Integer v;
2245 >        try {
2246 >            assertNull(h.join());
2247 >            r.assertInvoked();
2248 >        } catch (CompletionException ok) {
2249 >            checkCompletedWithWrappedCFException(h, ex);
2250 >            r.assertNotInvoked();
2251 >        }
2252  
2253 <    /**
2254 <     * applyToEitherAsync result completes exceptionally if action does
2255 <     */
2147 <    public void testApplyToEitherAsync3E() {
2148 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2149 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2150 <        FailingFunction r = new FailingFunction();
2151 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, r, new ThreadExecutor());
2152 <        f.complete(one);
2153 <        checkCompletedWithWrappedCFException(g);
2154 <    }
2253 >        checkCompletedWithWrappedCFException(f, ex);
2254 >        checkCompletedNormally(g, v1);
2255 >    }}
2256  
2257      /**
2258 <     * applyToEitherAsync result completes exceptionally if either source cancelled
2258 >     * runAfterEither result completes exceptionally if action does
2259       */
2260 <    public void testApplyToEitherAsync4E() {
2261 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2262 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2263 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2264 <        assertTrue(f.cancel(true));
2265 <        checkCompletedWithWrappedCancellationException(g);
2266 <
2267 <        f = new CompletableFuture<Integer>();
2268 <        f2 = new CompletableFuture<Integer>();
2269 <        assertTrue(f2.cancel(true));
2270 <        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2271 <        checkCompletedWithWrappedCancellationException(g);
2272 <    }
2260 >    public void testRunAfterEither_actionFailed1() {
2261 >        for (ExecutionMode m : ExecutionMode.values())
2262 >        for (Integer v1 : new Integer[] { 1, null })
2263 >        for (Integer v2 : new Integer[] { 2, null })
2264 >    {
2265 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2266 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2267 >        final FailingRunnable r = new FailingRunnable(m);
2268 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2269 >
2270 >        f.complete(v1);
2271 >        checkCompletedWithWrappedCFException(h);
2272 >        g.complete(v2);
2273 >        checkCompletedNormally(f, v1);
2274 >        checkCompletedNormally(g, v2);
2275 >    }}
2276 >
2277 >    public void testRunAfterEither_actionFailed2() {
2278 >        for (ExecutionMode m : ExecutionMode.values())
2279 >        for (Integer v1 : new Integer[] { 1, null })
2280 >        for (Integer v2 : new Integer[] { 2, null })
2281 >    {
2282 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2283 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2284 >        final FailingRunnable r = new FailingRunnable(m);
2285 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2286 >
2287 >        g.complete(v2);
2288 >        checkCompletedWithWrappedCFException(h);
2289 >        f.complete(v1);
2290 >        checkCompletedNormally(f, v1);
2291 >        checkCompletedNormally(g, v2);
2292 >    }}
2293  
2294      /**
2295 <     * acceptEitherAsync result completes normally after normal
2175 <     * completion of sources
2295 >     * runAfterEither result completes exceptionally if either source cancelled
2296       */
2297 <    public void testAcceptEitherAsyncE() {
2298 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2299 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2300 <        IncAction r = new IncAction();
2301 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2302 <        f.complete(one);
2303 <        checkCompletedNormally(g, null);
2304 <        assertEquals(r.value, 2);
2305 <
2306 <        r = new IncAction();
2307 <        f = new CompletableFuture<Integer>();
2308 <        f.complete(one);
2309 <        f2 = new CompletableFuture<Integer>();
2190 <        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2191 <        checkCompletedNormally(g, null);
2192 <        assertEquals(r.value, 2);
2193 <    }
2297 >    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 <    /**
2312 <     * acceptEitherAsync result completes exceptionally after exceptional
2313 <     * completion of source
2314 <     */
2315 <    public void testAcceptEitherAsync2E() {
2316 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2317 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2318 <        IncAction r = new IncAction();
2319 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2320 <        f.completeExceptionally(new CFException());
2321 <        checkCompletedWithWrappedCFException(g);
2311 >        checkCancelled(f);
2312 >        r.assertNotInvoked();
2313 >        checkCompletedNormally(g, v1);
2314 >        checkCompletedWithWrappedCancellationException(h);
2315 >    }}
2316 >
2317 >    public void testRunAfterEither_sourceCancelled2() {
2318 >        for (ExecutionMode m : ExecutionMode.values())
2319 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2320 >        for (Integer v1 : new Integer[] { 1, null })
2321 >    {
2322 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2323 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2324 >        final Noop r = new Noop(m);
2325 >        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 >    }}
2336 >
2337 >    public void testRunAfterEither_sourceCancelled3() {
2338 >        for (ExecutionMode m : ExecutionMode.values())
2339 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2340 >        for (Integer v1 : new Integer[] { 1, null })
2341 >    {
2342 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2343 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2344 >        final Noop r = new Noop(m);
2345 >
2346 >        assertTrue(g.cancel(mayInterruptIfRunning));
2347 >        f.complete(v1);
2348 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2349  
2350 <        r = new IncAction();
2351 <        f = new CompletableFuture<Integer>();
2352 <        f2 = new CompletableFuture<Integer>();
2353 <        f2.completeExceptionally(new CFException());
2354 <        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2355 <        f.complete(one);
2356 <        checkCompletedWithWrappedCFException(g);
2357 <    }
2350 >        // unspecified behavior
2351 >        Integer v;
2352 >        try {
2353 >            assertNull(h.join());
2354 >            r.assertInvoked();
2355 >        } catch (CompletionException ok) {
2356 >            checkCompletedWithWrappedCancellationException(h);
2357 >            r.assertNotInvoked();
2358 >        }
2359  
2360 <    /**
2361 <     * acceptEitherAsync result completes exceptionally if action does
2362 <     */
2363 <    public void testAcceptEitherAsync3E() {
2364 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2365 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2366 <        FailingConsumer r = new FailingConsumer();
2367 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2368 <        f.complete(one);
2369 <        checkCompletedWithWrappedCFException(g);
2370 <    }
2360 >        checkCancelled(g);
2361 >        checkCompletedNormally(f, v1);
2362 >    }}
2363 >
2364 >    public void testRunAfterEither_sourceCancelled4() {
2365 >        for (ExecutionMode m : ExecutionMode.values())
2366 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2367 >        for (Integer v1 : new Integer[] { 1, null })
2368 >    {
2369 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2370 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2371 >        final Noop r = new Noop(m);
2372 >
2373 >        assertTrue(f.cancel(mayInterruptIfRunning));
2374 >        g.complete(v1);
2375 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2376  
2377 <    /**
2378 <     * acceptEitherAsync result completes exceptionally if either
2379 <     * source cancelled
2380 <     */
2381 <    public void testAcceptEitherAsync4E() {
2382 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2383 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2384 <        IncAction r = new IncAction();
2385 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2237 <        assertTrue(f.cancel(true));
2238 <        checkCompletedWithWrappedCancellationException(g);
2377 >        // unspecified behavior
2378 >        Integer v;
2379 >        try {
2380 >            assertNull(h.join());
2381 >            r.assertInvoked();
2382 >        } catch (CompletionException ok) {
2383 >            checkCompletedWithWrappedCancellationException(h);
2384 >            r.assertNotInvoked();
2385 >        }
2386  
2387 <        r = new IncAction();
2388 <        f = new CompletableFuture<Integer>();
2389 <        f2 = new CompletableFuture<Integer>();
2243 <        assertTrue(f2.cancel(true));
2244 <        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2245 <        checkCompletedWithWrappedCancellationException(g);
2246 <    }
2387 >        checkCancelled(f);
2388 >        checkCompletedNormally(g, v1);
2389 >    }}
2390  
2391      /**
2392 <     * runAfterEitherAsync result completes normally after normal
2250 <     * completion of sources
2392 >     * thenCompose result completes normally after normal completion of source
2393       */
2394 <    public void testRunAfterEitherAsyncE() {
2395 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2396 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2397 <        Noop r = new Noop();
2398 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2399 <        f.complete(one);
2400 <        checkCompletedNormally(g, null);
2401 <        assertTrue(r.ran);
2402 <
2403 <        r = new Noop();
2404 <        f = new CompletableFuture<Integer>();
2405 <        f.complete(one);
2406 <        f2 = new CompletableFuture<Integer>();
2407 <        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2408 <        checkCompletedNormally(g, null);
2267 <        assertTrue(r.ran);
2268 <    }
2394 >    public void testThenCompose_normalCompletion() {
2395 >        for (ExecutionMode m : ExecutionMode.values())
2396 >        for (boolean createIncomplete : new boolean[] { true, false })
2397 >        for (Integer v1 : new Integer[] { 1, null })
2398 >    {
2399 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2400 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2401 >        if (!createIncomplete) f.complete(v1);
2402 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2403 >        if (createIncomplete) f.complete(v1);
2404 >
2405 >        checkCompletedNormally(g, inc(v1));
2406 >        checkCompletedNormally(f, v1);
2407 >        r.assertInvoked();
2408 >    }}
2409  
2410      /**
2411 <     * runAfterEitherAsync result completes exceptionally after exceptional
2411 >     * thenCompose result completes exceptionally after exceptional
2412       * completion of source
2413       */
2414 <    public void testRunAfterEitherAsync2E() {
2415 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2416 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2417 <        Noop r = new Noop();
2418 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2419 <        f.completeExceptionally(new CFException());
2420 <        checkCompletedWithWrappedCFException(g);
2421 <
2422 <        r = new Noop();
2423 <        f = new CompletableFuture<Integer>();
2424 <        f2 = new CompletableFuture<Integer>();
2425 <        f2.completeExceptionally(new CFException());
2426 <        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2427 <        f.complete(one);
2428 <        checkCompletedWithWrappedCFException(g);
2289 <    }
2414 >    public void testThenCompose_exceptionalCompletion() {
2415 >        for (ExecutionMode m : ExecutionMode.values())
2416 >        for (boolean createIncomplete : new boolean[] { true, false })
2417 >    {
2418 >        final CFException ex = new CFException();
2419 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2420 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2421 >        if (!createIncomplete) f.completeExceptionally(ex);
2422 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2423 >        if (createIncomplete) f.completeExceptionally(ex);
2424 >
2425 >        checkCompletedWithWrappedCFException(g, ex);
2426 >        checkCompletedWithWrappedCFException(f, ex);
2427 >        r.assertNotInvoked();
2428 >    }}
2429  
2430      /**
2431 <     * runAfterEitherAsync result completes exceptionally if action does
2293 <     */
2294 <    public void testRunAfterEitherAsync3E() {
2295 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2296 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2297 <        FailingNoop r = new FailingNoop();
2298 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2299 <        f.complete(one);
2300 <        checkCompletedWithWrappedCFException(g);
2301 <    }
2302 <
2303 <    /**
2304 <     * runAfterEitherAsync result completes exceptionally if either
2305 <     * source cancelled
2306 <     */
2307 <    public void testRunAfterEitherAsync4E() {
2308 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2309 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2310 <        Noop r = new Noop();
2311 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2312 <        assertTrue(f.cancel(true));
2313 <        checkCompletedWithWrappedCancellationException(g);
2314 <
2315 <        r = new Noop();
2316 <        f = new CompletableFuture<Integer>();
2317 <        f2 = new CompletableFuture<Integer>();
2318 <        assertTrue(f2.cancel(true));
2319 <        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2320 <        checkCompletedWithWrappedCancellationException(g);
2321 <    }
2322 <
2323 <    /**
2324 <     * thenComposeAsync result completes normally after normal
2325 <     * completion of source
2431 >     * thenCompose result completes exceptionally if action does
2432       */
2433 <    public void testThenComposeAsyncE() {
2434 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2435 <        CompletableFutureInc r = new CompletableFutureInc();
2436 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2437 <        f.complete(one);
2438 <        checkCompletedNormally(g, two);
2439 <    }
2433 >    public void testThenCompose_actionFailed() {
2434 >        for (ExecutionMode m : ExecutionMode.values())
2435 >        for (boolean createIncomplete : new boolean[] { true, false })
2436 >        for (Integer v1 : new Integer[] { 1, null })
2437 >    {
2438 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2439 >        final FailingCompletableFutureFunction r
2440 >            = new FailingCompletableFutureFunction(m);
2441 >        if (!createIncomplete) f.complete(v1);
2442 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2443 >        if (createIncomplete) f.complete(v1);
2444  
2335    /**
2336     * thenComposeAsync result completes exceptionally after
2337     * exceptional completion of source
2338     */
2339    public void testThenComposeAsync2E() {
2340        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2341        CompletableFutureInc r = new CompletableFutureInc();
2342        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2343        f.completeExceptionally(new CFException());
2445          checkCompletedWithWrappedCFException(g);
2446 <    }
2446 >        checkCompletedNormally(f, v1);
2447 >    }}
2448  
2449      /**
2450 <     * thenComposeAsync result completes exceptionally if action does
2450 >     * thenCompose result completes exceptionally if source cancelled
2451       */
2452 <    public void testThenComposeAsync3E() {
2453 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2454 <        FailingCompletableFutureFunction r = new FailingCompletableFutureFunction();
2455 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2456 <        f.complete(one);
2457 <        checkCompletedWithWrappedCFException(g);
2458 <    }
2452 >    public void testThenCompose_sourceCancelled() {
2453 >        for (ExecutionMode m : ExecutionMode.values())
2454 >        for (boolean createIncomplete : new boolean[] { true, false })
2455 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2456 >    {
2457 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2458 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2459 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2460 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2461 >        if (createIncomplete) {
2462 >            checkIncomplete(g);
2463 >            assertTrue(f.cancel(mayInterruptIfRunning));
2464 >        }
2465  
2358    /**
2359     * thenComposeAsync result completes exceptionally if source cancelled
2360     */
2361    public void testThenComposeAsync4E() {
2362        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2363        CompletableFutureInc r = new CompletableFutureInc();
2364        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2365        assertTrue(f.cancel(true));
2466          checkCompletedWithWrappedCancellationException(g);
2467 <    }
2467 >        checkCancelled(f);
2468 >    }}
2469  
2470      // other static methods
2471  
# Line 2373 | Line 2474 | public class CompletableFutureTest exten
2474       * with the value null
2475       */
2476      public void testAllOf_empty() throws Exception {
2477 <        CompletableFuture<?> f = CompletableFuture.allOf();
2477 >        CompletableFuture<Void> f = CompletableFuture.allOf();
2478          checkCompletedNormally(f, null);
2479      }
2480  
2481      /**
2482 <     * allOf returns a future completed when all components complete
2482 >     * allOf returns a future completed normally with the value null
2483 >     * when all components complete normally
2484       */
2485 <    public void testAllOf() throws Exception {
2485 >    public void testAllOf_normal() throws Exception {
2486          for (int k = 1; k < 20; ++k) {
2487 <            CompletableFuture[] fs = new CompletableFuture[k];
2487 >            CompletableFuture<Integer>[] fs
2488 >                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
2489              for (int i = 0; i < k; ++i)
2490 <                fs[i] = new CompletableFuture<Integer>();
2490 >                fs[i] = new CompletableFuture<>();
2491              CompletableFuture<Void> f = CompletableFuture.allOf(fs);
2492              for (int i = 0; i < k; ++i) {
2493                  checkIncomplete(f);
2494 +                checkIncomplete(CompletableFuture.allOf(fs));
2495                  fs[i].complete(one);
2496              }
2497              checkCompletedNormally(f, null);
2498 +            checkCompletedNormally(CompletableFuture.allOf(fs), null);
2499 +        }
2500 +    }
2501 +
2502 +    public void testAllOf_backwards() throws Exception {
2503 +        for (int k = 1; k < 20; ++k) {
2504 +            CompletableFuture<Integer>[] fs
2505 +                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
2506 +            for (int i = 0; i < k; ++i)
2507 +                fs[i] = new CompletableFuture<>();
2508 +            CompletableFuture<Void> f = CompletableFuture.allOf(fs);
2509 +            for (int i = k - 1; i >= 0; i--) {
2510 +                checkIncomplete(f);
2511 +                checkIncomplete(CompletableFuture.allOf(fs));
2512 +                fs[i].complete(one);
2513 +            }
2514 +            checkCompletedNormally(f, null);
2515 +            checkCompletedNormally(CompletableFuture.allOf(fs), null);
2516          }
2517      }
2518  
# Line 2398 | Line 2520 | public class CompletableFutureTest exten
2520       * anyOf(no component futures) returns an incomplete future
2521       */
2522      public void testAnyOf_empty() throws Exception {
2523 <        CompletableFuture<?> f = CompletableFuture.anyOf();
2523 >        CompletableFuture<Object> f = CompletableFuture.anyOf();
2524          checkIncomplete(f);
2525      }
2526  
2527      /**
2528 <     * anyOf returns a future completed when any components complete
2528 >     * anyOf returns a future completed normally with a value when
2529 >     * a component future does
2530       */
2531 <    public void testAnyOf() throws Exception {
2532 <        for (int k = 1; k < 20; ++k) {
2531 >    public void testAnyOf_normal() throws Exception {
2532 >        for (int k = 0; k < 10; ++k) {
2533              CompletableFuture[] fs = new CompletableFuture[k];
2534              for (int i = 0; i < k; ++i)
2535 <                fs[i] = new CompletableFuture<Integer>();
2535 >                fs[i] = new CompletableFuture<>();
2536              CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
2537              checkIncomplete(f);
2538              for (int i = 0; i < k; ++i) {
2539                  fs[i].complete(one);
2540                  checkCompletedNormally(f, one);
2541 +                checkCompletedNormally(CompletableFuture.anyOf(fs), one);
2542 +            }
2543 +        }
2544 +    }
2545 +
2546 +    /**
2547 +     * anyOf result completes exceptionally when any component does.
2548 +     */
2549 +    public void testAnyOf_exceptional() throws Exception {
2550 +        for (int k = 0; k < 10; ++k) {
2551 +            CompletableFuture[] fs = new CompletableFuture[k];
2552 +            for (int i = 0; i < k; ++i)
2553 +                fs[i] = new CompletableFuture<>();
2554 +            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
2555 +            checkIncomplete(f);
2556 +            for (int i = 0; i < k; ++i) {
2557 +                fs[i].completeExceptionally(new CFException());
2558 +                checkCompletedWithWrappedCFException(f);
2559 +                checkCompletedWithWrappedCFException(CompletableFuture.anyOf(fs));
2560              }
2561          }
2562      }
# Line 2423 | Line 2565 | public class CompletableFutureTest exten
2565       * Completion methods throw NullPointerException with null arguments
2566       */
2567      public void testNPE() {
2568 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2569 <        CompletableFuture<Integer> g = new CompletableFuture<Integer>();
2568 >        CompletableFuture<Integer> f = new CompletableFuture<>();
2569 >        CompletableFuture<Integer> g = new CompletableFuture<>();
2570          CompletableFuture<Integer> nullFuture = (CompletableFuture<Integer>)null;
2571          CompletableFuture<?> h;
2572          ThreadExecutor exec = new ThreadExecutor();
2573  
2574          Runnable[] throwingActions = {
2575 <            () -> { CompletableFuture.supplyAsync(null); },
2576 <            () -> { CompletableFuture.supplyAsync(null, exec); },
2577 <            () -> { CompletableFuture.supplyAsync(supplyOne, null); },
2578 <
2579 <            () -> { CompletableFuture.runAsync(null); },
2580 <            () -> { CompletableFuture.runAsync(null, exec); },
2581 <            () -> { CompletableFuture.runAsync(() -> {}, null); },
2582 <
2583 <            () -> { f.completeExceptionally(null); },
2584 <
2585 <            () -> { f.thenApply(null); },
2586 <            () -> { f.thenApplyAsync(null); },
2587 <            () -> { f.thenApplyAsync((x) -> x, null); },
2588 <            () -> { f.thenApplyAsync(null, exec); },
2589 <
2590 <            () -> { f.thenAccept(null); },
2591 <            () -> { f.thenAcceptAsync(null); },
2592 <            () -> { f.thenAcceptAsync((x) -> { ; }, null); },
2593 <            () -> { f.thenAcceptAsync(null, exec); },
2594 <
2595 <            () -> { f.thenRun(null); },
2596 <            () -> { f.thenRunAsync(null); },
2597 <            () -> { f.thenRunAsync(() -> { ; }, null); },
2598 <            () -> { f.thenRunAsync(null, exec); },
2599 <
2600 <            () -> { f.thenCombine(g, null); },
2601 <            () -> { f.thenCombineAsync(g, null); },
2602 <            () -> { f.thenCombineAsync(g, null, exec); },
2603 <            () -> { f.thenCombine(nullFuture, (x, y) -> x); },
2604 <            () -> { f.thenCombineAsync(nullFuture, (x, y) -> x); },
2605 <            () -> { f.thenCombineAsync(nullFuture, (x, y) -> x, exec); },
2606 <            () -> { f.thenCombineAsync(g, (x, y) -> x, null); },
2607 <
2608 <            () -> { f.thenAcceptBoth(g, null); },
2609 <            () -> { f.thenAcceptBothAsync(g, null); },
2610 <            () -> { f.thenAcceptBothAsync(g, null, exec); },
2611 <            () -> { f.thenAcceptBoth(nullFuture, (x, y) -> {}); },
2612 <            () -> { f.thenAcceptBothAsync(nullFuture, (x, y) -> {}); },
2613 <            () -> { f.thenAcceptBothAsync(nullFuture, (x, y) -> {}, exec); },
2614 <            () -> { f.thenAcceptBothAsync(g, (x, y) -> {}, null); },
2615 <
2616 <            () -> { f.runAfterBoth(g, null); },
2617 <            () -> { f.runAfterBothAsync(g, null); },
2618 <            () -> { f.runAfterBothAsync(g, null, exec); },
2619 <            () -> { f.runAfterBoth(nullFuture, () -> {}); },
2620 <            () -> { f.runAfterBothAsync(nullFuture, () -> {}); },
2621 <            () -> { f.runAfterBothAsync(nullFuture, () -> {}, exec); },
2622 <            () -> { f.runAfterBothAsync(g, () -> {}, null); },
2623 <
2624 <            () -> { f.applyToEither(g, null); },
2625 <            () -> { f.applyToEitherAsync(g, null); },
2626 <            () -> { f.applyToEitherAsync(g, null, exec); },
2627 <            () -> { f.applyToEither(nullFuture, (x) -> x); },
2628 <            () -> { f.applyToEitherAsync(nullFuture, (x) -> x); },
2629 <            () -> { f.applyToEitherAsync(nullFuture, (x) -> x, exec); },
2630 <            () -> { f.applyToEitherAsync(g, (x) -> x, null); },
2631 <
2632 <            () -> { f.acceptEither(g, null); },
2633 <            () -> { f.acceptEitherAsync(g, null); },
2634 <            () -> { f.acceptEitherAsync(g, null, exec); },
2635 <            () -> { f.acceptEither(nullFuture, (x) -> {}); },
2636 <            () -> { f.acceptEitherAsync(nullFuture, (x) -> {}); },
2637 <            () -> { f.acceptEitherAsync(nullFuture, (x) -> {}, exec); },
2638 <            () -> { f.acceptEitherAsync(g, (x) -> {}, null); },
2639 <
2640 <            () -> { f.runAfterEither(g, null); },
2641 <            () -> { f.runAfterEitherAsync(g, null); },
2642 <            () -> { f.runAfterEitherAsync(g, null, exec); },
2643 <            () -> { f.runAfterEither(nullFuture, () -> {}); },
2644 <            () -> { f.runAfterEitherAsync(nullFuture, () -> {}); },
2645 <            () -> { f.runAfterEitherAsync(nullFuture, () -> {}, exec); },
2646 <            () -> { f.runAfterEitherAsync(g, () -> {}, null); },
2647 <
2648 <            () -> { f.thenCompose(null); },
2649 <            () -> { f.thenComposeAsync(null); },
2650 <            () -> { f.thenComposeAsync(new CompletableFutureInc(), null); },
2651 <            () -> { f.thenComposeAsync(null, exec); },
2652 <
2653 <            () -> { f.exceptionally(null); },
2654 <
2655 <            () -> { f.handle(null); },
2656 <
2657 <            () -> { CompletableFuture.allOf((CompletableFuture<?>)null); },
2658 <            () -> { CompletableFuture.allOf((CompletableFuture<?>[])null); },
2659 <            () -> { CompletableFuture.allOf(f, null); },
2660 <            () -> { CompletableFuture.allOf(null, f); },
2661 <
2662 <            () -> { CompletableFuture.anyOf((CompletableFuture<?>)null); },
2663 <            () -> { CompletableFuture.anyOf((CompletableFuture<?>[])null); },
2664 <            () -> { CompletableFuture.anyOf(f, null); },
2665 <            () -> { CompletableFuture.anyOf(null, f); },
2575 >            () -> CompletableFuture.supplyAsync(null),
2576 >            () -> CompletableFuture.supplyAsync(null, exec),
2577 >            () -> CompletableFuture.supplyAsync(new IntegerSupplier(ExecutionMode.DEFAULT, 42), null),
2578 >
2579 >            () -> CompletableFuture.runAsync(null),
2580 >            () -> CompletableFuture.runAsync(null, exec),
2581 >            () -> CompletableFuture.runAsync(() -> {}, null),
2582 >
2583 >            () -> f.completeExceptionally(null),
2584 >
2585 >            () -> f.thenApply(null),
2586 >            () -> f.thenApplyAsync(null),
2587 >            () -> f.thenApplyAsync((x) -> x, null),
2588 >            () -> f.thenApplyAsync(null, exec),
2589 >
2590 >            () -> f.thenAccept(null),
2591 >            () -> f.thenAcceptAsync(null),
2592 >            () -> f.thenAcceptAsync((x) -> {} , null),
2593 >            () -> f.thenAcceptAsync(null, exec),
2594 >
2595 >            () -> f.thenRun(null),
2596 >            () -> f.thenRunAsync(null),
2597 >            () -> f.thenRunAsync(() -> {} , null),
2598 >            () -> f.thenRunAsync(null, exec),
2599 >
2600 >            () -> f.thenCombine(g, null),
2601 >            () -> f.thenCombineAsync(g, null),
2602 >            () -> f.thenCombineAsync(g, null, exec),
2603 >            () -> f.thenCombine(nullFuture, (x, y) -> x),
2604 >            () -> f.thenCombineAsync(nullFuture, (x, y) -> x),
2605 >            () -> f.thenCombineAsync(nullFuture, (x, y) -> x, exec),
2606 >            () -> f.thenCombineAsync(g, (x, y) -> x, null),
2607 >
2608 >            () -> f.thenAcceptBoth(g, null),
2609 >            () -> f.thenAcceptBothAsync(g, null),
2610 >            () -> f.thenAcceptBothAsync(g, null, exec),
2611 >            () -> f.thenAcceptBoth(nullFuture, (x, y) -> {}),
2612 >            () -> f.thenAcceptBothAsync(nullFuture, (x, y) -> {}),
2613 >            () -> f.thenAcceptBothAsync(nullFuture, (x, y) -> {}, exec),
2614 >            () -> f.thenAcceptBothAsync(g, (x, y) -> {}, null),
2615 >
2616 >            () -> f.runAfterBoth(g, null),
2617 >            () -> f.runAfterBothAsync(g, null),
2618 >            () -> f.runAfterBothAsync(g, null, exec),
2619 >            () -> f.runAfterBoth(nullFuture, () -> {}),
2620 >            () -> f.runAfterBothAsync(nullFuture, () -> {}),
2621 >            () -> f.runAfterBothAsync(nullFuture, () -> {}, exec),
2622 >            () -> f.runAfterBothAsync(g, () -> {}, null),
2623 >
2624 >            () -> f.applyToEither(g, null),
2625 >            () -> f.applyToEitherAsync(g, null),
2626 >            () -> f.applyToEitherAsync(g, null, exec),
2627 >            () -> f.applyToEither(nullFuture, (x) -> x),
2628 >            () -> f.applyToEitherAsync(nullFuture, (x) -> x),
2629 >            () -> f.applyToEitherAsync(nullFuture, (x) -> x, exec),
2630 >            () -> f.applyToEitherAsync(g, (x) -> x, null),
2631 >
2632 >            () -> f.acceptEither(g, null),
2633 >            () -> f.acceptEitherAsync(g, null),
2634 >            () -> f.acceptEitherAsync(g, null, exec),
2635 >            () -> f.acceptEither(nullFuture, (x) -> {}),
2636 >            () -> f.acceptEitherAsync(nullFuture, (x) -> {}),
2637 >            () -> f.acceptEitherAsync(nullFuture, (x) -> {}, exec),
2638 >            () -> f.acceptEitherAsync(g, (x) -> {}, null),
2639 >
2640 >            () -> f.runAfterEither(g, null),
2641 >            () -> f.runAfterEitherAsync(g, null),
2642 >            () -> f.runAfterEitherAsync(g, null, exec),
2643 >            () -> f.runAfterEither(nullFuture, () -> {}),
2644 >            () -> f.runAfterEitherAsync(nullFuture, () -> {}),
2645 >            () -> f.runAfterEitherAsync(nullFuture, () -> {}, exec),
2646 >            () -> f.runAfterEitherAsync(g, () -> {}, null),
2647 >
2648 >            () -> f.thenCompose(null),
2649 >            () -> f.thenComposeAsync(null),
2650 >            () -> f.thenComposeAsync(new CompletableFutureInc(ExecutionMode.EXECUTOR), null),
2651 >            () -> f.thenComposeAsync(null, exec),
2652 >
2653 >            () -> f.exceptionally(null),
2654 >
2655 >            () -> f.handle(null),
2656 >
2657 >            () -> CompletableFuture.allOf((CompletableFuture<?>)null),
2658 >            () -> CompletableFuture.allOf((CompletableFuture<?>[])null),
2659 >            () -> CompletableFuture.allOf(f, null),
2660 >            () -> CompletableFuture.allOf(null, f),
2661 >
2662 >            () -> CompletableFuture.anyOf((CompletableFuture<?>)null),
2663 >            () -> CompletableFuture.anyOf((CompletableFuture<?>[])null),
2664 >            () -> CompletableFuture.anyOf(f, null),
2665 >            () -> CompletableFuture.anyOf(null, f),
2666 >
2667 >            () -> f.obtrudeException(null),
2668          };
2669  
2670          assertThrows(NullPointerException.class, throwingActions);
2671          assertEquals(0, exec.count.get());
2672      }
2673  
2674 +    /**
2675 +     * toCompletableFuture returns this CompletableFuture.
2676 +     */
2677 +    public void testToCompletableFuture() {
2678 +        CompletableFuture<Integer> f = new CompletableFuture<>();
2679 +        assertSame(f, f.toCompletableFuture());
2680 +    }
2681 +
2682 +    /**
2683 +     * whenComplete action executes on normal completion, propagating
2684 +     * source result.
2685 +     */
2686 +    public void testWhenComplete_normalCompletion1() {
2687 +        for (ExecutionMode m : ExecutionMode.values())
2688 +        for (boolean createIncomplete : new boolean[] { true, false })
2689 +        for (Integer v1 : new Integer[] { 1, null })
2690 +    {
2691 +        final AtomicInteger a = new AtomicInteger(0);
2692 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
2693 +        if (!createIncomplete) f.complete(v1);
2694 +        final CompletableFuture<Integer> g = m.whenComplete
2695 +            (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);
2704 +        checkCompletedNormally(f, v1);
2705 +        assertEquals(1, a.get());
2706 +    }}
2707 +
2708 +    /**
2709 +     * whenComplete action executes on exceptional completion, propagating
2710 +     * source result.
2711 +     */
2712 +    public void testWhenComplete_exceptionalCompletion() {
2713 +        for (ExecutionMode m : ExecutionMode.values())
2714 +        for (boolean createIncomplete : new boolean[] { true, false })
2715 +        for (Integer v1 : new Integer[] { 1, null })
2716 +    {
2717 +        final AtomicInteger a = new AtomicInteger(0);
2718 +        final CFException ex = new CFException();
2719 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
2720 +        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());
2732 +    }}
2733 +
2734 +    /**
2735 +     * whenComplete action executes on cancelled source, propagating
2736 +     * CancellationException.
2737 +     */
2738 +    public void testWhenComplete_sourceCancelled() {
2739 +        for (ExecutionMode m : ExecutionMode.values())
2740 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2741 +        for (boolean createIncomplete : new boolean[] { true, false })
2742 +    {
2743 +        final AtomicInteger a = new AtomicInteger(0);
2744 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
2745 +        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2746 +        final CompletableFuture<Integer> g = m.whenComplete
2747 +            (f,
2748 +             (Integer x, Throwable t) -> {
2749 +                threadAssertNull(x);
2750 +                threadAssertTrue(t instanceof CancellationException);
2751 +                a.getAndIncrement();
2752 +            });
2753 +        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2754 +
2755 +        //try { g.join(); } catch (Throwable t) { throw new Error(t); }
2756 +        checkCompletedWithWrappedCancellationException(g);
2757 +        checkCancelled(f);
2758 +        assertEquals(1, a.get());
2759 +    }}
2760 +
2761 +    /**
2762 +     * If a whenComplete action throws an exception when triggered by
2763 +     * a normal completion, it completes exceptionally
2764 +     */
2765 +    public void testWhenComplete_actionFailed() {
2766 +        for (boolean createIncomplete : new boolean[] { true, false })
2767 +        for (ExecutionMode m : ExecutionMode.values())
2768 +        for (Integer v1 : new Integer[] { 1, null })
2769 +    {
2770 +        final AtomicInteger a = new AtomicInteger(0);
2771 +        final CFException ex = new CFException();
2772 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
2773 +        if (!createIncomplete) f.complete(v1);
2774 +        final CompletableFuture<Integer> g = m.whenComplete
2775 +            (f,
2776 +             (Integer x, Throwable t) -> {
2777 +                threadAssertSame(x, v1);
2778 +                threadAssertNull(t);
2779 +                a.getAndIncrement();
2780 +                throw ex;
2781 +            });
2782 +        if (createIncomplete) f.complete(v1);
2783 +        checkCompletedNormally(f, v1);
2784 +        checkCompletedWithWrappedCFException(g, ex);
2785 +        assertEquals(1, a.get());
2786 +    }}
2787 +
2788 +    /**
2789 +     * 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.
2792 +     */
2793 +    public void testWhenComplete_actionFailedSourceFailed() {
2794 +        for (boolean createIncomplete : new boolean[] { true, false })
2795 +        for (ExecutionMode m : ExecutionMode.values())
2796 +        for (Integer v1 : new Integer[] { 1, null })
2797 +    {
2798 +        final AtomicInteger a = new AtomicInteger(0);
2799 +        final CFException ex1 = new CFException();
2800 +        final CFException ex2 = new CFException();
2801 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
2802 +
2803 +        if (!createIncomplete) f.completeExceptionally(ex1);
2804 +        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);
2813 +
2814 +        checkCompletedWithWrappedCFException(f, ex1);
2815 +        checkCompletedWithWrappedCFException(g, ex1);
2816 +        assertEquals(1, a.get());
2817 +    }}
2818 +
2819   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines