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.45 by jsr166, Mon Jun 2 06:07:34 2014 UTC vs.
Revision 1.55 by jsr166, Mon Jun 2 21:41:37 2014 UTC

# Line 17 | Line 17 | 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 247 | 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 279 | 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 371 | Line 375 | public class CompletableFutureTest exten
375          }
376      }
377      static final class Noop implements Runnable {
378 +        final ExecutionMode m;
379          int invocationCount = 0;
380 +        Noop(ExecutionMode m) { this.m = m; }
381          public void run() {
382 +            m.checkExecutionMode();
383              invocationCount++;
384          }
385      }
# Line 412 | Line 419 | public class CompletableFutureTest exten
419              throw new CFException();
420          }
421      }
422 <    static final class FailingNoop implements Runnable {
422 >    static final class FailingRunnable implements Runnable {
423          int invocationCount = 0;
424          public void run() {
425              invocationCount++;
# Line 450 | Line 457 | public class CompletableFutureTest exten
457          }
458      }
459  
453    static final class ExceptionToInteger implements Function<Throwable, Integer> {
454        public Integer apply(Throwable x) { return Integer.valueOf(3); }
455    }
456
457    static final class IntegerHandler implements BiFunction<Integer, Throwable, Integer> {
458        int invocationCount = 0;
459        public Integer apply(Integer x, Throwable t) {
460            invocationCount++;
461            return (t == null) ? two : three;
462        }
463    }
464
460      /**
461       * Permits the testing of parallel code for the 3 different
462       * execution modes without repeating all the testing code.
463       */
464      enum ExecutionMode {
465          DEFAULT {
466 +            public void checkExecutionMode() {
467 +                assertNull(ForkJoinTask.getPool());
468 +            }
469 +            public <T> CompletableFuture<Void> thenRun
470 +                (CompletableFuture<T> f, Runnable a) {
471 +                return f.thenRun(a);
472 +            }
473 +            public <T> CompletableFuture<Void> thenAccept
474 +                (CompletableFuture<T> f, Consumer<? super T> a) {
475 +                return f.thenAccept(a);
476 +            }
477 +            public <T,U> CompletableFuture<U> thenApply
478 +                (CompletableFuture<T> f, Function<? super T,U> a) {
479 +                return f.thenApply(a);
480 +            }
481 +            public <T,U> CompletableFuture<U> thenCompose
482 +                (CompletableFuture<T> f,
483 +                 Function<? super T,? extends CompletionStage<U>> a) {
484 +                return f.thenCompose(a);
485 +            }
486 +            public <T,U> CompletableFuture<U> handle
487 +                (CompletableFuture<T> f,
488 +                 BiFunction<? super T,Throwable,? extends U> a) {
489 +                return f.handle(a);
490 +            }
491 +            public <T> CompletableFuture<T> whenComplete
492 +                (CompletableFuture<T> f,
493 +                 BiConsumer<? super T,? super Throwable> a) {
494 +                return f.whenComplete(a);
495 +            }
496              public <T,U> CompletableFuture<Void> runAfterBoth
497                  (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
498                  return f.runAfterBoth(g, a);
# Line 484 | Line 509 | public class CompletableFutureTest exten
509                   BiFunction<? super T,? super U,? extends V> a) {
510                  return f.thenCombine(g, a);
511              }
512 <            public <T,U> CompletableFuture<U> applyToEither
512 >            public <T> CompletableFuture<Void> runAfterEither
513                  (CompletableFuture<T> f,
514 <                 CompletionStage<? extends T> g,
515 <                 Function<? super T,U> a) {
516 <                return f.applyToEither(g, a);
514 >                 CompletionStage<?> g,
515 >                 java.lang.Runnable a) {
516 >                return f.runAfterEither(g, a);
517              }
518              public <T> CompletableFuture<Void> acceptEither
519                  (CompletableFuture<T> f,
# Line 496 | Line 521 | public class CompletableFutureTest exten
521                   Consumer<? super T> a) {
522                  return f.acceptEither(g, a);
523              }
524 <            public <T> CompletableFuture<Void> runAfterEither
524 >            public <T,U> CompletableFuture<U> applyToEither
525                  (CompletableFuture<T> f,
526 <                 CompletionStage<?> g,
527 <                 java.lang.Runnable a) {
528 <                return f.runAfterEither(g, a);
526 >                 CompletionStage<? extends T> g,
527 >                 Function<? super T,U> a) {
528 >                return f.applyToEither(g, a);
529 >            }
530 >        },
531 >
532 >        ASYNC {
533 >            public void checkExecutionMode() {
534 >                assertSame(ForkJoinPool.commonPool(),
535 >                           ForkJoinTask.getPool());
536 >            }
537 >            public <T> CompletableFuture<Void> thenRun
538 >                (CompletableFuture<T> f, Runnable a) {
539 >                return f.thenRunAsync(a);
540 >            }
541 >            public <T> CompletableFuture<Void> thenAccept
542 >                (CompletableFuture<T> f, Consumer<? super T> a) {
543 >                return f.thenAcceptAsync(a);
544 >            }
545 >            public <T,U> CompletableFuture<U> thenApply
546 >                (CompletableFuture<T> f, Function<? super T,U> a) {
547 >                return f.thenApplyAsync(a);
548              }
549              public <T,U> CompletableFuture<U> thenCompose
550                  (CompletableFuture<T> f,
551                   Function<? super T,? extends CompletionStage<U>> a) {
552 <                return f.thenCompose(a);
552 >                return f.thenComposeAsync(a);
553 >            }
554 >            public <T,U> CompletableFuture<U> handle
555 >                (CompletableFuture<T> f,
556 >                 BiFunction<? super T,Throwable,? extends U> a) {
557 >                return f.handleAsync(a);
558              }
559              public <T> CompletableFuture<T> whenComplete
560                  (CompletableFuture<T> f,
561                   BiConsumer<? super T,? super Throwable> a) {
562 <                return f.whenComplete(a);
562 >                return f.whenCompleteAsync(a);
563              }
515        },
516
517        DEFAULT_ASYNC {
564              public <T,U> CompletableFuture<Void> runAfterBoth
565                  (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
566                  return f.runAfterBothAsync(g, a);
# Line 531 | Line 577 | public class CompletableFutureTest exten
577                   BiFunction<? super T,? super U,? extends V> a) {
578                  return f.thenCombineAsync(g, a);
579              }
580 <            public <T,U> CompletableFuture<U> applyToEither
580 >            public <T> CompletableFuture<Void> runAfterEither
581                  (CompletableFuture<T> f,
582 <                 CompletionStage<? extends T> g,
583 <                 Function<? super T,U> a) {
584 <                return f.applyToEitherAsync(g, a);
582 >                 CompletionStage<?> g,
583 >                 java.lang.Runnable a) {
584 >                return f.runAfterEitherAsync(g, a);
585              }
586              public <T> CompletableFuture<Void> acceptEither
587                  (CompletableFuture<T> f,
# Line 543 | Line 589 | public class CompletableFutureTest exten
589                   Consumer<? super T> a) {
590                  return f.acceptEitherAsync(g, a);
591              }
592 <            public <T> CompletableFuture<Void> runAfterEither
592 >            public <T,U> CompletableFuture<U> applyToEither
593                  (CompletableFuture<T> f,
594 <                 CompletionStage<?> g,
595 <                 java.lang.Runnable a) {
596 <                return f.runAfterEitherAsync(g, a);
594 >                 CompletionStage<? extends T> g,
595 >                 Function<? super T,U> a) {
596 >                return f.applyToEitherAsync(g, a);
597 >            }
598 >        },
599 >
600 >        EXECUTOR {
601 >            public void checkExecutionMode() {
602 >                //TODO
603 >            }
604 >            public <T> CompletableFuture<Void> thenRun
605 >                (CompletableFuture<T> f, Runnable a) {
606 >                return f.thenRunAsync(a, new ThreadExecutor());
607 >            }
608 >            public <T> CompletableFuture<Void> thenAccept
609 >                (CompletableFuture<T> f, Consumer<? super T> a) {
610 >                return f.thenAcceptAsync(a, new ThreadExecutor());
611 >            }
612 >            public <T,U> CompletableFuture<U> thenApply
613 >                (CompletableFuture<T> f, Function<? super T,U> a) {
614 >                return f.thenApplyAsync(a, new ThreadExecutor());
615              }
616              public <T,U> CompletableFuture<U> thenCompose
617                  (CompletableFuture<T> f,
618                   Function<? super T,? extends CompletionStage<U>> a) {
619 <                return f.thenComposeAsync(a);
619 >                return f.thenComposeAsync(a, new ThreadExecutor());
620 >            }
621 >            public <T,U> CompletableFuture<U> handle
622 >                (CompletableFuture<T> f,
623 >                 BiFunction<? super T,Throwable,? extends U> a) {
624 >                return f.handleAsync(a, new ThreadExecutor());
625              }
626              public <T> CompletableFuture<T> whenComplete
627                  (CompletableFuture<T> f,
628                   BiConsumer<? super T,? super Throwable> a) {
629 <                return f.whenCompleteAsync(a);
629 >                return f.whenCompleteAsync(a, new ThreadExecutor());
630              }
562        },
563
564        EXECUTOR {
631              public <T,U> CompletableFuture<Void> runAfterBoth
632                  (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
633                  return f.runAfterBothAsync(g, a, new ThreadExecutor());
# Line 578 | Line 644 | public class CompletableFutureTest exten
644                   BiFunction<? super T,? super U,? extends V> a) {
645                  return f.thenCombineAsync(g, a, new ThreadExecutor());
646              }
581            public <T,U> CompletableFuture<U> applyToEither
582                (CompletableFuture<T> f,
583                 CompletionStage<? extends T> g,
584                 Function<? super T,U> a) {
585                return f.applyToEitherAsync(g, a, new ThreadExecutor());
586            }
587            public <T> CompletableFuture<Void> acceptEither
588                (CompletableFuture<T> f,
589                 CompletionStage<? extends T> g,
590                 Consumer<? super T> a) {
591                return f.acceptEitherAsync(g, a, new ThreadExecutor());
592            }
647              public <T> CompletableFuture<Void> runAfterEither
648                  (CompletableFuture<T> f,
649                   CompletionStage<?> g,
650                   java.lang.Runnable a) {
651                  return f.runAfterEitherAsync(g, a, new ThreadExecutor());
652              }
653 <            public <T,U> CompletableFuture<U> thenCompose
653 >            public <T> CompletableFuture<Void> acceptEither
654                  (CompletableFuture<T> f,
655 <                 Function<? super T,? extends CompletionStage<U>> a) {
656 <                return f.thenComposeAsync(a, new ThreadExecutor());
655 >                 CompletionStage<? extends T> g,
656 >                 Consumer<? super T> a) {
657 >                return f.acceptEitherAsync(g, a, new ThreadExecutor());
658              }
659 <            public <T> CompletableFuture<T> whenComplete
659 >            public <T,U> CompletableFuture<U> applyToEither
660                  (CompletableFuture<T> f,
661 <                 BiConsumer<? super T,? super Throwable> a) {
662 <                return f.whenCompleteAsync(a, new ThreadExecutor());
661 >                 CompletionStage<? extends T> g,
662 >                 Function<? super T,U> a) {
663 >                return f.applyToEitherAsync(g, a, new ThreadExecutor());
664              }
665          };
666  
667 +        public abstract void checkExecutionMode();
668 +        public abstract <T> CompletableFuture<Void> thenRun
669 +            (CompletableFuture<T> f, Runnable a);
670 +        public abstract <T> CompletableFuture<Void> thenAccept
671 +            (CompletableFuture<T> f, Consumer<? super T> a);
672 +        public abstract <T,U> CompletableFuture<U> thenApply
673 +            (CompletableFuture<T> f, Function<? super T,U> a);
674 +        public abstract <T,U> CompletableFuture<U> thenCompose
675 +            (CompletableFuture<T> f,
676 +             Function<? super T,? extends CompletionStage<U>> a);
677 +        public abstract <T,U> CompletableFuture<U> handle
678 +            (CompletableFuture<T> f,
679 +             BiFunction<? super T,Throwable,? extends U> a);
680 +        public abstract <T> CompletableFuture<T> whenComplete
681 +            (CompletableFuture<T> f,
682 +             BiConsumer<? super T,? super Throwable> a);
683          public abstract <T,U> CompletableFuture<Void> runAfterBoth
684              (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a);
685          public abstract <T,U> CompletableFuture<Void> thenAcceptBoth
# Line 618 | Line 690 | public class CompletableFutureTest exten
690              (CompletableFuture<T> f,
691               CompletionStage<? extends U> g,
692               BiFunction<? super T,? super U,? extends V> a);
621        public abstract <T,U> CompletableFuture<U> applyToEither
622            (CompletableFuture<T> f,
623             CompletionStage<? extends T> g,
624             Function<? super T,U> a);
625        public abstract <T> CompletableFuture<Void> acceptEither
626            (CompletableFuture<T> f,
627             CompletionStage<? extends T> g,
628             Consumer<? super T> a);
693          public abstract <T> CompletableFuture<Void> runAfterEither
694              (CompletableFuture<T> f,
695               CompletionStage<?> g,
696               java.lang.Runnable a);
697 <        public abstract <T,U> CompletableFuture<U> thenCompose
697 >        public abstract <T> CompletableFuture<Void> acceptEither
698              (CompletableFuture<T> f,
699 <             Function<? super T,? extends CompletionStage<U>> a);
700 <        public abstract <T> CompletableFuture<T> whenComplete
699 >             CompletionStage<? extends T> g,
700 >             Consumer<? super T> a);
701 >        public abstract <T,U> CompletableFuture<U> applyToEither
702              (CompletableFuture<T> f,
703 <             BiConsumer<? super T,? super Throwable> a);
703 >             CompletionStage<? extends T> g,
704 >             Function<? super T,U> a);
705 >    }
706  
707 +    /**
708 +     * exceptionally action is not invoked when source completes
709 +     * normally, and source result is propagated
710 +     */
711 +    public void testExceptionally_normalCompletion() {
712 +        for (boolean createIncomplete : new boolean[] { true, false })
713 +        for (Integer v1 : new Integer[] { 1, null })
714 +    {
715 +        final AtomicInteger a = new AtomicInteger(0);
716 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
717 +        if (!createIncomplete) f.complete(v1);
718 +        final CompletableFuture<Integer> g = f.exceptionally
719 +            ((Throwable t) -> {
720 +                // Should not be called
721 +                a.getAndIncrement();
722 +                throw new AssertionError();
723 +            });
724 +        if (createIncomplete) f.complete(v1);
725 +
726 +        checkCompletedNormally(g, v1);
727 +        checkCompletedNormally(f, v1);
728 +        assertEquals(0, a.get());
729 +    }}
730  
641    }
731  
732      /**
733       * exceptionally action completes with function value on source
734 <     * exception; otherwise with source value
734 >     * exception
735       */
736 <    public void testExceptionally() {
737 <        CompletableFuture<Integer> f = new CompletableFuture<>();
738 <        ExceptionToInteger r = new ExceptionToInteger();
739 <        CompletableFuture<Integer> g = f.exceptionally(r);
740 <        f.completeExceptionally(new CFException());
741 <        checkCompletedNormally(g, three);
736 >    public void testExceptionally_exceptionalCompletion() {
737 >        for (boolean createIncomplete : new boolean[] { true, false })
738 >        for (Integer v1 : new Integer[] { 1, null })
739 >    {
740 >        final AtomicInteger a = new AtomicInteger(0);
741 >        final CFException ex = new CFException();
742 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
743 >        if (!createIncomplete) f.completeExceptionally(ex);
744 >        final CompletableFuture<Integer> g = f.exceptionally
745 >            ((Throwable t) -> {
746 >                threadAssertSame(t, ex);
747 >                a.getAndIncrement();
748 >                return v1;
749 >            });
750 >        if (createIncomplete) f.completeExceptionally(ex);
751  
752 <        f = new CompletableFuture<>();
753 <        r = new ExceptionToInteger();
754 <        g = f.exceptionally(r);
755 <        f.complete(one);
756 <        checkCompletedNormally(g, one);
757 <    }
752 >        checkCompletedNormally(g, v1);
753 >        assertEquals(1, a.get());
754 >    }}
755 >
756 >    public void testExceptionally_exceptionalCompletionActionFailed() {
757 >        for (boolean createIncomplete : new boolean[] { true, false })
758 >        for (Integer v1 : new Integer[] { 1, null })
759 >    {
760 >        final AtomicInteger a = new AtomicInteger(0);
761 >        final CFException ex1 = new CFException();
762 >        final CFException ex2 = new CFException();
763 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
764 >        if (!createIncomplete) f.completeExceptionally(ex1);
765 >        final CompletableFuture<Integer> g = f.exceptionally
766 >            ((Throwable t) -> {
767 >                threadAssertSame(t, ex1);
768 >                a.getAndIncrement();
769 >                throw ex2;
770 >            });
771 >        if (createIncomplete) f.completeExceptionally(ex1);
772 >
773 >        checkCompletedWithWrappedCFException(g, ex2);
774 >        assertEquals(1, a.get());
775 >    }}
776  
777      /**
778 <     * handle action completes normally with function value on either
779 <     * normal or exceptional completion of source
778 >     * handle action completes normally with function value on normal
779 >     * completion of source
780       */
781 <    public void testHandle() {
782 <        CompletableFuture<Integer> f, g;
783 <        IntegerHandler r;
781 >    public void testHandle_normalCompletion() {
782 >        for (ExecutionMode m : ExecutionMode.values())
783 >        for (boolean createIncomplete : new boolean[] { true, false })
784 >        for (Integer v1 : new Integer[] { 1, null })
785 >    {
786 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
787 >        final AtomicInteger a = new AtomicInteger(0);
788 >        if (!createIncomplete) f.complete(v1);
789 >        final CompletableFuture<Integer> g = m.handle
790 >            (f,
791 >             (Integer x, Throwable t) -> {
792 >                threadAssertSame(x, v1);
793 >                threadAssertNull(t);
794 >                a.getAndIncrement();
795 >                return inc(v1);
796 >            });
797 >        if (createIncomplete) f.complete(v1);
798  
799 <        f = new CompletableFuture<>();
800 <        f.completeExceptionally(new CFException());
801 <        g = f.handle(r = new IntegerHandler());
802 <        assertEquals(1, r.invocationCount);
673 <        assertEquals(1, r.invocationCount);
674 <        checkCompletedNormally(g, three);
799 >        checkCompletedNormally(g, inc(v1));
800 >        checkCompletedNormally(f, v1);
801 >        assertEquals(1, a.get());
802 >    }}
803  
804 <        f = new CompletableFuture<>();
805 <        g = f.handle(r = new IntegerHandler());
806 <        assertEquals(0, r.invocationCount);
807 <        f.completeExceptionally(new CFException());
808 <        checkCompletedNormally(g, three);
809 <        assertEquals(1, r.invocationCount);
804 >    /**
805 >     * handle action completes normally with function value on
806 >     * exceptional completion of source
807 >     */
808 >    public void testHandle_exceptionalCompletion() {
809 >        for (ExecutionMode m : ExecutionMode.values())
810 >        for (boolean createIncomplete : new boolean[] { true, false })
811 >        for (Integer v1 : new Integer[] { 1, null })
812 >    {
813 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
814 >        final AtomicInteger a = new AtomicInteger(0);
815 >        final CFException ex = new CFException();
816 >        if (!createIncomplete) f.completeExceptionally(ex);
817 >        final CompletableFuture<Integer> g = m.handle
818 >            (f,
819 >             (Integer x, Throwable t) -> {
820 >                threadAssertNull(x);
821 >                threadAssertSame(t, ex);
822 >                a.getAndIncrement();
823 >                return v1;
824 >            });
825 >        if (createIncomplete) f.completeExceptionally(ex);
826  
827 <        f = new CompletableFuture<>();
828 <        f.complete(one);
829 <        g = f.handle(r = new IntegerHandler());
830 <        assertEquals(1, r.invocationCount);
687 <        checkCompletedNormally(g, two);
827 >        checkCompletedNormally(g, v1);
828 >        checkCompletedWithWrappedCFException(f, ex);
829 >        assertEquals(1, a.get());
830 >    }}
831  
832 <        f = new CompletableFuture<>();
833 <        g = f.handle(r = new IntegerHandler());
834 <        assertEquals(0, r.invocationCount);
835 <        f.complete(one);
836 <        assertEquals(1, r.invocationCount);
837 <        checkCompletedNormally(g, two);
838 <    }
832 >    /**
833 >     * handle action completes normally with function value on
834 >     * cancelled source
835 >     */
836 >    public void testHandle_sourceCancelled() {
837 >        for (ExecutionMode m : ExecutionMode.values())
838 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
839 >        for (boolean createIncomplete : new boolean[] { true, false })
840 >        for (Integer v1 : new Integer[] { 1, null })
841 >    {
842 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
843 >        final AtomicInteger a = new AtomicInteger(0);
844 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
845 >        final CompletableFuture<Integer> g = m.handle
846 >            (f,
847 >             (Integer x, Throwable t) -> {
848 >                threadAssertNull(x);
849 >                threadAssertTrue(t instanceof CancellationException);
850 >                a.getAndIncrement();
851 >                return v1;
852 >            });
853 >        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
854 >
855 >        checkCompletedNormally(g, v1);
856 >        checkCancelled(f);
857 >        assertEquals(1, a.get());
858 >    }}
859 >
860 >    /**
861 >     * handle result completes exceptionally if action does
862 >     */
863 >    public void testHandle_sourceFailedActionFailed() {
864 >        for (ExecutionMode m : ExecutionMode.values())
865 >        for (boolean createIncomplete : new boolean[] { true, false })
866 >    {
867 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
868 >        final AtomicInteger a = new AtomicInteger(0);
869 >        final CFException ex1 = new CFException();
870 >        final CFException ex2 = new CFException();
871 >        if (!createIncomplete) f.completeExceptionally(ex1);
872 >        final CompletableFuture<Integer> g = m.handle
873 >            (f,
874 >             (Integer x, Throwable t) -> {
875 >                threadAssertNull(x);
876 >                threadAssertSame(ex1, t);
877 >                a.getAndIncrement();
878 >                throw ex2;
879 >            });
880 >        if (createIncomplete) f.completeExceptionally(ex1);
881 >
882 >        checkCompletedWithWrappedCFException(g, ex2);
883 >        checkCompletedWithWrappedCFException(f, ex1);
884 >        assertEquals(1, a.get());
885 >    }}
886 >
887 >    public void testHandle_sourceCompletedNormallyActionFailed() {
888 >        for (ExecutionMode m : ExecutionMode.values())
889 >        for (boolean createIncomplete : new boolean[] { true, false })
890 >        for (Integer v1 : new Integer[] { 1, null })
891 >    {
892 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
893 >        final AtomicInteger a = new AtomicInteger(0);
894 >        final CFException ex = new CFException();
895 >        if (!createIncomplete) f.complete(v1);
896 >        final CompletableFuture<Integer> g = m.handle
897 >            (f,
898 >             (Integer x, Throwable t) -> {
899 >                threadAssertSame(x, v1);
900 >                threadAssertNull(t);
901 >                a.getAndIncrement();
902 >                throw ex;
903 >            });
904 >        if (createIncomplete) f.complete(v1);
905 >
906 >        checkCompletedWithWrappedCFException(g, ex);
907 >        checkCompletedNormally(f, v1);
908 >        assertEquals(1, a.get());
909 >    }}
910  
911      /**
912       * runAsync completes after running Runnable
913       */
914      public void testRunAsync() {
915 <        Noop r = new Noop();
915 >        Noop r = new Noop(ExecutionMode.ASYNC);
916          CompletableFuture<Void> f = CompletableFuture.runAsync(r);
917          assertNull(f.join());
918          assertEquals(1, r.invocationCount);
# Line 709 | Line 923 | public class CompletableFutureTest exten
923       * runAsync with executor completes after running Runnable
924       */
925      public void testRunAsync2() {
926 <        Noop r = new Noop();
926 >        Noop r = new Noop(ExecutionMode.EXECUTOR);
927          ThreadExecutor exec = new ThreadExecutor();
928          CompletableFuture<Void> f = CompletableFuture.runAsync(r, exec);
929          assertNull(f.join());
# Line 722 | Line 936 | public class CompletableFutureTest exten
936       * failing runAsync completes exceptionally after running Runnable
937       */
938      public void testRunAsync3() {
939 <        FailingNoop r = new FailingNoop();
939 >        FailingRunnable r = new FailingRunnable();
940          CompletableFuture<Void> f = CompletableFuture.runAsync(r);
941          checkCompletedWithWrappedCFException(f);
942          assertEquals(1, r.invocationCount);
# Line 763 | Line 977 | public class CompletableFutureTest exten
977      /**
978       * thenRun result completes normally after normal completion of source
979       */
980 <    public void testThenRun() {
981 <        CompletableFuture<Integer> f;
982 <        CompletableFuture<Void> g;
983 <        Noop r;
984 <
985 <        f = new CompletableFuture<>();
986 <        g = f.thenRun(r = new Noop());
987 <        f.complete(null);
988 <        checkCompletedNormally(g, null);
989 <        assertEquals(1, r.invocationCount);
980 >    public void testThenRun_normalCompletion() {
981 >        for (ExecutionMode m : ExecutionMode.values())
982 >        for (boolean createIncomplete : new boolean[] { true, false })
983 >        for (Integer v1 : new Integer[] { 1, null })
984 >    {
985 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
986 >        final Noop r = new Noop(m);
987 >        if (!createIncomplete) f.complete(v1);
988 >        final CompletableFuture<Void> g = m.thenRun(f, r);
989 >        if (createIncomplete) {
990 >            checkIncomplete(g);
991 >            f.complete(v1);
992 >        }
993  
777        f = new CompletableFuture<>();
778        f.complete(null);
779        g = f.thenRun(r = new Noop());
994          checkCompletedNormally(g, null);
995 +        checkCompletedNormally(f, v1);
996          assertEquals(1, r.invocationCount);
997 <    }
997 >    }}
998  
999      /**
1000       * thenRun result completes exceptionally after exceptional
1001       * completion of source
1002       */
1003 <    public void testThenRun2() {
1004 <        CompletableFuture<Integer> f;
1005 <        CompletableFuture<Void> g;
1006 <        Noop r;
1007 <
1008 <        f = new CompletableFuture<>();
1009 <        g = f.thenRun(r = new Noop());
1010 <        f.completeExceptionally(new CFException());
1011 <        checkCompletedWithWrappedCFException(g);
1012 <        assertEquals(0, r.invocationCount);
1003 >    public void testThenRun_exceptionalCompletion() {
1004 >        for (ExecutionMode m : ExecutionMode.values())
1005 >        for (boolean createIncomplete : new boolean[] { true, false })
1006 >    {
1007 >        final CFException ex = new CFException();
1008 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1009 >        final Noop r = new Noop(m);
1010 >        if (!createIncomplete) f.completeExceptionally(ex);
1011 >        final CompletableFuture<Void> g = m.thenRun(f, r);
1012 >        if (createIncomplete) {
1013 >            checkIncomplete(g);
1014 >            f.completeExceptionally(ex);
1015 >        }
1016  
1017 <        f = new CompletableFuture<>();
1018 <        f.completeExceptionally(new CFException());
801 <        g = f.thenRun(r = new Noop());
802 <        checkCompletedWithWrappedCFException(g);
1017 >        checkCompletedWithWrappedCFException(g, ex);
1018 >        checkCompletedWithWrappedCFException(f, ex);
1019          assertEquals(0, r.invocationCount);
1020 <    }
1020 >    }}
1021  
1022      /**
1023 <     * thenRun result completes exceptionally if action does
1023 >     * thenRun result completes exceptionally if source cancelled
1024       */
1025 <    public void testThenRun3() {
1026 <        CompletableFuture<Integer> f;
1027 <        CompletableFuture<Void> g;
1028 <        FailingNoop r;
1029 <
1030 <        f = new CompletableFuture<>();
1031 <        g = f.thenRun(r = new FailingNoop());
1032 <        f.complete(null);
1033 <        checkCompletedWithWrappedCFException(g);
1025 >    public void testThenRun_sourceCancelled() {
1026 >        for (ExecutionMode m : ExecutionMode.values())
1027 >        for (boolean createIncomplete : new boolean[] { true, false })
1028 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1029 >    {
1030 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1031 >        final Noop r = new Noop(m);
1032 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1033 >        final CompletableFuture<Void> g = f.thenRun(r);
1034 >        if (createIncomplete) {
1035 >            checkIncomplete(g);
1036 >            assertTrue(f.cancel(mayInterruptIfRunning));
1037 >        }
1038  
1039 <        f = new CompletableFuture<>();
1040 <        f.complete(null);
1041 <        g = f.thenRun(r = new FailingNoop());
1042 <        checkCompletedWithWrappedCFException(g);
823 <    }
1039 >        checkCompletedWithWrappedCancellationException(g);
1040 >        checkCancelled(f);
1041 >        assertEquals(0, r.invocationCount);
1042 >    }}
1043  
1044      /**
1045 <     * thenRun result completes exceptionally if source cancelled
1045 >     * thenRun result completes exceptionally if action does
1046       */
1047 <    public void testThenRun4() {
1048 <        CompletableFuture<Integer> f;
1049 <        CompletableFuture<Void> g;
1050 <        Noop r;
1051 <
1052 <        f = new CompletableFuture<>();
1053 <        g = f.thenRun(r = new Noop());
1054 <        assertTrue(f.cancel(true));
1055 <        checkCompletedWithWrappedCancellationException(g);
1047 >    public void testThenRun_actionFailed() {
1048 >        for (ExecutionMode m : ExecutionMode.values())
1049 >        for (boolean createIncomplete : new boolean[] { true, false })
1050 >        for (Integer v1 : new Integer[] { 1, null })
1051 >    {
1052 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1053 >        final FailingRunnable r = new FailingRunnable();
1054 >        if (!createIncomplete) f.complete(v1);
1055 >        final CompletableFuture<Void> g = f.thenRun(r);
1056 >        if (createIncomplete) {
1057 >            checkIncomplete(g);
1058 >            f.complete(v1);
1059 >        }
1060  
1061 <        f = new CompletableFuture<>();
1062 <        assertTrue(f.cancel(true));
1063 <        g = f.thenRun(r = new Noop());
841 <        checkCompletedWithWrappedCancellationException(g);
842 <    }
1061 >        checkCompletedWithWrappedCFException(g);
1062 >        checkCompletedNormally(f, v1);
1063 >    }}
1064  
1065      /**
1066       * thenApply result completes normally after normal completion of source
1067       */
1068 <    public void testThenApply() {
1069 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1070 <        CompletableFuture<Integer> g = f.thenApply(inc);
1071 <        f.complete(one);
1072 <        checkCompletedNormally(g, two);
1073 <    }
1068 >    public void testThenApply_normalCompletion() {
1069 >        for (ExecutionMode m : ExecutionMode.values())
1070 >        for (boolean createIncomplete : new boolean[] { true, false })
1071 >        for (Integer v1 : new Integer[] { 1, null })
1072 >    {
1073 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1074 >        final IncFunction r = new IncFunction();
1075 >        if (!createIncomplete) f.complete(v1);
1076 >        final CompletableFuture<Integer> g = m.thenApply(f, r);
1077 >        if (createIncomplete) {
1078 >            checkIncomplete(g);
1079 >            f.complete(v1);
1080 >        }
1081 >
1082 >        checkCompletedNormally(g, inc(v1));
1083 >        checkCompletedNormally(f, v1);
1084 >        assertEquals(1, r.invocationCount);
1085 >    }}
1086  
1087      /**
1088       * thenApply result completes exceptionally after exceptional
1089       * completion of source
1090       */
1091 <    public void testThenApply2() {
1092 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1093 <        CompletableFuture<Integer> g = f.thenApply(inc);
1094 <        f.completeExceptionally(new CFException());
1095 <        checkCompletedWithWrappedCFException(g);
1096 <    }
1091 >    public void testThenApply_exceptionalCompletion() {
1092 >        for (ExecutionMode m : ExecutionMode.values())
1093 >        for (boolean createIncomplete : new boolean[] { true, false })
1094 >    {
1095 >        final CFException ex = new CFException();
1096 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1097 >        final IncFunction r = new IncFunction();
1098 >        if (!createIncomplete) f.completeExceptionally(ex);
1099 >        final CompletableFuture<Integer> g = m.thenApply(f, r);
1100 >        if (createIncomplete) {
1101 >            checkIncomplete(g);
1102 >            f.completeExceptionally(ex);
1103 >        }
1104  
1105 <    /**
1106 <     * thenApply result completes exceptionally if action does
1107 <     */
1108 <    public void testThenApply3() {
869 <        CompletableFuture<Integer> f = new CompletableFuture<>();
870 <        CompletableFuture<Integer> g = f.thenApply(new FailingFunction());
871 <        f.complete(one);
872 <        checkCompletedWithWrappedCFException(g);
873 <    }
1105 >        checkCompletedWithWrappedCFException(g, ex);
1106 >        checkCompletedWithWrappedCFException(f, ex);
1107 >        assertEquals(0, r.invocationCount);
1108 >    }}
1109  
1110      /**
1111       * thenApply result completes exceptionally if source cancelled
1112       */
1113 <    public void testThenApply4() {
1114 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1115 <        CompletableFuture<Integer> g = f.thenApply(inc);
1116 <        assertTrue(f.cancel(true));
1113 >    public void testThenApply_sourceCancelled() {
1114 >        for (ExecutionMode m : ExecutionMode.values())
1115 >        for (boolean createIncomplete : new boolean[] { true, false })
1116 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1117 >    {
1118 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1119 >        final IncFunction r = new IncFunction();
1120 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1121 >        final CompletableFuture<Integer> g = f.thenApply(r);
1122 >        if (createIncomplete) {
1123 >            checkIncomplete(g);
1124 >            assertTrue(f.cancel(mayInterruptIfRunning));
1125 >        }
1126 >
1127          checkCompletedWithWrappedCancellationException(g);
1128 <    }
1128 >        checkCancelled(f);
1129 >        assertEquals(0, r.invocationCount);
1130 >    }}
1131 >
1132 >    /**
1133 >     * thenApply result completes exceptionally if action does
1134 >     */
1135 >    public void testThenApply_actionFailed() {
1136 >        for (ExecutionMode m : ExecutionMode.values())
1137 >        for (boolean createIncomplete : new boolean[] { true, false })
1138 >        for (Integer v1 : new Integer[] { 1, null })
1139 >    {
1140 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1141 >        final FailingFunction r = new FailingFunction();
1142 >        if (!createIncomplete) f.complete(v1);
1143 >        final CompletableFuture<Integer> g = f.thenApply(r);
1144 >        if (createIncomplete) {
1145 >            checkIncomplete(g);
1146 >            f.complete(v1);
1147 >        }
1148 >
1149 >        checkCompletedWithWrappedCFException(g);
1150 >        checkCompletedNormally(f, v1);
1151 >    }}
1152  
1153      /**
1154       * thenAccept result completes normally after normal completion of source
1155       */
1156 <    public void testThenAccept() {
1157 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1158 <        IncAction r = new IncAction();
1159 <        CompletableFuture<Void> g = f.thenAccept(r);
1160 <        f.complete(one);
1156 >    public void testThenAccept_normalCompletion() {
1157 >        for (ExecutionMode m : ExecutionMode.values())
1158 >        for (boolean createIncomplete : new boolean[] { true, false })
1159 >        for (Integer v1 : new Integer[] { 1, null })
1160 >    {
1161 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1162 >        final IncAction r = new IncAction();
1163 >        if (!createIncomplete) f.complete(v1);
1164 >        final CompletableFuture<Void> g = m.thenAccept(f, r);
1165 >        if (createIncomplete) {
1166 >            checkIncomplete(g);
1167 >            f.complete(v1);
1168 >        }
1169 >
1170          checkCompletedNormally(g, null);
1171 <        assertEquals(r.value, (Integer) 2);
1172 <    }
1171 >        checkCompletedNormally(f, v1);
1172 >        assertEquals(1, r.invocationCount);
1173 >        assertEquals(inc(v1), r.value);
1174 >    }}
1175  
1176      /**
1177       * thenAccept result completes exceptionally after exceptional
1178       * completion of source
1179       */
1180 <    public void testThenAccept2() {
1181 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1182 <        IncAction r = new IncAction();
1183 <        CompletableFuture<Void> g = f.thenAccept(r);
1184 <        f.completeExceptionally(new CFException());
1185 <        checkCompletedWithWrappedCFException(g);
1186 <    }
1180 >    public void testThenAccept_exceptionalCompletion() {
1181 >        for (ExecutionMode m : ExecutionMode.values())
1182 >        for (boolean createIncomplete : new boolean[] { true, false })
1183 >    {
1184 >        final CFException ex = new CFException();
1185 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1186 >        final IncAction r = new IncAction();
1187 >        if (!createIncomplete) f.completeExceptionally(ex);
1188 >        final CompletableFuture<Void> g = m.thenAccept(f, r);
1189 >        if (createIncomplete) {
1190 >            checkIncomplete(g);
1191 >            f.completeExceptionally(ex);
1192 >        }
1193 >
1194 >        checkCompletedWithWrappedCFException(g, ex);
1195 >        checkCompletedWithWrappedCFException(f, ex);
1196 >        assertEquals(0, r.invocationCount);
1197 >    }}
1198  
1199      /**
1200       * thenAccept result completes exceptionally if action does
1201       */
1202 <    public void testThenAccept3() {
1203 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1204 <        FailingConsumer r = new FailingConsumer();
1205 <        CompletableFuture<Void> g = f.thenAccept(r);
1206 <        f.complete(one);
1202 >    public void testThenAccept_actionFailed() {
1203 >        for (ExecutionMode m : ExecutionMode.values())
1204 >        for (boolean createIncomplete : new boolean[] { true, false })
1205 >        for (Integer v1 : new Integer[] { 1, null })
1206 >    {
1207 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1208 >        final FailingConsumer r = new FailingConsumer();
1209 >        if (!createIncomplete) f.complete(v1);
1210 >        final CompletableFuture<Void> g = f.thenAccept(r);
1211 >        if (createIncomplete) {
1212 >            checkIncomplete(g);
1213 >            f.complete(v1);
1214 >        }
1215 >
1216          checkCompletedWithWrappedCFException(g);
1217 <        assertEquals(1, r.invocationCount);
1218 <    }
1217 >        checkCompletedNormally(f, v1);
1218 >    }}
1219  
1220      /**
1221       * thenAccept result completes exceptionally if source cancelled
1222       */
1223 <    public void testThenAccept4() {
1224 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1225 <        IncAction r = new IncAction();
1226 <        CompletableFuture<Void> g = f.thenAccept(r);
1227 <        assertTrue(f.cancel(true));
1223 >    public void testThenAccept_sourceCancelled() {
1224 >        for (ExecutionMode m : ExecutionMode.values())
1225 >        for (boolean createIncomplete : new boolean[] { true, false })
1226 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1227 >    {
1228 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1229 >        final IncAction r = new IncAction();
1230 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1231 >        final CompletableFuture<Void> g = f.thenAccept(r);
1232 >        if (createIncomplete) {
1233 >            checkIncomplete(g);
1234 >            assertTrue(f.cancel(mayInterruptIfRunning));
1235 >        }
1236 >
1237          checkCompletedWithWrappedCancellationException(g);
1238 <    }
1238 >        checkCancelled(f);
1239 >        assertEquals(0, r.invocationCount);
1240 >    }}
1241  
1242      /**
1243       * thenCombine result completes normally after normal completion
1244       * of sources
1245       */
1246 <    public void testThenCombine_normalCompletion1() {
1246 >    public void testThenCombine_normalCompletion() {
1247 >        for (ExecutionMode m : ExecutionMode.values())
1248          for (boolean createIncomplete : new boolean[] { true, false })
1249          for (boolean fFirst : new boolean[] { true, false })
939        for (ExecutionMode m : ExecutionMode.values())
1250          for (Integer v1 : new Integer[] { 1, null })
1251 <        for (Integer v2 : new Integer[] { 2, null }) {
1252 <
1251 >        for (Integer v2 : new Integer[] { 2, null })
1252 >    {
1253          final CompletableFuture<Integer> f = new CompletableFuture<>();
1254          final CompletableFuture<Integer> g = new CompletableFuture<>();
1255          final SubtractFunction r = new SubtractFunction();
946        CompletableFuture<Integer> h = null;
947        if (createIncomplete) h = m.thenCombine(f, g, r);
1256  
1257 <        if (fFirst)
1258 <            f.complete(v1);
1259 <        else
1260 <            g.complete(v2);
1261 <        if (createIncomplete) checkIncomplete(h);
1262 <        assertEquals(0, r.invocationCount);
1263 <        if (!fFirst)
1264 <            f.complete(v1);
1265 <        else
958 <            g.complete(v2);
959 <        if (!createIncomplete) h = m.thenCombine(f, g, r);
1257 >        if (fFirst) f.complete(v1); else g.complete(v2);
1258 >        if (!createIncomplete)
1259 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1260 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1261 >        if (createIncomplete) {
1262 >            checkIncomplete(h);
1263 >            assertEquals(0, r.invocationCount);
1264 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1265 >        }
1266  
1267          checkCompletedNormally(h, subtract(v1, v2));
1268          checkCompletedNormally(f, v1);
1269          checkCompletedNormally(g, v2);
1270          assertEquals(1, r.invocationCount);
1271 <        }
966 <    }
1271 >    }}
1272  
1273      /**
1274       * thenCombine result completes exceptionally after exceptional
1275       * completion of either source
1276       */
1277 <    public void testThenCombine_exceptionalCompletion1() {
1277 >    public void testThenCombine_exceptionalCompletion() {
1278          for (ExecutionMode m : ExecutionMode.values())
1279 <        for (Integer v1 : new Integer[] { 1, null }) {
1280 <
1281 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1282 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
978 <        final SubtractFunction r = new SubtractFunction();
979 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
980 <        final CFException ex = new CFException();
981 <
982 <        f.completeExceptionally(ex);
983 <        checkIncomplete(h);
984 <        g.complete(v1);
985 <
986 <        checkCompletedWithWrappedCFException(h, ex);
987 <        checkCompletedWithWrappedCFException(f, ex);
988 <        assertEquals(0, r.invocationCount);
989 <        checkCompletedNormally(g, v1);
990 <        }
991 <    }
992 <
993 <    public void testThenCombine_exceptionalCompletion2() {
994 <        for (ExecutionMode m : ExecutionMode.values())
995 <        for (Integer v1 : new Integer[] { 1, null }) {
996 <
1279 >        for (boolean createIncomplete : new boolean[] { true, false })
1280 >        for (boolean fFirst : new boolean[] { true, false })
1281 >        for (Integer v1 : new Integer[] { 1, null })
1282 >    {
1283          final CompletableFuture<Integer> f = new CompletableFuture<>();
1284          final CompletableFuture<Integer> g = new CompletableFuture<>();
999        final SubtractFunction r = new SubtractFunction();
1000        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1285          final CFException ex = new CFException();
1002
1003        g.completeExceptionally(ex);
1004        checkIncomplete(h);
1005        f.complete(v1);
1006
1007        checkCompletedWithWrappedCFException(h, ex);
1008        checkCompletedWithWrappedCFException(g, ex);
1009        assertEquals(0, r.invocationCount);
1010        checkCompletedNormally(f, v1);
1011        }
1012    }
1013
1014    public void testThenCombine_exceptionalCompletion3() {
1015        for (ExecutionMode m : ExecutionMode.values())
1016        for (Integer v1 : new Integer[] { 1, null }) {
1017
1018        final CompletableFuture<Integer> f = new CompletableFuture<>();
1019        final CompletableFuture<Integer> g = new CompletableFuture<>();
1286          final SubtractFunction r = new SubtractFunction();
1021        final CFException ex = new CFException();
1287  
1288 <        g.completeExceptionally(ex);
1289 <        f.complete(v1);
1288 >        (fFirst ? f : g).complete(v1);
1289 >        if (!createIncomplete)
1290 >            (!fFirst ? f : g).completeExceptionally(ex);
1291          final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1292 <
1293 <        checkCompletedWithWrappedCFException(h, ex);
1294 <        checkCompletedWithWrappedCFException(g, ex);
1029 <        assertEquals(0, r.invocationCount);
1030 <        checkCompletedNormally(f, v1);
1292 >        if (createIncomplete) {
1293 >            checkIncomplete(h);
1294 >            (!fFirst ? f : g).completeExceptionally(ex);
1295          }
1032    }
1033
1034    public void testThenCombine_exceptionalCompletion4() {
1035        for (ExecutionMode m : ExecutionMode.values())
1036        for (Integer v1 : new Integer[] { 1, null }) {
1037
1038        final CompletableFuture<Integer> f = new CompletableFuture<>();
1039        final CompletableFuture<Integer> g = new CompletableFuture<>();
1040        final SubtractFunction r = new SubtractFunction();
1041        final CFException ex = new CFException();
1042
1043        f.completeExceptionally(ex);
1044        g.complete(v1);
1045        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1296  
1297          checkCompletedWithWrappedCFException(h, ex);
1048        checkCompletedWithWrappedCFException(f, ex);
1298          assertEquals(0, r.invocationCount);
1299 <        checkCompletedNormally(g, v1);
1300 <        }
1301 <    }
1299 >        checkCompletedNormally(fFirst ? f : g, v1);
1300 >        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1301 >    }}
1302  
1303      /**
1304       * thenCombine result completes exceptionally if action does
1305       */
1306 <    public void testThenCombine_actionFailed1() {
1306 >    public void testThenCombine_actionFailed() {
1307          for (ExecutionMode m : ExecutionMode.values())
1308 +        for (boolean fFirst : new boolean[] { true, false })
1309          for (Integer v1 : new Integer[] { 1, null })
1310 <        for (Integer v2 : new Integer[] { 2, null }) {
1311 <
1310 >        for (Integer v2 : new Integer[] { 2, null })
1311 >    {
1312          final CompletableFuture<Integer> f = new CompletableFuture<>();
1313          final CompletableFuture<Integer> g = new CompletableFuture<>();
1314          final FailingBiFunction r = new FailingBiFunction();
1315          final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1316  
1317 <        f.complete(v1);
1318 <        checkIncomplete(h);
1319 <        g.complete(v2);
1320 <
1321 <        checkCompletedWithWrappedCFException(h);
1322 <        checkCompletedNormally(f, v1);
1073 <        checkCompletedNormally(g, v2);
1317 >        if (fFirst) {
1318 >            f.complete(v1);
1319 >            g.complete(v2);
1320 >        } else {
1321 >            g.complete(v2);
1322 >            f.complete(v1);
1323          }
1075    }
1076
1077    public void testThenCombine_actionFailed2() {
1078        for (ExecutionMode m : ExecutionMode.values())
1079        for (Integer v1 : new Integer[] { 1, null })
1080        for (Integer v2 : new Integer[] { 2, null }) {
1081
1082        final CompletableFuture<Integer> f = new CompletableFuture<>();
1083        final CompletableFuture<Integer> g = new CompletableFuture<>();
1084        final FailingBiFunction r = new FailingBiFunction();
1085        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1086
1087        g.complete(v2);
1088        checkIncomplete(h);
1089        f.complete(v1);
1324  
1325          checkCompletedWithWrappedCFException(h);
1326          checkCompletedNormally(f, v1);
1327          checkCompletedNormally(g, v2);
1328 <        }
1095 <    }
1328 >    }}
1329  
1330      /**
1331       * thenCombine result completes exceptionally if either source cancelled
1332       */
1333 <    public void testThenCombine_sourceCancelled1() {
1333 >    public void testThenCombine_sourceCancelled() {
1334          for (ExecutionMode m : ExecutionMode.values())
1335          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1336 <        for (Integer v1 : new Integer[] { 1, null }) {
1337 <
1338 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1339 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1107 <        final SubtractFunction r = new SubtractFunction();
1108 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1109 <
1110 <        assertTrue(f.cancel(mayInterruptIfRunning));
1111 <        checkIncomplete(h);
1112 <        g.complete(v1);
1113 <
1114 <        checkCompletedWithWrappedCancellationException(h);
1115 <        checkCancelled(f);
1116 <        assertEquals(0, r.invocationCount);
1117 <        checkCompletedNormally(g, v1);
1118 <        }
1119 <    }
1120 <
1121 <    public void testThenCombine_sourceCancelled2() {
1122 <        for (ExecutionMode m : ExecutionMode.values())
1123 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1124 <        for (Integer v1 : new Integer[] { 1, null }) {
1125 <
1126 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1127 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1128 <        final SubtractFunction r = new SubtractFunction();
1129 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1130 <
1131 <        assertTrue(g.cancel(mayInterruptIfRunning));
1132 <        checkIncomplete(h);
1133 <        f.complete(v1);
1134 <
1135 <        checkCompletedWithWrappedCancellationException(h);
1136 <        checkCancelled(g);
1137 <        assertEquals(0, r.invocationCount);
1138 <        checkCompletedNormally(f, v1);
1139 <        }
1140 <    }
1141 <
1142 <    public void testThenCombine_sourceCancelled3() {
1143 <        for (ExecutionMode m : ExecutionMode.values())
1144 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1145 <        for (Integer v1 : new Integer[] { 1, null }) {
1146 <
1336 >        for (boolean createIncomplete : new boolean[] { true, false })
1337 >        for (boolean fFirst : new boolean[] { true, false })
1338 >        for (Integer v1 : new Integer[] { 1, null })
1339 >    {
1340          final CompletableFuture<Integer> f = new CompletableFuture<>();
1341          final CompletableFuture<Integer> g = new CompletableFuture<>();
1342          final SubtractFunction r = new SubtractFunction();
1343  
1344 <        assertTrue(g.cancel(mayInterruptIfRunning));
1345 <        f.complete(v1);
1344 >        (fFirst ? f : g).complete(v1);
1345 >        if (!createIncomplete)
1346 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1347          final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1348 <
1349 <        checkCompletedWithWrappedCancellationException(h);
1350 <        checkCancelled(g);
1157 <        assertEquals(0, r.invocationCount);
1158 <        checkCompletedNormally(f, v1);
1348 >        if (createIncomplete) {
1349 >            checkIncomplete(h);
1350 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1351          }
1160    }
1161
1162    public void testThenCombine_sourceCancelled4() {
1163        for (ExecutionMode m : ExecutionMode.values())
1164        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1165        for (Integer v1 : new Integer[] { 1, null }) {
1166
1167        final CompletableFuture<Integer> f = new CompletableFuture<>();
1168        final CompletableFuture<Integer> g = new CompletableFuture<>();
1169        final SubtractFunction r = new SubtractFunction();
1170
1171        assertTrue(f.cancel(mayInterruptIfRunning));
1172        g.complete(v1);
1173        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1352  
1353          checkCompletedWithWrappedCancellationException(h);
1354 <        checkCancelled(f);
1354 >        checkCancelled(!fFirst ? f : g);
1355          assertEquals(0, r.invocationCount);
1356 <        checkCompletedNormally(g, v1);
1357 <        }
1180 <    }
1356 >        checkCompletedNormally(fFirst ? f : g, v1);
1357 >    }}
1358  
1359      /**
1360       * thenAcceptBoth result completes normally after normal
1361       * completion of sources
1362       */
1363 <    public void testThenAcceptBoth_normalCompletion1() {
1187 <        for (ExecutionMode m : ExecutionMode.values())
1188 <        for (Integer v1 : new Integer[] { 1, null })
1189 <        for (Integer v2 : new Integer[] { 2, null }) {
1190 <
1191 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1192 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1193 <        final SubtractAction r = new SubtractAction();
1194 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1195 <
1196 <        f.complete(v1);
1197 <        checkIncomplete(h);
1198 <        assertEquals(0, r.invocationCount);
1199 <        g.complete(v2);
1200 <
1201 <        checkCompletedNormally(h, null);
1202 <        assertEquals(r.value, subtract(v1, v2));
1203 <        checkCompletedNormally(f, v1);
1204 <        checkCompletedNormally(g, v2);
1205 <        }
1206 <    }
1207 <
1208 <    public void testThenAcceptBoth_normalCompletion2() {
1209 <        for (ExecutionMode m : ExecutionMode.values())
1210 <        for (Integer v1 : new Integer[] { 1, null })
1211 <        for (Integer v2 : new Integer[] { 2, null }) {
1212 <
1213 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1214 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1215 <        final SubtractAction r = new SubtractAction();
1216 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1217 <
1218 <        g.complete(v2);
1219 <        checkIncomplete(h);
1220 <        assertEquals(0, r.invocationCount);
1221 <        f.complete(v1);
1222 <
1223 <        checkCompletedNormally(h, null);
1224 <        assertEquals(r.value, subtract(v1, v2));
1225 <        checkCompletedNormally(f, v1);
1226 <        checkCompletedNormally(g, v2);
1227 <        }
1228 <    }
1229 <
1230 <    public void testThenAcceptBoth_normalCompletion3() {
1363 >    public void testThenAcceptBoth_normalCompletion() {
1364          for (ExecutionMode m : ExecutionMode.values())
1365 +        for (boolean createIncomplete : new boolean[] { true, false })
1366 +        for (boolean fFirst : new boolean[] { true, false })
1367          for (Integer v1 : new Integer[] { 1, null })
1368 <        for (Integer v2 : new Integer[] { 2, null }) {
1369 <
1368 >        for (Integer v2 : new Integer[] { 2, null })
1369 >    {
1370          final CompletableFuture<Integer> f = new CompletableFuture<>();
1371          final CompletableFuture<Integer> g = new CompletableFuture<>();
1372          final SubtractAction r = new SubtractAction();
1373  
1374 <        g.complete(v2);
1375 <        f.complete(v1);
1374 >        if (fFirst) f.complete(v1); else g.complete(v2);
1375 >        if (!createIncomplete)
1376 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1377          final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1378 <
1379 <        checkCompletedNormally(h, null);
1380 <        assertEquals(r.value, subtract(v1, v2));
1381 <        checkCompletedNormally(f, v1);
1246 <        checkCompletedNormally(g, v2);
1378 >        if (createIncomplete) {
1379 >            checkIncomplete(h);
1380 >            assertEquals(0, r.invocationCount);
1381 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1382          }
1248    }
1249
1250    public void testThenAcceptBoth_normalCompletion4() {
1251        for (ExecutionMode m : ExecutionMode.values())
1252        for (Integer v1 : new Integer[] { 1, null })
1253        for (Integer v2 : new Integer[] { 2, null }) {
1254
1255        final CompletableFuture<Integer> f = new CompletableFuture<>();
1256        final CompletableFuture<Integer> g = new CompletableFuture<>();
1257        final SubtractAction r = new SubtractAction();
1258
1259        f.complete(v1);
1260        g.complete(v2);
1261        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1383  
1384          checkCompletedNormally(h, null);
1385 <        assertEquals(r.value, subtract(v1, v2));
1385 >        assertEquals(subtract(v1, v2), r.value);
1386          checkCompletedNormally(f, v1);
1387          checkCompletedNormally(g, v2);
1388 <        }
1268 <    }
1388 >    }}
1389  
1390      /**
1391       * thenAcceptBoth result completes exceptionally after exceptional
1392       * completion of either source
1393       */
1394 <    public void testThenAcceptBoth_exceptionalCompletion1() {
1275 <        for (ExecutionMode m : ExecutionMode.values())
1276 <        for (Integer v1 : new Integer[] { 1, null }) {
1277 <
1278 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1279 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1280 <        final SubtractAction r = new SubtractAction();
1281 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1282 <        final CFException ex = new CFException();
1283 <
1284 <        f.completeExceptionally(ex);
1285 <        checkIncomplete(h);
1286 <        g.complete(v1);
1287 <
1288 <        checkCompletedWithWrappedCFException(h, ex);
1289 <        checkCompletedWithWrappedCFException(f, ex);
1290 <        assertEquals(0, r.invocationCount);
1291 <        checkCompletedNormally(g, v1);
1292 <        }
1293 <    }
1294 <
1295 <    public void testThenAcceptBoth_exceptionalCompletion2() {
1394 >    public void testThenAcceptBoth_exceptionalCompletion() {
1395          for (ExecutionMode m : ExecutionMode.values())
1396 <        for (Integer v1 : new Integer[] { 1, null }) {
1397 <
1396 >        for (boolean createIncomplete : new boolean[] { true, false })
1397 >        for (boolean fFirst : new boolean[] { true, false })
1398 >        for (Integer v1 : new Integer[] { 1, null })
1399 >    {
1400          final CompletableFuture<Integer> f = new CompletableFuture<>();
1401          final CompletableFuture<Integer> g = new CompletableFuture<>();
1301        final SubtractAction r = new SubtractAction();
1302        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1402          final CFException ex = new CFException();
1304
1305        g.completeExceptionally(ex);
1306        checkIncomplete(h);
1307        f.complete(v1);
1308
1309        checkCompletedWithWrappedCFException(h, ex);
1310        checkCompletedWithWrappedCFException(g, ex);
1311        assertEquals(0, r.invocationCount);
1312        checkCompletedNormally(f, v1);
1313        }
1314    }
1315
1316    public void testThenAcceptBoth_exceptionalCompletion3() {
1317        for (ExecutionMode m : ExecutionMode.values())
1318        for (Integer v1 : new Integer[] { 1, null }) {
1319
1320        final CompletableFuture<Integer> f = new CompletableFuture<>();
1321        final CompletableFuture<Integer> g = new CompletableFuture<>();
1403          final SubtractAction r = new SubtractAction();
1323        final CFException ex = new CFException();
1404  
1405 <        g.completeExceptionally(ex);
1406 <        f.complete(v1);
1405 >        (fFirst ? f : g).complete(v1);
1406 >        if (!createIncomplete)
1407 >            (!fFirst ? f : g).completeExceptionally(ex);
1408          final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1409 <
1410 <        checkCompletedWithWrappedCFException(h, ex);
1411 <        checkCompletedWithWrappedCFException(g, ex);
1331 <        assertEquals(0, r.invocationCount);
1332 <        checkCompletedNormally(f, v1);
1409 >        if (createIncomplete) {
1410 >            checkIncomplete(h);
1411 >            (!fFirst ? f : g).completeExceptionally(ex);
1412          }
1334    }
1335
1336    public void testThenAcceptBoth_exceptionalCompletion4() {
1337        for (ExecutionMode m : ExecutionMode.values())
1338        for (Integer v1 : new Integer[] { 1, null }) {
1339
1340        final CompletableFuture<Integer> f = new CompletableFuture<>();
1341        final CompletableFuture<Integer> g = new CompletableFuture<>();
1342        final SubtractAction r = new SubtractAction();
1343        final CFException ex = new CFException();
1344
1345        f.completeExceptionally(ex);
1346        g.complete(v1);
1347        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1413  
1414          checkCompletedWithWrappedCFException(h, ex);
1350        checkCompletedWithWrappedCFException(f, ex);
1415          assertEquals(0, r.invocationCount);
1416 <        checkCompletedNormally(g, v1);
1417 <        }
1418 <    }
1416 >        checkCompletedNormally(fFirst ? f : g, v1);
1417 >        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1418 >    }}
1419  
1420      /**
1421       * thenAcceptBoth result completes exceptionally if action does
1422       */
1423 <    public void testThenAcceptBoth_actionFailed1() {
1423 >    public void testThenAcceptBoth_actionFailed() {
1424          for (ExecutionMode m : ExecutionMode.values())
1425 +        for (boolean fFirst : new boolean[] { true, false })
1426          for (Integer v1 : new Integer[] { 1, null })
1427 <        for (Integer v2 : new Integer[] { 2, null }) {
1428 <
1427 >        for (Integer v2 : new Integer[] { 2, null })
1428 >    {
1429          final CompletableFuture<Integer> f = new CompletableFuture<>();
1430          final CompletableFuture<Integer> g = new CompletableFuture<>();
1431          final FailingBiConsumer r = new FailingBiConsumer();
1432          final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1433  
1434 <        f.complete(v1);
1435 <        checkIncomplete(h);
1436 <        g.complete(v2);
1437 <
1438 <        checkCompletedWithWrappedCFException(h);
1439 <        checkCompletedNormally(f, v1);
1375 <        checkCompletedNormally(g, v2);
1434 >        if (fFirst) {
1435 >            f.complete(v1);
1436 >            g.complete(v2);
1437 >        } else {
1438 >            g.complete(v2);
1439 >            f.complete(v1);
1440          }
1377    }
1378
1379    public void testThenAcceptBoth_actionFailed2() {
1380        for (ExecutionMode m : ExecutionMode.values())
1381        for (Integer v1 : new Integer[] { 1, null })
1382        for (Integer v2 : new Integer[] { 2, null }) {
1383
1384        final CompletableFuture<Integer> f = new CompletableFuture<>();
1385        final CompletableFuture<Integer> g = new CompletableFuture<>();
1386        final FailingBiConsumer r = new FailingBiConsumer();
1387        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1388
1389        g.complete(v2);
1390        checkIncomplete(h);
1391        f.complete(v1);
1441  
1442          checkCompletedWithWrappedCFException(h);
1443          checkCompletedNormally(f, v1);
1444          checkCompletedNormally(g, v2);
1445 <        }
1397 <    }
1445 >    }}
1446  
1447      /**
1448       * thenAcceptBoth result completes exceptionally if either source cancelled
1449       */
1450 <    public void testThenAcceptBoth_sourceCancelled1() {
1450 >    public void testThenAcceptBoth_sourceCancelled() {
1451          for (ExecutionMode m : ExecutionMode.values())
1452          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1453 <        for (Integer v1 : new Integer[] { 1, null }) {
1454 <
1455 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1456 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1409 <        final SubtractAction r = new SubtractAction();
1410 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1411 <
1412 <        assertTrue(f.cancel(mayInterruptIfRunning));
1413 <        checkIncomplete(h);
1414 <        g.complete(v1);
1415 <
1416 <        checkCompletedWithWrappedCancellationException(h);
1417 <        checkCancelled(f);
1418 <        assertEquals(0, r.invocationCount);
1419 <        checkCompletedNormally(g, v1);
1420 <        }
1421 <    }
1422 <
1423 <    public void testThenAcceptBoth_sourceCancelled2() {
1424 <        for (ExecutionMode m : ExecutionMode.values())
1425 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1426 <        for (Integer v1 : new Integer[] { 1, null }) {
1427 <
1428 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1429 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1430 <        final SubtractAction r = new SubtractAction();
1431 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1432 <
1433 <        assertTrue(g.cancel(mayInterruptIfRunning));
1434 <        checkIncomplete(h);
1435 <        f.complete(v1);
1436 <
1437 <        checkCompletedWithWrappedCancellationException(h);
1438 <        checkCancelled(g);
1439 <        assertEquals(0, r.invocationCount);
1440 <        checkCompletedNormally(f, v1);
1441 <        }
1442 <    }
1443 <
1444 <    public void testThenAcceptBoth_sourceCancelled3() {
1445 <        for (ExecutionMode m : ExecutionMode.values())
1446 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1447 <        for (Integer v1 : new Integer[] { 1, null }) {
1448 <
1453 >        for (boolean createIncomplete : new boolean[] { true, false })
1454 >        for (boolean fFirst : new boolean[] { true, false })
1455 >        for (Integer v1 : new Integer[] { 1, null })
1456 >    {
1457          final CompletableFuture<Integer> f = new CompletableFuture<>();
1458          final CompletableFuture<Integer> g = new CompletableFuture<>();
1459          final SubtractAction r = new SubtractAction();
1460  
1461 <        assertTrue(g.cancel(mayInterruptIfRunning));
1462 <        f.complete(v1);
1461 >        (fFirst ? f : g).complete(v1);
1462 >        if (!createIncomplete)
1463 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1464          final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1465 <
1466 <        checkCompletedWithWrappedCancellationException(h);
1467 <        checkCancelled(g);
1459 <        assertEquals(0, r.invocationCount);
1460 <        checkCompletedNormally(f, v1);
1465 >        if (createIncomplete) {
1466 >            checkIncomplete(h);
1467 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1468          }
1462    }
1463
1464    public void testThenAcceptBoth_sourceCancelled4() {
1465        for (ExecutionMode m : ExecutionMode.values())
1466        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1467        for (Integer v1 : new Integer[] { 1, null }) {
1468
1469        final CompletableFuture<Integer> f = new CompletableFuture<>();
1470        final CompletableFuture<Integer> g = new CompletableFuture<>();
1471        final SubtractAction r = new SubtractAction();
1472
1473        assertTrue(f.cancel(mayInterruptIfRunning));
1474        g.complete(v1);
1475        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1469  
1470          checkCompletedWithWrappedCancellationException(h);
1471 <        checkCancelled(f);
1471 >        checkCancelled(!fFirst ? f : g);
1472          assertEquals(0, r.invocationCount);
1473 <        checkCompletedNormally(g, v1);
1474 <        }
1482 <    }
1473 >        checkCompletedNormally(fFirst ? f : g, v1);
1474 >    }}
1475  
1476      /**
1477       * runAfterBoth result completes normally after normal
1478       * completion of sources
1479       */
1480 <    public void testRunAfterBoth_normalCompletion1() {
1489 <        for (ExecutionMode m : ExecutionMode.values())
1490 <        for (Integer v1 : new Integer[] { 1, null })
1491 <        for (Integer v2 : new Integer[] { 2, null }) {
1492 <
1493 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1494 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1495 <        final Noop r = new Noop();
1496 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1497 <
1498 <        f.complete(v1);
1499 <        checkIncomplete(h);
1500 <        assertEquals(0, r.invocationCount);
1501 <        g.complete(v2);
1502 <
1503 <        checkCompletedNormally(h, null);
1504 <        assertEquals(1, r.invocationCount);
1505 <        checkCompletedNormally(f, v1);
1506 <        checkCompletedNormally(g, v2);
1507 <        }
1508 <    }
1509 <
1510 <    public void testRunAfterBoth_normalCompletion2() {
1511 <        for (ExecutionMode m : ExecutionMode.values())
1512 <        for (Integer v1 : new Integer[] { 1, null })
1513 <        for (Integer v2 : new Integer[] { 2, null }) {
1514 <
1515 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1516 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1517 <        final Noop r = new Noop();
1518 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1519 <
1520 <        g.complete(v2);
1521 <        checkIncomplete(h);
1522 <        assertEquals(0, r.invocationCount);
1523 <        f.complete(v1);
1524 <
1525 <        checkCompletedNormally(h, null);
1526 <        assertEquals(1, r.invocationCount);
1527 <        checkCompletedNormally(f, v1);
1528 <        checkCompletedNormally(g, v2);
1529 <        }
1530 <    }
1531 <
1532 <    public void testRunAfterBoth_normalCompletion3() {
1480 >    public void testRunAfterBoth_normalCompletion() {
1481          for (ExecutionMode m : ExecutionMode.values())
1482 +        for (boolean createIncomplete : new boolean[] { true, false })
1483 +        for (boolean fFirst : new boolean[] { true, false })
1484          for (Integer v1 : new Integer[] { 1, null })
1485 <        for (Integer v2 : new Integer[] { 2, null }) {
1486 <
1485 >        for (Integer v2 : new Integer[] { 2, null })
1486 >    {
1487          final CompletableFuture<Integer> f = new CompletableFuture<>();
1488          final CompletableFuture<Integer> g = new CompletableFuture<>();
1489 <        final Noop r = new Noop();
1489 >        final Noop r = new Noop(m);
1490  
1491 <        g.complete(v2);
1492 <        f.complete(v1);
1491 >        if (fFirst) f.complete(v1); else g.complete(v2);
1492 >        if (!createIncomplete)
1493 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1494          final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1495 <
1496 <        checkCompletedNormally(h, null);
1497 <        assertEquals(1, r.invocationCount);
1498 <        checkCompletedNormally(f, v1);
1548 <        checkCompletedNormally(g, v2);
1495 >        if (createIncomplete) {
1496 >            checkIncomplete(h);
1497 >            assertEquals(0, r.invocationCount);
1498 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1499          }
1550    }
1551
1552    public void testRunAfterBoth_normalCompletion4() {
1553        for (ExecutionMode m : ExecutionMode.values())
1554        for (Integer v1 : new Integer[] { 1, null })
1555        for (Integer v2 : new Integer[] { 2, null }) {
1556
1557        final CompletableFuture<Integer> f = new CompletableFuture<>();
1558        final CompletableFuture<Integer> g = new CompletableFuture<>();
1559        final Noop r = new Noop();
1560
1561        f.complete(v1);
1562        g.complete(v2);
1563        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1500  
1501          checkCompletedNormally(h, null);
1502          assertEquals(1, r.invocationCount);
1503          checkCompletedNormally(f, v1);
1504          checkCompletedNormally(g, v2);
1505 <        }
1570 <    }
1505 >    }}
1506  
1507      /**
1508       * runAfterBoth result completes exceptionally after exceptional
1509       * completion of either source
1510       */
1511 <    public void testRunAfterBoth_exceptionalCompletion1() {
1577 <        for (ExecutionMode m : ExecutionMode.values())
1578 <        for (Integer v1 : new Integer[] { 1, null }) {
1579 <
1580 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1581 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1582 <        final Noop r = new Noop();
1583 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1584 <        final CFException ex = new CFException();
1585 <
1586 <        f.completeExceptionally(ex);
1587 <        checkIncomplete(h);
1588 <        g.complete(v1);
1589 <
1590 <        checkCompletedWithWrappedCFException(h, ex);
1591 <        checkCompletedWithWrappedCFException(f, ex);
1592 <        assertEquals(0, r.invocationCount);
1593 <        checkCompletedNormally(g, v1);
1594 <        }
1595 <    }
1596 <
1597 <    public void testRunAfterBoth_exceptionalCompletion2() {
1598 <        for (ExecutionMode m : ExecutionMode.values())
1599 <        for (Integer v1 : new Integer[] { 1, null }) {
1600 <
1601 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1602 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1603 <        final Noop r = new Noop();
1604 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1605 <        final CFException ex = new CFException();
1606 <
1607 <        g.completeExceptionally(ex);
1608 <        checkIncomplete(h);
1609 <        f.complete(v1);
1610 <
1611 <        checkCompletedWithWrappedCFException(h, ex);
1612 <        checkCompletedWithWrappedCFException(g, ex);
1613 <        assertEquals(0, r.invocationCount);
1614 <        checkCompletedNormally(f, v1);
1615 <        }
1616 <    }
1617 <
1618 <    public void testRunAfterBoth_exceptionalCompletion3() {
1511 >    public void testRunAfterBoth_exceptionalCompletion() {
1512          for (ExecutionMode m : ExecutionMode.values())
1513 <        for (Integer v1 : new Integer[] { 1, null }) {
1514 <
1513 >        for (boolean createIncomplete : new boolean[] { true, false })
1514 >        for (boolean fFirst : new boolean[] { true, false })
1515 >        for (Integer v1 : new Integer[] { 1, null })
1516 >    {
1517          final CompletableFuture<Integer> f = new CompletableFuture<>();
1518          final CompletableFuture<Integer> g = new CompletableFuture<>();
1624        final Noop r = new Noop();
1519          final CFException ex = new CFException();
1520 +        final Noop r = new Noop(m);
1521  
1522 <        g.completeExceptionally(ex);
1523 <        f.complete(v1);
1522 >        (fFirst ? f : g).complete(v1);
1523 >        if (!createIncomplete)
1524 >            (!fFirst ? f : g).completeExceptionally(ex);
1525          final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1526 <
1527 <        checkCompletedWithWrappedCFException(h, ex);
1528 <        checkCompletedWithWrappedCFException(g, ex);
1633 <        assertEquals(0, r.invocationCount);
1634 <        checkCompletedNormally(f, v1);
1526 >        if (createIncomplete) {
1527 >            checkIncomplete(h);
1528 >            (!fFirst ? f : g).completeExceptionally(ex);
1529          }
1636    }
1637
1638    public void testRunAfterBoth_exceptionalCompletion4() {
1639        for (ExecutionMode m : ExecutionMode.values())
1640        for (Integer v1 : new Integer[] { 1, null }) {
1641
1642        final CompletableFuture<Integer> f = new CompletableFuture<>();
1643        final CompletableFuture<Integer> g = new CompletableFuture<>();
1644        final Noop r = new Noop();
1645        final CFException ex = new CFException();
1646
1647        f.completeExceptionally(ex);
1648        g.complete(v1);
1649        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1530  
1531          checkCompletedWithWrappedCFException(h, ex);
1652        checkCompletedWithWrappedCFException(f, ex);
1532          assertEquals(0, r.invocationCount);
1533 <        checkCompletedNormally(g, v1);
1534 <        }
1535 <    }
1533 >        checkCompletedNormally(fFirst ? f : g, v1);
1534 >        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1535 >    }}
1536  
1537      /**
1538       * runAfterBoth result completes exceptionally if action does
1539       */
1540 <    public void testRunAfterBoth_actionFailed1() {
1540 >    public void testRunAfterBoth_actionFailed() {
1541          for (ExecutionMode m : ExecutionMode.values())
1542 +        for (boolean fFirst : new boolean[] { true, false })
1543          for (Integer v1 : new Integer[] { 1, null })
1544 <        for (Integer v2 : new Integer[] { 2, null }) {
1545 <
1544 >        for (Integer v2 : new Integer[] { 2, null })
1545 >    {
1546          final CompletableFuture<Integer> f = new CompletableFuture<>();
1547          final CompletableFuture<Integer> g = new CompletableFuture<>();
1548 <        final FailingNoop r = new FailingNoop();
1669 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1548 >        final FailingRunnable r = new FailingRunnable();
1549  
1550 <        f.complete(v1);
1551 <        checkIncomplete(h);
1552 <        g.complete(v2);
1553 <
1554 <        checkCompletedWithWrappedCFException(h);
1555 <        checkCompletedNormally(f, v1);
1556 <        checkCompletedNormally(g, v2);
1550 >        CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r);
1551 >        if (fFirst) {
1552 >            f.complete(v1);
1553 >            g.complete(v2);
1554 >        } else {
1555 >            g.complete(v2);
1556 >            f.complete(v1);
1557          }
1558 <    }
1558 >        CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r);
1559  
1560 <    public void testRunAfterBoth_actionFailed2() {
1561 <        for (ExecutionMode m : ExecutionMode.values())
1683 <        for (Integer v1 : new Integer[] { 1, null })
1684 <        for (Integer v2 : new Integer[] { 2, null }) {
1685 <
1686 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1687 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1688 <        final FailingNoop r = new FailingNoop();
1689 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1690 <
1691 <        g.complete(v2);
1692 <        checkIncomplete(h);
1693 <        f.complete(v1);
1694 <
1695 <        checkCompletedWithWrappedCFException(h);
1560 >        checkCompletedWithWrappedCFException(h1);
1561 >        checkCompletedWithWrappedCFException(h2);
1562          checkCompletedNormally(f, v1);
1563          checkCompletedNormally(g, v2);
1564 <        }
1699 <    }
1564 >    }}
1565  
1566      /**
1567       * runAfterBoth result completes exceptionally if either source cancelled
1568       */
1569 <    public void testRunAfterBoth_sourceCancelled1() {
1569 >    public void testRunAfterBoth_sourceCancelled() {
1570          for (ExecutionMode m : ExecutionMode.values())
1571          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1572 <        for (Integer v1 : new Integer[] { 1, null }) {
1573 <
1574 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1575 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1711 <        final Noop r = new Noop();
1712 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1713 <
1714 <        assertTrue(f.cancel(mayInterruptIfRunning));
1715 <        checkIncomplete(h);
1716 <        g.complete(v1);
1717 <
1718 <        checkCompletedWithWrappedCancellationException(h);
1719 <        checkCancelled(f);
1720 <        assertEquals(0, r.invocationCount);
1721 <        checkCompletedNormally(g, v1);
1722 <        }
1723 <    }
1724 <
1725 <    public void testRunAfterBoth_sourceCancelled2() {
1726 <        for (ExecutionMode m : ExecutionMode.values())
1727 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1728 <        for (Integer v1 : new Integer[] { 1, null }) {
1729 <
1572 >        for (boolean createIncomplete : new boolean[] { true, false })
1573 >        for (boolean fFirst : new boolean[] { true, false })
1574 >        for (Integer v1 : new Integer[] { 1, null })
1575 >    {
1576          final CompletableFuture<Integer> f = new CompletableFuture<>();
1577          final CompletableFuture<Integer> g = new CompletableFuture<>();
1578 <        final Noop r = new Noop();
1733 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1734 <
1735 <        assertTrue(g.cancel(mayInterruptIfRunning));
1736 <        checkIncomplete(h);
1737 <        f.complete(v1);
1738 <
1739 <        checkCompletedWithWrappedCancellationException(h);
1740 <        checkCancelled(g);
1741 <        assertEquals(0, r.invocationCount);
1742 <        checkCompletedNormally(f, v1);
1743 <        }
1744 <    }
1578 >        final Noop r = new Noop(m);
1579  
1746    public void testRunAfterBoth_sourceCancelled3() {
1747        for (ExecutionMode m : ExecutionMode.values())
1748        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1749        for (Integer v1 : new Integer[] { 1, null }) {
1580  
1581 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1582 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1583 <        final Noop r = new Noop();
1754 <
1755 <        assertTrue(g.cancel(mayInterruptIfRunning));
1756 <        f.complete(v1);
1581 >        (fFirst ? f : g).complete(v1);
1582 >        if (!createIncomplete)
1583 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1584          final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1585 <
1586 <        checkCompletedWithWrappedCancellationException(h);
1587 <        checkCancelled(g);
1761 <        assertEquals(0, r.invocationCount);
1762 <        checkCompletedNormally(f, v1);
1585 >        if (createIncomplete) {
1586 >            checkIncomplete(h);
1587 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1588          }
1764    }
1765
1766    public void testRunAfterBoth_sourceCancelled4() {
1767        for (ExecutionMode m : ExecutionMode.values())
1768        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1769        for (Integer v1 : new Integer[] { 1, null }) {
1770
1771        final CompletableFuture<Integer> f = new CompletableFuture<>();
1772        final CompletableFuture<Integer> g = new CompletableFuture<>();
1773        final Noop r = new Noop();
1774
1775        assertTrue(f.cancel(mayInterruptIfRunning));
1776        g.complete(v1);
1777        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1589  
1590          checkCompletedWithWrappedCancellationException(h);
1591 <        checkCancelled(f);
1591 >        checkCancelled(!fFirst ? f : g);
1592          assertEquals(0, r.invocationCount);
1593 <        checkCompletedNormally(g, v1);
1594 <        }
1784 <    }
1593 >        checkCompletedNormally(fFirst ? f : g, v1);
1594 >    }}
1595  
1596      /**
1597       * applyToEither result completes normally after normal completion
1598       * of either source
1599       */
1600 <    public void testApplyToEither_normalCompletion1() {
1600 >    public void testApplyToEither_normalCompletion() {
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 <        for (Integer v2 : new Integer[] { 2, null }) {
1606 <
1605 >        for (Integer v2 : new Integer[] { 2, null })
1606 >    {
1607          final CompletableFuture<Integer> f = new CompletableFuture<>();
1608          final CompletableFuture<Integer> g = new CompletableFuture<>();
1609          final IncFunction r = new IncFunction();
1798        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1610  
1611 <        f.complete(v1);
1612 <        checkCompletedNormally(h, inc(v1));
1613 <        g.complete(v2);
1611 >        if (!createIncomplete)
1612 >            if (fFirst) f.complete(v1); else g.complete(v2);
1613 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1614 >        if (createIncomplete) {
1615 >            checkIncomplete(h);
1616 >            assertEquals(0, r.invocationCount);
1617 >            if (fFirst) f.complete(v1); else g.complete(v2);
1618 >        }
1619 >        checkCompletedNormally(h, inc(fFirst ? v1 : v2));
1620 >        if (!fFirst) f.complete(v1); else g.complete(v2);
1621  
1622          checkCompletedNormally(f, v1);
1623          checkCompletedNormally(g, v2);
1624 <        checkCompletedNormally(h, inc(v1));
1625 <        }
1808 <    }
1624 >        checkCompletedNormally(h, inc(fFirst ? v1 : v2));
1625 >    }}
1626  
1627 <    public void testApplyToEither_normalCompletion2() {
1627 >    public void testApplyToEither_normalCompletionBothAvailable() {
1628          for (ExecutionMode m : ExecutionMode.values())
1629 +        for (boolean fFirst : new boolean[] { true, false })
1630          for (Integer v1 : new Integer[] { 1, null })
1631 <        for (Integer v2 : new Integer[] { 2, null }) {
1632 <
1631 >        for (Integer v2 : new Integer[] { 2, null })
1632 >    {
1633          final CompletableFuture<Integer> f = new CompletableFuture<>();
1634          final CompletableFuture<Integer> g = new CompletableFuture<>();
1635          final IncFunction r = new IncFunction();
1818        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1819
1820        g.complete(v2);
1821        checkCompletedNormally(h, inc(v2));
1822        f.complete(v1);
1636  
1637 <        checkCompletedNormally(f, v1);
1638 <        checkCompletedNormally(g, v2);
1639 <        checkCompletedNormally(h, inc(v2));
1637 >        if (fFirst) {
1638 >            f.complete(v1);
1639 >            g.complete(v2);
1640 >        } else {
1641 >            g.complete(v2);
1642 >            f.complete(v1);
1643          }
1828    }
1829    public void testApplyToEither_normalCompletion3() {
1830        for (ExecutionMode m : ExecutionMode.values())
1831        for (Integer v1 : new Integer[] { 1, null })
1832        for (Integer v2 : new Integer[] { 2, null }) {
1644  
1834        final CompletableFuture<Integer> f = new CompletableFuture<>();
1835        final CompletableFuture<Integer> g = new CompletableFuture<>();
1836        final IncFunction r = new IncFunction();
1837
1838        f.complete(v1);
1839        g.complete(v2);
1645          final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1646  
1647          checkCompletedNormally(f, v1);
# Line 1846 | Line 1651 | public class CompletableFutureTest exten
1651          assertTrue(Objects.equals(h.join(), inc(v1)) ||
1652                     Objects.equals(h.join(), inc(v2)));
1653          assertEquals(1, r.invocationCount);
1654 <        }
1850 <    }
1654 >    }}
1655  
1656      /**
1657       * applyToEither result completes exceptionally after exceptional
# Line 1855 | Line 1659 | public class CompletableFutureTest exten
1659       */
1660      public void testApplyToEither_exceptionalCompletion1() {
1661          for (ExecutionMode m : ExecutionMode.values())
1662 <        for (Integer v1 : new Integer[] { 1, null }) {
1663 <
1662 >        for (boolean createIncomplete : new boolean[] { true, false })
1663 >        for (boolean fFirst : new boolean[] { true, false })
1664 >        for (Integer v1 : new Integer[] { 1, null })
1665 >    {
1666          final CompletableFuture<Integer> f = new CompletableFuture<>();
1667          final CompletableFuture<Integer> g = new CompletableFuture<>();
1668 +        final CFException ex = new CFException();
1669          final IncFunction r = new IncFunction();
1670 +
1671 +        if (!createIncomplete) (fFirst ? f : g).completeExceptionally(ex);
1672          final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1673 <        final CFException ex = new CFException();
1673 >        if (createIncomplete) {
1674 >            checkIncomplete(h);
1675 >            assertEquals(0, r.invocationCount);
1676 >            (fFirst ? f : g).completeExceptionally(ex);
1677 >        }
1678  
1866        f.completeExceptionally(ex);
1679          checkCompletedWithWrappedCFException(h, ex);
1680 <        g.complete(v1);
1680 >        (!fFirst ? f : g).complete(v1);
1681  
1682          assertEquals(0, r.invocationCount);
1683 <        checkCompletedNormally(g, v1);
1684 <        checkCompletedWithWrappedCFException(f, ex);
1683 >        checkCompletedNormally(!fFirst ? f : g, v1);
1684 >        checkCompletedWithWrappedCFException(fFirst ? f : g, ex);
1685          checkCompletedWithWrappedCFException(h, ex);
1686 <        }
1875 <    }
1686 >    }}
1687  
1688      public void testApplyToEither_exceptionalCompletion2() {
1689          for (ExecutionMode m : ExecutionMode.values())
1690 <        for (Integer v1 : new Integer[] { 1, null }) {
1691 <
1690 >        for (boolean reverseArgs : new boolean[] { true, false })
1691 >        for (boolean fFirst : new boolean[] { true, false })
1692 >        for (Integer v1 : new Integer[] { 1, null })
1693 >    {
1694          final CompletableFuture<Integer> f = new CompletableFuture<>();
1695          final CompletableFuture<Integer> g = new CompletableFuture<>();
1696 <        final IncFunction r = new IncFunction();
1697 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1696 >        final IncFunction r1 = new IncFunction();
1697 >        final IncFunction r2 = new IncFunction();
1698          final CFException ex = new CFException();
1699 <
1700 <        g.completeExceptionally(ex);
1701 <        checkCompletedWithWrappedCFException(h, ex);
1702 <        f.complete(v1);
1703 <
1704 <        assertEquals(0, r.invocationCount);
1705 <        checkCompletedNormally(f, v1);
1706 <        checkCompletedWithWrappedCFException(g, ex);
1707 <        checkCompletedWithWrappedCFException(h, ex);
1699 >        final CompletableFuture<Integer> j = (reverseArgs ? g : f);
1700 >        final CompletableFuture<Integer> k = (reverseArgs ? f : g);
1701 >        final CompletableFuture<Integer> h1 = m.applyToEither(j, k, r1);
1702 >        if (fFirst) {
1703 >            f.complete(v1);
1704 >            g.completeExceptionally(ex);
1705 >        } else {
1706 >            g.completeExceptionally(ex);
1707 >            f.complete(v1);
1708          }
1709 <    }
1897 <
1898 <    public void testApplyToEither_exceptionalCompletion3() {
1899 <        for (ExecutionMode m : ExecutionMode.values())
1900 <        for (Integer v1 : new Integer[] { 1, null }) {
1901 <
1902 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1903 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1904 <        final IncFunction r = new IncFunction();
1905 <        final CFException ex = new CFException();
1906 <
1907 <        g.completeExceptionally(ex);
1908 <        f.complete(v1);
1909 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1709 >        final CompletableFuture<Integer> h2 = m.applyToEither(j, k, r2);
1710  
1711          // unspecified behavior
1912        Integer v;
1712          try {
1713 <            assertEquals(h.join(), inc(v1));
1714 <            assertEquals(1, r.invocationCount);
1713 >            assertEquals(inc(v1), h1.join());
1714 >            assertEquals(1, r1.invocationCount);
1715          } catch (CompletionException ok) {
1716 <            checkCompletedWithWrappedCFException(h, ex);
1717 <            assertEquals(0, r.invocationCount);
1716 >            checkCompletedWithWrappedCFException(h1, ex);
1717 >            assertEquals(0, r1.invocationCount);
1718          }
1719  
1921        checkCompletedWithWrappedCFException(g, ex);
1922        checkCompletedNormally(f, v1);
1923        }
1924    }
1925
1926    public void testApplyToEither_exceptionalCompletion4() {
1927        for (ExecutionMode m : ExecutionMode.values())
1928        for (Integer v1 : new Integer[] { 1, null }) {
1929
1930        final CompletableFuture<Integer> f = new CompletableFuture<>();
1931        final CompletableFuture<Integer> g = new CompletableFuture<>();
1932        final IncFunction r = new IncFunction();
1933        final CFException ex = new CFException();
1934
1935        f.completeExceptionally(ex);
1936        g.complete(v1);
1937        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1938
1939        // unspecified behavior
1940        Integer v;
1720          try {
1721 <            assertEquals(h.join(), inc(v1));
1722 <            assertEquals(1, r.invocationCount);
1721 >            assertEquals(inc(v1), h2.join());
1722 >            assertEquals(1, r2.invocationCount);
1723          } catch (CompletionException ok) {
1724 <            checkCompletedWithWrappedCFException(h, ex);
1725 <            assertEquals(0, r.invocationCount);
1724 >            checkCompletedWithWrappedCFException(h2, ex);
1725 >            assertEquals(0, r2.invocationCount);
1726          }
1727  
1728 <        checkCompletedWithWrappedCFException(f, ex);
1729 <        checkCompletedNormally(g, v1);
1730 <        }
1952 <    }
1728 >        checkCompletedWithWrappedCFException(g, ex);
1729 >        checkCompletedNormally(f, v1);
1730 >    }}
1731  
1732      /**
1733       * applyToEither result completes exceptionally if action does
# Line 1957 | Line 1735 | public class CompletableFutureTest exten
1735      public void testApplyToEither_actionFailed1() {
1736          for (ExecutionMode m : ExecutionMode.values())
1737          for (Integer v1 : new Integer[] { 1, null })
1738 <        for (Integer v2 : new Integer[] { 2, null }) {
1739 <
1738 >        for (Integer v2 : new Integer[] { 2, null })
1739 >    {
1740          final CompletableFuture<Integer> f = new CompletableFuture<>();
1741          final CompletableFuture<Integer> g = new CompletableFuture<>();
1742          final FailingFunction r = new FailingFunction();
# Line 1969 | Line 1747 | public class CompletableFutureTest exten
1747          g.complete(v2);
1748          checkCompletedNormally(f, v1);
1749          checkCompletedNormally(g, v2);
1750 <        }
1973 <    }
1750 >    }}
1751  
1752      public void testApplyToEither_actionFailed2() {
1753          for (ExecutionMode m : ExecutionMode.values())
1754          for (Integer v1 : new Integer[] { 1, null })
1755 <        for (Integer v2 : new Integer[] { 2, null }) {
1756 <
1755 >        for (Integer v2 : new Integer[] { 2, null })
1756 >    {
1757          final CompletableFuture<Integer> f = new CompletableFuture<>();
1758          final CompletableFuture<Integer> g = new CompletableFuture<>();
1759          final FailingFunction r = new FailingFunction();
# Line 1987 | Line 1764 | public class CompletableFutureTest exten
1764          f.complete(v1);
1765          checkCompletedNormally(f, v1);
1766          checkCompletedNormally(g, v2);
1767 <        }
1991 <    }
1767 >    }}
1768  
1769      /**
1770       * applyToEither result completes exceptionally if either source cancelled
# Line 1996 | Line 1772 | public class CompletableFutureTest exten
1772      public void testApplyToEither_sourceCancelled1() {
1773          for (ExecutionMode m : ExecutionMode.values())
1774          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1775 <        for (Integer v1 : new Integer[] { 1, null }) {
1776 <
1775 >        for (boolean createIncomplete : new boolean[] { true, false })
1776 >        for (boolean fFirst : new boolean[] { true, false })
1777 >        for (Integer v1 : new Integer[] { 1, null })
1778 >    {
1779          final CompletableFuture<Integer> f = new CompletableFuture<>();
1780          final CompletableFuture<Integer> g = new CompletableFuture<>();
1781          final IncFunction r = new IncFunction();
1782 +
1783 +        if (!createIncomplete) assertTrue((fFirst ? f : g).cancel(mayInterruptIfRunning));
1784          final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1785 +        if (createIncomplete) {
1786 +            checkIncomplete(h);
1787 +            assertEquals(0, r.invocationCount);
1788 +            assertTrue((fFirst ? f : g).cancel(mayInterruptIfRunning));
1789 +        }
1790  
2006        assertTrue(f.cancel(mayInterruptIfRunning));
1791          checkCompletedWithWrappedCancellationException(h);
1792 <        g.complete(v1);
1792 >        (!fFirst ? f : g).complete(v1);
1793  
2010        checkCancelled(f);
1794          assertEquals(0, r.invocationCount);
1795 <        checkCompletedNormally(g, v1);
1795 >        checkCompletedNormally(!fFirst ? f : g, v1);
1796 >        checkCancelled(fFirst ? f : g);
1797          checkCompletedWithWrappedCancellationException(h);
1798 <        }
2015 <    }
1798 >    }}
1799  
1800      public void testApplyToEither_sourceCancelled2() {
1801          for (ExecutionMode m : ExecutionMode.values())
1802          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1803 <        for (Integer v1 : new Integer[] { 1, null }) {
1804 <
1803 >        for (boolean reverseArgs : new boolean[] { true, false })
1804 >        for (boolean fFirst : new boolean[] { true, false })
1805 >        for (Integer v1 : new Integer[] { 1, null })
1806 >    {
1807          final CompletableFuture<Integer> f = new CompletableFuture<>();
1808          final CompletableFuture<Integer> g = new CompletableFuture<>();
1809 <        final IncFunction r = new IncFunction();
1810 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1811 <
1812 <        assertTrue(g.cancel(mayInterruptIfRunning));
1813 <        checkCompletedWithWrappedCancellationException(h);
2029 <        f.complete(v1);
1809 >        final IncFunction r1 = new IncFunction();
1810 >        final IncFunction r2 = new IncFunction();
1811 >        final CFException ex = new CFException();
1812 >        final CompletableFuture<Integer> j = (reverseArgs ? g : f);
1813 >        final CompletableFuture<Integer> k = (reverseArgs ? f : g);
1814  
1815 <        checkCancelled(g);
1816 <        assertEquals(0, r.invocationCount);
1817 <        checkCompletedNormally(f, v1);
1818 <        checkCompletedWithWrappedCancellationException(h);
1815 >        final CompletableFuture<Integer> h1 = m.applyToEither(j, k, r1);
1816 >        if (fFirst) {
1817 >            f.complete(v1);
1818 >            assertTrue(g.cancel(mayInterruptIfRunning));
1819 >        } else {
1820 >            assertTrue(g.cancel(mayInterruptIfRunning));
1821 >            f.complete(v1);
1822          }
1823 <    }
2037 <
2038 <    public void testApplyToEither_sourceCancelled3() {
2039 <        for (ExecutionMode m : ExecutionMode.values())
2040 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2041 <        for (Integer v1 : new Integer[] { 1, null }) {
2042 <
2043 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2044 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2045 <        final IncFunction r = new IncFunction();
2046 <
2047 <        assertTrue(g.cancel(mayInterruptIfRunning));
2048 <        f.complete(v1);
2049 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1823 >        final CompletableFuture<Integer> h2 = m.applyToEither(j, k, r2);
1824  
1825          // unspecified behavior
2052        Integer v;
1826          try {
1827 <            assertEquals(h.join(), inc(v1));
1828 <            assertEquals(1, r.invocationCount);
1827 >            assertEquals(inc(v1), h1.join());
1828 >            assertEquals(1, r1.invocationCount);
1829          } catch (CompletionException ok) {
1830 <            checkCompletedWithWrappedCancellationException(h);
1831 <            assertEquals(0, r.invocationCount);
1830 >            checkCompletedWithWrappedCancellationException(h1);
1831 >            assertEquals(0, r1.invocationCount);
1832          }
1833  
2061        checkCancelled(g);
2062        checkCompletedNormally(f, v1);
2063        }
2064    }
2065
2066    public void testApplyToEither_sourceCancelled4() {
2067        for (ExecutionMode m : ExecutionMode.values())
2068        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2069        for (Integer v1 : new Integer[] { 1, null }) {
2070
2071        final CompletableFuture<Integer> f = new CompletableFuture<>();
2072        final CompletableFuture<Integer> g = new CompletableFuture<>();
2073        final IncFunction r = new IncFunction();
2074
2075        assertTrue(f.cancel(mayInterruptIfRunning));
2076        g.complete(v1);
2077        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2078
2079        // unspecified behavior
2080        Integer v;
1834          try {
1835 <            assertEquals(h.join(), inc(v1));
1836 <            assertEquals(1, r.invocationCount);
1835 >            assertEquals(inc(v1), h2.join());
1836 >            assertEquals(1, r2.invocationCount);
1837          } catch (CompletionException ok) {
1838 <            checkCompletedWithWrappedCancellationException(h);
1839 <            assertEquals(0, r.invocationCount);
1838 >            checkCompletedWithWrappedCancellationException(h2);
1839 >            assertEquals(0, r2.invocationCount);
1840          }
1841  
1842 <        checkCancelled(f);
1843 <        checkCompletedNormally(g, v1);
1844 <        }
2092 <    }
1842 >        checkCancelled(g);
1843 >        checkCompletedNormally(f, v1);
1844 >    }}
1845  
1846      /**
1847       * acceptEither result completes normally after normal completion
# Line 2098 | Line 1850 | public class CompletableFutureTest exten
1850      public void testAcceptEither_normalCompletion1() {
1851          for (ExecutionMode m : ExecutionMode.values())
1852          for (Integer v1 : new Integer[] { 1, null })
1853 <        for (Integer v2 : new Integer[] { 2, null }) {
1854 <
1853 >        for (Integer v2 : new Integer[] { 2, null })
1854 >    {
1855          final CompletableFuture<Integer> f = new CompletableFuture<>();
1856          final CompletableFuture<Integer> g = new CompletableFuture<>();
1857          final IncAction r = new IncAction();
# Line 2107 | Line 1859 | public class CompletableFutureTest exten
1859  
1860          f.complete(v1);
1861          checkCompletedNormally(h, null);
1862 <        assertEquals(r.value, inc(v1));
1862 >        assertEquals(inc(v1), r.value);
1863          g.complete(v2);
1864  
1865          checkCompletedNormally(f, v1);
1866          checkCompletedNormally(g, v2);
1867          checkCompletedNormally(h, null);
1868 <        }
2117 <    }
1868 >    }}
1869  
1870      public void testAcceptEither_normalCompletion2() {
1871          for (ExecutionMode m : ExecutionMode.values())
1872          for (Integer v1 : new Integer[] { 1, null })
1873 <        for (Integer v2 : new Integer[] { 2, null }) {
1874 <
1873 >        for (Integer v2 : new Integer[] { 2, null })
1874 >    {
1875          final CompletableFuture<Integer> f = new CompletableFuture<>();
1876          final CompletableFuture<Integer> g = new CompletableFuture<>();
1877          final IncAction r = new IncAction();
# Line 2128 | Line 1879 | public class CompletableFutureTest exten
1879  
1880          g.complete(v2);
1881          checkCompletedNormally(h, null);
1882 <        assertEquals(r.value, inc(v2));
1882 >        assertEquals(inc(v2), r.value);
1883          f.complete(v1);
1884  
1885          checkCompletedNormally(f, v1);
1886          checkCompletedNormally(g, v2);
1887          checkCompletedNormally(h, null);
1888 <        }
1889 <    }
1888 >    }}
1889 >
1890      public void testAcceptEither_normalCompletion3() {
1891          for (ExecutionMode m : ExecutionMode.values())
1892          for (Integer v1 : new Integer[] { 1, null })
1893 <        for (Integer v2 : new Integer[] { 2, null }) {
1894 <
1893 >        for (Integer v2 : new Integer[] { 2, null })
1894 >    {
1895          final CompletableFuture<Integer> f = new CompletableFuture<>();
1896          final CompletableFuture<Integer> g = new CompletableFuture<>();
1897          final IncAction r = new IncAction();
# Line 2156 | Line 1907 | public class CompletableFutureTest exten
1907          // unspecified behavior
1908          assertTrue(Objects.equals(r.value, inc(v1)) ||
1909                     Objects.equals(r.value, inc(v2)));
1910 <        }
2160 <    }
1910 >    }}
1911  
1912      /**
1913       * acceptEither result completes exceptionally after exceptional
# Line 2165 | Line 1915 | public class CompletableFutureTest exten
1915       */
1916      public void testAcceptEither_exceptionalCompletion1() {
1917          for (ExecutionMode m : ExecutionMode.values())
1918 <        for (Integer v1 : new Integer[] { 1, null }) {
1919 <
1918 >        for (Integer v1 : new Integer[] { 1, null })
1919 >    {
1920          final CompletableFuture<Integer> f = new CompletableFuture<>();
1921          final CompletableFuture<Integer> g = new CompletableFuture<>();
1922          final IncAction r = new IncAction();
# Line 2181 | Line 1931 | public class CompletableFutureTest exten
1931          checkCompletedNormally(g, v1);
1932          checkCompletedWithWrappedCFException(f, ex);
1933          checkCompletedWithWrappedCFException(h, ex);
1934 <        }
2185 <    }
1934 >    }}
1935  
1936      public void testAcceptEither_exceptionalCompletion2() {
1937          for (ExecutionMode m : ExecutionMode.values())
1938 <        for (Integer v1 : new Integer[] { 1, null }) {
1939 <
1938 >        for (Integer v1 : new Integer[] { 1, null })
1939 >    {
1940          final CompletableFuture<Integer> f = new CompletableFuture<>();
1941          final CompletableFuture<Integer> g = new CompletableFuture<>();
1942          final IncAction r = new IncAction();
# Line 2202 | Line 1951 | public class CompletableFutureTest exten
1951          checkCompletedNormally(f, v1);
1952          checkCompletedWithWrappedCFException(g, ex);
1953          checkCompletedWithWrappedCFException(h, ex);
1954 <        }
2206 <    }
1954 >    }}
1955  
1956      public void testAcceptEither_exceptionalCompletion3() {
1957          for (ExecutionMode m : ExecutionMode.values())
1958 <        for (Integer v1 : new Integer[] { 1, null }) {
1959 <
1958 >        for (Integer v1 : new Integer[] { 1, null })
1959 >    {
1960          final CompletableFuture<Integer> f = new CompletableFuture<>();
1961          final CompletableFuture<Integer> g = new CompletableFuture<>();
1962          final IncAction r = new IncAction();
# Line 2221 | Line 1969 | public class CompletableFutureTest exten
1969          // unspecified behavior
1970          Integer v;
1971          try {
1972 <            assertEquals(h.join(), null);
1972 >            assertNull(h.join());
1973              assertEquals(1, r.invocationCount);
1974              assertEquals(inc(v1), r.value);
1975          } catch (CompletionException ok) {
# Line 2231 | Line 1979 | public class CompletableFutureTest exten
1979  
1980          checkCompletedWithWrappedCFException(g, ex);
1981          checkCompletedNormally(f, v1);
1982 <        }
2235 <    }
1982 >    }}
1983  
1984      public void testAcceptEither_exceptionalCompletion4() {
1985          for (ExecutionMode m : ExecutionMode.values())
1986 <        for (Integer v1 : new Integer[] { 1, null }) {
1987 <
1986 >        for (Integer v1 : new Integer[] { 1, null })
1987 >    {
1988          final CompletableFuture<Integer> f = new CompletableFuture<>();
1989          final CompletableFuture<Integer> g = new CompletableFuture<>();
1990          final IncAction r = new IncAction();
# Line 2250 | Line 1997 | public class CompletableFutureTest exten
1997          // unspecified behavior
1998          Integer v;
1999          try {
2000 <            assertEquals(h.join(), null);
2000 >            assertNull(h.join());
2001              assertEquals(1, r.invocationCount);
2002              assertEquals(inc(v1), r.value);
2003          } catch (CompletionException ok) {
# Line 2260 | Line 2007 | public class CompletableFutureTest exten
2007  
2008          checkCompletedWithWrappedCFException(f, ex);
2009          checkCompletedNormally(g, v1);
2010 <        }
2264 <    }
2010 >    }}
2011  
2012      /**
2013       * acceptEither result completes exceptionally if action does
# Line 2269 | Line 2015 | public class CompletableFutureTest exten
2015      public void testAcceptEither_actionFailed1() {
2016          for (ExecutionMode m : ExecutionMode.values())
2017          for (Integer v1 : new Integer[] { 1, null })
2018 <        for (Integer v2 : new Integer[] { 2, null }) {
2019 <
2018 >        for (Integer v2 : new Integer[] { 2, null })
2019 >    {
2020          final CompletableFuture<Integer> f = new CompletableFuture<>();
2021          final CompletableFuture<Integer> g = new CompletableFuture<>();
2022          final FailingConsumer r = new FailingConsumer();
# Line 2281 | Line 2027 | public class CompletableFutureTest exten
2027          g.complete(v2);
2028          checkCompletedNormally(f, v1);
2029          checkCompletedNormally(g, v2);
2030 <        }
2285 <    }
2030 >    }}
2031  
2032      public void testAcceptEither_actionFailed2() {
2033          for (ExecutionMode m : ExecutionMode.values())
2034          for (Integer v1 : new Integer[] { 1, null })
2035 <        for (Integer v2 : new Integer[] { 2, null }) {
2036 <
2035 >        for (Integer v2 : new Integer[] { 2, null })
2036 >    {
2037          final CompletableFuture<Integer> f = new CompletableFuture<>();
2038          final CompletableFuture<Integer> g = new CompletableFuture<>();
2039          final FailingConsumer r = new FailingConsumer();
# Line 2299 | Line 2044 | public class CompletableFutureTest exten
2044          f.complete(v1);
2045          checkCompletedNormally(f, v1);
2046          checkCompletedNormally(g, v2);
2047 <        }
2303 <    }
2047 >    }}
2048  
2049      /**
2050       * acceptEither result completes exceptionally if either source cancelled
# Line 2308 | Line 2052 | public class CompletableFutureTest exten
2052      public void testAcceptEither_sourceCancelled1() {
2053          for (ExecutionMode m : ExecutionMode.values())
2054          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2055 <        for (Integer v1 : new Integer[] { 1, null }) {
2056 <
2055 >        for (Integer v1 : new Integer[] { 1, null })
2056 >    {
2057          final CompletableFuture<Integer> f = new CompletableFuture<>();
2058          final CompletableFuture<Integer> g = new CompletableFuture<>();
2059          final IncAction r = new IncAction();
# Line 2323 | Line 2067 | public class CompletableFutureTest exten
2067          assertEquals(0, r.invocationCount);
2068          checkCompletedNormally(g, v1);
2069          checkCompletedWithWrappedCancellationException(h);
2070 <        }
2327 <    }
2070 >    }}
2071  
2072      public void testAcceptEither_sourceCancelled2() {
2073          for (ExecutionMode m : ExecutionMode.values())
2074          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2075 <        for (Integer v1 : new Integer[] { 1, null }) {
2076 <
2075 >        for (Integer v1 : new Integer[] { 1, null })
2076 >    {
2077          final CompletableFuture<Integer> f = new CompletableFuture<>();
2078          final CompletableFuture<Integer> g = new CompletableFuture<>();
2079          final IncAction r = new IncAction();
# Line 2344 | Line 2087 | public class CompletableFutureTest exten
2087          assertEquals(0, r.invocationCount);
2088          checkCompletedNormally(f, v1);
2089          checkCompletedWithWrappedCancellationException(h);
2090 <        }
2348 <    }
2090 >    }}
2091  
2092      public void testAcceptEither_sourceCancelled3() {
2093          for (ExecutionMode m : ExecutionMode.values())
2094          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2095 <        for (Integer v1 : new Integer[] { 1, null }) {
2096 <
2095 >        for (Integer v1 : new Integer[] { 1, null })
2096 >    {
2097          final CompletableFuture<Integer> f = new CompletableFuture<>();
2098          final CompletableFuture<Integer> g = new CompletableFuture<>();
2099          final IncAction r = new IncAction();
# Line 2363 | Line 2105 | public class CompletableFutureTest exten
2105          // unspecified behavior
2106          Integer v;
2107          try {
2108 <            assertEquals(h.join(), null);
2108 >            assertNull(h.join());
2109              assertEquals(1, r.invocationCount);
2110              assertEquals(inc(v1), r.value);
2111          } catch (CompletionException ok) {
# Line 2373 | Line 2115 | public class CompletableFutureTest exten
2115  
2116          checkCancelled(g);
2117          checkCompletedNormally(f, v1);
2118 <        }
2377 <    }
2118 >    }}
2119  
2120      public void testAcceptEither_sourceCancelled4() {
2121          for (ExecutionMode m : ExecutionMode.values())
2122          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2123 <        for (Integer v1 : new Integer[] { 1, null }) {
2124 <
2123 >        for (Integer v1 : new Integer[] { 1, null })
2124 >    {
2125          final CompletableFuture<Integer> f = new CompletableFuture<>();
2126          final CompletableFuture<Integer> g = new CompletableFuture<>();
2127          final IncAction r = new IncAction();
# Line 2392 | Line 2133 | public class CompletableFutureTest exten
2133          // unspecified behavior
2134          Integer v;
2135          try {
2136 <            assertEquals(h.join(), null);
2136 >            assertNull(h.join());
2137              assertEquals(1, r.invocationCount);
2138              assertEquals(inc(v1), r.value);
2139          } catch (CompletionException ok) {
# Line 2402 | Line 2143 | public class CompletableFutureTest exten
2143  
2144          checkCancelled(f);
2145          checkCompletedNormally(g, v1);
2146 <        }
2406 <    }
2146 >    }}
2147  
2148      /**
2149       * runAfterEither result completes normally after normal completion
# Line 2412 | Line 2152 | public class CompletableFutureTest exten
2152      public void testRunAfterEither_normalCompletion1() {
2153          for (ExecutionMode m : ExecutionMode.values())
2154          for (Integer v1 : new Integer[] { 1, null })
2155 <        for (Integer v2 : new Integer[] { 2, null }) {
2156 <
2155 >        for (Integer v2 : new Integer[] { 2, null })
2156 >    {
2157          final CompletableFuture<Integer> f = new CompletableFuture<>();
2158          final CompletableFuture<Integer> g = new CompletableFuture<>();
2159 <        final Noop r = new Noop();
2159 >        final Noop r = new Noop(m);
2160          final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2161  
2162          f.complete(v1);
# Line 2428 | Line 2168 | public class CompletableFutureTest exten
2168          checkCompletedNormally(g, v2);
2169          checkCompletedNormally(h, null);
2170          assertEquals(1, r.invocationCount);
2171 <        }
2432 <    }
2171 >    }}
2172  
2173      public void testRunAfterEither_normalCompletion2() {
2174          for (ExecutionMode m : ExecutionMode.values())
2175          for (Integer v1 : new Integer[] { 1, null })
2176 <        for (Integer v2 : new Integer[] { 2, null }) {
2177 <
2176 >        for (Integer v2 : new Integer[] { 2, null })
2177 >    {
2178          final CompletableFuture<Integer> f = new CompletableFuture<>();
2179          final CompletableFuture<Integer> g = new CompletableFuture<>();
2180 <        final Noop r = new Noop();
2180 >        final Noop r = new Noop(m);
2181          final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2182  
2183          g.complete(v2);
# Line 2450 | Line 2189 | public class CompletableFutureTest exten
2189          checkCompletedNormally(g, v2);
2190          checkCompletedNormally(h, null);
2191          assertEquals(1, r.invocationCount);
2192 <        }
2193 <    }
2192 >        }}
2193 >
2194      public void testRunAfterEither_normalCompletion3() {
2195          for (ExecutionMode m : ExecutionMode.values())
2196          for (Integer v1 : new Integer[] { 1, null })
2197 <        for (Integer v2 : new Integer[] { 2, null }) {
2198 <
2197 >        for (Integer v2 : new Integer[] { 2, null })
2198 >    {
2199          final CompletableFuture<Integer> f = new CompletableFuture<>();
2200          final CompletableFuture<Integer> g = new CompletableFuture<>();
2201 <        final Noop r = new Noop();
2201 >        final Noop r = new Noop(m);
2202  
2203          f.complete(v1);
2204          g.complete(v2);
# Line 2469 | Line 2208 | public class CompletableFutureTest exten
2208          checkCompletedNormally(f, v1);
2209          checkCompletedNormally(g, v2);
2210          assertEquals(1, r.invocationCount);
2211 <        }
2473 <    }
2211 >    }}
2212  
2213      /**
2214       * runAfterEither result completes exceptionally after exceptional
# Line 2478 | Line 2216 | public class CompletableFutureTest exten
2216       */
2217      public void testRunAfterEither_exceptionalCompletion1() {
2218          for (ExecutionMode m : ExecutionMode.values())
2219 <        for (Integer v1 : new Integer[] { 1, null }) {
2220 <
2219 >        for (Integer v1 : new Integer[] { 1, null })
2220 >    {
2221          final CompletableFuture<Integer> f = new CompletableFuture<>();
2222          final CompletableFuture<Integer> g = new CompletableFuture<>();
2223 <        final Noop r = new Noop();
2223 >        final Noop r = new Noop(m);
2224          final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2225          final CFException ex = new CFException();
2226  
# Line 2494 | Line 2232 | public class CompletableFutureTest exten
2232          checkCompletedNormally(g, v1);
2233          checkCompletedWithWrappedCFException(f, ex);
2234          checkCompletedWithWrappedCFException(h, ex);
2235 <        }
2498 <    }
2235 >    }}
2236  
2237      public void testRunAfterEither_exceptionalCompletion2() {
2238          for (ExecutionMode m : ExecutionMode.values())
2239 <        for (Integer v1 : new Integer[] { 1, null }) {
2240 <
2239 >        for (Integer v1 : new Integer[] { 1, null })
2240 >    {
2241          final CompletableFuture<Integer> f = new CompletableFuture<>();
2242          final CompletableFuture<Integer> g = new CompletableFuture<>();
2243 <        final Noop r = new Noop();
2243 >        final Noop r = new Noop(m);
2244          final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2245          final CFException ex = new CFException();
2246  
# Line 2515 | Line 2252 | public class CompletableFutureTest exten
2252          checkCompletedNormally(f, v1);
2253          checkCompletedWithWrappedCFException(g, ex);
2254          checkCompletedWithWrappedCFException(h, ex);
2255 <        }
2519 <    }
2255 >    }}
2256  
2257      public void testRunAfterEither_exceptionalCompletion3() {
2258          for (ExecutionMode m : ExecutionMode.values())
2259 <        for (Integer v1 : new Integer[] { 1, null }) {
2260 <
2259 >        for (Integer v1 : new Integer[] { 1, null })
2260 >    {
2261          final CompletableFuture<Integer> f = new CompletableFuture<>();
2262          final CompletableFuture<Integer> g = new CompletableFuture<>();
2263 <        final Noop r = new Noop();
2263 >        final Noop r = new Noop(m);
2264          final CFException ex = new CFException();
2265  
2266          g.completeExceptionally(ex);
# Line 2534 | Line 2270 | public class CompletableFutureTest exten
2270          // unspecified behavior
2271          Integer v;
2272          try {
2273 <            assertEquals(h.join(), null);
2273 >            assertNull(h.join());
2274              assertEquals(1, r.invocationCount);
2275          } catch (CompletionException ok) {
2276              checkCompletedWithWrappedCFException(h, ex);
# Line 2543 | Line 2279 | public class CompletableFutureTest exten
2279  
2280          checkCompletedWithWrappedCFException(g, ex);
2281          checkCompletedNormally(f, v1);
2282 <        }
2547 <    }
2282 >    }}
2283  
2284      public void testRunAfterEither_exceptionalCompletion4() {
2285          for (ExecutionMode m : ExecutionMode.values())
2286 <        for (Integer v1 : new Integer[] { 1, null }) {
2287 <
2286 >        for (Integer v1 : new Integer[] { 1, null })
2287 >    {
2288          final CompletableFuture<Integer> f = new CompletableFuture<>();
2289          final CompletableFuture<Integer> g = new CompletableFuture<>();
2290 <        final Noop r = new Noop();
2290 >        final Noop r = new Noop(m);
2291          final CFException ex = new CFException();
2292  
2293          f.completeExceptionally(ex);
# Line 2562 | Line 2297 | public class CompletableFutureTest exten
2297          // unspecified behavior
2298          Integer v;
2299          try {
2300 <            assertEquals(h.join(), null);
2300 >            assertNull(h.join());
2301              assertEquals(1, r.invocationCount);
2302          } catch (CompletionException ok) {
2303              checkCompletedWithWrappedCFException(h, ex);
# Line 2571 | Line 2306 | public class CompletableFutureTest exten
2306  
2307          checkCompletedWithWrappedCFException(f, ex);
2308          checkCompletedNormally(g, v1);
2309 <        }
2575 <    }
2309 >    }}
2310  
2311      /**
2312       * runAfterEither result completes exceptionally if action does
# Line 2580 | Line 2314 | public class CompletableFutureTest exten
2314      public void testRunAfterEither_actionFailed1() {
2315          for (ExecutionMode m : ExecutionMode.values())
2316          for (Integer v1 : new Integer[] { 1, null })
2317 <        for (Integer v2 : new Integer[] { 2, null }) {
2318 <
2317 >        for (Integer v2 : new Integer[] { 2, null })
2318 >    {
2319          final CompletableFuture<Integer> f = new CompletableFuture<>();
2320          final CompletableFuture<Integer> g = new CompletableFuture<>();
2321 <        final FailingNoop r = new FailingNoop();
2321 >        final FailingRunnable r = new FailingRunnable();
2322          final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2323  
2324          f.complete(v1);
# Line 2592 | Line 2326 | public class CompletableFutureTest exten
2326          g.complete(v2);
2327          checkCompletedNormally(f, v1);
2328          checkCompletedNormally(g, v2);
2329 <        }
2596 <    }
2329 >    }}
2330  
2331      public void testRunAfterEither_actionFailed2() {
2332          for (ExecutionMode m : ExecutionMode.values())
2333          for (Integer v1 : new Integer[] { 1, null })
2334 <        for (Integer v2 : new Integer[] { 2, null }) {
2335 <
2334 >        for (Integer v2 : new Integer[] { 2, null })
2335 >    {
2336          final CompletableFuture<Integer> f = new CompletableFuture<>();
2337          final CompletableFuture<Integer> g = new CompletableFuture<>();
2338 <        final FailingNoop r = new FailingNoop();
2338 >        final FailingRunnable r = new FailingRunnable();
2339          final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2340  
2341          g.complete(v2);
# Line 2610 | Line 2343 | public class CompletableFutureTest exten
2343          f.complete(v1);
2344          checkCompletedNormally(f, v1);
2345          checkCompletedNormally(g, v2);
2346 <        }
2614 <    }
2346 >    }}
2347  
2348      /**
2349       * runAfterEither result completes exceptionally if either source cancelled
# Line 2619 | Line 2351 | public class CompletableFutureTest exten
2351      public void testRunAfterEither_sourceCancelled1() {
2352          for (ExecutionMode m : ExecutionMode.values())
2353          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2354 <        for (Integer v1 : new Integer[] { 1, null }) {
2355 <
2354 >        for (Integer v1 : new Integer[] { 1, null })
2355 >    {
2356          final CompletableFuture<Integer> f = new CompletableFuture<>();
2357          final CompletableFuture<Integer> g = new CompletableFuture<>();
2358 <        final Noop r = new Noop();
2358 >        final Noop r = new Noop(m);
2359          final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2360  
2361          assertTrue(f.cancel(mayInterruptIfRunning));
# Line 2634 | Line 2366 | public class CompletableFutureTest exten
2366          assertEquals(0, r.invocationCount);
2367          checkCompletedNormally(g, v1);
2368          checkCompletedWithWrappedCancellationException(h);
2369 <        }
2638 <    }
2369 >    }}
2370  
2371      public void testRunAfterEither_sourceCancelled2() {
2372          for (ExecutionMode m : ExecutionMode.values())
2373          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2374 <        for (Integer v1 : new Integer[] { 1, null }) {
2375 <
2374 >        for (Integer v1 : new Integer[] { 1, null })
2375 >    {
2376          final CompletableFuture<Integer> f = new CompletableFuture<>();
2377          final CompletableFuture<Integer> g = new CompletableFuture<>();
2378 <        final Noop r = new Noop();
2378 >        final Noop r = new Noop(m);
2379          final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2380  
2381          assertTrue(g.cancel(mayInterruptIfRunning));
# Line 2655 | Line 2386 | public class CompletableFutureTest exten
2386          assertEquals(0, r.invocationCount);
2387          checkCompletedNormally(f, v1);
2388          checkCompletedWithWrappedCancellationException(h);
2389 <        }
2659 <    }
2389 >    }}
2390  
2391      public void testRunAfterEither_sourceCancelled3() {
2392          for (ExecutionMode m : ExecutionMode.values())
2393          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2394 <        for (Integer v1 : new Integer[] { 1, null }) {
2395 <
2394 >        for (Integer v1 : new Integer[] { 1, null })
2395 >    {
2396          final CompletableFuture<Integer> f = new CompletableFuture<>();
2397          final CompletableFuture<Integer> g = new CompletableFuture<>();
2398 <        final Noop r = new Noop();
2398 >        final Noop r = new Noop(m);
2399  
2400          assertTrue(g.cancel(mayInterruptIfRunning));
2401          f.complete(v1);
# Line 2674 | Line 2404 | public class CompletableFutureTest exten
2404          // unspecified behavior
2405          Integer v;
2406          try {
2407 <            assertEquals(h.join(), null);
2407 >            assertNull(h.join());
2408              assertEquals(1, r.invocationCount);
2409          } catch (CompletionException ok) {
2410              checkCompletedWithWrappedCancellationException(h);
# Line 2683 | Line 2413 | public class CompletableFutureTest exten
2413  
2414          checkCancelled(g);
2415          checkCompletedNormally(f, v1);
2416 <        }
2687 <    }
2416 >    }}
2417  
2418      public void testRunAfterEither_sourceCancelled4() {
2419          for (ExecutionMode m : ExecutionMode.values())
2420          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2421 <        for (Integer v1 : new Integer[] { 1, null }) {
2422 <
2421 >        for (Integer v1 : new Integer[] { 1, null })
2422 >    {
2423          final CompletableFuture<Integer> f = new CompletableFuture<>();
2424          final CompletableFuture<Integer> g = new CompletableFuture<>();
2425 <        final Noop r = new Noop();
2425 >        final Noop r = new Noop(m);
2426  
2427          assertTrue(f.cancel(mayInterruptIfRunning));
2428          g.complete(v1);
# Line 2702 | Line 2431 | public class CompletableFutureTest exten
2431          // unspecified behavior
2432          Integer v;
2433          try {
2434 <            assertEquals(h.join(), null);
2434 >            assertNull(h.join());
2435              assertEquals(1, r.invocationCount);
2436          } catch (CompletionException ok) {
2437              checkCompletedWithWrappedCancellationException(h);
# Line 2711 | Line 2440 | public class CompletableFutureTest exten
2440  
2441          checkCancelled(f);
2442          checkCompletedNormally(g, v1);
2443 <        }
2715 <    }
2443 >    }}
2444  
2445      /**
2446       * thenCompose result completes normally after normal completion of source
2447       */
2448 <    public void testThenCompose_normalCompletion1() {
2448 >    public void testThenCompose_normalCompletion() {
2449          for (ExecutionMode m : ExecutionMode.values())
2450 <        for (Integer v1 : new Integer[] { 1, null }) {
2451 <
2450 >        for (boolean createIncomplete : new boolean[] { true, false })
2451 >        for (Integer v1 : new Integer[] { 1, null })
2452 >    {
2453          final CompletableFuture<Integer> f = new CompletableFuture<>();
2454          final CompletableFutureInc r = new CompletableFutureInc();
2455 +        if (!createIncomplete) f.complete(v1);
2456          final CompletableFuture<Integer> g = f.thenCompose(r);
2457 <        f.complete(v1);
2728 <        checkCompletedNormally(g, inc(v1));
2729 <        checkCompletedNormally(f, v1);
2730 <        assertEquals(1, r.invocationCount);
2731 <        }
2732 <    }
2733 <
2734 <    public void testThenCompose_normalCompletion2() {
2735 <        for (ExecutionMode m : ExecutionMode.values())
2736 <        for (Integer v1 : new Integer[] { 1, null }) {
2457 >        if (createIncomplete) f.complete(v1);
2458  
2738        final CompletableFuture<Integer> f = new CompletableFuture<>();
2739        final CompletableFutureInc r = new CompletableFutureInc();
2740        f.complete(v1);
2741        final CompletableFuture<Integer> g = f.thenCompose(r);
2459          checkCompletedNormally(g, inc(v1));
2460          checkCompletedNormally(f, v1);
2461          assertEquals(1, r.invocationCount);
2462 <        }
2746 <    }
2462 >    }}
2463  
2464      /**
2465       * thenCompose result completes exceptionally after exceptional
2466       * completion of source
2467       */
2468 <    public void testThenCompose_exceptionalCompletion1() {
2469 <        for (ExecutionMode m : ExecutionMode.values()) {
2470 <
2468 >    public void testThenCompose_exceptionalCompletion() {
2469 >        for (ExecutionMode m : ExecutionMode.values())
2470 >        for (boolean createIncomplete : new boolean[] { true, false })
2471 >    {
2472          final CFException ex = new CFException();
2473          final CompletableFutureInc r = new CompletableFutureInc();
2474          final CompletableFuture<Integer> f = new CompletableFuture<>();
2475 +        if (!createIncomplete) f.completeExceptionally(ex);
2476          final CompletableFuture<Integer> g = f.thenCompose(r);
2477 <        f.completeExceptionally(ex);
2760 <        checkCompletedWithWrappedCFException(g, ex);
2761 <        checkCompletedWithWrappedCFException(f, ex);
2762 <        }
2763 <    }
2764 <
2765 <    public void testThenCompose_exceptionalCompletion2() {
2766 <        for (ExecutionMode m : ExecutionMode.values()) {
2477 >        if (createIncomplete) f.completeExceptionally(ex);
2478  
2768        final CFException ex = new CFException();
2769        final CompletableFuture<Integer> f = new CompletableFuture<>();
2770        f.completeExceptionally(ex);
2771        final CompletableFutureInc r = new CompletableFutureInc();
2772        final CompletableFuture<Integer> g = f.thenCompose(r);
2479          checkCompletedWithWrappedCFException(g, ex);
2480          checkCompletedWithWrappedCFException(f, ex);
2481 <        }
2482 <    }
2481 >        assertEquals(0, r.invocationCount);
2482 >    }}
2483  
2484      /**
2485       * thenCompose result completes exceptionally if action does
2486       */
2487 <    public void testThenCompose_actionFailed1() {
2487 >    public void testThenCompose_actionFailed() {
2488          for (ExecutionMode m : ExecutionMode.values())
2489 <        for (Integer v1 : new Integer[] { 1, null }) {
2490 <
2489 >        for (boolean createIncomplete : new boolean[] { true, false })
2490 >        for (Integer v1 : new Integer[] { 1, null })
2491 >    {
2492          final CompletableFuture<Integer> f = new CompletableFuture<>();
2493          final FailingCompletableFutureFunction r
2494              = new FailingCompletableFutureFunction();
2495 +        if (!createIncomplete) f.complete(v1);
2496          final CompletableFuture<Integer> g = f.thenCompose(r);
2497 <        f.complete(v1);
2790 <        checkCompletedWithWrappedCFException(g);
2791 <        checkCompletedNormally(f, v1);
2792 <        }
2793 <    }
2794 <
2795 <    public void testThenCompose_actionFailed2() {
2796 <        for (ExecutionMode m : ExecutionMode.values())
2797 <        for (Integer v1 : new Integer[] { 1, null }) {
2497 >        if (createIncomplete) f.complete(v1);
2498  
2799        final CompletableFuture<Integer> f = new CompletableFuture<>();
2800        f.complete(v1);
2801        final FailingCompletableFutureFunction r
2802            = new FailingCompletableFutureFunction();
2803        final CompletableFuture<Integer> g = f.thenCompose(r);
2499          checkCompletedWithWrappedCFException(g);
2500          checkCompletedNormally(f, v1);
2501 <        }
2807 <    }
2501 >    }}
2502  
2503      /**
2504       * thenCompose result completes exceptionally if source cancelled
2505       */
2506 <    public void testThenCompose_sourceCancelled1() {
2506 >    public void testThenCompose_sourceCancelled() {
2507          for (ExecutionMode m : ExecutionMode.values())
2508 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false }) {
2509 <
2508 >        for (boolean createIncomplete : new boolean[] { true, false })
2509 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2510 >    {
2511          final CompletableFuture<Integer> f = new CompletableFuture<>();
2512          final CompletableFutureInc r = new CompletableFutureInc();
2513 +        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2514          final CompletableFuture<Integer> g = f.thenCompose(r);
2515 <        assertTrue(f.cancel(mayInterruptIfRunning));
2516 <        checkCompletedWithWrappedCancellationException(g);
2517 <        checkCancelled(f);
2515 >        if (createIncomplete) {
2516 >            checkIncomplete(g);
2517 >            assertTrue(f.cancel(mayInterruptIfRunning));
2518          }
2823    }
2824
2825    public void testThenCompose_sourceCancelled2() {
2826        for (ExecutionMode m : ExecutionMode.values())
2827        for (boolean mayInterruptIfRunning : new boolean[] { true, false }) {
2519  
2829        final CompletableFuture<Integer> f = new CompletableFuture<>();
2830        assertTrue(f.cancel(mayInterruptIfRunning));
2831        final CompletableFutureInc r = new CompletableFutureInc();
2832        final CompletableFuture<Integer> g = f.thenCompose(r);
2520          checkCompletedWithWrappedCancellationException(g);
2521          checkCancelled(f);
2522 <        }
2836 <    }
2837 <
2838 <    // asyncs
2839 <
2840 <    /**
2841 <     * thenRunAsync result completes normally after normal completion of source
2842 <     */
2843 <    public void testThenRunAsync() {
2844 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2845 <        Noop r = new Noop();
2846 <        CompletableFuture<Void> g = f.thenRunAsync(r);
2847 <        f.complete(null);
2848 <        checkCompletedNormally(g, null);
2849 <
2850 <        // reordered version
2851 <        f = new CompletableFuture<>();
2852 <        f.complete(null);
2853 <        r = new Noop();
2854 <        g = f.thenRunAsync(r);
2855 <        checkCompletedNormally(g, null);
2856 <    }
2857 <
2858 <    /**
2859 <     * thenRunAsync result completes exceptionally after exceptional
2860 <     * completion of source
2861 <     */
2862 <    public void testThenRunAsync2() {
2863 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2864 <        Noop r = new Noop();
2865 <        CompletableFuture<Void> g = f.thenRunAsync(r);
2866 <        f.completeExceptionally(new CFException());
2867 <        try {
2868 <            g.join();
2869 <            shouldThrow();
2870 <        } catch (CompletionException success) {}
2871 <        checkCompletedWithWrappedCFException(g);
2872 <    }
2873 <
2874 <    /**
2875 <     * thenRunAsync result completes exceptionally if action does
2876 <     */
2877 <    public void testThenRunAsync3() {
2878 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2879 <        FailingNoop r = new FailingNoop();
2880 <        CompletableFuture<Void> g = f.thenRunAsync(r);
2881 <        f.complete(null);
2882 <        checkCompletedWithWrappedCFException(g);
2883 <    }
2884 <
2885 <    /**
2886 <     * thenRunAsync result completes exceptionally if source cancelled
2887 <     */
2888 <    public void testThenRunAsync4() {
2889 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2890 <        Noop r = new Noop();
2891 <        CompletableFuture<Void> g = f.thenRunAsync(r);
2892 <        assertTrue(f.cancel(true));
2893 <        checkCompletedWithWrappedCancellationException(g);
2894 <    }
2895 <
2896 <    /**
2897 <     * thenApplyAsync result completes normally after normal completion of source
2898 <     */
2899 <    public void testThenApplyAsync() {
2900 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2901 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
2902 <        f.complete(one);
2903 <        checkCompletedNormally(g, two);
2904 <    }
2905 <
2906 <    /**
2907 <     * thenApplyAsync result completes exceptionally after exceptional
2908 <     * completion of source
2909 <     */
2910 <    public void testThenApplyAsync2() {
2911 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2912 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
2913 <        f.completeExceptionally(new CFException());
2914 <        checkCompletedWithWrappedCFException(g);
2915 <    }
2916 <
2917 <    /**
2918 <     * thenApplyAsync result completes exceptionally if action does
2919 <     */
2920 <    public void testThenApplyAsync3() {
2921 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2922 <        FailingFunction r = new FailingFunction();
2923 <        CompletableFuture<Integer> g = f.thenApplyAsync(r);
2924 <        f.complete(null);
2925 <        checkCompletedWithWrappedCFException(g);
2926 <    }
2927 <
2928 <    /**
2929 <     * thenApplyAsync result completes exceptionally if source cancelled
2930 <     */
2931 <    public void testThenApplyAsync4() {
2932 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2933 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
2934 <        assertTrue(f.cancel(true));
2935 <        checkCompletedWithWrappedCancellationException(g);
2936 <    }
2937 <
2938 <    /**
2939 <     * thenAcceptAsync result completes normally after normal
2940 <     * completion of source
2941 <     */
2942 <    public void testThenAcceptAsync() {
2943 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2944 <        IncAction r = new IncAction();
2945 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2946 <        f.complete(one);
2947 <        checkCompletedNormally(g, null);
2948 <        assertEquals(r.value, (Integer) 2);
2949 <    }
2950 <
2951 <    /**
2952 <     * thenAcceptAsync result completes exceptionally after exceptional
2953 <     * completion of source
2954 <     */
2955 <    public void testThenAcceptAsync2() {
2956 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2957 <        IncAction r = new IncAction();
2958 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2959 <        f.completeExceptionally(new CFException());
2960 <        checkCompletedWithWrappedCFException(g);
2961 <    }
2962 <
2963 <    /**
2964 <     * thenAcceptAsync result completes exceptionally if action does
2965 <     */
2966 <    public void testThenAcceptAsync3() {
2967 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2968 <        FailingConsumer r = new FailingConsumer();
2969 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2970 <        f.complete(null);
2971 <        checkCompletedWithWrappedCFException(g);
2972 <    }
2973 <
2974 <    /**
2975 <     * thenAcceptAsync result completes exceptionally if source cancelled
2976 <     */
2977 <    public void testThenAcceptAsync4() {
2978 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2979 <        IncAction r = new IncAction();
2980 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2981 <        assertTrue(f.cancel(true));
2982 <        checkCompletedWithWrappedCancellationException(g);
2983 <    }
2984 <
2985 <    // async with explicit executors
2986 <
2987 <    /**
2988 <     * thenRunAsync result completes normally after normal completion of source
2989 <     */
2990 <    public void testThenRunAsyncE() {
2991 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2992 <        Noop r = new Noop();
2993 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2994 <        f.complete(null);
2995 <        checkCompletedNormally(g, null);
2996 <
2997 <        // reordered version
2998 <        f = new CompletableFuture<>();
2999 <        f.complete(null);
3000 <        r = new Noop();
3001 <        g = f.thenRunAsync(r, new ThreadExecutor());
3002 <        checkCompletedNormally(g, null);
3003 <    }
3004 <
3005 <    /**
3006 <     * thenRunAsync result completes exceptionally after exceptional
3007 <     * completion of source
3008 <     */
3009 <    public void testThenRunAsync2E() {
3010 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3011 <        Noop r = new Noop();
3012 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
3013 <        f.completeExceptionally(new CFException());
3014 <        try {
3015 <            g.join();
3016 <            shouldThrow();
3017 <        } catch (CompletionException success) {}
3018 <        checkCompletedWithWrappedCFException(g);
3019 <    }
3020 <
3021 <    /**
3022 <     * thenRunAsync result completes exceptionally if action does
3023 <     */
3024 <    public void testThenRunAsync3E() {
3025 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3026 <        FailingNoop r = new FailingNoop();
3027 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
3028 <        f.complete(null);
3029 <        checkCompletedWithWrappedCFException(g);
3030 <    }
3031 <
3032 <    /**
3033 <     * thenRunAsync result completes exceptionally if source cancelled
3034 <     */
3035 <    public void testThenRunAsync4E() {
3036 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3037 <        Noop r = new Noop();
3038 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
3039 <        assertTrue(f.cancel(true));
3040 <        checkCompletedWithWrappedCancellationException(g);
3041 <    }
3042 <
3043 <    /**
3044 <     * thenApplyAsync result completes normally after normal completion of source
3045 <     */
3046 <    public void testThenApplyAsyncE() {
3047 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3048 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
3049 <        f.complete(one);
3050 <        checkCompletedNormally(g, two);
3051 <    }
3052 <
3053 <    /**
3054 <     * thenApplyAsync result completes exceptionally after exceptional
3055 <     * completion of source
3056 <     */
3057 <    public void testThenApplyAsync2E() {
3058 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3059 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
3060 <        f.completeExceptionally(new CFException());
3061 <        checkCompletedWithWrappedCFException(g);
3062 <    }
3063 <
3064 <    /**
3065 <     * thenApplyAsync result completes exceptionally if action does
3066 <     */
3067 <    public void testThenApplyAsync3E() {
3068 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3069 <        FailingFunction r = new FailingFunction();
3070 <        CompletableFuture<Integer> g = f.thenApplyAsync(r, new ThreadExecutor());
3071 <        f.complete(null);
3072 <        checkCompletedWithWrappedCFException(g);
3073 <    }
3074 <
3075 <    /**
3076 <     * thenApplyAsync result completes exceptionally if source cancelled
3077 <     */
3078 <    public void testThenApplyAsync4E() {
3079 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3080 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
3081 <        assertTrue(f.cancel(true));
3082 <        checkCompletedWithWrappedCancellationException(g);
3083 <    }
3084 <
3085 <    /**
3086 <     * thenAcceptAsync result completes normally after normal
3087 <     * completion of source
3088 <     */
3089 <    public void testThenAcceptAsyncE() {
3090 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3091 <        IncAction r = new IncAction();
3092 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3093 <        f.complete(one);
3094 <        checkCompletedNormally(g, null);
3095 <        assertEquals(r.value, (Integer) 2);
3096 <    }
3097 <
3098 <    /**
3099 <     * thenAcceptAsync result completes exceptionally after exceptional
3100 <     * completion of source
3101 <     */
3102 <    public void testThenAcceptAsync2E() {
3103 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3104 <        IncAction r = new IncAction();
3105 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3106 <        f.completeExceptionally(new CFException());
3107 <        checkCompletedWithWrappedCFException(g);
3108 <    }
3109 <
3110 <    /**
3111 <     * thenAcceptAsync result completes exceptionally if action does
3112 <     */
3113 <    public void testThenAcceptAsync3E() {
3114 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3115 <        FailingConsumer r = new FailingConsumer();
3116 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3117 <        f.complete(null);
3118 <        checkCompletedWithWrappedCFException(g);
3119 <    }
3120 <
3121 <    /**
3122 <     * thenAcceptAsync result completes exceptionally if source cancelled
3123 <     */
3124 <    public void testThenAcceptAsync4E() {
3125 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3126 <        IncAction r = new IncAction();
3127 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3128 <        assertTrue(f.cancel(true));
3129 <        checkCompletedWithWrappedCancellationException(g);
3130 <    }
2522 >    }}
2523  
2524      // other static methods
2525  
# Line 3328 | Line 2720 | public class CompletableFutureTest exten
2720       * source result.
2721       */
2722      public void testWhenComplete_normalCompletion1() {
3331        for (boolean createIncomplete : new boolean[] { true, false })
2723          for (ExecutionMode m : ExecutionMode.values())
2724 <        for (Integer v1 : new Integer[] { 1, null }) {
2725 <
2726 <        final AtomicInteger a = new AtomicInteger();
2724 >        for (boolean createIncomplete : new boolean[] { true, false })
2725 >        for (Integer v1 : new Integer[] { 1, null })
2726 >    {
2727 >        final AtomicInteger a = new AtomicInteger(0);
2728          final CompletableFuture<Integer> f = new CompletableFuture<>();
2729          if (!createIncomplete) f.complete(v1);
2730 <        final CompletableFuture<Integer> g =
2731 <            m.whenComplete(f,
2732 <                           (Integer x, Throwable t) -> {
2733 <                               threadAssertSame(x, v1);
2734 <                               threadAssertNull(t);
2735 <                               a.getAndIncrement();
2736 <                           });
2730 >        final CompletableFuture<Integer> g = m.whenComplete
2731 >            (f,
2732 >             (Integer x, Throwable t) -> {
2733 >                threadAssertSame(x, v1);
2734 >                threadAssertNull(t);
2735 >                a.getAndIncrement();
2736 >            });
2737          if (createIncomplete) f.complete(v1);
2738 <        checkCompletedNormally(f, v1);
2738 >
2739          checkCompletedNormally(g, v1);
2740 <        assertEquals(a.get(), 1);
2741 <        }
2742 <    }
2740 >        checkCompletedNormally(f, v1);
2741 >        assertEquals(1, a.get());
2742 >    }}
2743  
2744      /**
2745       * whenComplete action executes on exceptional completion, propagating
2746       * source result.
2747       */
2748      public void testWhenComplete_exceptionalCompletion() {
3357        for (boolean createIncomplete : new boolean[] { true, false })
2749          for (ExecutionMode m : ExecutionMode.values())
2750 <        for (Integer v1 : new Integer[] { 1, null }) {
2751 <
2752 <        final AtomicInteger a = new AtomicInteger();
2750 >        for (boolean createIncomplete : new boolean[] { true, false })
2751 >        for (Integer v1 : new Integer[] { 1, null })
2752 >    {
2753 >        final AtomicInteger a = new AtomicInteger(0);
2754          final CFException ex = new CFException();
2755          final CompletableFuture<Integer> f = new CompletableFuture<>();
2756          if (!createIncomplete) f.completeExceptionally(ex);
# Line 3372 | Line 2764 | public class CompletableFutureTest exten
2764          if (createIncomplete) f.completeExceptionally(ex);
2765          checkCompletedWithWrappedCFException(f, ex);
2766          checkCompletedWithWrappedCFException(g, ex);
2767 <        assertEquals(a.get(), 1);
2768 <        }
2769 <    }
2767 >        assertEquals(1, a.get());
2768 >    }}
2769 >
2770 >    /**
2771 >     * whenComplete action executes on cancelled source, propagating
2772 >     * CancellationException.
2773 >     */
2774 >    public void testWhenComplete_sourceCancelled() {
2775 >        for (ExecutionMode m : ExecutionMode.values())
2776 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2777 >        for (boolean createIncomplete : new boolean[] { true, false })
2778 >    {
2779 >        final AtomicInteger a = new AtomicInteger(0);
2780 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2781 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2782 >        final CompletableFuture<Integer> g = m.whenComplete
2783 >            (f,
2784 >             (Integer x, Throwable t) -> {
2785 >                threadAssertNull(x);
2786 >                threadAssertTrue(t instanceof CancellationException);
2787 >                a.getAndIncrement();
2788 >            });
2789 >        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2790 >
2791 >        //try { g.join(); } catch (Throwable t) { throw new Error(t); }
2792 >        checkCompletedWithWrappedCancellationException(g);
2793 >        checkCancelled(f);
2794 >        assertEquals(1, a.get());
2795 >    }}
2796  
2797      /**
2798       * If a whenComplete action throws an exception when triggered by
# Line 3383 | Line 2801 | public class CompletableFutureTest exten
2801      public void testWhenComplete_actionFailed() {
2802          for (boolean createIncomplete : new boolean[] { true, false })
2803          for (ExecutionMode m : ExecutionMode.values())
2804 <        for (Integer v1 : new Integer[] { 1, null }) {
2805 <
2804 >        for (Integer v1 : new Integer[] { 1, null })
2805 >    {
2806 >        final AtomicInteger a = new AtomicInteger(0);
2807          final CFException ex = new CFException();
2808          final CompletableFuture<Integer> f = new CompletableFuture<>();
2809          if (!createIncomplete) f.complete(v1);
# Line 3393 | Line 2812 | public class CompletableFutureTest exten
2812               (Integer x, Throwable t) -> {
2813                  threadAssertSame(x, v1);
2814                  threadAssertNull(t);
2815 +                a.getAndIncrement();
2816                  throw ex;
2817              });
2818          if (createIncomplete) f.complete(v1);
2819          checkCompletedNormally(f, v1);
2820          checkCompletedWithWrappedCFException(g, ex);
2821 <        }
2822 <    }
2821 >        assertEquals(1, a.get());
2822 >    }}
2823  
2824      /**
2825       * If a whenComplete action throws an exception when triggered by
# Line 3409 | Line 2829 | public class CompletableFutureTest exten
2829      public void testWhenComplete_actionFailedSourceFailed() {
2830          for (boolean createIncomplete : new boolean[] { true, false })
2831          for (ExecutionMode m : ExecutionMode.values())
2832 <        for (Integer v1 : new Integer[] { 1, null }) {
2833 <
2832 >        for (Integer v1 : new Integer[] { 1, null })
2833 >    {
2834 >        final AtomicInteger a = new AtomicInteger(0);
2835          final CFException ex1 = new CFException();
2836          final CFException ex2 = new CFException();
2837          final CompletableFuture<Integer> f = new CompletableFuture<>();
# Line 3421 | Line 2842 | public class CompletableFutureTest exten
2842               (Integer x, Throwable t) -> {
2843                  threadAssertSame(t, ex1);
2844                  threadAssertNull(x);
2845 +                a.getAndIncrement();
2846                  throw ex2;
2847              });
2848          if (createIncomplete) f.completeExceptionally(ex1);
2849  
2850          checkCompletedWithWrappedCFException(f, ex1);
2851          checkCompletedWithWrappedCFException(g, ex1);
2852 <        }
2853 <    }
3432 <
3433 <    /**
3434 <     * handleAsync action completes normally with function value on
3435 <     * either normal or exceptional completion of source
3436 <     */
3437 <    public void testHandleAsync() {
3438 <        CompletableFuture<Integer> f, g;
3439 <        IntegerHandler r;
3440 <
3441 <        f = new CompletableFuture<>();
3442 <        g = f.handleAsync(r = new IntegerHandler());
3443 <        assertEquals(0, r.invocationCount);
3444 <        f.completeExceptionally(new CFException());
3445 <        checkCompletedWithWrappedCFException(f);
3446 <        checkCompletedNormally(g, three);
3447 <        assertEquals(1, r.invocationCount);
3448 <
3449 <        f = new CompletableFuture<>();
3450 <        g = f.handleAsync(r = new IntegerHandler());
3451 <        assertEquals(0, r.invocationCount);
3452 <        f.completeExceptionally(new CFException());
3453 <        checkCompletedWithWrappedCFException(f);
3454 <        checkCompletedNormally(g, three);
3455 <        assertEquals(1, r.invocationCount);
3456 <
3457 <        f = new CompletableFuture<>();
3458 <        g = f.handleAsync(r = new IntegerHandler());
3459 <        assertEquals(0, r.invocationCount);
3460 <        f.complete(one);
3461 <        checkCompletedNormally(f, one);
3462 <        checkCompletedNormally(g, two);
3463 <        assertEquals(1, r.invocationCount);
3464 <
3465 <        f = new CompletableFuture<>();
3466 <        g = f.handleAsync(r = new IntegerHandler());
3467 <        assertEquals(0, r.invocationCount);
3468 <        f.complete(one);
3469 <        checkCompletedNormally(f, one);
3470 <        checkCompletedNormally(g, two);
3471 <        assertEquals(1, r.invocationCount);
3472 <    }
3473 <
3474 <    /**
3475 <     * handleAsync action with Executor completes normally with
3476 <     * function value on either normal or exceptional completion of
3477 <     * source
3478 <     */
3479 <    public void testHandleAsync2() {
3480 <        CompletableFuture<Integer> f, g;
3481 <        ThreadExecutor exec = new ThreadExecutor();
3482 <        IntegerHandler r;
3483 <
3484 <        f = new CompletableFuture<>();
3485 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3486 <        assertEquals(0, r.invocationCount);
3487 <        f.completeExceptionally(new CFException());
3488 <        checkCompletedWithWrappedCFException(f);
3489 <        checkCompletedNormally(g, three);
3490 <        assertEquals(1, r.invocationCount);
3491 <
3492 <        f = new CompletableFuture<>();
3493 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3494 <        assertEquals(0, r.invocationCount);
3495 <        f.completeExceptionally(new CFException());
3496 <        checkCompletedWithWrappedCFException(f);
3497 <        checkCompletedNormally(g, three);
3498 <        assertEquals(1, r.invocationCount);
3499 <
3500 <        f = new CompletableFuture<>();
3501 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3502 <        assertEquals(0, r.invocationCount);
3503 <        f.complete(one);
3504 <        checkCompletedNormally(f, one);
3505 <        checkCompletedNormally(g, two);
3506 <        assertEquals(1, r.invocationCount);
3507 <
3508 <        f = new CompletableFuture<>();
3509 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3510 <        assertEquals(0, r.invocationCount);
3511 <        f.complete(one);
3512 <        checkCompletedNormally(f, one);
3513 <        checkCompletedNormally(g, two);
3514 <        assertEquals(1, r.invocationCount);
3515 <    }
2852 >        assertEquals(1, a.get());
2853 >    }}
2854  
2855   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines