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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines