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.64 by jsr166, Fri Jun 6 17:08:48 2014 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines