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.54 by jsr166, Mon Jun 2 21:32:24 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);
286 >        assertEquals(0, f.getNumberOfDependents());
287          CompletableFuture g = f.thenRun(new Noop());
288 <        assertEquals(f.getNumberOfDependents(), 1);
289 <        assertEquals(g.getNumberOfDependents(), 0);
288 >        assertEquals(1, f.getNumberOfDependents());
289 >        assertEquals(0, g.getNumberOfDependents());
290          CompletableFuture h = f.thenRun(new Noop());
291 <        assertEquals(f.getNumberOfDependents(), 2);
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 412 | Line 416 | public class CompletableFutureTest exten
416              throw new CFException();
417          }
418      }
419 <    static final class FailingNoop implements Runnable {
419 >    static final class FailingRunnable implements Runnable {
420          int invocationCount = 0;
421          public void run() {
422              invocationCount++;
# Line 450 | Line 454 | public class CompletableFutureTest exten
454          }
455      }
456  
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
457      /**
458       * Permits the testing of parallel code for the 3 different
459       * execution modes without repeating all the testing code.
460       */
461      enum ExecutionMode {
462          DEFAULT {
463 +            public void checkExecutionMode() {
464 +                assertNull(ForkJoinTask.getPool());
465 +            }
466 +            public <T> CompletableFuture<Void> thenRun
467 +                (CompletableFuture<T> f, Runnable a) {
468 +                return f.thenRun(a);
469 +            }
470 +            public <T> CompletableFuture<Void> thenAccept
471 +                (CompletableFuture<T> f, Consumer<? super T> a) {
472 +                return f.thenAccept(a);
473 +            }
474 +            public <T,U> CompletableFuture<U> thenApply
475 +                (CompletableFuture<T> f, Function<? super T,U> a) {
476 +                return f.thenApply(a);
477 +            }
478 +            public <T,U> CompletableFuture<U> thenCompose
479 +                (CompletableFuture<T> f,
480 +                 Function<? super T,? extends CompletionStage<U>> a) {
481 +                return f.thenCompose(a);
482 +            }
483 +            public <T,U> CompletableFuture<U> handle
484 +                (CompletableFuture<T> f,
485 +                 BiFunction<? super T,Throwable,? extends U> a) {
486 +                return f.handle(a);
487 +            }
488 +            public <T> CompletableFuture<T> whenComplete
489 +                (CompletableFuture<T> f,
490 +                 BiConsumer<? super T,? super Throwable> a) {
491 +                return f.whenComplete(a);
492 +            }
493              public <T,U> CompletableFuture<Void> runAfterBoth
494                  (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
495                  return f.runAfterBoth(g, a);
# Line 484 | Line 506 | public class CompletableFutureTest exten
506                   BiFunction<? super T,? super U,? extends V> a) {
507                  return f.thenCombine(g, a);
508              }
509 <            public <T,U> CompletableFuture<U> applyToEither
509 >            public <T> CompletableFuture<Void> runAfterEither
510                  (CompletableFuture<T> f,
511 <                 CompletionStage<? extends T> g,
512 <                 Function<? super T,U> a) {
513 <                return f.applyToEither(g, a);
511 >                 CompletionStage<?> g,
512 >                 java.lang.Runnable a) {
513 >                return f.runAfterEither(g, a);
514              }
515              public <T> CompletableFuture<Void> acceptEither
516                  (CompletableFuture<T> f,
# Line 496 | Line 518 | public class CompletableFutureTest exten
518                   Consumer<? super T> a) {
519                  return f.acceptEither(g, a);
520              }
521 <            public <T> CompletableFuture<Void> runAfterEither
521 >            public <T,U> CompletableFuture<U> applyToEither
522                  (CompletableFuture<T> f,
523 <                 CompletionStage<?> g,
524 <                 java.lang.Runnable a) {
525 <                return f.runAfterEither(g, a);
523 >                 CompletionStage<? extends T> g,
524 >                 Function<? super T,U> a) {
525 >                return f.applyToEither(g, a);
526 >            }
527 >        },
528 >
529 >        ASYNC {
530 >            public void checkExecutionMode() {
531 >                assertSame(ForkJoinPool.commonPool(),
532 >                           ForkJoinTask.getPool());
533 >            }
534 >            public <T> CompletableFuture<Void> thenRun
535 >                (CompletableFuture<T> f, Runnable a) {
536 >                return f.thenRunAsync(a);
537 >            }
538 >            public <T> CompletableFuture<Void> thenAccept
539 >                (CompletableFuture<T> f, Consumer<? super T> a) {
540 >                return f.thenAcceptAsync(a);
541 >            }
542 >            public <T,U> CompletableFuture<U> thenApply
543 >                (CompletableFuture<T> f, Function<? super T,U> a) {
544 >                return f.thenApplyAsync(a);
545              }
546              public <T,U> CompletableFuture<U> thenCompose
547                  (CompletableFuture<T> f,
548                   Function<? super T,? extends CompletionStage<U>> a) {
549 <                return f.thenCompose(a);
549 >                return f.thenComposeAsync(a);
550 >            }
551 >            public <T,U> CompletableFuture<U> handle
552 >                (CompletableFuture<T> f,
553 >                 BiFunction<? super T,Throwable,? extends U> a) {
554 >                return f.handleAsync(a);
555              }
556              public <T> CompletableFuture<T> whenComplete
557                  (CompletableFuture<T> f,
558                   BiConsumer<? super T,? super Throwable> a) {
559 <                return f.whenComplete(a);
559 >                return f.whenCompleteAsync(a);
560              }
515        },
516
517        DEFAULT_ASYNC {
561              public <T,U> CompletableFuture<Void> runAfterBoth
562                  (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
563                  return f.runAfterBothAsync(g, a);
# Line 531 | Line 574 | public class CompletableFutureTest exten
574                   BiFunction<? super T,? super U,? extends V> a) {
575                  return f.thenCombineAsync(g, a);
576              }
577 <            public <T,U> CompletableFuture<U> applyToEither
577 >            public <T> CompletableFuture<Void> runAfterEither
578                  (CompletableFuture<T> f,
579 <                 CompletionStage<? extends T> g,
580 <                 Function<? super T,U> a) {
581 <                return f.applyToEitherAsync(g, a);
579 >                 CompletionStage<?> g,
580 >                 java.lang.Runnable a) {
581 >                return f.runAfterEitherAsync(g, a);
582              }
583              public <T> CompletableFuture<Void> acceptEither
584                  (CompletableFuture<T> f,
# Line 543 | Line 586 | public class CompletableFutureTest exten
586                   Consumer<? super T> a) {
587                  return f.acceptEitherAsync(g, a);
588              }
589 <            public <T> CompletableFuture<Void> runAfterEither
589 >            public <T,U> CompletableFuture<U> applyToEither
590                  (CompletableFuture<T> f,
591 <                 CompletionStage<?> g,
592 <                 java.lang.Runnable a) {
593 <                return f.runAfterEitherAsync(g, a);
591 >                 CompletionStage<? extends T> g,
592 >                 Function<? super T,U> a) {
593 >                return f.applyToEitherAsync(g, a);
594 >            }
595 >        },
596 >
597 >        EXECUTOR {
598 >            public void checkExecutionMode() {
599 >                //TODO
600 >            }
601 >            public <T> CompletableFuture<Void> thenRun
602 >                (CompletableFuture<T> f, Runnable a) {
603 >                return f.thenRunAsync(a, new ThreadExecutor());
604 >            }
605 >            public <T> CompletableFuture<Void> thenAccept
606 >                (CompletableFuture<T> f, Consumer<? super T> a) {
607 >                return f.thenAcceptAsync(a, new ThreadExecutor());
608 >            }
609 >            public <T,U> CompletableFuture<U> thenApply
610 >                (CompletableFuture<T> f, Function<? super T,U> a) {
611 >                return f.thenApplyAsync(a, new ThreadExecutor());
612              }
613              public <T,U> CompletableFuture<U> thenCompose
614                  (CompletableFuture<T> f,
615                   Function<? super T,? extends CompletionStage<U>> a) {
616 <                return f.thenComposeAsync(a);
616 >                return f.thenComposeAsync(a, new ThreadExecutor());
617 >            }
618 >            public <T,U> CompletableFuture<U> handle
619 >                (CompletableFuture<T> f,
620 >                 BiFunction<? super T,Throwable,? extends U> a) {
621 >                return f.handleAsync(a, new ThreadExecutor());
622              }
623              public <T> CompletableFuture<T> whenComplete
624                  (CompletableFuture<T> f,
625                   BiConsumer<? super T,? super Throwable> a) {
626 <                return f.whenCompleteAsync(a);
626 >                return f.whenCompleteAsync(a, new ThreadExecutor());
627              }
562        },
563
564        EXECUTOR {
628              public <T,U> CompletableFuture<Void> runAfterBoth
629                  (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
630                  return f.runAfterBothAsync(g, a, new ThreadExecutor());
# Line 578 | Line 641 | public class CompletableFutureTest exten
641                   BiFunction<? super T,? super U,? extends V> a) {
642                  return f.thenCombineAsync(g, a, new ThreadExecutor());
643              }
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            }
644              public <T> CompletableFuture<Void> runAfterEither
645                  (CompletableFuture<T> f,
646                   CompletionStage<?> g,
647                   java.lang.Runnable a) {
648                  return f.runAfterEitherAsync(g, a, new ThreadExecutor());
649              }
650 <            public <T,U> CompletableFuture<U> thenCompose
650 >            public <T> CompletableFuture<Void> acceptEither
651                  (CompletableFuture<T> f,
652 <                 Function<? super T,? extends CompletionStage<U>> a) {
653 <                return f.thenComposeAsync(a, new ThreadExecutor());
652 >                 CompletionStage<? extends T> g,
653 >                 Consumer<? super T> a) {
654 >                return f.acceptEitherAsync(g, a, new ThreadExecutor());
655              }
656 <            public <T> CompletableFuture<T> whenComplete
656 >            public <T,U> CompletableFuture<U> applyToEither
657                  (CompletableFuture<T> f,
658 <                 BiConsumer<? super T,? super Throwable> a) {
659 <                return f.whenCompleteAsync(a, new ThreadExecutor());
658 >                 CompletionStage<? extends T> g,
659 >                 Function<? super T,U> a) {
660 >                return f.applyToEitherAsync(g, a, new ThreadExecutor());
661              }
662          };
663  
664 +        public abstract void checkExecutionMode();
665 +        public abstract <T> CompletableFuture<Void> thenRun
666 +            (CompletableFuture<T> f, Runnable a);
667 +        public abstract <T> CompletableFuture<Void> thenAccept
668 +            (CompletableFuture<T> f, Consumer<? super T> a);
669 +        public abstract <T,U> CompletableFuture<U> thenApply
670 +            (CompletableFuture<T> f, Function<? super T,U> a);
671 +        public abstract <T,U> CompletableFuture<U> thenCompose
672 +            (CompletableFuture<T> f,
673 +             Function<? super T,? extends CompletionStage<U>> a);
674 +        public abstract <T,U> CompletableFuture<U> handle
675 +            (CompletableFuture<T> f,
676 +             BiFunction<? super T,Throwable,? extends U> a);
677 +        public abstract <T> CompletableFuture<T> whenComplete
678 +            (CompletableFuture<T> f,
679 +             BiConsumer<? super T,? super Throwable> a);
680          public abstract <T,U> CompletableFuture<Void> runAfterBoth
681              (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a);
682          public abstract <T,U> CompletableFuture<Void> thenAcceptBoth
# Line 618 | Line 687 | public class CompletableFutureTest exten
687              (CompletableFuture<T> f,
688               CompletionStage<? extends U> g,
689               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);
690          public abstract <T> CompletableFuture<Void> runAfterEither
691              (CompletableFuture<T> f,
692               CompletionStage<?> g,
693               java.lang.Runnable a);
694 <        public abstract <T,U> CompletableFuture<U> thenCompose
694 >        public abstract <T> CompletableFuture<Void> acceptEither
695              (CompletableFuture<T> f,
696 <             Function<? super T,? extends CompletionStage<U>> a);
697 <        public abstract <T> CompletableFuture<T> whenComplete
696 >             CompletionStage<? extends T> g,
697 >             Consumer<? super T> a);
698 >        public abstract <T,U> CompletableFuture<U> applyToEither
699              (CompletableFuture<T> f,
700 <             BiConsumer<? super T,? super Throwable> a);
700 >             CompletionStage<? extends T> g,
701 >             Function<? super T,U> a);
702 >    }
703  
704 +    /**
705 +     * exceptionally action is not invoked when source completes
706 +     * normally, and source result is propagated
707 +     */
708 +    public void testExceptionally_normalCompletion() {
709 +        for (boolean createIncomplete : new boolean[] { true, false })
710 +        for (Integer v1 : new Integer[] { 1, null })
711 +    {
712 +        final AtomicInteger a = new AtomicInteger(0);
713 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
714 +        if (!createIncomplete) f.complete(v1);
715 +        final CompletableFuture<Integer> g = f.exceptionally
716 +            ((Throwable t) -> {
717 +                // Should not be called
718 +                a.getAndIncrement();
719 +                throw new AssertionError();
720 +            });
721 +        if (createIncomplete) f.complete(v1);
722 +
723 +        checkCompletedNormally(g, v1);
724 +        checkCompletedNormally(f, v1);
725 +        assertEquals(0, a.get());
726 +    }}
727  
641    }
728  
729      /**
730       * exceptionally action completes with function value on source
731 <     * exception; otherwise with source value
731 >     * exception
732       */
733 <    public void testExceptionally() {
734 <        CompletableFuture<Integer> f = new CompletableFuture<>();
735 <        ExceptionToInteger r = new ExceptionToInteger();
736 <        CompletableFuture<Integer> g = f.exceptionally(r);
737 <        f.completeExceptionally(new CFException());
738 <        checkCompletedNormally(g, three);
733 >    public void testExceptionally_exceptionalCompletion() {
734 >        for (boolean createIncomplete : new boolean[] { true, false })
735 >        for (Integer v1 : new Integer[] { 1, null })
736 >    {
737 >        final AtomicInteger a = new AtomicInteger(0);
738 >        final CFException ex = new CFException();
739 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
740 >        if (!createIncomplete) f.completeExceptionally(ex);
741 >        final CompletableFuture<Integer> g = f.exceptionally
742 >            ((Throwable t) -> {
743 >                threadAssertSame(t, ex);
744 >                a.getAndIncrement();
745 >                return v1;
746 >            });
747 >        if (createIncomplete) f.completeExceptionally(ex);
748  
749 <        f = new CompletableFuture<>();
750 <        r = new ExceptionToInteger();
751 <        g = f.exceptionally(r);
752 <        f.complete(one);
753 <        checkCompletedNormally(g, one);
754 <    }
749 >        checkCompletedNormally(g, v1);
750 >        assertEquals(1, a.get());
751 >    }}
752 >
753 >    public void testExceptionally_exceptionalCompletionActionFailed() {
754 >        for (boolean createIncomplete : new boolean[] { true, false })
755 >        for (Integer v1 : new Integer[] { 1, null })
756 >    {
757 >        final AtomicInteger a = new AtomicInteger(0);
758 >        final CFException ex1 = new CFException();
759 >        final CFException ex2 = new CFException();
760 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
761 >        if (!createIncomplete) f.completeExceptionally(ex1);
762 >        final CompletableFuture<Integer> g = f.exceptionally
763 >            ((Throwable t) -> {
764 >                threadAssertSame(t, ex1);
765 >                a.getAndIncrement();
766 >                throw ex2;
767 >            });
768 >        if (createIncomplete) f.completeExceptionally(ex1);
769 >
770 >        checkCompletedWithWrappedCFException(g, ex2);
771 >        assertEquals(1, a.get());
772 >    }}
773  
774      /**
775 <     * handle action completes normally with function value on either
776 <     * normal or exceptional completion of source
775 >     * handle action completes normally with function value on normal
776 >     * completion of source
777       */
778 <    public void testHandle() {
779 <        CompletableFuture<Integer> f, g;
780 <        IntegerHandler r;
778 >    public void testHandle_normalCompletion() {
779 >        for (ExecutionMode m : ExecutionMode.values())
780 >        for (boolean createIncomplete : new boolean[] { true, false })
781 >        for (Integer v1 : new Integer[] { 1, null })
782 >    {
783 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
784 >        final AtomicInteger a = new AtomicInteger(0);
785 >        if (!createIncomplete) f.complete(v1);
786 >        final CompletableFuture<Integer> g = m.handle
787 >            (f,
788 >             (Integer x, Throwable t) -> {
789 >                threadAssertSame(x, v1);
790 >                threadAssertNull(t);
791 >                a.getAndIncrement();
792 >                return inc(v1);
793 >            });
794 >        if (createIncomplete) f.complete(v1);
795  
796 <        f = new CompletableFuture<>();
797 <        f.completeExceptionally(new CFException());
798 <        g = f.handle(r = new IntegerHandler());
799 <        assertEquals(1, r.invocationCount);
673 <        assertEquals(1, r.invocationCount);
674 <        checkCompletedNormally(g, three);
796 >        checkCompletedNormally(g, inc(v1));
797 >        checkCompletedNormally(f, v1);
798 >        assertEquals(1, a.get());
799 >    }}
800  
801 <        f = new CompletableFuture<>();
802 <        g = f.handle(r = new IntegerHandler());
803 <        assertEquals(0, r.invocationCount);
804 <        f.completeExceptionally(new CFException());
805 <        checkCompletedNormally(g, three);
806 <        assertEquals(1, r.invocationCount);
801 >    /**
802 >     * handle action completes normally with function value on
803 >     * exceptional completion of source
804 >     */
805 >    public void testHandle_exceptionalCompletion() {
806 >        for (ExecutionMode m : ExecutionMode.values())
807 >        for (boolean createIncomplete : new boolean[] { true, false })
808 >        for (Integer v1 : new Integer[] { 1, null })
809 >    {
810 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
811 >        final AtomicInteger a = new AtomicInteger(0);
812 >        final CFException ex = new CFException();
813 >        if (!createIncomplete) f.completeExceptionally(ex);
814 >        final CompletableFuture<Integer> g = m.handle
815 >            (f,
816 >             (Integer x, Throwable t) -> {
817 >                threadAssertNull(x);
818 >                threadAssertSame(t, ex);
819 >                a.getAndIncrement();
820 >                return v1;
821 >            });
822 >        if (createIncomplete) f.completeExceptionally(ex);
823  
824 <        f = new CompletableFuture<>();
825 <        f.complete(one);
826 <        g = f.handle(r = new IntegerHandler());
827 <        assertEquals(1, r.invocationCount);
687 <        checkCompletedNormally(g, two);
824 >        checkCompletedNormally(g, v1);
825 >        checkCompletedWithWrappedCFException(f, ex);
826 >        assertEquals(1, a.get());
827 >    }}
828  
829 <        f = new CompletableFuture<>();
830 <        g = f.handle(r = new IntegerHandler());
831 <        assertEquals(0, r.invocationCount);
832 <        f.complete(one);
833 <        assertEquals(1, r.invocationCount);
834 <        checkCompletedNormally(g, two);
835 <    }
829 >    /**
830 >     * handle action completes normally with function value on
831 >     * cancelled source
832 >     */
833 >    public void testHandle_sourceCancelled() {
834 >        for (ExecutionMode m : ExecutionMode.values())
835 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
836 >        for (boolean createIncomplete : new boolean[] { true, false })
837 >        for (Integer v1 : new Integer[] { 1, null })
838 >    {
839 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
840 >        final AtomicInteger a = new AtomicInteger(0);
841 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
842 >        final CompletableFuture<Integer> g = m.handle
843 >            (f,
844 >             (Integer x, Throwable t) -> {
845 >                threadAssertNull(x);
846 >                threadAssertTrue(t instanceof CancellationException);
847 >                a.getAndIncrement();
848 >                return v1;
849 >            });
850 >        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
851 >
852 >        checkCompletedNormally(g, v1);
853 >        checkCancelled(f);
854 >        assertEquals(1, a.get());
855 >    }}
856 >
857 >    /**
858 >     * handle result completes exceptionally if action does
859 >     */
860 >    public void testHandle_sourceFailedActionFailed() {
861 >        for (ExecutionMode m : ExecutionMode.values())
862 >        for (boolean createIncomplete : new boolean[] { true, false })
863 >    {
864 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
865 >        final AtomicInteger a = new AtomicInteger(0);
866 >        final CFException ex1 = new CFException();
867 >        final CFException ex2 = new CFException();
868 >        if (!createIncomplete) f.completeExceptionally(ex1);
869 >        final CompletableFuture<Integer> g = m.handle
870 >            (f,
871 >             (Integer x, Throwable t) -> {
872 >                threadAssertNull(x);
873 >                threadAssertSame(ex1, t);
874 >                a.getAndIncrement();
875 >                throw ex2;
876 >            });
877 >        if (createIncomplete) f.completeExceptionally(ex1);
878 >
879 >        checkCompletedWithWrappedCFException(g, ex2);
880 >        checkCompletedWithWrappedCFException(f, ex1);
881 >        assertEquals(1, a.get());
882 >    }}
883 >
884 >    public void testHandle_sourceCompletedNormallyActionFailed() {
885 >        for (ExecutionMode m : ExecutionMode.values())
886 >        for (boolean createIncomplete : new boolean[] { true, false })
887 >        for (Integer v1 : new Integer[] { 1, null })
888 >    {
889 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
890 >        final AtomicInteger a = new AtomicInteger(0);
891 >        final CFException ex = new CFException();
892 >        if (!createIncomplete) f.complete(v1);
893 >        final CompletableFuture<Integer> g = m.handle
894 >            (f,
895 >             (Integer x, Throwable t) -> {
896 >                threadAssertSame(x, v1);
897 >                threadAssertNull(t);
898 >                a.getAndIncrement();
899 >                throw ex;
900 >            });
901 >        if (createIncomplete) f.complete(v1);
902 >
903 >        checkCompletedWithWrappedCFException(g, ex);
904 >        checkCompletedNormally(f, v1);
905 >        assertEquals(1, a.get());
906 >    }}
907  
908      /**
909       * runAsync completes after running Runnable
# Line 722 | Line 933 | public class CompletableFutureTest exten
933       * failing runAsync completes exceptionally after running Runnable
934       */
935      public void testRunAsync3() {
936 <        FailingNoop r = new FailingNoop();
936 >        FailingRunnable r = new FailingRunnable();
937          CompletableFuture<Void> f = CompletableFuture.runAsync(r);
938          checkCompletedWithWrappedCFException(f);
939          assertEquals(1, r.invocationCount);
# Line 763 | Line 974 | public class CompletableFutureTest exten
974      /**
975       * thenRun result completes normally after normal completion of source
976       */
977 <    public void testThenRun() {
978 <        CompletableFuture<Integer> f;
979 <        CompletableFuture<Void> g;
980 <        Noop r;
981 <
982 <        f = new CompletableFuture<>();
983 <        g = f.thenRun(r = new Noop());
984 <        f.complete(null);
985 <        checkCompletedNormally(g, null);
986 <        assertEquals(1, r.invocationCount);
977 >    public void testThenRun_normalCompletion() {
978 >        for (ExecutionMode m : ExecutionMode.values())
979 >        for (boolean createIncomplete : new boolean[] { true, false })
980 >        for (Integer v1 : new Integer[] { 1, null })
981 >    {
982 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
983 >        final Noop r = new Noop();
984 >        if (!createIncomplete) f.complete(v1);
985 >        final CompletableFuture<Void> g = m.thenRun(f, r);
986 >        if (createIncomplete) {
987 >            checkIncomplete(g);
988 >            f.complete(v1);
989 >        }
990  
777        f = new CompletableFuture<>();
778        f.complete(null);
779        g = f.thenRun(r = new Noop());
991          checkCompletedNormally(g, null);
992 +        checkCompletedNormally(f, v1);
993          assertEquals(1, r.invocationCount);
994 <    }
994 >    }}
995  
996      /**
997       * thenRun result completes exceptionally after exceptional
998       * completion of source
999       */
1000 <    public void testThenRun2() {
1001 <        CompletableFuture<Integer> f;
1002 <        CompletableFuture<Void> g;
1003 <        Noop r;
1004 <
1005 <        f = new CompletableFuture<>();
1006 <        g = f.thenRun(r = new Noop());
1007 <        f.completeExceptionally(new CFException());
1008 <        checkCompletedWithWrappedCFException(g);
1009 <        assertEquals(0, r.invocationCount);
1000 >    public void testThenRun_exceptionalCompletion() {
1001 >        for (ExecutionMode m : ExecutionMode.values())
1002 >        for (boolean createIncomplete : new boolean[] { true, false })
1003 >    {
1004 >        final CFException ex = new CFException();
1005 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1006 >        final Noop r = new Noop();
1007 >        if (!createIncomplete) f.completeExceptionally(ex);
1008 >        final CompletableFuture<Void> g = m.thenRun(f, r);
1009 >        if (createIncomplete) {
1010 >            checkIncomplete(g);
1011 >            f.completeExceptionally(ex);
1012 >        }
1013  
1014 <        f = new CompletableFuture<>();
1015 <        f.completeExceptionally(new CFException());
801 <        g = f.thenRun(r = new Noop());
802 <        checkCompletedWithWrappedCFException(g);
1014 >        checkCompletedWithWrappedCFException(g, ex);
1015 >        checkCompletedWithWrappedCFException(f, ex);
1016          assertEquals(0, r.invocationCount);
1017 <    }
1017 >    }}
1018  
1019      /**
1020 <     * thenRun result completes exceptionally if action does
1020 >     * thenRun result completes exceptionally if source cancelled
1021       */
1022 <    public void testThenRun3() {
1023 <        CompletableFuture<Integer> f;
1024 <        CompletableFuture<Void> g;
1025 <        FailingNoop r;
1026 <
1027 <        f = new CompletableFuture<>();
1028 <        g = f.thenRun(r = new FailingNoop());
1029 <        f.complete(null);
1030 <        checkCompletedWithWrappedCFException(g);
1022 >    public void testThenRun_sourceCancelled() {
1023 >        for (ExecutionMode m : ExecutionMode.values())
1024 >        for (boolean createIncomplete : new boolean[] { true, false })
1025 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1026 >    {
1027 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1028 >        final Noop r = new Noop();
1029 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1030 >        final CompletableFuture<Void> g = f.thenRun(r);
1031 >        if (createIncomplete) {
1032 >            checkIncomplete(g);
1033 >            assertTrue(f.cancel(mayInterruptIfRunning));
1034 >        }
1035  
1036 <        f = new CompletableFuture<>();
1037 <        f.complete(null);
1038 <        g = f.thenRun(r = new FailingNoop());
1039 <        checkCompletedWithWrappedCFException(g);
823 <    }
1036 >        checkCompletedWithWrappedCancellationException(g);
1037 >        checkCancelled(f);
1038 >        assertEquals(0, r.invocationCount);
1039 >    }}
1040  
1041      /**
1042 <     * thenRun result completes exceptionally if source cancelled
1042 >     * thenRun result completes exceptionally if action does
1043       */
1044 <    public void testThenRun4() {
1045 <        CompletableFuture<Integer> f;
1046 <        CompletableFuture<Void> g;
1047 <        Noop r;
1048 <
1049 <        f = new CompletableFuture<>();
1050 <        g = f.thenRun(r = new Noop());
1051 <        assertTrue(f.cancel(true));
1052 <        checkCompletedWithWrappedCancellationException(g);
1044 >    public void testThenRun_actionFailed() {
1045 >        for (ExecutionMode m : ExecutionMode.values())
1046 >        for (boolean createIncomplete : new boolean[] { true, false })
1047 >        for (Integer v1 : new Integer[] { 1, null })
1048 >    {
1049 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1050 >        final FailingRunnable r = new FailingRunnable();
1051 >        if (!createIncomplete) f.complete(v1);
1052 >        final CompletableFuture<Void> g = f.thenRun(r);
1053 >        if (createIncomplete) {
1054 >            checkIncomplete(g);
1055 >            f.complete(v1);
1056 >        }
1057  
1058 <        f = new CompletableFuture<>();
1059 <        assertTrue(f.cancel(true));
1060 <        g = f.thenRun(r = new Noop());
841 <        checkCompletedWithWrappedCancellationException(g);
842 <    }
1058 >        checkCompletedWithWrappedCFException(g);
1059 >        checkCompletedNormally(f, v1);
1060 >    }}
1061  
1062      /**
1063       * thenApply result completes normally after normal completion of source
1064       */
1065 <    public void testThenApply() {
1066 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1067 <        CompletableFuture<Integer> g = f.thenApply(inc);
1068 <        f.complete(one);
1069 <        checkCompletedNormally(g, two);
1070 <    }
1065 >    public void testThenApply_normalCompletion() {
1066 >        for (ExecutionMode m : ExecutionMode.values())
1067 >        for (boolean createIncomplete : new boolean[] { true, false })
1068 >        for (Integer v1 : new Integer[] { 1, null })
1069 >    {
1070 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1071 >        final IncFunction r = new IncFunction();
1072 >        if (!createIncomplete) f.complete(v1);
1073 >        final CompletableFuture<Integer> g = m.thenApply(f, r);
1074 >        if (createIncomplete) {
1075 >            checkIncomplete(g);
1076 >            f.complete(v1);
1077 >        }
1078 >
1079 >        checkCompletedNormally(g, inc(v1));
1080 >        checkCompletedNormally(f, v1);
1081 >        assertEquals(1, r.invocationCount);
1082 >    }}
1083  
1084      /**
1085       * thenApply result completes exceptionally after exceptional
1086       * completion of source
1087       */
1088 <    public void testThenApply2() {
1089 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1090 <        CompletableFuture<Integer> g = f.thenApply(inc);
1091 <        f.completeExceptionally(new CFException());
1092 <        checkCompletedWithWrappedCFException(g);
1093 <    }
1088 >    public void testThenApply_exceptionalCompletion() {
1089 >        for (ExecutionMode m : ExecutionMode.values())
1090 >        for (boolean createIncomplete : new boolean[] { true, false })
1091 >    {
1092 >        final CFException ex = new CFException();
1093 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1094 >        final IncFunction r = new IncFunction();
1095 >        if (!createIncomplete) f.completeExceptionally(ex);
1096 >        final CompletableFuture<Integer> g = m.thenApply(f, r);
1097 >        if (createIncomplete) {
1098 >            checkIncomplete(g);
1099 >            f.completeExceptionally(ex);
1100 >        }
1101  
1102 <    /**
1103 <     * thenApply result completes exceptionally if action does
1104 <     */
1105 <    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 <    }
1102 >        checkCompletedWithWrappedCFException(g, ex);
1103 >        checkCompletedWithWrappedCFException(f, ex);
1104 >        assertEquals(0, r.invocationCount);
1105 >    }}
1106  
1107      /**
1108       * thenApply result completes exceptionally if source cancelled
1109       */
1110 <    public void testThenApply4() {
1111 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1112 <        CompletableFuture<Integer> g = f.thenApply(inc);
1113 <        assertTrue(f.cancel(true));
1110 >    public void testThenApply_sourceCancelled() {
1111 >        for (ExecutionMode m : ExecutionMode.values())
1112 >        for (boolean createIncomplete : new boolean[] { true, false })
1113 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1114 >    {
1115 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1116 >        final IncFunction r = new IncFunction();
1117 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1118 >        final CompletableFuture<Integer> g = f.thenApply(r);
1119 >        if (createIncomplete) {
1120 >            checkIncomplete(g);
1121 >            assertTrue(f.cancel(mayInterruptIfRunning));
1122 >        }
1123 >
1124          checkCompletedWithWrappedCancellationException(g);
1125 <    }
1125 >        checkCancelled(f);
1126 >        assertEquals(0, r.invocationCount);
1127 >    }}
1128 >
1129 >    /**
1130 >     * thenApply result completes exceptionally if action does
1131 >     */
1132 >    public void testThenApply_actionFailed() {
1133 >        for (ExecutionMode m : ExecutionMode.values())
1134 >        for (boolean createIncomplete : new boolean[] { true, false })
1135 >        for (Integer v1 : new Integer[] { 1, null })
1136 >    {
1137 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1138 >        final FailingFunction r = new FailingFunction();
1139 >        if (!createIncomplete) f.complete(v1);
1140 >        final CompletableFuture<Integer> g = f.thenApply(r);
1141 >        if (createIncomplete) {
1142 >            checkIncomplete(g);
1143 >            f.complete(v1);
1144 >        }
1145 >
1146 >        checkCompletedWithWrappedCFException(g);
1147 >        checkCompletedNormally(f, v1);
1148 >    }}
1149  
1150      /**
1151       * thenAccept result completes normally after normal completion of source
1152       */
1153 <    public void testThenAccept() {
1154 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1155 <        IncAction r = new IncAction();
1156 <        CompletableFuture<Void> g = f.thenAccept(r);
1157 <        f.complete(one);
1153 >    public void testThenAccept_normalCompletion() {
1154 >        for (ExecutionMode m : ExecutionMode.values())
1155 >        for (boolean createIncomplete : new boolean[] { true, false })
1156 >        for (Integer v1 : new Integer[] { 1, null })
1157 >    {
1158 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1159 >        final IncAction r = new IncAction();
1160 >        if (!createIncomplete) f.complete(v1);
1161 >        final CompletableFuture<Void> g = m.thenAccept(f, r);
1162 >        if (createIncomplete) {
1163 >            checkIncomplete(g);
1164 >            f.complete(v1);
1165 >        }
1166 >
1167          checkCompletedNormally(g, null);
1168 <        assertEquals(r.value, (Integer) 2);
1169 <    }
1168 >        checkCompletedNormally(f, v1);
1169 >        assertEquals(1, r.invocationCount);
1170 >        assertEquals(inc(v1), r.value);
1171 >    }}
1172  
1173      /**
1174       * thenAccept result completes exceptionally after exceptional
1175       * completion of source
1176       */
1177 <    public void testThenAccept2() {
1178 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1179 <        IncAction r = new IncAction();
1180 <        CompletableFuture<Void> g = f.thenAccept(r);
1181 <        f.completeExceptionally(new CFException());
1182 <        checkCompletedWithWrappedCFException(g);
1183 <    }
1177 >    public void testThenAccept_exceptionalCompletion() {
1178 >        for (ExecutionMode m : ExecutionMode.values())
1179 >        for (boolean createIncomplete : new boolean[] { true, false })
1180 >    {
1181 >        final CFException ex = new CFException();
1182 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1183 >        final IncAction r = new IncAction();
1184 >        if (!createIncomplete) f.completeExceptionally(ex);
1185 >        final CompletableFuture<Void> g = m.thenAccept(f, r);
1186 >        if (createIncomplete) {
1187 >            checkIncomplete(g);
1188 >            f.completeExceptionally(ex);
1189 >        }
1190 >
1191 >        checkCompletedWithWrappedCFException(g, ex);
1192 >        checkCompletedWithWrappedCFException(f, ex);
1193 >        assertEquals(0, r.invocationCount);
1194 >    }}
1195  
1196      /**
1197       * thenAccept result completes exceptionally if action does
1198       */
1199 <    public void testThenAccept3() {
1200 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1201 <        FailingConsumer r = new FailingConsumer();
1202 <        CompletableFuture<Void> g = f.thenAccept(r);
1203 <        f.complete(one);
1199 >    public void testThenAccept_actionFailed() {
1200 >        for (ExecutionMode m : ExecutionMode.values())
1201 >        for (boolean createIncomplete : new boolean[] { true, false })
1202 >        for (Integer v1 : new Integer[] { 1, null })
1203 >    {
1204 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1205 >        final FailingConsumer r = new FailingConsumer();
1206 >        if (!createIncomplete) f.complete(v1);
1207 >        final CompletableFuture<Void> g = f.thenAccept(r);
1208 >        if (createIncomplete) {
1209 >            checkIncomplete(g);
1210 >            f.complete(v1);
1211 >        }
1212 >
1213          checkCompletedWithWrappedCFException(g);
1214 <        assertEquals(1, r.invocationCount);
1215 <    }
1214 >        checkCompletedNormally(f, v1);
1215 >    }}
1216  
1217      /**
1218       * thenAccept result completes exceptionally if source cancelled
1219       */
1220 <    public void testThenAccept4() {
1221 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1222 <        IncAction r = new IncAction();
1223 <        CompletableFuture<Void> g = f.thenAccept(r);
1224 <        assertTrue(f.cancel(true));
1220 >    public void testThenAccept_sourceCancelled() {
1221 >        for (ExecutionMode m : ExecutionMode.values())
1222 >        for (boolean createIncomplete : new boolean[] { true, false })
1223 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1224 >    {
1225 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1226 >        final IncAction r = new IncAction();
1227 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1228 >        final CompletableFuture<Void> g = f.thenAccept(r);
1229 >        if (createIncomplete) {
1230 >            checkIncomplete(g);
1231 >            assertTrue(f.cancel(mayInterruptIfRunning));
1232 >        }
1233 >
1234          checkCompletedWithWrappedCancellationException(g);
1235 <    }
1235 >        checkCancelled(f);
1236 >        assertEquals(0, r.invocationCount);
1237 >    }}
1238  
1239      /**
1240       * thenCombine result completes normally after normal completion
1241       * of sources
1242       */
1243 <    public void testThenCombine_normalCompletion1() {
1243 >    public void testThenCombine_normalCompletion() {
1244 >        for (ExecutionMode m : ExecutionMode.values())
1245          for (boolean createIncomplete : new boolean[] { true, false })
1246          for (boolean fFirst : new boolean[] { true, false })
939        for (ExecutionMode m : ExecutionMode.values())
1247          for (Integer v1 : new Integer[] { 1, null })
1248 <        for (Integer v2 : new Integer[] { 2, null }) {
1249 <
1248 >        for (Integer v2 : new Integer[] { 2, null })
1249 >    {
1250          final CompletableFuture<Integer> f = new CompletableFuture<>();
1251          final CompletableFuture<Integer> g = new CompletableFuture<>();
1252          final SubtractFunction r = new SubtractFunction();
946        CompletableFuture<Integer> h = null;
947        if (createIncomplete) h = m.thenCombine(f, g, r);
1253  
1254 <        if (fFirst)
1255 <            f.complete(v1);
1256 <        else
1257 <            g.complete(v2);
1258 <        if (createIncomplete) checkIncomplete(h);
1259 <        assertEquals(0, r.invocationCount);
1260 <        if (!fFirst)
1261 <            f.complete(v1);
1262 <        else
958 <            g.complete(v2);
959 <        if (!createIncomplete) h = m.thenCombine(f, g, r);
1254 >        if (fFirst) f.complete(v1); else g.complete(v2);
1255 >        if (!createIncomplete)
1256 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1257 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1258 >        if (createIncomplete) {
1259 >            checkIncomplete(h);
1260 >            assertEquals(0, r.invocationCount);
1261 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1262 >        }
1263  
1264          checkCompletedNormally(h, subtract(v1, v2));
1265          checkCompletedNormally(f, v1);
1266          checkCompletedNormally(g, v2);
1267          assertEquals(1, r.invocationCount);
1268 <        }
966 <    }
1268 >    }}
1269  
1270      /**
1271       * thenCombine result completes exceptionally after exceptional
1272       * completion of either source
1273       */
1274 <    public void testThenCombine_exceptionalCompletion1() {
973 <        for (ExecutionMode m : ExecutionMode.values())
974 <        for (Integer v1 : new Integer[] { 1, null }) {
975 <
976 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
977 <        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() {
1274 >    public void testThenCombine_exceptionalCompletion() {
1275          for (ExecutionMode m : ExecutionMode.values())
1276 <        for (Integer v1 : new Integer[] { 1, null }) {
1277 <
1276 >        for (boolean createIncomplete : new boolean[] { true, false })
1277 >        for (boolean fFirst : new boolean[] { true, false })
1278 >        for (Integer v1 : new Integer[] { 1, null })
1279 >    {
1280          final CompletableFuture<Integer> f = new CompletableFuture<>();
1281          final CompletableFuture<Integer> g = new CompletableFuture<>();
999        final SubtractFunction r = new SubtractFunction();
1000        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1282          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<>();
1283          final SubtractFunction r = new SubtractFunction();
1021        final CFException ex = new CFException();
1284  
1285 <        g.completeExceptionally(ex);
1286 <        f.complete(v1);
1285 >        (fFirst ? f : g).complete(v1);
1286 >        if (!createIncomplete)
1287 >            (!fFirst ? f : g).completeExceptionally(ex);
1288          final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1289 <
1290 <        checkCompletedWithWrappedCFException(h, ex);
1291 <        checkCompletedWithWrappedCFException(g, ex);
1029 <        assertEquals(0, r.invocationCount);
1030 <        checkCompletedNormally(f, v1);
1289 >        if (createIncomplete) {
1290 >            checkIncomplete(h);
1291 >            (!fFirst ? f : g).completeExceptionally(ex);
1292          }
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);
1293  
1294          checkCompletedWithWrappedCFException(h, ex);
1048        checkCompletedWithWrappedCFException(f, ex);
1295          assertEquals(0, r.invocationCount);
1296 <        checkCompletedNormally(g, v1);
1297 <        }
1298 <    }
1296 >        checkCompletedNormally(fFirst ? f : g, v1);
1297 >        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1298 >    }}
1299  
1300      /**
1301       * thenCombine result completes exceptionally if action does
1302       */
1303 <    public void testThenCombine_actionFailed1() {
1303 >    public void testThenCombine_actionFailed() {
1304          for (ExecutionMode m : ExecutionMode.values())
1305 +        for (boolean fFirst : new boolean[] { true, false })
1306          for (Integer v1 : new Integer[] { 1, null })
1307 <        for (Integer v2 : new Integer[] { 2, null }) {
1308 <
1307 >        for (Integer v2 : new Integer[] { 2, null })
1308 >    {
1309          final CompletableFuture<Integer> f = new CompletableFuture<>();
1310          final CompletableFuture<Integer> g = new CompletableFuture<>();
1311          final FailingBiFunction r = new FailingBiFunction();
1312          final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1313  
1314 <        f.complete(v1);
1315 <        checkIncomplete(h);
1316 <        g.complete(v2);
1317 <
1318 <        checkCompletedWithWrappedCFException(h);
1319 <        checkCompletedNormally(f, v1);
1073 <        checkCompletedNormally(g, v2);
1314 >        if (fFirst) {
1315 >            f.complete(v1);
1316 >            g.complete(v2);
1317 >        } else {
1318 >            g.complete(v2);
1319 >            f.complete(v1);
1320          }
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);
1321  
1322          checkCompletedWithWrappedCFException(h);
1323          checkCompletedNormally(f, v1);
1324          checkCompletedNormally(g, v2);
1325 <        }
1095 <    }
1325 >    }}
1326  
1327      /**
1328       * thenCombine result completes exceptionally if either source cancelled
1329       */
1330 <    public void testThenCombine_sourceCancelled1() {
1101 <        for (ExecutionMode m : ExecutionMode.values())
1102 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1103 <        for (Integer v1 : new Integer[] { 1, null }) {
1104 <
1105 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1106 <        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() {
1330 >    public void testThenCombine_sourceCancelled() {
1331          for (ExecutionMode m : ExecutionMode.values())
1332          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1333 <        for (Integer v1 : new Integer[] { 1, null }) {
1334 <
1333 >        for (boolean createIncomplete : new boolean[] { true, false })
1334 >        for (boolean fFirst : new boolean[] { true, false })
1335 >        for (Integer v1 : new Integer[] { 1, null })
1336 >    {
1337          final CompletableFuture<Integer> f = new CompletableFuture<>();
1338          final CompletableFuture<Integer> g = new CompletableFuture<>();
1339          final SubtractFunction r = new SubtractFunction();
1340  
1341 <        assertTrue(g.cancel(mayInterruptIfRunning));
1342 <        f.complete(v1);
1341 >        (fFirst ? f : g).complete(v1);
1342 >        if (!createIncomplete)
1343 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1344          final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1345 <
1346 <        checkCompletedWithWrappedCancellationException(h);
1347 <        checkCancelled(g);
1157 <        assertEquals(0, r.invocationCount);
1158 <        checkCompletedNormally(f, v1);
1345 >        if (createIncomplete) {
1346 >            checkIncomplete(h);
1347 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1348          }
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);
1349  
1350          checkCompletedWithWrappedCancellationException(h);
1351 <        checkCancelled(f);
1351 >        checkCancelled(!fFirst ? f : g);
1352          assertEquals(0, r.invocationCount);
1353 <        checkCompletedNormally(g, v1);
1354 <        }
1180 <    }
1353 >        checkCompletedNormally(fFirst ? f : g, v1);
1354 >    }}
1355  
1356      /**
1357       * thenAcceptBoth result completes normally after normal
1358       * completion of sources
1359       */
1360 <    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() {
1360 >    public void testThenAcceptBoth_normalCompletion() {
1361          for (ExecutionMode m : ExecutionMode.values())
1362 +        for (boolean createIncomplete : new boolean[] { true, false })
1363 +        for (boolean fFirst : new boolean[] { true, false })
1364          for (Integer v1 : new Integer[] { 1, null })
1365 <        for (Integer v2 : new Integer[] { 2, null }) {
1366 <
1365 >        for (Integer v2 : new Integer[] { 2, null })
1366 >    {
1367          final CompletableFuture<Integer> f = new CompletableFuture<>();
1368          final CompletableFuture<Integer> g = new CompletableFuture<>();
1369          final SubtractAction r = new SubtractAction();
1370  
1371 <        g.complete(v2);
1372 <        f.complete(v1);
1371 >        if (fFirst) f.complete(v1); else g.complete(v2);
1372 >        if (!createIncomplete)
1373 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1374          final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1375 <
1376 <        checkCompletedNormally(h, null);
1377 <        assertEquals(r.value, subtract(v1, v2));
1378 <        checkCompletedNormally(f, v1);
1246 <        checkCompletedNormally(g, v2);
1375 >        if (createIncomplete) {
1376 >            checkIncomplete(h);
1377 >            assertEquals(0, r.invocationCount);
1378 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1379          }
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);
1380  
1381          checkCompletedNormally(h, null);
1382 <        assertEquals(r.value, subtract(v1, v2));
1382 >        assertEquals(subtract(v1, v2), r.value);
1383          checkCompletedNormally(f, v1);
1384          checkCompletedNormally(g, v2);
1385 <        }
1268 <    }
1385 >    }}
1386  
1387      /**
1388       * thenAcceptBoth result completes exceptionally after exceptional
1389       * completion of either source
1390       */
1391 <    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() {
1391 >    public void testThenAcceptBoth_exceptionalCompletion() {
1392          for (ExecutionMode m : ExecutionMode.values())
1393 <        for (Integer v1 : new Integer[] { 1, null }) {
1394 <
1393 >        for (boolean createIncomplete : new boolean[] { true, false })
1394 >        for (boolean fFirst : new boolean[] { true, false })
1395 >        for (Integer v1 : new Integer[] { 1, null })
1396 >    {
1397          final CompletableFuture<Integer> f = new CompletableFuture<>();
1398          final CompletableFuture<Integer> g = new CompletableFuture<>();
1301        final SubtractAction r = new SubtractAction();
1302        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1399          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<>();
1400          final SubtractAction r = new SubtractAction();
1323        final CFException ex = new CFException();
1401  
1402 <        g.completeExceptionally(ex);
1403 <        f.complete(v1);
1402 >        (fFirst ? f : g).complete(v1);
1403 >        if (!createIncomplete)
1404 >            (!fFirst ? f : g).completeExceptionally(ex);
1405          final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1406 <
1407 <        checkCompletedWithWrappedCFException(h, ex);
1408 <        checkCompletedWithWrappedCFException(g, ex);
1331 <        assertEquals(0, r.invocationCount);
1332 <        checkCompletedNormally(f, v1);
1406 >        if (createIncomplete) {
1407 >            checkIncomplete(h);
1408 >            (!fFirst ? f : g).completeExceptionally(ex);
1409          }
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);
1410  
1411          checkCompletedWithWrappedCFException(h, ex);
1350        checkCompletedWithWrappedCFException(f, ex);
1412          assertEquals(0, r.invocationCount);
1413 <        checkCompletedNormally(g, v1);
1414 <        }
1415 <    }
1413 >        checkCompletedNormally(fFirst ? f : g, v1);
1414 >        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1415 >    }}
1416  
1417      /**
1418       * thenAcceptBoth result completes exceptionally if action does
1419       */
1420 <    public void testThenAcceptBoth_actionFailed1() {
1420 >    public void testThenAcceptBoth_actionFailed() {
1421          for (ExecutionMode m : ExecutionMode.values())
1422 +        for (boolean fFirst : new boolean[] { true, false })
1423          for (Integer v1 : new Integer[] { 1, null })
1424 <        for (Integer v2 : new Integer[] { 2, null }) {
1425 <
1424 >        for (Integer v2 : new Integer[] { 2, null })
1425 >    {
1426          final CompletableFuture<Integer> f = new CompletableFuture<>();
1427          final CompletableFuture<Integer> g = new CompletableFuture<>();
1428          final FailingBiConsumer r = new FailingBiConsumer();
1429          final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1430  
1431 <        f.complete(v1);
1432 <        checkIncomplete(h);
1433 <        g.complete(v2);
1434 <
1435 <        checkCompletedWithWrappedCFException(h);
1436 <        checkCompletedNormally(f, v1);
1375 <        checkCompletedNormally(g, v2);
1431 >        if (fFirst) {
1432 >            f.complete(v1);
1433 >            g.complete(v2);
1434 >        } else {
1435 >            g.complete(v2);
1436 >            f.complete(v1);
1437          }
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);
1438  
1439          checkCompletedWithWrappedCFException(h);
1440          checkCompletedNormally(f, v1);
1441          checkCompletedNormally(g, v2);
1442 <        }
1397 <    }
1442 >    }}
1443  
1444      /**
1445       * thenAcceptBoth result completes exceptionally if either source cancelled
1446       */
1447 <    public void testThenAcceptBoth_sourceCancelled1() {
1403 <        for (ExecutionMode m : ExecutionMode.values())
1404 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1405 <        for (Integer v1 : new Integer[] { 1, null }) {
1406 <
1407 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1408 <        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() {
1447 >    public void testThenAcceptBoth_sourceCancelled() {
1448          for (ExecutionMode m : ExecutionMode.values())
1449          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1450 <        for (Integer v1 : new Integer[] { 1, null }) {
1451 <
1450 >        for (boolean createIncomplete : new boolean[] { true, false })
1451 >        for (boolean fFirst : new boolean[] { true, false })
1452 >        for (Integer v1 : new Integer[] { 1, null })
1453 >    {
1454          final CompletableFuture<Integer> f = new CompletableFuture<>();
1455          final CompletableFuture<Integer> g = new CompletableFuture<>();
1456          final SubtractAction r = new SubtractAction();
1457  
1458 <        assertTrue(g.cancel(mayInterruptIfRunning));
1459 <        f.complete(v1);
1458 >        (fFirst ? f : g).complete(v1);
1459 >        if (!createIncomplete)
1460 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1461          final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1462 <
1463 <        checkCompletedWithWrappedCancellationException(h);
1464 <        checkCancelled(g);
1459 <        assertEquals(0, r.invocationCount);
1460 <        checkCompletedNormally(f, v1);
1462 >        if (createIncomplete) {
1463 >            checkIncomplete(h);
1464 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1465          }
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);
1466  
1467          checkCompletedWithWrappedCancellationException(h);
1468 <        checkCancelled(f);
1468 >        checkCancelled(!fFirst ? f : g);
1469          assertEquals(0, r.invocationCount);
1470 <        checkCompletedNormally(g, v1);
1471 <        }
1482 <    }
1470 >        checkCompletedNormally(fFirst ? f : g, v1);
1471 >    }}
1472  
1473      /**
1474       * runAfterBoth result completes normally after normal
1475       * completion of sources
1476       */
1477 <    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() {
1477 >    public void testRunAfterBoth_normalCompletion() {
1478          for (ExecutionMode m : ExecutionMode.values())
1479 +        for (boolean createIncomplete : new boolean[] { true, false })
1480 +        for (boolean fFirst : new boolean[] { true, false })
1481          for (Integer v1 : new Integer[] { 1, null })
1482 <        for (Integer v2 : new Integer[] { 2, null }) {
1483 <
1482 >        for (Integer v2 : new Integer[] { 2, null })
1483 >    {
1484          final CompletableFuture<Integer> f = new CompletableFuture<>();
1485          final CompletableFuture<Integer> g = new CompletableFuture<>();
1486          final Noop r = new Noop();
1487  
1488 <        g.complete(v2);
1489 <        f.complete(v1);
1488 >        if (fFirst) f.complete(v1); else g.complete(v2);
1489 >        if (!createIncomplete)
1490 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1491          final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1492 <
1493 <        checkCompletedNormally(h, null);
1494 <        assertEquals(1, r.invocationCount);
1495 <        checkCompletedNormally(f, v1);
1548 <        checkCompletedNormally(g, v2);
1492 >        if (createIncomplete) {
1493 >            checkIncomplete(h);
1494 >            assertEquals(0, r.invocationCount);
1495 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1496          }
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);
1497  
1498          checkCompletedNormally(h, null);
1499          assertEquals(1, r.invocationCount);
1500          checkCompletedNormally(f, v1);
1501          checkCompletedNormally(g, v2);
1502 <        }
1570 <    }
1502 >    }}
1503  
1504      /**
1505       * runAfterBoth result completes exceptionally after exceptional
1506       * completion of either source
1507       */
1508 <    public void testRunAfterBoth_exceptionalCompletion1() {
1508 >    public void testRunAfterBoth_exceptionalCompletion() {
1509          for (ExecutionMode m : ExecutionMode.values())
1510 <        for (Integer v1 : new Integer[] { 1, null }) {
1511 <
1510 >        for (boolean createIncomplete : new boolean[] { true, false })
1511 >        for (boolean fFirst : new boolean[] { true, false })
1512 >        for (Integer v1 : new Integer[] { 1, null })
1513 >    {
1514          final CompletableFuture<Integer> f = new CompletableFuture<>();
1515          final CompletableFuture<Integer> g = new CompletableFuture<>();
1582        final Noop r = new Noop();
1583        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1516          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<>();
1517          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);
1518  
1519 <        checkCompletedWithWrappedCFException(h, ex);
1520 <        checkCompletedWithWrappedCFException(g, ex);
1521 <        assertEquals(0, r.invocationCount);
1614 <        checkCompletedNormally(f, v1);
1615 <        }
1616 <    }
1617 <
1618 <    public void testRunAfterBoth_exceptionalCompletion3() {
1619 <        for (ExecutionMode m : ExecutionMode.values())
1620 <        for (Integer v1 : new Integer[] { 1, null }) {
1621 <
1622 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1623 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1624 <        final Noop r = new Noop();
1625 <        final CFException ex = new CFException();
1626 <
1627 <        g.completeExceptionally(ex);
1628 <        f.complete(v1);
1519 >        (fFirst ? f : g).complete(v1);
1520 >        if (!createIncomplete)
1521 >            (!fFirst ? f : g).completeExceptionally(ex);
1522          final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1523 <
1524 <        checkCompletedWithWrappedCFException(h, ex);
1525 <        checkCompletedWithWrappedCFException(g, ex);
1633 <        assertEquals(0, r.invocationCount);
1634 <        checkCompletedNormally(f, v1);
1523 >        if (createIncomplete) {
1524 >            checkIncomplete(h);
1525 >            (!fFirst ? f : g).completeExceptionally(ex);
1526          }
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);
1527  
1528          checkCompletedWithWrappedCFException(h, ex);
1652        checkCompletedWithWrappedCFException(f, ex);
1529          assertEquals(0, r.invocationCount);
1530 <        checkCompletedNormally(g, v1);
1531 <        }
1532 <    }
1530 >        checkCompletedNormally(fFirst ? f : g, v1);
1531 >        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1532 >    }}
1533  
1534      /**
1535       * runAfterBoth result completes exceptionally if action does
1536       */
1537 <    public void testRunAfterBoth_actionFailed1() {
1537 >    public void testRunAfterBoth_actionFailed() {
1538          for (ExecutionMode m : ExecutionMode.values())
1539 +        for (boolean fFirst : new boolean[] { true, false })
1540          for (Integer v1 : new Integer[] { 1, null })
1541 <        for (Integer v2 : new Integer[] { 2, null }) {
1542 <
1541 >        for (Integer v2 : new Integer[] { 2, null })
1542 >    {
1543          final CompletableFuture<Integer> f = new CompletableFuture<>();
1544          final CompletableFuture<Integer> g = new CompletableFuture<>();
1545 <        final FailingNoop r = new FailingNoop();
1669 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1545 >        final FailingRunnable r = new FailingRunnable();
1546  
1547 <        f.complete(v1);
1548 <        checkIncomplete(h);
1549 <        g.complete(v2);
1550 <
1551 <        checkCompletedWithWrappedCFException(h);
1552 <        checkCompletedNormally(f, v1);
1553 <        checkCompletedNormally(g, v2);
1547 >        CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r);
1548 >        if (fFirst) {
1549 >            f.complete(v1);
1550 >            g.complete(v2);
1551 >        } else {
1552 >            g.complete(v2);
1553 >            f.complete(v1);
1554          }
1555 <    }
1680 <
1681 <    public void testRunAfterBoth_actionFailed2() {
1682 <        for (ExecutionMode m : ExecutionMode.values())
1683 <        for (Integer v1 : new Integer[] { 1, null })
1684 <        for (Integer v2 : new Integer[] { 2, null }) {
1555 >        CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r);
1556  
1557 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1558 <        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);
1557 >        checkCompletedWithWrappedCFException(h1);
1558 >        checkCompletedWithWrappedCFException(h2);
1559          checkCompletedNormally(f, v1);
1560          checkCompletedNormally(g, v2);
1561 <        }
1699 <    }
1561 >    }}
1562  
1563      /**
1564       * runAfterBoth result completes exceptionally if either source cancelled
1565       */
1566 <    public void testRunAfterBoth_sourceCancelled1() {
1705 <        for (ExecutionMode m : ExecutionMode.values())
1706 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1707 <        for (Integer v1 : new Integer[] { 1, null }) {
1708 <
1709 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1710 <        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() {
1566 >    public void testRunAfterBoth_sourceCancelled() {
1567          for (ExecutionMode m : ExecutionMode.values())
1568          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1569 <        for (Integer v1 : new Integer[] { 1, null }) {
1570 <
1569 >        for (boolean createIncomplete : new boolean[] { true, false })
1570 >        for (boolean fFirst : new boolean[] { true, false })
1571 >        for (Integer v1 : new Integer[] { 1, null })
1572 >    {
1573          final CompletableFuture<Integer> f = new CompletableFuture<>();
1574          final CompletableFuture<Integer> g = new CompletableFuture<>();
1575          final Noop r = new Noop();
1733        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1576  
1735        assertTrue(g.cancel(mayInterruptIfRunning));
1736        checkIncomplete(h);
1737        f.complete(v1);
1577  
1578 <        checkCompletedWithWrappedCancellationException(h);
1579 <        checkCancelled(g);
1580 <        assertEquals(0, r.invocationCount);
1742 <        checkCompletedNormally(f, v1);
1743 <        }
1744 <    }
1745 <
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 }) {
1750 <
1751 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1752 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1753 <        final Noop r = new Noop();
1754 <
1755 <        assertTrue(g.cancel(mayInterruptIfRunning));
1756 <        f.complete(v1);
1578 >        (fFirst ? f : g).complete(v1);
1579 >        if (!createIncomplete)
1580 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1581          final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1582 <
1583 <        checkCompletedWithWrappedCancellationException(h);
1584 <        checkCancelled(g);
1761 <        assertEquals(0, r.invocationCount);
1762 <        checkCompletedNormally(f, v1);
1582 >        if (createIncomplete) {
1583 >            checkIncomplete(h);
1584 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1585          }
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);
1586  
1587          checkCompletedWithWrappedCancellationException(h);
1588 <        checkCancelled(f);
1588 >        checkCancelled(!fFirst ? f : g);
1589          assertEquals(0, r.invocationCount);
1590 <        checkCompletedNormally(g, v1);
1591 <        }
1784 <    }
1590 >        checkCompletedNormally(fFirst ? f : g, v1);
1591 >    }}
1592  
1593      /**
1594       * applyToEither result completes normally after normal completion
1595       * of either source
1596       */
1597 <    public void testApplyToEither_normalCompletion1() {
1597 >    public void testApplyToEither_normalCompletion() {
1598          for (ExecutionMode m : ExecutionMode.values())
1599 +        for (boolean createIncomplete : new boolean[] { true, false })
1600 +        for (boolean fFirst : new boolean[] { true, false })
1601          for (Integer v1 : new Integer[] { 1, null })
1602 <        for (Integer v2 : new Integer[] { 2, null }) {
1603 <
1602 >        for (Integer v2 : new Integer[] { 2, null })
1603 >    {
1604          final CompletableFuture<Integer> f = new CompletableFuture<>();
1605          final CompletableFuture<Integer> g = new CompletableFuture<>();
1606          final IncFunction r = new IncFunction();
1798        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1607  
1608 <        f.complete(v1);
1609 <        checkCompletedNormally(h, inc(v1));
1610 <        g.complete(v2);
1608 >        if (!createIncomplete)
1609 >            if (fFirst) f.complete(v1); else g.complete(v2);
1610 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1611 >        if (createIncomplete) {
1612 >            checkIncomplete(h);
1613 >            assertEquals(0, r.invocationCount);
1614 >            if (fFirst) f.complete(v1); else g.complete(v2);
1615 >        }
1616 >        checkCompletedNormally(h, inc(fFirst ? v1 : v2));
1617 >        if (!fFirst) f.complete(v1); else g.complete(v2);
1618  
1619          checkCompletedNormally(f, v1);
1620          checkCompletedNormally(g, v2);
1621 <        checkCompletedNormally(h, inc(v1));
1622 <        }
1808 <    }
1621 >        checkCompletedNormally(h, inc(fFirst ? v1 : v2));
1622 >    }}
1623  
1624 <    public void testApplyToEither_normalCompletion2() {
1624 >    public void testApplyToEither_normalCompletionBothAvailable() {
1625          for (ExecutionMode m : ExecutionMode.values())
1626 +        for (boolean fFirst : new boolean[] { true, false })
1627          for (Integer v1 : new Integer[] { 1, null })
1628 <        for (Integer v2 : new Integer[] { 2, null }) {
1629 <
1628 >        for (Integer v2 : new Integer[] { 2, null })
1629 >    {
1630          final CompletableFuture<Integer> f = new CompletableFuture<>();
1631          final CompletableFuture<Integer> g = new CompletableFuture<>();
1632          final IncFunction r = new IncFunction();
1818        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1633  
1634 <        g.complete(v2);
1635 <        checkCompletedNormally(h, inc(v2));
1636 <        f.complete(v1);
1637 <
1638 <        checkCompletedNormally(f, v1);
1639 <        checkCompletedNormally(g, v2);
1826 <        checkCompletedNormally(h, inc(v2));
1634 >        if (fFirst) {
1635 >            f.complete(v1);
1636 >            g.complete(v2);
1637 >        } else {
1638 >            g.complete(v2);
1639 >            f.complete(v1);
1640          }
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 }) {
1641  
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);
1642          final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1643  
1644          checkCompletedNormally(f, v1);
# Line 1846 | Line 1648 | public class CompletableFutureTest exten
1648          assertTrue(Objects.equals(h.join(), inc(v1)) ||
1649                     Objects.equals(h.join(), inc(v2)));
1650          assertEquals(1, r.invocationCount);
1651 <        }
1850 <    }
1651 >    }}
1652  
1653      /**
1654       * applyToEither result completes exceptionally after exceptional
# Line 1855 | Line 1656 | public class CompletableFutureTest exten
1656       */
1657      public void testApplyToEither_exceptionalCompletion1() {
1658          for (ExecutionMode m : ExecutionMode.values())
1659 <        for (Integer v1 : new Integer[] { 1, null }) {
1660 <
1659 >        for (boolean createIncomplete : new boolean[] { true, false })
1660 >        for (boolean fFirst : new boolean[] { true, false })
1661 >        for (Integer v1 : new Integer[] { 1, null })
1662 >    {
1663          final CompletableFuture<Integer> f = new CompletableFuture<>();
1664          final CompletableFuture<Integer> g = new CompletableFuture<>();
1665 +        final CFException ex = new CFException();
1666          final IncFunction r = new IncFunction();
1667 +
1668 +        if (!createIncomplete) (fFirst ? f : g).completeExceptionally(ex);
1669          final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1670 <        final CFException ex = new CFException();
1670 >        if (createIncomplete) {
1671 >            checkIncomplete(h);
1672 >            assertEquals(0, r.invocationCount);
1673 >            (fFirst ? f : g).completeExceptionally(ex);
1674 >        }
1675  
1866        f.completeExceptionally(ex);
1676          checkCompletedWithWrappedCFException(h, ex);
1677 <        g.complete(v1);
1677 >        (!fFirst ? f : g).complete(v1);
1678  
1679          assertEquals(0, r.invocationCount);
1680 <        checkCompletedNormally(g, v1);
1681 <        checkCompletedWithWrappedCFException(f, ex);
1680 >        checkCompletedNormally(!fFirst ? f : g, v1);
1681 >        checkCompletedWithWrappedCFException(fFirst ? f : g, ex);
1682          checkCompletedWithWrappedCFException(h, ex);
1683 <        }
1875 <    }
1683 >    }}
1684  
1685      public void testApplyToEither_exceptionalCompletion2() {
1686          for (ExecutionMode m : ExecutionMode.values())
1687 <        for (Integer v1 : new Integer[] { 1, null }) {
1688 <
1687 >        for (boolean reverseArgs : new boolean[] { true, false })
1688 >        for (boolean fFirst : new boolean[] { true, false })
1689 >        for (Integer v1 : new Integer[] { 1, null })
1690 >    {
1691          final CompletableFuture<Integer> f = new CompletableFuture<>();
1692          final CompletableFuture<Integer> g = new CompletableFuture<>();
1693 <        final IncFunction r = new IncFunction();
1694 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1693 >        final IncFunction r1 = new IncFunction();
1694 >        final IncFunction r2 = new IncFunction();
1695          final CFException ex = new CFException();
1696 <
1697 <        g.completeExceptionally(ex);
1698 <        checkCompletedWithWrappedCFException(h, ex);
1699 <        f.complete(v1);
1700 <
1701 <        assertEquals(0, r.invocationCount);
1702 <        checkCompletedNormally(f, v1);
1703 <        checkCompletedWithWrappedCFException(g, ex);
1704 <        checkCompletedWithWrappedCFException(h, ex);
1696 >        final CompletableFuture<Integer> j = (reverseArgs ? g : f);
1697 >        final CompletableFuture<Integer> k = (reverseArgs ? f : g);
1698 >        final CompletableFuture<Integer> h1 = m.applyToEither(j, k, r1);
1699 >        if (fFirst) {
1700 >            f.complete(v1);
1701 >            g.completeExceptionally(ex);
1702 >        } else {
1703 >            g.completeExceptionally(ex);
1704 >            f.complete(v1);
1705          }
1706 <    }
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);
1706 >        final CompletableFuture<Integer> h2 = m.applyToEither(j, k, r2);
1707  
1708          // unspecified behavior
1912        Integer v;
1709          try {
1710 <            assertEquals(h.join(), inc(v1));
1711 <            assertEquals(1, r.invocationCount);
1710 >            assertEquals(inc(v1), h1.join());
1711 >            assertEquals(1, r1.invocationCount);
1712          } catch (CompletionException ok) {
1713 <            checkCompletedWithWrappedCFException(h, ex);
1714 <            assertEquals(0, r.invocationCount);
1713 >            checkCompletedWithWrappedCFException(h1, ex);
1714 >            assertEquals(0, r1.invocationCount);
1715          }
1716  
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;
1717          try {
1718 <            assertEquals(h.join(), inc(v1));
1719 <            assertEquals(1, r.invocationCount);
1718 >            assertEquals(inc(v1), h2.join());
1719 >            assertEquals(1, r2.invocationCount);
1720          } catch (CompletionException ok) {
1721 <            checkCompletedWithWrappedCFException(h, ex);
1722 <            assertEquals(0, r.invocationCount);
1721 >            checkCompletedWithWrappedCFException(h2, ex);
1722 >            assertEquals(0, r2.invocationCount);
1723          }
1724  
1725 <        checkCompletedWithWrappedCFException(f, ex);
1726 <        checkCompletedNormally(g, v1);
1727 <        }
1952 <    }
1725 >        checkCompletedWithWrappedCFException(g, ex);
1726 >        checkCompletedNormally(f, v1);
1727 >    }}
1728  
1729      /**
1730       * applyToEither result completes exceptionally if action does
# Line 1957 | Line 1732 | public class CompletableFutureTest exten
1732      public void testApplyToEither_actionFailed1() {
1733          for (ExecutionMode m : ExecutionMode.values())
1734          for (Integer v1 : new Integer[] { 1, null })
1735 <        for (Integer v2 : new Integer[] { 2, null }) {
1736 <
1735 >        for (Integer v2 : new Integer[] { 2, null })
1736 >    {
1737          final CompletableFuture<Integer> f = new CompletableFuture<>();
1738          final CompletableFuture<Integer> g = new CompletableFuture<>();
1739          final FailingFunction r = new FailingFunction();
# Line 1969 | Line 1744 | public class CompletableFutureTest exten
1744          g.complete(v2);
1745          checkCompletedNormally(f, v1);
1746          checkCompletedNormally(g, v2);
1747 <        }
1973 <    }
1747 >    }}
1748  
1749      public void testApplyToEither_actionFailed2() {
1750          for (ExecutionMode m : ExecutionMode.values())
1751          for (Integer v1 : new Integer[] { 1, null })
1752 <        for (Integer v2 : new Integer[] { 2, null }) {
1753 <
1752 >        for (Integer v2 : new Integer[] { 2, null })
1753 >    {
1754          final CompletableFuture<Integer> f = new CompletableFuture<>();
1755          final CompletableFuture<Integer> g = new CompletableFuture<>();
1756          final FailingFunction r = new FailingFunction();
# Line 1987 | Line 1761 | public class CompletableFutureTest exten
1761          f.complete(v1);
1762          checkCompletedNormally(f, v1);
1763          checkCompletedNormally(g, v2);
1764 <        }
1991 <    }
1764 >    }}
1765  
1766      /**
1767       * applyToEither result completes exceptionally if either source cancelled
# Line 1996 | Line 1769 | public class CompletableFutureTest exten
1769      public void testApplyToEither_sourceCancelled1() {
1770          for (ExecutionMode m : ExecutionMode.values())
1771          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1772 <        for (Integer v1 : new Integer[] { 1, null }) {
1773 <
1772 >        for (boolean createIncomplete : new boolean[] { true, false })
1773 >        for (boolean fFirst : new boolean[] { true, false })
1774 >        for (Integer v1 : new Integer[] { 1, null })
1775 >    {
1776          final CompletableFuture<Integer> f = new CompletableFuture<>();
1777          final CompletableFuture<Integer> g = new CompletableFuture<>();
1778          final IncFunction r = new IncFunction();
1779 +
1780 +        if (!createIncomplete) assertTrue((fFirst ? f : g).cancel(mayInterruptIfRunning));
1781          final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1782 +        if (createIncomplete) {
1783 +            checkIncomplete(h);
1784 +            assertEquals(0, r.invocationCount);
1785 +            assertTrue((fFirst ? f : g).cancel(mayInterruptIfRunning));
1786 +        }
1787  
2006        assertTrue(f.cancel(mayInterruptIfRunning));
1788          checkCompletedWithWrappedCancellationException(h);
1789 <        g.complete(v1);
1789 >        (!fFirst ? f : g).complete(v1);
1790  
2010        checkCancelled(f);
1791          assertEquals(0, r.invocationCount);
1792 <        checkCompletedNormally(g, v1);
1792 >        checkCompletedNormally(!fFirst ? f : g, v1);
1793 >        checkCancelled(fFirst ? f : g);
1794          checkCompletedWithWrappedCancellationException(h);
1795 <        }
2015 <    }
1795 >    }}
1796  
1797      public void testApplyToEither_sourceCancelled2() {
1798          for (ExecutionMode m : ExecutionMode.values())
1799          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1800 <        for (Integer v1 : new Integer[] { 1, null }) {
1801 <
1800 >        for (boolean reverseArgs : new boolean[] { true, false })
1801 >        for (boolean fFirst : new boolean[] { true, false })
1802 >        for (Integer v1 : new Integer[] { 1, null })
1803 >    {
1804          final CompletableFuture<Integer> f = new CompletableFuture<>();
1805          final CompletableFuture<Integer> g = new CompletableFuture<>();
1806 <        final IncFunction r = new IncFunction();
1807 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1808 <
1809 <        assertTrue(g.cancel(mayInterruptIfRunning));
1810 <        checkCompletedWithWrappedCancellationException(h);
2029 <        f.complete(v1);
1806 >        final IncFunction r1 = new IncFunction();
1807 >        final IncFunction r2 = new IncFunction();
1808 >        final CFException ex = new CFException();
1809 >        final CompletableFuture<Integer> j = (reverseArgs ? g : f);
1810 >        final CompletableFuture<Integer> k = (reverseArgs ? f : g);
1811  
1812 <        checkCancelled(g);
1813 <        assertEquals(0, r.invocationCount);
1814 <        checkCompletedNormally(f, v1);
1815 <        checkCompletedWithWrappedCancellationException(h);
1812 >        final CompletableFuture<Integer> h1 = m.applyToEither(j, k, r1);
1813 >        if (fFirst) {
1814 >            f.complete(v1);
1815 >            assertTrue(g.cancel(mayInterruptIfRunning));
1816 >        } else {
1817 >            assertTrue(g.cancel(mayInterruptIfRunning));
1818 >            f.complete(v1);
1819          }
1820 <    }
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);
1820 >        final CompletableFuture<Integer> h2 = m.applyToEither(j, k, r2);
1821  
1822          // unspecified behavior
2052        Integer v;
1823          try {
1824 <            assertEquals(h.join(), inc(v1));
1825 <            assertEquals(1, r.invocationCount);
1824 >            assertEquals(inc(v1), h1.join());
1825 >            assertEquals(1, r1.invocationCount);
1826          } catch (CompletionException ok) {
1827 <            checkCompletedWithWrappedCancellationException(h);
1828 <            assertEquals(0, r.invocationCount);
1827 >            checkCompletedWithWrappedCancellationException(h1);
1828 >            assertEquals(0, r1.invocationCount);
1829          }
1830  
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;
1831          try {
1832 <            assertEquals(h.join(), inc(v1));
1833 <            assertEquals(1, r.invocationCount);
1832 >            assertEquals(inc(v1), h2.join());
1833 >            assertEquals(1, r2.invocationCount);
1834          } catch (CompletionException ok) {
1835 <            checkCompletedWithWrappedCancellationException(h);
1836 <            assertEquals(0, r.invocationCount);
1835 >            checkCompletedWithWrappedCancellationException(h2);
1836 >            assertEquals(0, r2.invocationCount);
1837          }
1838  
1839 <        checkCancelled(f);
1840 <        checkCompletedNormally(g, v1);
1841 <        }
2092 <    }
1839 >        checkCancelled(g);
1840 >        checkCompletedNormally(f, v1);
1841 >    }}
1842  
1843      /**
1844       * acceptEither result completes normally after normal completion
# Line 2098 | Line 1847 | public class CompletableFutureTest exten
1847      public void testAcceptEither_normalCompletion1() {
1848          for (ExecutionMode m : ExecutionMode.values())
1849          for (Integer v1 : new Integer[] { 1, null })
1850 <        for (Integer v2 : new Integer[] { 2, null }) {
1851 <
1850 >        for (Integer v2 : new Integer[] { 2, null })
1851 >    {
1852          final CompletableFuture<Integer> f = new CompletableFuture<>();
1853          final CompletableFuture<Integer> g = new CompletableFuture<>();
1854          final IncAction r = new IncAction();
# Line 2107 | Line 1856 | public class CompletableFutureTest exten
1856  
1857          f.complete(v1);
1858          checkCompletedNormally(h, null);
1859 <        assertEquals(r.value, inc(v1));
1859 >        assertEquals(inc(v1), r.value);
1860          g.complete(v2);
1861  
1862          checkCompletedNormally(f, v1);
1863          checkCompletedNormally(g, v2);
1864          checkCompletedNormally(h, null);
1865 <        }
2117 <    }
1865 >    }}
1866  
1867      public void testAcceptEither_normalCompletion2() {
1868          for (ExecutionMode m : ExecutionMode.values())
1869          for (Integer v1 : new Integer[] { 1, null })
1870 <        for (Integer v2 : new Integer[] { 2, null }) {
1871 <
1870 >        for (Integer v2 : new Integer[] { 2, null })
1871 >    {
1872          final CompletableFuture<Integer> f = new CompletableFuture<>();
1873          final CompletableFuture<Integer> g = new CompletableFuture<>();
1874          final IncAction r = new IncAction();
# Line 2128 | Line 1876 | public class CompletableFutureTest exten
1876  
1877          g.complete(v2);
1878          checkCompletedNormally(h, null);
1879 <        assertEquals(r.value, inc(v2));
1879 >        assertEquals(inc(v2), r.value);
1880          f.complete(v1);
1881  
1882          checkCompletedNormally(f, v1);
1883          checkCompletedNormally(g, v2);
1884          checkCompletedNormally(h, null);
1885 <        }
1886 <    }
1885 >    }}
1886 >
1887      public void testAcceptEither_normalCompletion3() {
1888          for (ExecutionMode m : ExecutionMode.values())
1889          for (Integer v1 : new Integer[] { 1, null })
1890 <        for (Integer v2 : new Integer[] { 2, null }) {
1891 <
1890 >        for (Integer v2 : new Integer[] { 2, null })
1891 >    {
1892          final CompletableFuture<Integer> f = new CompletableFuture<>();
1893          final CompletableFuture<Integer> g = new CompletableFuture<>();
1894          final IncAction r = new IncAction();
# Line 2156 | Line 1904 | public class CompletableFutureTest exten
1904          // unspecified behavior
1905          assertTrue(Objects.equals(r.value, inc(v1)) ||
1906                     Objects.equals(r.value, inc(v2)));
1907 <        }
2160 <    }
1907 >    }}
1908  
1909      /**
1910       * acceptEither result completes exceptionally after exceptional
# Line 2165 | Line 1912 | public class CompletableFutureTest exten
1912       */
1913      public void testAcceptEither_exceptionalCompletion1() {
1914          for (ExecutionMode m : ExecutionMode.values())
1915 <        for (Integer v1 : new Integer[] { 1, null }) {
1916 <
1915 >        for (Integer v1 : new Integer[] { 1, null })
1916 >    {
1917          final CompletableFuture<Integer> f = new CompletableFuture<>();
1918          final CompletableFuture<Integer> g = new CompletableFuture<>();
1919          final IncAction r = new IncAction();
# Line 2181 | Line 1928 | public class CompletableFutureTest exten
1928          checkCompletedNormally(g, v1);
1929          checkCompletedWithWrappedCFException(f, ex);
1930          checkCompletedWithWrappedCFException(h, ex);
1931 <        }
2185 <    }
1931 >    }}
1932  
1933      public void testAcceptEither_exceptionalCompletion2() {
1934          for (ExecutionMode m : ExecutionMode.values())
1935 <        for (Integer v1 : new Integer[] { 1, null }) {
1936 <
1935 >        for (Integer v1 : new Integer[] { 1, null })
1936 >    {
1937          final CompletableFuture<Integer> f = new CompletableFuture<>();
1938          final CompletableFuture<Integer> g = new CompletableFuture<>();
1939          final IncAction r = new IncAction();
# Line 2202 | Line 1948 | public class CompletableFutureTest exten
1948          checkCompletedNormally(f, v1);
1949          checkCompletedWithWrappedCFException(g, ex);
1950          checkCompletedWithWrappedCFException(h, ex);
1951 <        }
2206 <    }
1951 >    }}
1952  
1953      public void testAcceptEither_exceptionalCompletion3() {
1954          for (ExecutionMode m : ExecutionMode.values())
1955 <        for (Integer v1 : new Integer[] { 1, null }) {
1956 <
1955 >        for (Integer v1 : new Integer[] { 1, null })
1956 >    {
1957          final CompletableFuture<Integer> f = new CompletableFuture<>();
1958          final CompletableFuture<Integer> g = new CompletableFuture<>();
1959          final IncAction r = new IncAction();
# Line 2221 | Line 1966 | public class CompletableFutureTest exten
1966          // unspecified behavior
1967          Integer v;
1968          try {
1969 <            assertEquals(h.join(), null);
1969 >            assertNull(h.join());
1970              assertEquals(1, r.invocationCount);
1971              assertEquals(inc(v1), r.value);
1972          } catch (CompletionException ok) {
# Line 2231 | Line 1976 | public class CompletableFutureTest exten
1976  
1977          checkCompletedWithWrappedCFException(g, ex);
1978          checkCompletedNormally(f, v1);
1979 <        }
2235 <    }
1979 >    }}
1980  
1981      public void testAcceptEither_exceptionalCompletion4() {
1982          for (ExecutionMode m : ExecutionMode.values())
1983 <        for (Integer v1 : new Integer[] { 1, null }) {
1984 <
1983 >        for (Integer v1 : new Integer[] { 1, null })
1984 >    {
1985          final CompletableFuture<Integer> f = new CompletableFuture<>();
1986          final CompletableFuture<Integer> g = new CompletableFuture<>();
1987          final IncAction r = new IncAction();
# Line 2250 | Line 1994 | public class CompletableFutureTest exten
1994          // unspecified behavior
1995          Integer v;
1996          try {
1997 <            assertEquals(h.join(), null);
1997 >            assertNull(h.join());
1998              assertEquals(1, r.invocationCount);
1999              assertEquals(inc(v1), r.value);
2000          } catch (CompletionException ok) {
# Line 2260 | Line 2004 | public class CompletableFutureTest exten
2004  
2005          checkCompletedWithWrappedCFException(f, ex);
2006          checkCompletedNormally(g, v1);
2007 <        }
2264 <    }
2007 >    }}
2008  
2009      /**
2010       * acceptEither result completes exceptionally if action does
# Line 2269 | Line 2012 | public class CompletableFutureTest exten
2012      public void testAcceptEither_actionFailed1() {
2013          for (ExecutionMode m : ExecutionMode.values())
2014          for (Integer v1 : new Integer[] { 1, null })
2015 <        for (Integer v2 : new Integer[] { 2, null }) {
2016 <
2015 >        for (Integer v2 : new Integer[] { 2, null })
2016 >    {
2017          final CompletableFuture<Integer> f = new CompletableFuture<>();
2018          final CompletableFuture<Integer> g = new CompletableFuture<>();
2019          final FailingConsumer r = new FailingConsumer();
# Line 2281 | Line 2024 | public class CompletableFutureTest exten
2024          g.complete(v2);
2025          checkCompletedNormally(f, v1);
2026          checkCompletedNormally(g, v2);
2027 <        }
2285 <    }
2027 >    }}
2028  
2029      public void testAcceptEither_actionFailed2() {
2030          for (ExecutionMode m : ExecutionMode.values())
2031          for (Integer v1 : new Integer[] { 1, null })
2032 <        for (Integer v2 : new Integer[] { 2, null }) {
2033 <
2032 >        for (Integer v2 : new Integer[] { 2, null })
2033 >    {
2034          final CompletableFuture<Integer> f = new CompletableFuture<>();
2035          final CompletableFuture<Integer> g = new CompletableFuture<>();
2036          final FailingConsumer r = new FailingConsumer();
# Line 2299 | Line 2041 | public class CompletableFutureTest exten
2041          f.complete(v1);
2042          checkCompletedNormally(f, v1);
2043          checkCompletedNormally(g, v2);
2044 <        }
2303 <    }
2044 >    }}
2045  
2046      /**
2047       * acceptEither result completes exceptionally if either source cancelled
# Line 2308 | Line 2049 | public class CompletableFutureTest exten
2049      public void testAcceptEither_sourceCancelled1() {
2050          for (ExecutionMode m : ExecutionMode.values())
2051          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2052 <        for (Integer v1 : new Integer[] { 1, null }) {
2053 <
2052 >        for (Integer v1 : new Integer[] { 1, null })
2053 >    {
2054          final CompletableFuture<Integer> f = new CompletableFuture<>();
2055          final CompletableFuture<Integer> g = new CompletableFuture<>();
2056          final IncAction r = new IncAction();
# Line 2323 | Line 2064 | public class CompletableFutureTest exten
2064          assertEquals(0, r.invocationCount);
2065          checkCompletedNormally(g, v1);
2066          checkCompletedWithWrappedCancellationException(h);
2067 <        }
2327 <    }
2067 >    }}
2068  
2069      public void testAcceptEither_sourceCancelled2() {
2070          for (ExecutionMode m : ExecutionMode.values())
2071          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2072 <        for (Integer v1 : new Integer[] { 1, null }) {
2073 <
2072 >        for (Integer v1 : new Integer[] { 1, null })
2073 >    {
2074          final CompletableFuture<Integer> f = new CompletableFuture<>();
2075          final CompletableFuture<Integer> g = new CompletableFuture<>();
2076          final IncAction r = new IncAction();
# Line 2344 | Line 2084 | public class CompletableFutureTest exten
2084          assertEquals(0, r.invocationCount);
2085          checkCompletedNormally(f, v1);
2086          checkCompletedWithWrappedCancellationException(h);
2087 <        }
2348 <    }
2087 >    }}
2088  
2089      public void testAcceptEither_sourceCancelled3() {
2090          for (ExecutionMode m : ExecutionMode.values())
2091          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2092 <        for (Integer v1 : new Integer[] { 1, null }) {
2093 <
2092 >        for (Integer v1 : new Integer[] { 1, null })
2093 >    {
2094          final CompletableFuture<Integer> f = new CompletableFuture<>();
2095          final CompletableFuture<Integer> g = new CompletableFuture<>();
2096          final IncAction r = new IncAction();
# Line 2363 | Line 2102 | public class CompletableFutureTest exten
2102          // unspecified behavior
2103          Integer v;
2104          try {
2105 <            assertEquals(h.join(), null);
2105 >            assertNull(h.join());
2106              assertEquals(1, r.invocationCount);
2107              assertEquals(inc(v1), r.value);
2108          } catch (CompletionException ok) {
# Line 2373 | Line 2112 | public class CompletableFutureTest exten
2112  
2113          checkCancelled(g);
2114          checkCompletedNormally(f, v1);
2115 <        }
2377 <    }
2115 >    }}
2116  
2117      public void testAcceptEither_sourceCancelled4() {
2118          for (ExecutionMode m : ExecutionMode.values())
2119          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2120 <        for (Integer v1 : new Integer[] { 1, null }) {
2121 <
2120 >        for (Integer v1 : new Integer[] { 1, null })
2121 >    {
2122          final CompletableFuture<Integer> f = new CompletableFuture<>();
2123          final CompletableFuture<Integer> g = new CompletableFuture<>();
2124          final IncAction r = new IncAction();
# Line 2392 | Line 2130 | public class CompletableFutureTest exten
2130          // unspecified behavior
2131          Integer v;
2132          try {
2133 <            assertEquals(h.join(), null);
2133 >            assertNull(h.join());
2134              assertEquals(1, r.invocationCount);
2135              assertEquals(inc(v1), r.value);
2136          } catch (CompletionException ok) {
# Line 2402 | Line 2140 | public class CompletableFutureTest exten
2140  
2141          checkCancelled(f);
2142          checkCompletedNormally(g, v1);
2143 <        }
2406 <    }
2143 >    }}
2144  
2145      /**
2146       * runAfterEither result completes normally after normal completion
# Line 2412 | Line 2149 | public class CompletableFutureTest exten
2149      public void testRunAfterEither_normalCompletion1() {
2150          for (ExecutionMode m : ExecutionMode.values())
2151          for (Integer v1 : new Integer[] { 1, null })
2152 <        for (Integer v2 : new Integer[] { 2, null }) {
2153 <
2152 >        for (Integer v2 : new Integer[] { 2, null })
2153 >    {
2154          final CompletableFuture<Integer> f = new CompletableFuture<>();
2155          final CompletableFuture<Integer> g = new CompletableFuture<>();
2156          final Noop r = new Noop();
# Line 2428 | Line 2165 | public class CompletableFutureTest exten
2165          checkCompletedNormally(g, v2);
2166          checkCompletedNormally(h, null);
2167          assertEquals(1, r.invocationCount);
2168 <        }
2432 <    }
2168 >    }}
2169  
2170      public void testRunAfterEither_normalCompletion2() {
2171          for (ExecutionMode m : ExecutionMode.values())
2172          for (Integer v1 : new Integer[] { 1, null })
2173 <        for (Integer v2 : new Integer[] { 2, null }) {
2174 <
2173 >        for (Integer v2 : new Integer[] { 2, null })
2174 >    {
2175          final CompletableFuture<Integer> f = new CompletableFuture<>();
2176          final CompletableFuture<Integer> g = new CompletableFuture<>();
2177          final Noop r = new Noop();
# Line 2450 | Line 2186 | public class CompletableFutureTest exten
2186          checkCompletedNormally(g, v2);
2187          checkCompletedNormally(h, null);
2188          assertEquals(1, r.invocationCount);
2189 <        }
2190 <    }
2189 >        }}
2190 >
2191      public void testRunAfterEither_normalCompletion3() {
2192          for (ExecutionMode m : ExecutionMode.values())
2193          for (Integer v1 : new Integer[] { 1, null })
2194 <        for (Integer v2 : new Integer[] { 2, null }) {
2195 <
2194 >        for (Integer v2 : new Integer[] { 2, null })
2195 >    {
2196          final CompletableFuture<Integer> f = new CompletableFuture<>();
2197          final CompletableFuture<Integer> g = new CompletableFuture<>();
2198          final Noop r = new Noop();
# Line 2469 | Line 2205 | public class CompletableFutureTest exten
2205          checkCompletedNormally(f, v1);
2206          checkCompletedNormally(g, v2);
2207          assertEquals(1, r.invocationCount);
2208 <        }
2473 <    }
2208 >    }}
2209  
2210      /**
2211       * runAfterEither result completes exceptionally after exceptional
# Line 2478 | Line 2213 | public class CompletableFutureTest exten
2213       */
2214      public void testRunAfterEither_exceptionalCompletion1() {
2215          for (ExecutionMode m : ExecutionMode.values())
2216 <        for (Integer v1 : new Integer[] { 1, null }) {
2217 <
2216 >        for (Integer v1 : new Integer[] { 1, null })
2217 >    {
2218          final CompletableFuture<Integer> f = new CompletableFuture<>();
2219          final CompletableFuture<Integer> g = new CompletableFuture<>();
2220          final Noop r = new Noop();
# Line 2494 | Line 2229 | public class CompletableFutureTest exten
2229          checkCompletedNormally(g, v1);
2230          checkCompletedWithWrappedCFException(f, ex);
2231          checkCompletedWithWrappedCFException(h, ex);
2232 <        }
2498 <    }
2232 >    }}
2233  
2234      public void testRunAfterEither_exceptionalCompletion2() {
2235          for (ExecutionMode m : ExecutionMode.values())
2236 <        for (Integer v1 : new Integer[] { 1, null }) {
2237 <
2236 >        for (Integer v1 : new Integer[] { 1, null })
2237 >    {
2238          final CompletableFuture<Integer> f = new CompletableFuture<>();
2239          final CompletableFuture<Integer> g = new CompletableFuture<>();
2240          final Noop r = new Noop();
# Line 2515 | Line 2249 | public class CompletableFutureTest exten
2249          checkCompletedNormally(f, v1);
2250          checkCompletedWithWrappedCFException(g, ex);
2251          checkCompletedWithWrappedCFException(h, ex);
2252 <        }
2519 <    }
2252 >    }}
2253  
2254      public void testRunAfterEither_exceptionalCompletion3() {
2255          for (ExecutionMode m : ExecutionMode.values())
2256 <        for (Integer v1 : new Integer[] { 1, null }) {
2257 <
2256 >        for (Integer v1 : new Integer[] { 1, null })
2257 >    {
2258          final CompletableFuture<Integer> f = new CompletableFuture<>();
2259          final CompletableFuture<Integer> g = new CompletableFuture<>();
2260          final Noop r = new Noop();
# Line 2534 | Line 2267 | public class CompletableFutureTest exten
2267          // unspecified behavior
2268          Integer v;
2269          try {
2270 <            assertEquals(h.join(), null);
2270 >            assertNull(h.join());
2271              assertEquals(1, r.invocationCount);
2272          } catch (CompletionException ok) {
2273              checkCompletedWithWrappedCFException(h, ex);
# Line 2543 | Line 2276 | public class CompletableFutureTest exten
2276  
2277          checkCompletedWithWrappedCFException(g, ex);
2278          checkCompletedNormally(f, v1);
2279 <        }
2547 <    }
2279 >    }}
2280  
2281      public void testRunAfterEither_exceptionalCompletion4() {
2282          for (ExecutionMode m : ExecutionMode.values())
2283 <        for (Integer v1 : new Integer[] { 1, null }) {
2284 <
2283 >        for (Integer v1 : new Integer[] { 1, null })
2284 >    {
2285          final CompletableFuture<Integer> f = new CompletableFuture<>();
2286          final CompletableFuture<Integer> g = new CompletableFuture<>();
2287          final Noop r = new Noop();
# Line 2562 | Line 2294 | public class CompletableFutureTest exten
2294          // unspecified behavior
2295          Integer v;
2296          try {
2297 <            assertEquals(h.join(), null);
2297 >            assertNull(h.join());
2298              assertEquals(1, r.invocationCount);
2299          } catch (CompletionException ok) {
2300              checkCompletedWithWrappedCFException(h, ex);
# Line 2571 | Line 2303 | public class CompletableFutureTest exten
2303  
2304          checkCompletedWithWrappedCFException(f, ex);
2305          checkCompletedNormally(g, v1);
2306 <        }
2575 <    }
2306 >    }}
2307  
2308      /**
2309       * runAfterEither result completes exceptionally if action does
# Line 2580 | Line 2311 | public class CompletableFutureTest exten
2311      public void testRunAfterEither_actionFailed1() {
2312          for (ExecutionMode m : ExecutionMode.values())
2313          for (Integer v1 : new Integer[] { 1, null })
2314 <        for (Integer v2 : new Integer[] { 2, null }) {
2315 <
2314 >        for (Integer v2 : new Integer[] { 2, null })
2315 >    {
2316          final CompletableFuture<Integer> f = new CompletableFuture<>();
2317          final CompletableFuture<Integer> g = new CompletableFuture<>();
2318 <        final FailingNoop r = new FailingNoop();
2318 >        final FailingRunnable r = new FailingRunnable();
2319          final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2320  
2321          f.complete(v1);
# Line 2592 | Line 2323 | public class CompletableFutureTest exten
2323          g.complete(v2);
2324          checkCompletedNormally(f, v1);
2325          checkCompletedNormally(g, v2);
2326 <        }
2596 <    }
2326 >    }}
2327  
2328      public void testRunAfterEither_actionFailed2() {
2329          for (ExecutionMode m : ExecutionMode.values())
2330          for (Integer v1 : new Integer[] { 1, null })
2331 <        for (Integer v2 : new Integer[] { 2, null }) {
2332 <
2331 >        for (Integer v2 : new Integer[] { 2, null })
2332 >    {
2333          final CompletableFuture<Integer> f = new CompletableFuture<>();
2334          final CompletableFuture<Integer> g = new CompletableFuture<>();
2335 <        final FailingNoop r = new FailingNoop();
2335 >        final FailingRunnable r = new FailingRunnable();
2336          final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2337  
2338          g.complete(v2);
# Line 2610 | Line 2340 | public class CompletableFutureTest exten
2340          f.complete(v1);
2341          checkCompletedNormally(f, v1);
2342          checkCompletedNormally(g, v2);
2343 <        }
2614 <    }
2343 >    }}
2344  
2345      /**
2346       * runAfterEither result completes exceptionally if either source cancelled
# Line 2619 | Line 2348 | public class CompletableFutureTest exten
2348      public void testRunAfterEither_sourceCancelled1() {
2349          for (ExecutionMode m : ExecutionMode.values())
2350          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2351 <        for (Integer v1 : new Integer[] { 1, null }) {
2352 <
2351 >        for (Integer v1 : new Integer[] { 1, null })
2352 >    {
2353          final CompletableFuture<Integer> f = new CompletableFuture<>();
2354          final CompletableFuture<Integer> g = new CompletableFuture<>();
2355          final Noop r = new Noop();
# Line 2634 | Line 2363 | public class CompletableFutureTest exten
2363          assertEquals(0, r.invocationCount);
2364          checkCompletedNormally(g, v1);
2365          checkCompletedWithWrappedCancellationException(h);
2366 <        }
2638 <    }
2366 >    }}
2367  
2368      public void testRunAfterEither_sourceCancelled2() {
2369          for (ExecutionMode m : ExecutionMode.values())
2370          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2371 <        for (Integer v1 : new Integer[] { 1, null }) {
2372 <
2371 >        for (Integer v1 : new Integer[] { 1, null })
2372 >    {
2373          final CompletableFuture<Integer> f = new CompletableFuture<>();
2374          final CompletableFuture<Integer> g = new CompletableFuture<>();
2375          final Noop r = new Noop();
# Line 2655 | Line 2383 | public class CompletableFutureTest exten
2383          assertEquals(0, r.invocationCount);
2384          checkCompletedNormally(f, v1);
2385          checkCompletedWithWrappedCancellationException(h);
2386 <        }
2659 <    }
2386 >    }}
2387  
2388      public void testRunAfterEither_sourceCancelled3() {
2389          for (ExecutionMode m : ExecutionMode.values())
2390          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2391 <        for (Integer v1 : new Integer[] { 1, null }) {
2392 <
2391 >        for (Integer v1 : new Integer[] { 1, null })
2392 >    {
2393          final CompletableFuture<Integer> f = new CompletableFuture<>();
2394          final CompletableFuture<Integer> g = new CompletableFuture<>();
2395          final Noop r = new Noop();
# Line 2674 | Line 2401 | public class CompletableFutureTest exten
2401          // unspecified behavior
2402          Integer v;
2403          try {
2404 <            assertEquals(h.join(), null);
2404 >            assertNull(h.join());
2405              assertEquals(1, r.invocationCount);
2406          } catch (CompletionException ok) {
2407              checkCompletedWithWrappedCancellationException(h);
# Line 2683 | Line 2410 | public class CompletableFutureTest exten
2410  
2411          checkCancelled(g);
2412          checkCompletedNormally(f, v1);
2413 <        }
2687 <    }
2413 >    }}
2414  
2415      public void testRunAfterEither_sourceCancelled4() {
2416          for (ExecutionMode m : ExecutionMode.values())
2417          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2418 <        for (Integer v1 : new Integer[] { 1, null }) {
2419 <
2418 >        for (Integer v1 : new Integer[] { 1, null })
2419 >    {
2420          final CompletableFuture<Integer> f = new CompletableFuture<>();
2421          final CompletableFuture<Integer> g = new CompletableFuture<>();
2422          final Noop r = new Noop();
# Line 2702 | Line 2428 | public class CompletableFutureTest exten
2428          // unspecified behavior
2429          Integer v;
2430          try {
2431 <            assertEquals(h.join(), null);
2431 >            assertNull(h.join());
2432              assertEquals(1, r.invocationCount);
2433          } catch (CompletionException ok) {
2434              checkCompletedWithWrappedCancellationException(h);
# Line 2711 | Line 2437 | public class CompletableFutureTest exten
2437  
2438          checkCancelled(f);
2439          checkCompletedNormally(g, v1);
2440 <        }
2715 <    }
2440 >    }}
2441  
2442      /**
2443       * thenCompose result completes normally after normal completion of source
2444       */
2445 <    public void testThenCompose_normalCompletion1() {
2445 >    public void testThenCompose_normalCompletion() {
2446          for (ExecutionMode m : ExecutionMode.values())
2447 <        for (Integer v1 : new Integer[] { 1, null }) {
2448 <
2447 >        for (boolean createIncomplete : new boolean[] { true, false })
2448 >        for (Integer v1 : new Integer[] { 1, null })
2449 >    {
2450          final CompletableFuture<Integer> f = new CompletableFuture<>();
2451          final CompletableFutureInc r = new CompletableFutureInc();
2452 +        if (!createIncomplete) f.complete(v1);
2453          final CompletableFuture<Integer> g = f.thenCompose(r);
2454 <        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 }) {
2454 >        if (createIncomplete) f.complete(v1);
2455  
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);
2456          checkCompletedNormally(g, inc(v1));
2457          checkCompletedNormally(f, v1);
2458          assertEquals(1, r.invocationCount);
2459 <        }
2746 <    }
2459 >    }}
2460  
2461      /**
2462       * thenCompose result completes exceptionally after exceptional
2463       * completion of source
2464       */
2465 <    public void testThenCompose_exceptionalCompletion1() {
2466 <        for (ExecutionMode m : ExecutionMode.values()) {
2467 <
2465 >    public void testThenCompose_exceptionalCompletion() {
2466 >        for (ExecutionMode m : ExecutionMode.values())
2467 >        for (boolean createIncomplete : new boolean[] { true, false })
2468 >    {
2469          final CFException ex = new CFException();
2470          final CompletableFutureInc r = new CompletableFutureInc();
2471          final CompletableFuture<Integer> f = new CompletableFuture<>();
2472 +        if (!createIncomplete) f.completeExceptionally(ex);
2473          final CompletableFuture<Integer> g = f.thenCompose(r);
2474 <        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()) {
2474 >        if (createIncomplete) f.completeExceptionally(ex);
2475  
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);
2476          checkCompletedWithWrappedCFException(g, ex);
2477          checkCompletedWithWrappedCFException(f, ex);
2478 <        }
2479 <    }
2478 >        assertEquals(0, r.invocationCount);
2479 >    }}
2480  
2481      /**
2482       * thenCompose result completes exceptionally if action does
2483       */
2484 <    public void testThenCompose_actionFailed1() {
2484 >    public void testThenCompose_actionFailed() {
2485          for (ExecutionMode m : ExecutionMode.values())
2486 <        for (Integer v1 : new Integer[] { 1, null }) {
2487 <
2486 >        for (boolean createIncomplete : new boolean[] { true, false })
2487 >        for (Integer v1 : new Integer[] { 1, null })
2488 >    {
2489          final CompletableFuture<Integer> f = new CompletableFuture<>();
2490          final FailingCompletableFutureFunction r
2491              = new FailingCompletableFutureFunction();
2492 +        if (!createIncomplete) f.complete(v1);
2493          final CompletableFuture<Integer> g = f.thenCompose(r);
2494 <        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 }) {
2494 >        if (createIncomplete) f.complete(v1);
2495  
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);
2496          checkCompletedWithWrappedCFException(g);
2497          checkCompletedNormally(f, v1);
2498 <        }
2807 <    }
2498 >    }}
2499  
2500      /**
2501       * thenCompose result completes exceptionally if source cancelled
2502       */
2503 <    public void testThenCompose_sourceCancelled1() {
2503 >    public void testThenCompose_sourceCancelled() {
2504          for (ExecutionMode m : ExecutionMode.values())
2505 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false }) {
2506 <
2505 >        for (boolean createIncomplete : new boolean[] { true, false })
2506 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2507 >    {
2508          final CompletableFuture<Integer> f = new CompletableFuture<>();
2509          final CompletableFutureInc r = new CompletableFutureInc();
2510 +        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2511          final CompletableFuture<Integer> g = f.thenCompose(r);
2512 <        assertTrue(f.cancel(mayInterruptIfRunning));
2513 <        checkCompletedWithWrappedCancellationException(g);
2514 <        checkCancelled(f);
2512 >        if (createIncomplete) {
2513 >            checkIncomplete(g);
2514 >            assertTrue(f.cancel(mayInterruptIfRunning));
2515          }
2823    }
2516  
2825    public void testThenCompose_sourceCancelled2() {
2826        for (ExecutionMode m : ExecutionMode.values())
2827        for (boolean mayInterruptIfRunning : new boolean[] { true, false }) {
2828
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);
2517          checkCompletedWithWrappedCancellationException(g);
2518          checkCancelled(f);
2519 <        }
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 <    }
2519 >    }}
2520  
2521      // other static methods
2522  
# Line 3328 | Line 2717 | public class CompletableFutureTest exten
2717       * source result.
2718       */
2719      public void testWhenComplete_normalCompletion1() {
3331        for (boolean createIncomplete : new boolean[] { true, false })
2720          for (ExecutionMode m : ExecutionMode.values())
2721 <        for (Integer v1 : new Integer[] { 1, null }) {
2722 <
2723 <        final AtomicInteger a = new AtomicInteger();
2721 >        for (boolean createIncomplete : new boolean[] { true, false })
2722 >        for (Integer v1 : new Integer[] { 1, null })
2723 >    {
2724 >        final AtomicInteger a = new AtomicInteger(0);
2725          final CompletableFuture<Integer> f = new CompletableFuture<>();
2726          if (!createIncomplete) f.complete(v1);
2727 <        final CompletableFuture<Integer> g =
2728 <            m.whenComplete(f,
2729 <                           (Integer x, Throwable t) -> {
2730 <                               threadAssertSame(x, v1);
2731 <                               threadAssertNull(t);
2732 <                               a.getAndIncrement();
2733 <                           });
2727 >        final CompletableFuture<Integer> g = m.whenComplete
2728 >            (f,
2729 >             (Integer x, Throwable t) -> {
2730 >                threadAssertSame(x, v1);
2731 >                threadAssertNull(t);
2732 >                a.getAndIncrement();
2733 >            });
2734          if (createIncomplete) f.complete(v1);
2735 <        checkCompletedNormally(f, v1);
2735 >
2736          checkCompletedNormally(g, v1);
2737 <        assertEquals(a.get(), 1);
2738 <        }
2739 <    }
2737 >        checkCompletedNormally(f, v1);
2738 >        assertEquals(1, a.get());
2739 >    }}
2740  
2741      /**
2742       * whenComplete action executes on exceptional completion, propagating
2743       * source result.
2744       */
2745      public void testWhenComplete_exceptionalCompletion() {
3357        for (boolean createIncomplete : new boolean[] { true, false })
2746          for (ExecutionMode m : ExecutionMode.values())
2747 <        for (Integer v1 : new Integer[] { 1, null }) {
2748 <
2749 <        final AtomicInteger a = new AtomicInteger();
2747 >        for (boolean createIncomplete : new boolean[] { true, false })
2748 >        for (Integer v1 : new Integer[] { 1, null })
2749 >    {
2750 >        final AtomicInteger a = new AtomicInteger(0);
2751          final CFException ex = new CFException();
2752          final CompletableFuture<Integer> f = new CompletableFuture<>();
2753          if (!createIncomplete) f.completeExceptionally(ex);
# Line 3372 | Line 2761 | public class CompletableFutureTest exten
2761          if (createIncomplete) f.completeExceptionally(ex);
2762          checkCompletedWithWrappedCFException(f, ex);
2763          checkCompletedWithWrappedCFException(g, ex);
2764 <        assertEquals(a.get(), 1);
2765 <        }
2766 <    }
2764 >        assertEquals(1, a.get());
2765 >    }}
2766 >
2767 >    /**
2768 >     * whenComplete action executes on cancelled source, propagating
2769 >     * CancellationException.
2770 >     */
2771 >    public void testWhenComplete_sourceCancelled() {
2772 >        for (ExecutionMode m : ExecutionMode.values())
2773 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2774 >        for (boolean createIncomplete : new boolean[] { true, false })
2775 >    {
2776 >        final AtomicInteger a = new AtomicInteger(0);
2777 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2778 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2779 >        final CompletableFuture<Integer> g = m.whenComplete
2780 >            (f,
2781 >             (Integer x, Throwable t) -> {
2782 >                threadAssertNull(x);
2783 >                threadAssertTrue(t instanceof CancellationException);
2784 >                a.getAndIncrement();
2785 >            });
2786 >        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2787 >
2788 >        //try { g.join(); } catch (Throwable t) { throw new Error(t); }
2789 >        checkCompletedWithWrappedCancellationException(g);
2790 >        checkCancelled(f);
2791 >        assertEquals(1, a.get());
2792 >    }}
2793  
2794      /**
2795       * If a whenComplete action throws an exception when triggered by
# Line 3383 | Line 2798 | public class CompletableFutureTest exten
2798      public void testWhenComplete_actionFailed() {
2799          for (boolean createIncomplete : new boolean[] { true, false })
2800          for (ExecutionMode m : ExecutionMode.values())
2801 <        for (Integer v1 : new Integer[] { 1, null }) {
2802 <
2801 >        for (Integer v1 : new Integer[] { 1, null })
2802 >    {
2803 >        final AtomicInteger a = new AtomicInteger(0);
2804          final CFException ex = new CFException();
2805          final CompletableFuture<Integer> f = new CompletableFuture<>();
2806          if (!createIncomplete) f.complete(v1);
# Line 3393 | Line 2809 | public class CompletableFutureTest exten
2809               (Integer x, Throwable t) -> {
2810                  threadAssertSame(x, v1);
2811                  threadAssertNull(t);
2812 +                a.getAndIncrement();
2813                  throw ex;
2814              });
2815          if (createIncomplete) f.complete(v1);
2816          checkCompletedNormally(f, v1);
2817          checkCompletedWithWrappedCFException(g, ex);
2818 <        }
2819 <    }
2818 >        assertEquals(1, a.get());
2819 >    }}
2820  
2821      /**
2822       * If a whenComplete action throws an exception when triggered by
# Line 3409 | Line 2826 | public class CompletableFutureTest exten
2826      public void testWhenComplete_actionFailedSourceFailed() {
2827          for (boolean createIncomplete : new boolean[] { true, false })
2828          for (ExecutionMode m : ExecutionMode.values())
2829 <        for (Integer v1 : new Integer[] { 1, null }) {
2830 <
2829 >        for (Integer v1 : new Integer[] { 1, null })
2830 >    {
2831 >        final AtomicInteger a = new AtomicInteger(0);
2832          final CFException ex1 = new CFException();
2833          final CFException ex2 = new CFException();
2834          final CompletableFuture<Integer> f = new CompletableFuture<>();
# Line 3421 | Line 2839 | public class CompletableFutureTest exten
2839               (Integer x, Throwable t) -> {
2840                  threadAssertSame(t, ex1);
2841                  threadAssertNull(x);
2842 +                a.getAndIncrement();
2843                  throw ex2;
2844              });
2845          if (createIncomplete) f.completeExceptionally(ex1);
2846  
2847          checkCompletedWithWrappedCFException(f, ex1);
2848          checkCompletedWithWrappedCFException(g, ex1);
2849 <        }
2850 <    }
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 <    }
2849 >        assertEquals(1, a.get());
2850 >    }}
2851  
2852   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines