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.37 by jsr166, Sun Jun 1 23:20:19 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 318 | Line 322 | public class CompletableFutureTest exten
322  
323      // Choose non-commutative actions for better coverage
324  
325 <    // A non-commutative function that handles null values as well,
326 <    // and produces null values occasionally.
323 <    public static Integer subtract(Integer x, Integer y) {
325 >    // A non-commutative function that handles and produces null values as well.
326 >    static Integer subtract(Integer x, Integer y) {
327          return (x == null && y == null) ? null :
328              ((x == null) ? 42 : x.intValue())
329              - ((y == null) ? 99 : y.intValue());
330      }
331  
332 +    // A function that handles and produces null values as well.
333 +    static Integer inc(Integer x) {
334 +        return (x == null) ? null : x + 1;
335 +    }
336 +
337      static final Supplier<Integer> supplyOne =
338          () -> Integer.valueOf(1);
339      static final Function<Integer, Integer> inc =
# Line 333 | Line 341 | public class CompletableFutureTest exten
341      static final BiFunction<Integer, Integer, Integer> subtract =
342          (Integer x, Integer y) -> subtract(x, y);
343      static final class IncAction implements Consumer<Integer> {
344 <        int value;
345 <        public void accept(Integer x) { value = x.intValue() + 1; }
344 >        int invocationCount = 0;
345 >        Integer value;
346 >        public void accept(Integer x) {
347 >            invocationCount++;
348 >            value = inc(x);
349 >        }
350 >    }
351 >    static final class IncFunction implements Function<Integer,Integer> {
352 >        int invocationCount = 0;
353 >        Integer value;
354 >        public Integer apply(Integer x) {
355 >            invocationCount++;
356 >            return value = inc(x);
357 >        }
358      }
359      static final class SubtractAction implements BiConsumer<Integer, Integer> {
360          int invocationCount = 0;
361          Integer value;
362          // Check this action was invoked exactly once when result is computed.
343        public boolean ran() { return invocationCount == 1; }
363          public void accept(Integer x, Integer y) {
364              invocationCount++;
365              value = subtract(x, y);
# Line 350 | Line 369 | public class CompletableFutureTest exten
369          int invocationCount = 0;
370          Integer value;
371          // Check this action was invoked exactly once when result is computed.
353        public boolean ran() { return invocationCount == 1; }
372          public Integer apply(Integer x, Integer y) {
373              invocationCount++;
374              return value = subtract(x, y);
375          }
376      }
377      static final class Noop implements Runnable {
378 <        boolean ran;
379 <        public void run() { ran = true; }
378 >        int invocationCount = 0;
379 >        public void run() {
380 >            invocationCount++;
381 >        }
382      }
383  
384      static final class FailingSupplier implements Supplier<Integer> {
385 <        boolean ran;
386 <        public Integer get() { ran = true; throw new CFException(); }
385 >        int invocationCount = 0;
386 >        public Integer get() {
387 >            invocationCount++;
388 >            throw new CFException();
389 >        }
390      }
391      static final class FailingConsumer implements Consumer<Integer> {
392 <        boolean ran;
393 <        public void accept(Integer x) { ran = true; throw new CFException(); }
392 >        int invocationCount = 0;
393 >        public void accept(Integer x) {
394 >            invocationCount++;
395 >            throw new CFException();
396 >        }
397      }
398      static final class FailingBiConsumer implements BiConsumer<Integer, Integer> {
399 <        boolean ran;
400 <        public void accept(Integer x, Integer y) { ran = true; throw new CFException(); }
399 >        int invocationCount = 0;
400 >        public void accept(Integer x, Integer y) {
401 >            invocationCount++;
402 >            throw new CFException();
403 >        }
404      }
405      static final class FailingFunction implements Function<Integer, Integer> {
406 <        boolean ran;
407 <        public Integer apply(Integer x) { ran = true; throw new CFException(); }
406 >        int invocationCount = 0;
407 >        public Integer apply(Integer x) {
408 >            invocationCount++;
409 >            throw new CFException();
410 >        }
411      }
412      static final class FailingBiFunction implements BiFunction<Integer, Integer, Integer> {
413 <        boolean ran;
414 <        public Integer apply(Integer x, Integer y) { ran = true; throw new CFException(); }
413 >        int invocationCount = 0;
414 >        public Integer apply(Integer x, Integer y) {
415 >            invocationCount++;
416 >            throw new CFException();
417 >        }
418      }
419 <    static final class FailingNoop implements Runnable {
420 <        boolean ran;
421 <        public void run() { ran = true; throw new CFException(); }
419 >    static final class FailingRunnable implements Runnable {
420 >        int invocationCount = 0;
421 >        public void run() {
422 >            invocationCount++;
423 >            throw new CFException();
424 >        }
425      }
426  
427      static final class CompletableFutureInc
428          implements Function<Integer, CompletableFuture<Integer>> {
429 <        boolean ran;
429 >        int invocationCount = 0;
430          public CompletableFuture<Integer> apply(Integer x) {
431 <            ran = true;
431 >            invocationCount++;
432              CompletableFuture<Integer> f = new CompletableFuture<>();
433 <            f.complete(Integer.valueOf(x.intValue() + 1));
433 >            f.complete(inc(x));
434              return f;
435          }
436      }
437  
438      static final class FailingCompletableFutureFunction
439          implements Function<Integer, CompletableFuture<Integer>> {
440 <        boolean ran;
440 >        int invocationCount = 0;
441          public CompletableFuture<Integer> apply(Integer x) {
442 <            ran = true; throw new CFException();
442 >            invocationCount++;
443 >            throw new CFException();
444          }
445      }
446  
# Line 415 | Line 454 | public class CompletableFutureTest exten
454          }
455      }
456  
418    static final class ExceptionToInteger implements Function<Throwable, Integer> {
419        public Integer apply(Throwable x) { return Integer.valueOf(3); }
420    }
421
422    static final class IntegerHandler implements BiFunction<Integer, Throwable, Integer> {
423        boolean ran;
424        public Integer apply(Integer x, Throwable t) {
425            ran = true;
426            return (t == null) ? two : three;
427        }
428    }
429
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 449 | 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> CompletableFuture<Void> runAfterEither
510 +                (CompletableFuture<T> f,
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,
517 +                 CompletionStage<? extends T> g,
518 +                 Consumer<? super T> a) {
519 +                return f.acceptEither(g, a);
520 +            }
521 +            public <T,U> CompletableFuture<U> applyToEither
522 +                (CompletableFuture<T> f,
523 +                 CompletionStage<? extends T> g,
524 +                 Function<? super T,U> a) {
525 +                return f.applyToEither(g, a);
526 +            }
527          },
528  
529 < //             /** Experimental way to do more testing */
530 < //         REVERSE_DEFAULT {
531 < //             public <T,U> CompletableFuture<Void> runAfterBoth
532 < //                 (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
533 < //                 return g.runAfterBoth(f, a);
534 < //             }
535 < //             public <T,U> CompletableFuture<Void> thenAcceptBoth
536 < //                 (CompletableFuture<T> f,
537 < //                  CompletionStage<? extends U> g,
538 < //                  BiConsumer<? super T,? super U> a) {
539 < //                 return DEFAULT.thenAcceptBoth(f, g, a);
540 < //             }
541 < //         },
542 <
543 <        DEFAULT_ASYNC {
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.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.whenCompleteAsync(a);
560 >            }
561              public <T,U> CompletableFuture<Void> runAfterBoth
562                  (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
563                  return f.runAfterBothAsync(g, a);
# Line 482 | 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> CompletableFuture<Void> runAfterEither
578 +                (CompletableFuture<T> f,
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,
585 +                 CompletionStage<? extends T> g,
586 +                 Consumer<? super T> a) {
587 +                return f.acceptEitherAsync(g, a);
588 +            }
589 +            public <T,U> CompletableFuture<U> applyToEither
590 +                (CompletableFuture<T> f,
591 +                 CompletionStage<? extends T> g,
592 +                 Function<? super T,U> a) {
593 +                return f.applyToEitherAsync(g, a);
594 +            }
595          },
596  
487 //         REVERSE_DEFAULT_ASYNC {
488 //             public <T,U> CompletableFuture<Void> runAfterBoth
489 //                 (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
490 //                 return f.runAfterBothAsync(g, a);
491 //             }
492 //             public <T,U> CompletableFuture<Void> thenAcceptBoth
493 //                 (CompletableFuture<T> f,
494 //                  CompletionStage<? extends U> g,
495 //                  BiConsumer<? super T,? super U> a) {
496 //                 return DEFAULT_ASYNC.thenAcceptBoth(f, g, a);
497 //             }
498 //         },
499
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, 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, new ThreadExecutor());
627 +            }
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 514 | Line 641 | public class CompletableFutureTest exten
641                   BiFunction<? super T,? super U,? extends V> a) {
642                  return f.thenCombineAsync(g, a, new ThreadExecutor());
643              }
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> CompletableFuture<Void> acceptEither
651 +                (CompletableFuture<T> f,
652 +                 CompletionStage<? extends T> g,
653 +                 Consumer<? super T> a) {
654 +                return f.acceptEitherAsync(g, a, new ThreadExecutor());
655 +            }
656 +            public <T,U> CompletableFuture<U> applyToEither
657 +                (CompletableFuture<T> f,
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 526 | Line 687 | public class CompletableFutureTest exten
687              (CompletableFuture<T> f,
688               CompletionStage<? extends U> g,
689               BiFunction<? super T,? super U,? extends V> a);
690 +        public abstract <T> CompletableFuture<Void> runAfterEither
691 +            (CompletableFuture<T> f,
692 +             CompletionStage<?> g,
693 +             java.lang.Runnable a);
694 +        public abstract <T> CompletableFuture<Void> acceptEither
695 +            (CompletableFuture<T> f,
696 +             CompletionStage<? extends T> g,
697 +             Consumer<? super T> a);
698 +        public abstract <T,U> CompletableFuture<U> applyToEither
699 +            (CompletableFuture<T> f,
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 +
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 <        assertTrue(r.ran);
561 <        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 <        assertFalse(r.ran);
804 <        f.completeExceptionally(new CFException());
805 <        checkCompletedNormally(g, three);
806 <        assertTrue(r.ran);
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 <        assertTrue(r.ran);
574 <        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 <        assertFalse(r.ran);
832 <        f.complete(one);
833 <        assertTrue(r.ran);
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 588 | Line 912 | public class CompletableFutureTest exten
912          Noop r = new Noop();
913          CompletableFuture<Void> f = CompletableFuture.runAsync(r);
914          assertNull(f.join());
915 <        assertTrue(r.ran);
915 >        assertEquals(1, r.invocationCount);
916          checkCompletedNormally(f, null);
917      }
918  
# Line 600 | Line 924 | public class CompletableFutureTest exten
924          ThreadExecutor exec = new ThreadExecutor();
925          CompletableFuture<Void> f = CompletableFuture.runAsync(r, exec);
926          assertNull(f.join());
927 <        assertTrue(r.ran);
927 >        assertEquals(1, r.invocationCount);
928          checkCompletedNormally(f, null);
929          assertEquals(1, exec.count.get());
930      }
# Line 609 | 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 <        assertTrue(r.ran);
939 >        assertEquals(1, r.invocationCount);
940      }
941  
942      /**
# Line 642 | Line 966 | public class CompletableFutureTest exten
966          FailingSupplier r = new FailingSupplier();
967          CompletableFuture<Integer> f = CompletableFuture.supplyAsync(r);
968          checkCompletedWithWrappedCFException(f);
969 <        assertTrue(r.ran);
969 >        assertEquals(1, r.invocationCount);
970      }
971  
972      // seq completion methods
# Line 650 | 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 <        assertTrue(r.ran);
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  
664        f = new CompletableFuture<>();
665        f.complete(null);
666        g = f.thenRun(r = new Noop());
991          checkCompletedNormally(g, null);
992 <        assertTrue(r.ran);
993 <    }
992 >        checkCompletedNormally(f, v1);
993 >        assertEquals(1, r.invocationCount);
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 <        assertFalse(r.ran);
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());
1016 <        g = f.thenRun(r = new Noop());
1017 <        checkCompletedWithWrappedCFException(g);
690 <        assertFalse(r.ran);
691 <    }
1014 >        checkCompletedWithWrappedCFException(g, ex);
1015 >        checkCompletedWithWrappedCFException(f, ex);
1016 >        assertEquals(0, r.invocationCount);
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);
710 <    }
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());
728 <        checkCompletedWithWrappedCancellationException(g);
729 <    }
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() {
756 <        CompletableFuture<Integer> f = new CompletableFuture<>();
757 <        CompletableFuture<Integer> g = f.thenApply(new FailingFunction());
758 <        f.complete(one);
759 <        checkCompletedWithWrappedCFException(g);
760 <    }
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, 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 <        assertTrue(r.ran);
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 })
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();
831        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1253  
1254 <        f.complete(v1);
1255 <        checkIncomplete(h);
1256 <        assertFalse(r.ran());
1257 <        g.complete(v2);
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 <        }
1268 <    }
1267 >        assertEquals(1, r.invocationCount);
1268 >    }}
1269  
1270 <    public void testThenCombine_normalCompletion2() {
1270 >    /**
1271 >     * thenCombine result completes exceptionally after exceptional
1272 >     * completion of either source
1273 >     */
1274 >    public void testThenCombine_exceptionalCompletion() {
1275          for (ExecutionMode m : ExecutionMode.values())
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 <        for (Integer v2 : new Integer[] { 2, null }) {
848 <
1279 >    {
1280          final CompletableFuture<Integer> f = new CompletableFuture<>();
1281          final CompletableFuture<Integer> g = new CompletableFuture<>();
1282 +        final CFException ex = new CFException();
1283          final SubtractFunction r = new SubtractFunction();
1284 +
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 +        if (createIncomplete) {
1290 +            checkIncomplete(h);
1291 +            (!fFirst ? f : g).completeExceptionally(ex);
1292 +        }
1293  
1294 <        g.complete(v2);
1295 <        checkIncomplete(h);
1296 <        assertFalse(r.ran());
1297 <        f.complete(v1);
1294 >        checkCompletedWithWrappedCFException(h, ex);
1295 >        assertEquals(0, r.invocationCount);
1296 >        checkCompletedNormally(fFirst ? f : g, v1);
1297 >        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1298 >    }}
1299  
1300 <        checkCompletedNormally(h, subtract(v1, v2));
1300 >    /**
1301 >     * thenCombine result completes exceptionally if action does
1302 >     */
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 >    {
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 >        if (fFirst) {
1315 >            f.complete(v1);
1316 >            g.complete(v2);
1317 >        } else {
1318 >            g.complete(v2);
1319 >            f.complete(v1);
1320 >        }
1321 >
1322 >        checkCompletedWithWrappedCFException(h);
1323          checkCompletedNormally(f, v1);
1324          checkCompletedNormally(g, v2);
1325 <        }
863 <    }
1325 >    }}
1326  
1327 <    public void testThenCombine_normalCompletion3() {
1327 >    /**
1328 >     * thenCombine result completes exceptionally if either source cancelled
1329 >     */
1330 >    public void testThenCombine_sourceCancelled() {
1331          for (ExecutionMode m : ExecutionMode.values())
1332 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
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 <        for (Integer v2 : new Integer[] { 2, null }) {
869 <
1336 >    {
1337          final CompletableFuture<Integer> f = new CompletableFuture<>();
1338          final CompletableFuture<Integer> g = new CompletableFuture<>();
1339          final SubtractFunction r = new SubtractFunction();
1340  
1341 <        g.complete(v2);
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 <        checkCompletedNormally(h, subtract(v1, v2));
1347 <        checkCompletedNormally(f, v1);
880 <        checkCompletedNormally(g, v2);
1345 >        if (createIncomplete) {
1346 >            checkIncomplete(h);
1347 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1348          }
882    }
1349  
1350 <    public void testThenCombine_normalCompletion4() {
1350 >        checkCompletedWithWrappedCancellationException(h);
1351 >        checkCancelled(!fFirst ? f : g);
1352 >        assertEquals(0, r.invocationCount);
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_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 SubtractFunction r = new SubtractFunction();
1369 >        final SubtractAction r = new SubtractAction();
1370  
1371 <        f.complete(v1);
1372 <        g.complete(v2);
1373 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
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 >        if (createIncomplete) {
1376 >            checkIncomplete(h);
1377 >            assertEquals(0, r.invocationCount);
1378 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1379 >        }
1380  
1381 <        checkCompletedNormally(h, subtract(v1, v2));
1381 >        checkCompletedNormally(h, null);
1382 >        assertEquals(subtract(v1, v2), r.value);
1383          checkCompletedNormally(f, v1);
1384          checkCompletedNormally(g, v2);
1385 <        }
901 <    }
1385 >    }}
1386  
1387      /**
1388 <     * thenCombine result completes exceptionally after exceptional
1388 >     * thenAcceptBoth result completes exceptionally after exceptional
1389       * completion of either source
1390       */
1391 <    public void testThenCombine_exceptionalCompletion1() {
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<>();
913        final SubtractFunction r = new SubtractFunction();
914        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1399          final CFException ex = new CFException();
1400 +        final SubtractAction r = new SubtractAction();
1401  
1402 <        f.completeExceptionally(ex);
1403 <        checkIncomplete(h);
1404 <        g.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 >        if (createIncomplete) {
1407 >            checkIncomplete(h);
1408 >            (!fFirst ? f : g).completeExceptionally(ex);
1409 >        }
1410  
1411          checkCompletedWithWrappedCFException(h, ex);
1412 <        checkCompletedWithWrappedCFException(f, ex);
1413 <        assertFalse(r.ran());
1414 <        checkCompletedNormally(g, v1);
1415 <        }
926 <    }
1412 >        assertEquals(0, r.invocationCount);
1413 >        checkCompletedNormally(fFirst ? f : g, v1);
1414 >        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1415 >    }}
1416  
1417 <    public void testThenCombine_exceptionalCompletion2() {
1417 >    /**
1418 >     * thenAcceptBoth result completes exceptionally if action does
1419 >     */
1420 >    public void testThenAcceptBoth_actionFailed() {
1421          for (ExecutionMode m : ExecutionMode.values())
1422 <        for (Integer v1 : new Integer[] { 1, null }) {
1423 <
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 >    {
1426          final CompletableFuture<Integer> f = new CompletableFuture<>();
1427          final CompletableFuture<Integer> g = new CompletableFuture<>();
1428 <        final SubtractFunction r = new SubtractFunction();
1429 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
936 <        final CFException ex = new CFException();
1428 >        final FailingBiConsumer r = new FailingBiConsumer();
1429 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1430  
1431 <        g.completeExceptionally(ex);
1432 <        checkIncomplete(h);
1433 <        f.complete(v1);
1431 >        if (fFirst) {
1432 >            f.complete(v1);
1433 >            g.complete(v2);
1434 >        } else {
1435 >            g.complete(v2);
1436 >            f.complete(v1);
1437 >        }
1438  
1439 <        checkCompletedWithWrappedCFException(h, ex);
943 <        checkCompletedWithWrappedCFException(g, ex);
944 <        assertFalse(r.ran());
1439 >        checkCompletedWithWrappedCFException(h);
1440          checkCompletedNormally(f, v1);
1441 <        }
1442 <    }
1441 >        checkCompletedNormally(g, v2);
1442 >    }}
1443  
1444 <    public void testThenCombine_exceptionalCompletion3() {
1444 >    /**
1445 >     * thenAcceptBoth result completes exceptionally if either source cancelled
1446 >     */
1447 >    public void testThenAcceptBoth_sourceCancelled() {
1448          for (ExecutionMode m : ExecutionMode.values())
1449 <        for (Integer v1 : new Integer[] { 1, null }) {
1449 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
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 +        (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 +        if (createIncomplete) {
1463 +            checkIncomplete(h);
1464 +            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1465 +        }
1466 +
1467 +        checkCompletedWithWrappedCancellationException(h);
1468 +        checkCancelled(!fFirst ? f : g);
1469 +        assertEquals(0, r.invocationCount);
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_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 +    {
1484          final CompletableFuture<Integer> f = new CompletableFuture<>();
1485          final CompletableFuture<Integer> g = new CompletableFuture<>();
1486 <        final SubtractFunction r = new SubtractFunction();
956 <        final CFException ex = new CFException();
1486 >        final Noop r = new Noop();
1487  
1488 <        g.completeExceptionally(ex);
1489 <        f.complete(v1);
1490 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
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 >        if (createIncomplete) {
1493 >            checkIncomplete(h);
1494 >            assertEquals(0, r.invocationCount);
1495 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1496 >        }
1497  
1498 <        checkCompletedWithWrappedCFException(h, ex);
1499 <        checkCompletedWithWrappedCFException(g, ex);
964 <        assertFalse(r.ran());
1498 >        checkCompletedNormally(h, null);
1499 >        assertEquals(1, r.invocationCount);
1500          checkCompletedNormally(f, v1);
1501 <        }
1502 <    }
1501 >        checkCompletedNormally(g, v2);
1502 >    }}
1503  
1504 <    public void testThenCombine_exceptionalCompletion4() {
1504 >    /**
1505 >     * runAfterBoth result completes exceptionally after exceptional
1506 >     * completion of either source
1507 >     */
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<>();
975        final SubtractFunction r = new SubtractFunction();
1516          final CFException ex = new CFException();
1517 +        final Noop r = new Noop();
1518  
1519 <        f.completeExceptionally(ex);
1520 <        g.complete(v1);
1521 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
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 >        if (createIncomplete) {
1524 >            checkIncomplete(h);
1525 >            (!fFirst ? f : g).completeExceptionally(ex);
1526 >        }
1527  
1528          checkCompletedWithWrappedCFException(h, ex);
1529 <        checkCompletedWithWrappedCFException(f, ex);
1530 <        assertFalse(r.ran());
1531 <        checkCompletedNormally(g, v1);
1532 <        }
987 <    }
1529 >        assertEquals(0, r.invocationCount);
1530 >        checkCompletedNormally(fFirst ? f : g, v1);
1531 >        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1532 >    }}
1533  
1534      /**
1535 <     * thenCombine result completes exceptionally if action does
1535 >     * runAfterBoth result completes exceptionally if action does
1536       */
1537 <    public void testThenCombine_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 FailingBiFunction r = new FailingBiFunction();
1000 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1545 >        final FailingRunnable r = new FailingRunnable();
1546  
1547 <        f.complete(v1);
1548 <        checkIncomplete(h);
1549 <        g.complete(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 >        CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r);
1556  
1557 <        checkCompletedWithWrappedCFException(h);
1557 >        checkCompletedWithWrappedCFException(h1);
1558 >        checkCompletedWithWrappedCFException(h2);
1559          checkCompletedNormally(f, v1);
1560          checkCompletedNormally(g, v2);
1561 <        }
1010 <    }
1561 >    }}
1562  
1563 <    public void testThenCombine_actionFailed2() {
1563 >    /**
1564 >     * runAfterBoth result completes exceptionally if either source cancelled
1565 >     */
1566 >    public void testRunAfterBoth_sourceCancelled() {
1567          for (ExecutionMode m : ExecutionMode.values())
1568 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
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 <        for (Integer v2 : new Integer[] { 2, null }) {
1016 <
1572 >    {
1573          final CompletableFuture<Integer> f = new CompletableFuture<>();
1574          final CompletableFuture<Integer> g = new CompletableFuture<>();
1575 <        final FailingBiFunction r = new FailingBiFunction();
1020 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1575 >        final Noop r = new Noop();
1576  
1022        g.complete(v2);
1023        checkIncomplete(h);
1024        f.complete(v1);
1577  
1578 <        checkCompletedWithWrappedCFException(h);
1579 <        checkCompletedNormally(f, v1);
1580 <        checkCompletedNormally(g, v2);
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 >        if (createIncomplete) {
1583 >            checkIncomplete(h);
1584 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1585          }
1586 <    }
1586 >
1587 >        checkCompletedWithWrappedCancellationException(h);
1588 >        checkCancelled(!fFirst ? f : g);
1589 >        assertEquals(0, r.invocationCount);
1590 >        checkCompletedNormally(fFirst ? f : g, v1);
1591 >    }}
1592  
1593      /**
1594 <     * thenCombine result completes exceptionally if either source cancelled
1594 >     * applyToEither result completes normally after normal completion
1595 >     * of either source
1596       */
1597 <    public void testThenCombine_sourceCancelled1() {
1597 >    public void testApplyToEither_normalCompletion() {
1598          for (ExecutionMode m : ExecutionMode.values())
1599 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1600 <        for (Integer v1 : new Integer[] { 1, null }) {
1601 <
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 >    {
1604          final CompletableFuture<Integer> f = new CompletableFuture<>();
1605          final CompletableFuture<Integer> g = new CompletableFuture<>();
1606 <        final SubtractFunction r = new SubtractFunction();
1043 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1044 <
1045 <        assertTrue(f.cancel(mayInterruptIfRunning));
1046 <        checkIncomplete(h);
1047 <        g.complete(v1);
1606 >        final IncFunction r = new IncFunction();
1607  
1608 <        checkCompletedWithWrappedCancellationException(h);
1609 <        checkCancelled(f);
1610 <        assertFalse(r.ran());
1611 <        checkCompletedNormally(g, v1);
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 <    }
1616 >        checkCompletedNormally(h, inc(fFirst ? v1 : v2));
1617 >        if (!fFirst) f.complete(v1); else g.complete(v2);
1618  
1619 <    public void testThenCombine_sourceCancelled2() {
1620 <        for (ExecutionMode m : ExecutionMode.values())
1621 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1622 <        for (Integer v1 : new Integer[] { 1, null }) {
1619 >        checkCompletedNormally(f, v1);
1620 >        checkCompletedNormally(g, v2);
1621 >        checkCompletedNormally(h, inc(fFirst ? v1 : v2));
1622 >    }}
1623  
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 +    {
1630          final CompletableFuture<Integer> f = new CompletableFuture<>();
1631          final CompletableFuture<Integer> g = new CompletableFuture<>();
1632 <        final SubtractFunction r = new SubtractFunction();
1064 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1632 >        final IncFunction r = new IncFunction();
1633  
1634 <        assertTrue(g.cancel(mayInterruptIfRunning));
1635 <        checkIncomplete(h);
1636 <        f.complete(v1);
1634 >        if (fFirst) {
1635 >            f.complete(v1);
1636 >            g.complete(v2);
1637 >        } else {
1638 >            g.complete(v2);
1639 >            f.complete(v1);
1640 >        }
1641 >
1642 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1643  
1070        checkCompletedWithWrappedCancellationException(h);
1071        checkCancelled(g);
1072        assertFalse(r.ran());
1644          checkCompletedNormally(f, v1);
1645 <        }
1075 <    }
1645 >        checkCompletedNormally(g, v2);
1646  
1647 <    public void testThenCombine_sourceCancelled3() {
1648 <        for (ExecutionMode m : ExecutionMode.values())
1649 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1650 <        for (Integer v1 : new Integer[] { 1, null }) {
1647 >        // unspecified behavior
1648 >        assertTrue(Objects.equals(h.join(), inc(v1)) ||
1649 >                   Objects.equals(h.join(), inc(v2)));
1650 >        assertEquals(1, r.invocationCount);
1651 >    }}
1652  
1653 +    /**
1654 +     * applyToEither result completes exceptionally after exceptional
1655 +     * completion of either source
1656 +     */
1657 +    public void testApplyToEither_exceptionalCompletion1() {
1658 +        for (ExecutionMode m : ExecutionMode.values())
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 SubtractFunction r = new SubtractFunction();
1666 <
1086 <        assertTrue(g.cancel(mayInterruptIfRunning));
1087 <        f.complete(v1);
1088 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1665 >        final CFException ex = new CFException();
1666 >        final IncFunction r = new IncFunction();
1667  
1668 <        checkCompletedWithWrappedCancellationException(h);
1669 <        checkCancelled(g);
1670 <        assertFalse(r.ran());
1671 <        checkCompletedNormally(f, v1);
1668 >        if (!createIncomplete) (fFirst ? f : g).completeExceptionally(ex);
1669 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1670 >        if (createIncomplete) {
1671 >            checkIncomplete(h);
1672 >            assertEquals(0, r.invocationCount);
1673 >            (fFirst ? f : g).completeExceptionally(ex);
1674          }
1095    }
1675  
1676 <    public void testThenCombine_sourceCancelled4() {
1677 <        for (ExecutionMode m : ExecutionMode.values())
1099 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1100 <        for (Integer v1 : new Integer[] { 1, null }) {
1676 >        checkCompletedWithWrappedCFException(h, ex);
1677 >        (!fFirst ? f : g).complete(v1);
1678  
1679 +        assertEquals(0, r.invocationCount);
1680 +        checkCompletedNormally(!fFirst ? f : g, v1);
1681 +        checkCompletedWithWrappedCFException(fFirst ? f : g, ex);
1682 +        checkCompletedWithWrappedCFException(h, ex);
1683 +    }}
1684 +
1685 +    public void testApplyToEither_exceptionalCompletion2() {
1686 +        for (ExecutionMode m : ExecutionMode.values())
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 SubtractFunction r = new SubtractFunction();
1694 <
1695 <        assertTrue(f.cancel(mayInterruptIfRunning));
1696 <        g.complete(v1);
1697 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1693 >        final IncFunction r1 = new IncFunction();
1694 >        final IncFunction r2 = new IncFunction();
1695 >        final CFException ex = new CFException();
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 >        final CompletableFuture<Integer> h2 = m.applyToEither(j, k, r2);
1707 >
1708 >        // unspecified behavior
1709 >        try {
1710 >            assertEquals(inc(v1), h1.join());
1711 >            assertEquals(1, r1.invocationCount);
1712 >        } catch (CompletionException ok) {
1713 >            checkCompletedWithWrappedCFException(h1, ex);
1714 >            assertEquals(0, r1.invocationCount);
1715 >        }
1716  
1717 <        checkCompletedWithWrappedCancellationException(h);
1718 <        checkCancelled(f);
1719 <        assertFalse(r.ran());
1720 <        checkCompletedNormally(g, v1);
1717 >        try {
1718 >            assertEquals(inc(v1), h2.join());
1719 >            assertEquals(1, r2.invocationCount);
1720 >        } catch (CompletionException ok) {
1721 >            checkCompletedWithWrappedCFException(h2, ex);
1722 >            assertEquals(0, r2.invocationCount);
1723          }
1724 <    }
1724 >
1725 >        checkCompletedWithWrappedCFException(g, ex);
1726 >        checkCompletedNormally(f, v1);
1727 >    }}
1728  
1729      /**
1730 <     * thenAcceptBoth result completes normally after normal
1119 <     * completion of sources
1730 >     * applyToEither result completes exceptionally if action does
1731       */
1732 <    public void testThenAcceptBoth_normalCompletion1() {
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 SubtractAction r = new SubtractAction();
1740 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1739 >        final FailingFunction r = new FailingFunction();
1740 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1741  
1742          f.complete(v1);
1743 <        checkIncomplete(h);
1133 <        assertFalse(r.ran());
1743 >        checkCompletedWithWrappedCFException(h);
1744          g.complete(v2);
1745 +        checkCompletedNormally(f, v1);
1746 +        checkCompletedNormally(g, v2);
1747 +    }}
1748  
1749 <        checkCompletedNormally(h, null);
1750 <        assertEquals(r.value, subtract(v1, v2));
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 >    {
1754 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1755 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1756 >        final FailingFunction r = new FailingFunction();
1757 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1758 >
1759 >        g.complete(v2);
1760 >        checkCompletedWithWrappedCFException(h);
1761 >        f.complete(v1);
1762          checkCompletedNormally(f, v1);
1763          checkCompletedNormally(g, v2);
1764 +    }}
1765 +
1766 +    /**
1767 +     * applyToEither result completes exceptionally if either source cancelled
1768 +     */
1769 +    public void testApplyToEither_sourceCancelled1() {
1770 +        for (ExecutionMode m : ExecutionMode.values())
1771 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
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          }
1141    }
1787  
1788 <    public void testThenAcceptBoth_normalCompletion2() {
1788 >        checkCompletedWithWrappedCancellationException(h);
1789 >        (!fFirst ? f : g).complete(v1);
1790 >
1791 >        assertEquals(0, r.invocationCount);
1792 >        checkCompletedNormally(!fFirst ? f : g, v1);
1793 >        checkCancelled(fFirst ? f : g);
1794 >        checkCompletedWithWrappedCancellationException(h);
1795 >    }}
1796 >
1797 >    public void testApplyToEither_sourceCancelled2() {
1798          for (ExecutionMode m : ExecutionMode.values())
1799 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
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 <        for (Integer v2 : new Integer[] { 2, null }) {
1803 >    {
1804 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1805 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
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 >        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 >        final CompletableFuture<Integer> h2 = m.applyToEither(j, k, r2);
1821 >
1822 >        // unspecified behavior
1823 >        try {
1824 >            assertEquals(inc(v1), h1.join());
1825 >            assertEquals(1, r1.invocationCount);
1826 >        } catch (CompletionException ok) {
1827 >            checkCompletedWithWrappedCancellationException(h1);
1828 >            assertEquals(0, r1.invocationCount);
1829 >        }
1830 >
1831 >        try {
1832 >            assertEquals(inc(v1), h2.join());
1833 >            assertEquals(1, r2.invocationCount);
1834 >        } catch (CompletionException ok) {
1835 >            checkCompletedWithWrappedCancellationException(h2);
1836 >            assertEquals(0, r2.invocationCount);
1837 >        }
1838 >
1839 >        checkCancelled(g);
1840 >        checkCompletedNormally(f, v1);
1841 >    }}
1842  
1843 +    /**
1844 +     * acceptEither result completes normally after normal completion
1845 +     * of either source
1846 +     */
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 +    {
1852          final CompletableFuture<Integer> f = new CompletableFuture<>();
1853          final CompletableFuture<Integer> g = new CompletableFuture<>();
1854 <        final SubtractAction r = new SubtractAction();
1855 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1854 >        final IncAction r = new IncAction();
1855 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
1856  
1153        g.complete(v2);
1154        checkIncomplete(h);
1155        assertFalse(r.ran());
1857          f.complete(v1);
1157
1858          checkCompletedNormally(h, null);
1859 <        assertEquals(r.value, subtract(v1, v2));
1859 >        assertEquals(inc(v1), r.value);
1860 >        g.complete(v2);
1861 >
1862          checkCompletedNormally(f, v1);
1863          checkCompletedNormally(g, v2);
1864 <        }
1865 <    }
1864 >        checkCompletedNormally(h, null);
1865 >    }}
1866  
1867 <    public void testThenAcceptBoth_normalCompletion3() {
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 SubtractAction r = new SubtractAction();
1874 >        final IncAction r = new IncAction();
1875 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
1876  
1877          g.complete(v2);
1878 +        checkCompletedNormally(h, null);
1879 +        assertEquals(inc(v2), r.value);
1880          f.complete(v1);
1176        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1881  
1178        checkCompletedNormally(h, null);
1179        assertEquals(r.value, subtract(v1, v2));
1882          checkCompletedNormally(f, v1);
1883          checkCompletedNormally(g, v2);
1884 <        }
1885 <    }
1884 >        checkCompletedNormally(h, null);
1885 >    }}
1886  
1887 <    public void testThenAcceptBoth_normalCompletion4() {
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 SubtractAction r = new SubtractAction();
1894 >        final IncAction r = new IncAction();
1895  
1896          f.complete(v1);
1897          g.complete(v2);
1898 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1898 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
1899  
1900          checkCompletedNormally(h, null);
1199        assertEquals(r.value, subtract(v1, v2));
1901          checkCompletedNormally(f, v1);
1902          checkCompletedNormally(g, v2);
1903 <        }
1904 <    }
1903 >
1904 >        // unspecified behavior
1905 >        assertTrue(Objects.equals(r.value, inc(v1)) ||
1906 >                   Objects.equals(r.value, inc(v2)));
1907 >    }}
1908  
1909      /**
1910 <     * thenAcceptBoth result completes exceptionally after exceptional
1910 >     * acceptEither result completes exceptionally after exceptional
1911       * completion of either source
1912       */
1913 <    public void testThenAcceptBoth_exceptionalCompletion1() {
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 SubtractAction r = new SubtractAction();
1920 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1919 >        final IncAction r = new IncAction();
1920 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
1921          final CFException ex = new CFException();
1922  
1923          f.completeExceptionally(ex);
1924 <        checkIncomplete(h);
1924 >        checkCompletedWithWrappedCFException(h, ex);
1925          g.complete(v1);
1926  
1927 <        checkCompletedWithWrappedCFException(h, ex);
1224 <        checkCompletedWithWrappedCFException(f, ex);
1225 <        assertFalse(r.ran());
1927 >        assertEquals(0, r.invocationCount);
1928          checkCompletedNormally(g, v1);
1929 <        }
1930 <    }
1929 >        checkCompletedWithWrappedCFException(f, ex);
1930 >        checkCompletedWithWrappedCFException(h, ex);
1931 >    }}
1932  
1933 <    public void testThenAcceptBoth_exceptionalCompletion2() {
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 SubtractAction r = new SubtractAction();
1940 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1939 >        final IncAction r = new IncAction();
1940 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
1941          final CFException ex = new CFException();
1942  
1943          g.completeExceptionally(ex);
1944 <        checkIncomplete(h);
1944 >        checkCompletedWithWrappedCFException(h, ex);
1945          f.complete(v1);
1946  
1947 <        checkCompletedWithWrappedCFException(h, ex);
1245 <        checkCompletedWithWrappedCFException(g, ex);
1246 <        assertFalse(r.ran());
1947 >        assertEquals(0, r.invocationCount);
1948          checkCompletedNormally(f, v1);
1949 <        }
1950 <    }
1949 >        checkCompletedWithWrappedCFException(g, ex);
1950 >        checkCompletedWithWrappedCFException(h, ex);
1951 >    }}
1952  
1953 <    public void testThenAcceptBoth_exceptionalCompletion3() {
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 SubtractAction r = new SubtractAction();
1959 >        final IncAction r = new IncAction();
1960          final CFException ex = new CFException();
1961  
1962          g.completeExceptionally(ex);
1963          f.complete(v1);
1964 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1964 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
1965 >
1966 >        // unspecified behavior
1967 >        Integer v;
1968 >        try {
1969 >            assertNull(h.join());
1970 >            assertEquals(1, r.invocationCount);
1971 >            assertEquals(inc(v1), r.value);
1972 >        } catch (CompletionException ok) {
1973 >            checkCompletedWithWrappedCFException(h, ex);
1974 >            assertEquals(0, r.invocationCount);
1975 >        }
1976  
1264        checkCompletedWithWrappedCFException(h, ex);
1977          checkCompletedWithWrappedCFException(g, ex);
1266        assertFalse(r.ran());
1978          checkCompletedNormally(f, v1);
1979 <        }
1269 <    }
1979 >    }}
1980  
1981 <    public void testThenAcceptBoth_exceptionalCompletion4() {
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 SubtractAction r = new SubtractAction();
1987 >        final IncAction r = new IncAction();
1988          final CFException ex = new CFException();
1989  
1990          f.completeExceptionally(ex);
1991          g.complete(v1);
1992 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1992 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
1993 >
1994 >        // unspecified behavior
1995 >        Integer v;
1996 >        try {
1997 >            assertNull(h.join());
1998 >            assertEquals(1, r.invocationCount);
1999 >            assertEquals(inc(v1), r.value);
2000 >        } catch (CompletionException ok) {
2001 >            checkCompletedWithWrappedCFException(h, ex);
2002 >            assertEquals(0, r.invocationCount);
2003 >        }
2004  
1284        checkCompletedWithWrappedCFException(h, ex);
2005          checkCompletedWithWrappedCFException(f, ex);
1286        assertFalse(r.ran());
2006          checkCompletedNormally(g, v1);
2007 <        }
1289 <    }
2007 >    }}
2008  
2009      /**
2010 <     * thenAcceptBoth result completes exceptionally if action does
2010 >     * acceptEither result completes exceptionally if action does
2011       */
2012 <    public void testThenAcceptBoth_actionFailed1() {
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 FailingBiConsumer r = new FailingBiConsumer();
2020 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
2019 >        final FailingConsumer r = new FailingConsumer();
2020 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2021  
2022          f.complete(v1);
1305        checkIncomplete(h);
1306        g.complete(v2);
1307
2023          checkCompletedWithWrappedCFException(h);
2024 +        g.complete(v2);
2025          checkCompletedNormally(f, v1);
2026          checkCompletedNormally(g, v2);
2027 <        }
1312 <    }
2027 >    }}
2028  
2029 <    public void testThenAcceptBoth_actionFailed2() {
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 FailingBiConsumer r = new FailingBiConsumer();
2037 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
2036 >        final FailingConsumer r = new FailingConsumer();
2037 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2038  
2039          g.complete(v2);
1325        checkIncomplete(h);
1326        f.complete(v1);
1327
2040          checkCompletedWithWrappedCFException(h);
2041 +        f.complete(v1);
2042          checkCompletedNormally(f, v1);
2043          checkCompletedNormally(g, v2);
2044 <        }
1332 <    }
2044 >    }}
2045  
2046      /**
2047 <     * thenAcceptBoth result completes exceptionally if either source cancelled
2047 >     * acceptEither result completes exceptionally if either source cancelled
2048       */
2049 <    public void testThenAcceptBoth_sourceCancelled1() {
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 SubtractAction r = new SubtractAction();
2057 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
2056 >        final IncAction r = new IncAction();
2057 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2058  
2059          assertTrue(f.cancel(mayInterruptIfRunning));
2060 <        checkIncomplete(h);
2060 >        checkCompletedWithWrappedCancellationException(h);
2061          g.complete(v1);
2062  
1351        checkCompletedWithWrappedCancellationException(h);
2063          checkCancelled(f);
2064 <        assertFalse(r.ran());
2064 >        assertEquals(0, r.invocationCount);
2065          checkCompletedNormally(g, v1);
2066 <        }
2067 <    }
2066 >        checkCompletedWithWrappedCancellationException(h);
2067 >    }}
2068  
2069 <    public void testThenAcceptBoth_sourceCancelled2() {
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 SubtractAction r = new SubtractAction();
2077 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
2076 >        final IncAction r = new IncAction();
2077 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2078  
2079          assertTrue(g.cancel(mayInterruptIfRunning));
2080 <        checkIncomplete(h);
2080 >        checkCompletedWithWrappedCancellationException(h);
2081          f.complete(v1);
2082  
1372        checkCompletedWithWrappedCancellationException(h);
2083          checkCancelled(g);
2084 <        assertFalse(r.ran());
2084 >        assertEquals(0, r.invocationCount);
2085          checkCompletedNormally(f, v1);
2086 <        }
2087 <    }
2086 >        checkCompletedWithWrappedCancellationException(h);
2087 >    }}
2088  
2089 <    public void testThenAcceptBoth_sourceCancelled3() {
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 SubtractAction r = new SubtractAction();
2096 >        final IncAction r = new IncAction();
2097  
2098          assertTrue(g.cancel(mayInterruptIfRunning));
2099          f.complete(v1);
2100 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
2100 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2101 >
2102 >        // unspecified behavior
2103 >        Integer v;
2104 >        try {
2105 >            assertNull(h.join());
2106 >            assertEquals(1, r.invocationCount);
2107 >            assertEquals(inc(v1), r.value);
2108 >        } catch (CompletionException ok) {
2109 >            checkCompletedWithWrappedCancellationException(h);
2110 >            assertEquals(0, r.invocationCount);
2111 >        }
2112  
1392        checkCompletedWithWrappedCancellationException(h);
2113          checkCancelled(g);
1394        assertFalse(r.ran());
2114          checkCompletedNormally(f, v1);
2115 <        }
1397 <    }
2115 >    }}
2116  
2117 <    public void testThenAcceptBoth_sourceCancelled4() {
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 SubtractAction r = new SubtractAction();
2124 >        final IncAction r = new IncAction();
2125  
2126          assertTrue(f.cancel(mayInterruptIfRunning));
2127          g.complete(v1);
2128 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
2128 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2129 >
2130 >        // unspecified behavior
2131 >        Integer v;
2132 >        try {
2133 >            assertNull(h.join());
2134 >            assertEquals(1, r.invocationCount);
2135 >            assertEquals(inc(v1), r.value);
2136 >        } catch (CompletionException ok) {
2137 >            checkCompletedWithWrappedCancellationException(h);
2138 >            assertEquals(0, r.invocationCount);
2139 >        }
2140  
1412        checkCompletedWithWrappedCancellationException(h);
2141          checkCancelled(f);
1414        assertFalse(r.ran());
2142          checkCompletedNormally(g, v1);
2143 <        }
1417 <    }
2143 >    }}
2144  
2145      /**
2146 <     * runAfterBoth result completes normally after normal
2147 <     * completion of sources
2146 >     * runAfterEither result completes normally after normal completion
2147 >     * of either source
2148       */
2149 <    public void testRunAfterBoth_normalCompletion1() {
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();
2157 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2157 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2158  
2159          f.complete(v1);
1434        checkIncomplete(h);
1435        assertFalse(r.ran);
1436        g.complete(v2);
1437
2160          checkCompletedNormally(h, null);
2161 <        assertTrue(r.ran);
1440 <        checkCompletedNormally(f, v1);
1441 <        checkCompletedNormally(g, v2);
1442 <        }
1443 <    }
1444 <
1445 <    public void testRunAfterBoth_normalCompletion2() {
1446 <        for (ExecutionMode m : ExecutionMode.values())
1447 <        for (Integer v1 : new Integer[] { 1, null })
1448 <        for (Integer v2 : new Integer[] { 2, null }) {
1449 <
1450 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1451 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1452 <        final Noop r = new Noop();
1453 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1454 <
2161 >        assertEquals(1, r.invocationCount);
2162          g.complete(v2);
1456        checkIncomplete(h);
1457        assertFalse(r.ran);
1458        f.complete(v1);
2163  
1460        checkCompletedNormally(h, null);
1461        assertTrue(r.ran);
2164          checkCompletedNormally(f, v1);
2165          checkCompletedNormally(g, v2);
2166 <        }
2167 <    }
2166 >        checkCompletedNormally(h, null);
2167 >        assertEquals(1, r.invocationCount);
2168 >    }}
2169  
2170 <    public void testRunAfterBoth_normalCompletion3() {
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();
2178 +        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2179  
2180          g.complete(v2);
2181 +        checkCompletedNormally(h, null);
2182 +        assertEquals(1, r.invocationCount);
2183          f.complete(v1);
1478        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2184  
1480        checkCompletedNormally(h, null);
1481        assertTrue(r.ran);
2185          checkCompletedNormally(f, v1);
2186          checkCompletedNormally(g, v2);
2187 <        }
2188 <    }
2187 >        checkCompletedNormally(h, null);
2188 >        assertEquals(1, r.invocationCount);
2189 >        }}
2190  
2191 <    public void testRunAfterBoth_normalCompletion4() {
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();
2199  
2200          f.complete(v1);
2201          g.complete(v2);
2202 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2202 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2203  
2204          checkCompletedNormally(h, null);
1501        assertTrue(r.ran);
2205          checkCompletedNormally(f, v1);
2206          checkCompletedNormally(g, v2);
2207 <        }
2208 <    }
2207 >        assertEquals(1, r.invocationCount);
2208 >    }}
2209  
2210      /**
2211 <     * runAfterBoth result completes exceptionally after exceptional
2211 >     * runAfterEither result completes exceptionally after exceptional
2212       * completion of either source
2213       */
2214 <    public void testRunAfterBoth_exceptionalCompletion1() {
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();
2221 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2221 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2222          final CFException ex = new CFException();
2223  
2224          f.completeExceptionally(ex);
2225 <        checkIncomplete(h);
2225 >        checkCompletedWithWrappedCFException(h, ex);
2226          g.complete(v1);
2227  
2228 <        checkCompletedWithWrappedCFException(h, ex);
1526 <        checkCompletedWithWrappedCFException(f, ex);
1527 <        assertFalse(r.ran);
2228 >        assertEquals(0, r.invocationCount);
2229          checkCompletedNormally(g, v1);
2230 <        }
2231 <    }
2230 >        checkCompletedWithWrappedCFException(f, ex);
2231 >        checkCompletedWithWrappedCFException(h, ex);
2232 >    }}
2233  
2234 <    public void testRunAfterBoth_exceptionalCompletion2() {
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();
2241 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2241 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2242          final CFException ex = new CFException();
2243  
2244          g.completeExceptionally(ex);
2245 <        checkIncomplete(h);
2245 >        checkCompletedWithWrappedCFException(h, ex);
2246          f.complete(v1);
2247  
2248 <        checkCompletedWithWrappedCFException(h, ex);
1547 <        checkCompletedWithWrappedCFException(g, ex);
1548 <        assertFalse(r.ran);
2248 >        assertEquals(0, r.invocationCount);
2249          checkCompletedNormally(f, v1);
2250 <        }
2251 <    }
2250 >        checkCompletedWithWrappedCFException(g, ex);
2251 >        checkCompletedWithWrappedCFException(h, ex);
2252 >    }}
2253  
2254 <    public void testRunAfterBoth_exceptionalCompletion3() {
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 1561 | Line 2262 | public class CompletableFutureTest exten
2262  
2263          g.completeExceptionally(ex);
2264          f.complete(v1);
2265 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2265 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2266 >
2267 >        // unspecified behavior
2268 >        Integer v;
2269 >        try {
2270 >            assertNull(h.join());
2271 >            assertEquals(1, r.invocationCount);
2272 >        } catch (CompletionException ok) {
2273 >            checkCompletedWithWrappedCFException(h, ex);
2274 >            assertEquals(0, r.invocationCount);
2275 >        }
2276  
1566        checkCompletedWithWrappedCFException(h, ex);
2277          checkCompletedWithWrappedCFException(g, ex);
1568        assertFalse(r.ran);
2278          checkCompletedNormally(f, v1);
2279 <        }
1571 <    }
2279 >    }}
2280  
2281 <    public void testRunAfterBoth_exceptionalCompletion4() {
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 1581 | Line 2289 | public class CompletableFutureTest exten
2289  
2290          f.completeExceptionally(ex);
2291          g.complete(v1);
2292 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2292 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2293 >
2294 >        // unspecified behavior
2295 >        Integer v;
2296 >        try {
2297 >            assertNull(h.join());
2298 >            assertEquals(1, r.invocationCount);
2299 >        } catch (CompletionException ok) {
2300 >            checkCompletedWithWrappedCFException(h, ex);
2301 >            assertEquals(0, r.invocationCount);
2302 >        }
2303  
1586        checkCompletedWithWrappedCFException(h, ex);
2304          checkCompletedWithWrappedCFException(f, ex);
1588        assertFalse(r.ran);
2305          checkCompletedNormally(g, v1);
2306 <        }
1591 <    }
2306 >    }}
2307  
2308      /**
2309 <     * runAfterBoth result completes exceptionally if action does
2309 >     * runAfterEither result completes exceptionally if action does
2310       */
2311 <    public void testRunAfterBoth_actionFailed1() {
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();
2319 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2318 >        final FailingRunnable r = new FailingRunnable();
2319 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2320  
2321          f.complete(v1);
1607        checkIncomplete(h);
1608        g.complete(v2);
1609
2322          checkCompletedWithWrappedCFException(h);
2323 +        g.complete(v2);
2324          checkCompletedNormally(f, v1);
2325          checkCompletedNormally(g, v2);
2326 <        }
1614 <    }
2326 >    }}
2327  
2328 <    public void testRunAfterBoth_actionFailed2() {
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();
2336 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2335 >        final FailingRunnable r = new FailingRunnable();
2336 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2337  
2338          g.complete(v2);
1627        checkIncomplete(h);
1628        f.complete(v1);
1629
2339          checkCompletedWithWrappedCFException(h);
2340 +        f.complete(v1);
2341          checkCompletedNormally(f, v1);
2342          checkCompletedNormally(g, v2);
2343 <        }
1634 <    }
2343 >    }}
2344  
2345      /**
2346 <     * runAfterBoth result completes exceptionally if either source cancelled
2346 >     * runAfterEither result completes exceptionally if either source cancelled
2347       */
2348 <    public void testRunAfterBoth_sourceCancelled1() {
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();
2356 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2356 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2357  
2358          assertTrue(f.cancel(mayInterruptIfRunning));
2359 <        checkIncomplete(h);
2359 >        checkCompletedWithWrappedCancellationException(h);
2360          g.complete(v1);
2361  
1653        checkCompletedWithWrappedCancellationException(h);
2362          checkCancelled(f);
2363 <        assertFalse(r.ran);
2363 >        assertEquals(0, r.invocationCount);
2364          checkCompletedNormally(g, v1);
2365 <        }
2366 <    }
2365 >        checkCompletedWithWrappedCancellationException(h);
2366 >    }}
2367  
2368 <    public void testRunAfterBoth_sourceCancelled2() {
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();
2376 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2376 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2377  
2378          assertTrue(g.cancel(mayInterruptIfRunning));
2379 <        checkIncomplete(h);
2379 >        checkCompletedWithWrappedCancellationException(h);
2380          f.complete(v1);
2381  
1674        checkCompletedWithWrappedCancellationException(h);
2382          checkCancelled(g);
2383 <        assertFalse(r.ran);
2383 >        assertEquals(0, r.invocationCount);
2384          checkCompletedNormally(f, v1);
2385 <        }
2386 <    }
2385 >        checkCompletedWithWrappedCancellationException(h);
2386 >    }}
2387  
2388 <    public void testRunAfterBoth_sourceCancelled3() {
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();
2396  
2397          assertTrue(g.cancel(mayInterruptIfRunning));
2398          f.complete(v1);
2399 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2399 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2400 >
2401 >        // unspecified behavior
2402 >        Integer v;
2403 >        try {
2404 >            assertNull(h.join());
2405 >            assertEquals(1, r.invocationCount);
2406 >        } catch (CompletionException ok) {
2407 >            checkCompletedWithWrappedCancellationException(h);
2408 >            assertEquals(0, r.invocationCount);
2409 >        }
2410  
1694        checkCompletedWithWrappedCancellationException(h);
2411          checkCancelled(g);
1696        assertFalse(r.ran);
2412          checkCompletedNormally(f, v1);
2413 <        }
1699 <    }
2413 >    }}
2414  
2415 <    public void testRunAfterBoth_sourceCancelled4() {
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();
2423  
2424          assertTrue(f.cancel(mayInterruptIfRunning));
2425          g.complete(v1);
2426 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2426 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2427  
2428 <        checkCompletedWithWrappedCancellationException(h);
2429 <        checkCancelled(f);
2430 <        assertFalse(r.ran);
2431 <        checkCompletedNormally(g, v1);
2428 >        // unspecified behavior
2429 >        Integer v;
2430 >        try {
2431 >            assertNull(h.join());
2432 >            assertEquals(1, r.invocationCount);
2433 >        } catch (CompletionException ok) {
2434 >            checkCompletedWithWrappedCancellationException(h);
2435 >            assertEquals(0, r.invocationCount);
2436          }
1719    }
2437  
2438 <    /**
2439 <     * applyToEither result completes normally after normal completion
2440 <     * of either source
1724 <     */
1725 <    public void testApplyToEither() {
1726 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1727 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1728 <        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
1729 <        f.complete(one);
1730 <        checkCompletedNormally(g, two);
1731 <        f2.complete(one);
1732 <        checkCompletedNormally(g, two);
1733 <
1734 <        f = new CompletableFuture<>();
1735 <        f.complete(one);
1736 <        f2 = new CompletableFuture<>();
1737 <        g = f.applyToEither(f2, inc);
1738 <        checkCompletedNormally(g, two);
1739 <    }
1740 <
1741 <    /**
1742 <     * applyToEither result completes exceptionally after exceptional
1743 <     * completion of either source
1744 <     */
1745 <    public void testApplyToEither2() {
1746 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1747 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1748 <        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
1749 <        f.completeExceptionally(new CFException());
1750 <        f2.complete(one);
1751 <        checkCompletedWithWrappedCFException(g);
1752 <
1753 <        f = new CompletableFuture<>();
1754 <        f2 = new CompletableFuture<>();
1755 <        f2.completeExceptionally(new CFException());
1756 <        g = f.applyToEither(f2, inc);
1757 <        checkCompletedWithWrappedCFException(g);
1758 <    }
1759 <
1760 <    /**
1761 <     * applyToEither result completes exceptionally if action does
1762 <     */
1763 <    public void testApplyToEither3() {
1764 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1765 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1766 <        FailingFunction r = new FailingFunction();
1767 <        CompletableFuture<Integer> g = f.applyToEither(f2, r);
1768 <        f2.complete(two);
1769 <        checkCompletedWithWrappedCFException(g);
1770 <    }
1771 <
1772 <    /**
1773 <     * applyToEither result completes exceptionally if either source cancelled
1774 <     */
1775 <    public void testApplyToEither4() {
1776 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1777 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1778 <        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
1779 <        assertTrue(f.cancel(true));
1780 <        checkCompletedWithWrappedCancellationException(g);
1781 <        f = new CompletableFuture<>();
1782 <        f2 = new CompletableFuture<>();
1783 <        assertTrue(f2.cancel(true));
1784 <        checkCompletedWithWrappedCancellationException(g);
1785 <    }
1786 <
1787 <    /**
1788 <     * acceptEither result completes normally after normal completion
1789 <     * of either source
1790 <     */
1791 <    public void testAcceptEither() {
1792 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1793 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1794 <        IncAction r = new IncAction();
1795 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
1796 <        f.complete(one);
1797 <        checkCompletedNormally(g, null);
1798 <        f2.complete(one);
1799 <        checkCompletedNormally(g, null);
1800 <        assertEquals(r.value, 2);
1801 <
1802 <        r = new IncAction();
1803 <        f = new CompletableFuture<>();
1804 <        f.complete(one);
1805 <        f2 = new CompletableFuture<>();
1806 <        g = f.acceptEither(f2, r);
1807 <        checkCompletedNormally(g, null);
1808 <        assertEquals(r.value, 2);
1809 <    }
1810 <
1811 <    /**
1812 <     * acceptEither result completes exceptionally after exceptional
1813 <     * completion of either source
1814 <     */
1815 <    public void testAcceptEither2() {
1816 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1817 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1818 <        IncAction r = new IncAction();
1819 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
1820 <        f.completeExceptionally(new CFException());
1821 <        f2.complete(one);
1822 <        checkCompletedWithWrappedCFException(g);
1823 <
1824 <        r = new IncAction();
1825 <        f = new CompletableFuture<>();
1826 <        f2 = new CompletableFuture<>();
1827 <        f2.completeExceptionally(new CFException());
1828 <        g = f.acceptEither(f2, r);
1829 <        checkCompletedWithWrappedCFException(g);
1830 <    }
1831 <
1832 <    /**
1833 <     * acceptEither result completes exceptionally if action does
1834 <     */
1835 <    public void testAcceptEither3() {
1836 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1837 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1838 <        FailingConsumer r = new FailingConsumer();
1839 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
1840 <        f2.complete(two);
1841 <        checkCompletedWithWrappedCFException(g);
1842 <    }
1843 <
1844 <    /**
1845 <     * acceptEither result completes exceptionally if either source cancelled
1846 <     */
1847 <    public void testAcceptEither4() {
1848 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1849 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1850 <        IncAction r = new IncAction();
1851 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
1852 <        assertTrue(f.cancel(true));
1853 <        checkCompletedWithWrappedCancellationException(g);
1854 <        f = new CompletableFuture<>();
1855 <        f2 = new CompletableFuture<>();
1856 <        assertTrue(f2.cancel(true));
1857 <        checkCompletedWithWrappedCancellationException(g);
1858 <    }
1859 <
1860 <    /**
1861 <     * runAfterEither result completes normally after normal completion
1862 <     * of either source
1863 <     */
1864 <    public void testRunAfterEither() {
1865 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1866 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1867 <        Noop r = new Noop();
1868 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
1869 <        f.complete(one);
1870 <        checkCompletedNormally(g, null);
1871 <        f2.complete(one);
1872 <        checkCompletedNormally(g, null);
1873 <        assertTrue(r.ran);
1874 <
1875 <        r = new Noop();
1876 <        f = new CompletableFuture<>();
1877 <        f.complete(one);
1878 <        f2 = new CompletableFuture<>();
1879 <        g = f.runAfterEither(f2, r);
1880 <        checkCompletedNormally(g, null);
1881 <        assertTrue(r.ran);
1882 <    }
1883 <
1884 <    /**
1885 <     * runAfterEither result completes exceptionally after exceptional
1886 <     * completion of either source
1887 <     */
1888 <    public void testRunAfterEither2() {
1889 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1890 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1891 <        Noop r = new Noop();
1892 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
1893 <        f.completeExceptionally(new CFException());
1894 <        f2.complete(one);
1895 <        checkCompletedWithWrappedCFException(g);
1896 <
1897 <        r = new Noop();
1898 <        f = new CompletableFuture<>();
1899 <        f2 = new CompletableFuture<>();
1900 <        f2.completeExceptionally(new CFException());
1901 <        g = f.runAfterEither(f2, r);
1902 <        checkCompletedWithWrappedCFException(g);
1903 <    }
1904 <
1905 <    /**
1906 <     * runAfterEither result completes exceptionally if action does
1907 <     */
1908 <    public void testRunAfterEither3() {
1909 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1910 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1911 <        FailingNoop r = new FailingNoop();
1912 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
1913 <        f2.complete(two);
1914 <        checkCompletedWithWrappedCFException(g);
1915 <    }
1916 <
1917 <    /**
1918 <     * runAfterEither result completes exceptionally if either source cancelled
1919 <     */
1920 <    public void testRunAfterEither4() {
1921 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1922 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1923 <        Noop r = new Noop();
1924 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
1925 <        assertTrue(f.cancel(true));
1926 <        checkCompletedWithWrappedCancellationException(g);
1927 <        f = new CompletableFuture<>();
1928 <        f2 = new CompletableFuture<>();
1929 <        assertTrue(f2.cancel(true));
1930 <        checkCompletedWithWrappedCancellationException(g);
1931 <    }
2438 >        checkCancelled(f);
2439 >        checkCompletedNormally(g, v1);
2440 >    }}
2441  
2442      /**
2443       * thenCompose result completes normally after normal completion of source
2444       */
2445 <    public void testThenCompose() {
2446 <        CompletableFuture<Integer> f, g;
2447 <        CompletableFutureInc r;
2448 <
2449 <        f = new CompletableFuture<>();
2450 <        g = f.thenCompose(r = new CompletableFutureInc());
2451 <        f.complete(one);
2452 <        checkCompletedNormally(g, two);
2453 <        assertTrue(r.ran);
2445 >    public void testThenCompose_normalCompletion() {
2446 >        for (ExecutionMode m : ExecutionMode.values())
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 >        if (createIncomplete) f.complete(v1);
2455  
2456 <        f = new CompletableFuture<>();
2457 <        f.complete(one);
2458 <        g = f.thenCompose(r = new CompletableFutureInc());
2459 <        checkCompletedNormally(g, two);
1950 <        assertTrue(r.ran);
1951 <    }
2456 >        checkCompletedNormally(g, inc(v1));
2457 >        checkCompletedNormally(f, v1);
2458 >        assertEquals(1, r.invocationCount);
2459 >    }}
2460  
2461      /**
2462       * thenCompose result completes exceptionally after exceptional
2463       * completion of source
2464       */
2465 <    public void testThenCompose2() {
2466 <        CompletableFuture<Integer> f, g;
2467 <        CompletableFutureInc r;
2468 <
2469 <        f = new CompletableFuture<>();
2470 <        g = f.thenCompose(r = new CompletableFutureInc());
2471 <        f.completeExceptionally(new CFException());
2472 <        checkCompletedWithWrappedCFException(g);
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 >        if (createIncomplete) f.completeExceptionally(ex);
2475  
2476 <        f = new CompletableFuture<>();
2477 <        f.completeExceptionally(new CFException());
2478 <        g = f.thenCompose(r = new CompletableFutureInc());
2479 <        checkCompletedWithWrappedCFException(g);
1970 <    }
2476 >        checkCompletedWithWrappedCFException(g, ex);
2477 >        checkCompletedWithWrappedCFException(f, ex);
2478 >        assertEquals(0, r.invocationCount);
2479 >    }}
2480  
2481      /**
2482       * thenCompose result completes exceptionally if action does
2483       */
2484 <    public void testThenCompose3() {
2485 <        CompletableFuture<Integer> f, g;
2486 <        FailingCompletableFutureFunction r;
2487 <
2488 <        f = new CompletableFuture<>();
2489 <        g = f.thenCompose(r = new FailingCompletableFutureFunction());
2490 <        f.complete(one);
2491 <        checkCompletedWithWrappedCFException(g);
2484 >    public void testThenCompose_actionFailed() {
2485 >        for (ExecutionMode m : ExecutionMode.values())
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 >        if (createIncomplete) f.complete(v1);
2495  
1984        f = new CompletableFuture<>();
1985        f.complete(one);
1986        g = f.thenCompose(r = new FailingCompletableFutureFunction());
2496          checkCompletedWithWrappedCFException(g);
2497 <    }
2497 >        checkCompletedNormally(f, v1);
2498 >    }}
2499  
2500      /**
2501       * thenCompose result completes exceptionally if source cancelled
2502       */
2503 <    public void testThenCompose4() {
2504 <        CompletableFuture<Integer> f, g;
2505 <        CompletableFutureInc r;
2506 <
2507 <        f = new CompletableFuture<>();
2508 <        g = f.thenCompose(r = new CompletableFutureInc());
2509 <        assertTrue(f.cancel(true));
2510 <        checkCompletedWithWrappedCancellationException(g);
2511 <
2512 <        f = new CompletableFuture<>();
2513 <        assertTrue(f.cancel(true));
2514 <        g = f.thenCompose(r = new CompletableFutureInc());
2515 <        checkCompletedWithWrappedCancellationException(g);
2006 <    }
2007 <
2008 <    // asyncs
2009 <
2010 <    /**
2011 <     * thenRunAsync result completes normally after normal completion of source
2012 <     */
2013 <    public void testThenRunAsync() {
2014 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2015 <        Noop r = new Noop();
2016 <        CompletableFuture<Void> g = f.thenRunAsync(r);
2017 <        f.complete(null);
2018 <        checkCompletedNormally(g, null);
2019 <
2020 <        // reordered version
2021 <        f = new CompletableFuture<>();
2022 <        f.complete(null);
2023 <        r = new Noop();
2024 <        g = f.thenRunAsync(r);
2025 <        checkCompletedNormally(g, null);
2026 <    }
2027 <
2028 <    /**
2029 <     * thenRunAsync result completes exceptionally after exceptional
2030 <     * completion of source
2031 <     */
2032 <    public void testThenRunAsync2() {
2033 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2034 <        Noop r = new Noop();
2035 <        CompletableFuture<Void> g = f.thenRunAsync(r);
2036 <        f.completeExceptionally(new CFException());
2037 <        try {
2038 <            g.join();
2039 <            shouldThrow();
2040 <        } catch (CompletionException success) {}
2041 <        checkCompletedWithWrappedCFException(g);
2042 <    }
2043 <
2044 <    /**
2045 <     * thenRunAsync result completes exceptionally if action does
2046 <     */
2047 <    public void testThenRunAsync3() {
2048 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2049 <        FailingNoop r = new FailingNoop();
2050 <        CompletableFuture<Void> g = f.thenRunAsync(r);
2051 <        f.complete(null);
2052 <        checkCompletedWithWrappedCFException(g);
2053 <    }
2054 <
2055 <    /**
2056 <     * thenRunAsync result completes exceptionally if source cancelled
2057 <     */
2058 <    public void testThenRunAsync4() {
2059 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2060 <        Noop r = new Noop();
2061 <        CompletableFuture<Void> g = f.thenRunAsync(r);
2062 <        assertTrue(f.cancel(true));
2063 <        checkCompletedWithWrappedCancellationException(g);
2064 <    }
2065 <
2066 <    /**
2067 <     * thenApplyAsync result completes normally after normal completion of source
2068 <     */
2069 <    public void testThenApplyAsync() {
2070 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2071 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
2072 <        f.complete(one);
2073 <        checkCompletedNormally(g, two);
2074 <    }
2075 <
2076 <    /**
2077 <     * thenApplyAsync result completes exceptionally after exceptional
2078 <     * completion of source
2079 <     */
2080 <    public void testThenApplyAsync2() {
2081 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2082 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
2083 <        f.completeExceptionally(new CFException());
2084 <        checkCompletedWithWrappedCFException(g);
2085 <    }
2086 <
2087 <    /**
2088 <     * thenApplyAsync result completes exceptionally if action does
2089 <     */
2090 <    public void testThenApplyAsync3() {
2091 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2092 <        FailingFunction r = new FailingFunction();
2093 <        CompletableFuture<Integer> g = f.thenApplyAsync(r);
2094 <        f.complete(null);
2095 <        checkCompletedWithWrappedCFException(g);
2096 <    }
2097 <
2098 <    /**
2099 <     * thenApplyAsync result completes exceptionally if source cancelled
2100 <     */
2101 <    public void testThenApplyAsync4() {
2102 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2103 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
2104 <        assertTrue(f.cancel(true));
2105 <        checkCompletedWithWrappedCancellationException(g);
2106 <    }
2107 <
2108 <    /**
2109 <     * thenAcceptAsync result completes normally after normal
2110 <     * completion of source
2111 <     */
2112 <    public void testThenAcceptAsync() {
2113 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2114 <        IncAction r = new IncAction();
2115 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2116 <        f.complete(one);
2117 <        checkCompletedNormally(g, null);
2118 <        assertEquals(r.value, 2);
2119 <    }
2120 <
2121 <    /**
2122 <     * thenAcceptAsync result completes exceptionally after exceptional
2123 <     * completion of source
2124 <     */
2125 <    public void testThenAcceptAsync2() {
2126 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2127 <        IncAction r = new IncAction();
2128 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2129 <        f.completeExceptionally(new CFException());
2130 <        checkCompletedWithWrappedCFException(g);
2131 <    }
2132 <
2133 <    /**
2134 <     * thenAcceptAsync result completes exceptionally if action does
2135 <     */
2136 <    public void testThenAcceptAsync3() {
2137 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2138 <        FailingConsumer r = new FailingConsumer();
2139 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2140 <        f.complete(null);
2141 <        checkCompletedWithWrappedCFException(g);
2142 <    }
2143 <
2144 <    /**
2145 <     * thenAcceptAsync result completes exceptionally if source cancelled
2146 <     */
2147 <    public void testThenAcceptAsync4() {
2148 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2149 <        IncAction r = new IncAction();
2150 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2151 <        assertTrue(f.cancel(true));
2152 <        checkCompletedWithWrappedCancellationException(g);
2153 <    }
2154 <
2155 <    /**
2156 <     * applyToEitherAsync result completes normally after normal
2157 <     * completion of sources
2158 <     */
2159 <    public void testApplyToEitherAsync() {
2160 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2161 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2162 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
2163 <        f.complete(one);
2164 <        checkCompletedNormally(g, two);
2165 <
2166 <        f = new CompletableFuture<>();
2167 <        f.complete(one);
2168 <        f2 = new CompletableFuture<>();
2169 <        g = f.applyToEitherAsync(f2, inc);
2170 <        checkCompletedNormally(g, two);
2171 <    }
2172 <
2173 <    /**
2174 <     * applyToEitherAsync result completes exceptionally after exceptional
2175 <     * completion of source
2176 <     */
2177 <    public void testApplyToEitherAsync2() {
2178 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2179 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2180 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
2181 <        f.completeExceptionally(new CFException());
2182 <        checkCompletedWithWrappedCFException(g);
2183 <
2184 <        f = new CompletableFuture<>();
2185 <        f2 = new CompletableFuture<>();
2186 <        f2.completeExceptionally(new CFException());
2187 <        g = f.applyToEitherAsync(f2, inc);
2188 <        f.complete(one);
2189 <        checkCompletedWithWrappedCFException(g);
2190 <    }
2191 <
2192 <    /**
2193 <     * applyToEitherAsync result completes exceptionally if action does
2194 <     */
2195 <    public void testApplyToEitherAsync3() {
2196 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2197 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2198 <        FailingFunction r = new FailingFunction();
2199 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, r);
2200 <        f.complete(one);
2201 <        checkCompletedWithWrappedCFException(g);
2202 <    }
2203 <
2204 <    /**
2205 <     * applyToEitherAsync result completes exceptionally if either source cancelled
2206 <     */
2207 <    public void testApplyToEitherAsync4() {
2208 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2209 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2210 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
2211 <        assertTrue(f.cancel(true));
2212 <        checkCompletedWithWrappedCancellationException(g);
2213 <
2214 <        f = new CompletableFuture<>();
2215 <        f2 = new CompletableFuture<>();
2216 <        assertTrue(f2.cancel(true));
2217 <        g = f.applyToEitherAsync(f2, inc);
2218 <        checkCompletedWithWrappedCancellationException(g);
2219 <    }
2220 <
2221 <    /**
2222 <     * acceptEitherAsync result completes normally after normal
2223 <     * completion of sources
2224 <     */
2225 <    public void testAcceptEitherAsync() {
2226 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2227 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2228 <        IncAction r = new IncAction();
2229 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
2230 <        f.complete(one);
2231 <        checkCompletedNormally(g, null);
2232 <        assertEquals(r.value, 2);
2233 <
2234 <        r = new IncAction();
2235 <        f = new CompletableFuture<>();
2236 <        f.complete(one);
2237 <        f2 = new CompletableFuture<>();
2238 <        g = f.acceptEitherAsync(f2, r);
2239 <        checkCompletedNormally(g, null);
2240 <        assertEquals(r.value, 2);
2241 <    }
2242 <
2243 <    /**
2244 <     * acceptEitherAsync result completes exceptionally after exceptional
2245 <     * completion of source
2246 <     */
2247 <    public void testAcceptEitherAsync2() {
2248 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2249 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2250 <        IncAction r = new IncAction();
2251 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
2252 <        f.completeExceptionally(new CFException());
2253 <        checkCompletedWithWrappedCFException(g);
2254 <
2255 <        r = new IncAction();
2256 <        f = new CompletableFuture<>();
2257 <        f2 = new CompletableFuture<>();
2258 <        f2.completeExceptionally(new CFException());
2259 <        g = f.acceptEitherAsync(f2, r);
2260 <        f.complete(one);
2261 <        checkCompletedWithWrappedCFException(g);
2262 <    }
2263 <
2264 <    /**
2265 <     * acceptEitherAsync result completes exceptionally if action does
2266 <     */
2267 <    public void testAcceptEitherAsync3() {
2268 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2269 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2270 <        FailingConsumer r = new FailingConsumer();
2271 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
2272 <        f.complete(one);
2273 <        checkCompletedWithWrappedCFException(g);
2274 <    }
2275 <
2276 <    /**
2277 <     * acceptEitherAsync result completes exceptionally if either
2278 <     * source cancelled
2279 <     */
2280 <    public void testAcceptEitherAsync4() {
2281 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2282 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2283 <        IncAction r = new IncAction();
2284 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
2285 <        assertTrue(f.cancel(true));
2286 <        checkCompletedWithWrappedCancellationException(g);
2287 <
2288 <        r = new IncAction();
2289 <        f = new CompletableFuture<>();
2290 <        f2 = new CompletableFuture<>();
2291 <        assertTrue(f2.cancel(true));
2292 <        g = f.acceptEitherAsync(f2, r);
2293 <        checkCompletedWithWrappedCancellationException(g);
2294 <    }
2295 <
2296 <    /**
2297 <     * runAfterEitherAsync result completes normally after normal
2298 <     * completion of sources
2299 <     */
2300 <    public void testRunAfterEitherAsync() {
2301 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2302 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2303 <        Noop r = new Noop();
2304 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
2305 <        f.complete(one);
2306 <        checkCompletedNormally(g, null);
2307 <        assertTrue(r.ran);
2308 <
2309 <        r = new Noop();
2310 <        f = new CompletableFuture<>();
2311 <        f.complete(one);
2312 <        f2 = new CompletableFuture<>();
2313 <        g = f.runAfterEitherAsync(f2, r);
2314 <        checkCompletedNormally(g, null);
2315 <        assertTrue(r.ran);
2316 <    }
2317 <
2318 <    /**
2319 <     * runAfterEitherAsync result completes exceptionally after exceptional
2320 <     * completion of source
2321 <     */
2322 <    public void testRunAfterEitherAsync2() {
2323 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2324 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2325 <        Noop r = new Noop();
2326 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
2327 <        f.completeExceptionally(new CFException());
2328 <        checkCompletedWithWrappedCFException(g);
2329 <
2330 <        r = new Noop();
2331 <        f = new CompletableFuture<>();
2332 <        f2 = new CompletableFuture<>();
2333 <        f2.completeExceptionally(new CFException());
2334 <        g = f.runAfterEitherAsync(f2, r);
2335 <        f.complete(one);
2336 <        checkCompletedWithWrappedCFException(g);
2337 <    }
2338 <
2339 <    /**
2340 <     * runAfterEitherAsync result completes exceptionally if action does
2341 <     */
2342 <    public void testRunAfterEitherAsync3() {
2343 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2344 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2345 <        FailingNoop r = new FailingNoop();
2346 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
2347 <        f.complete(one);
2348 <        checkCompletedWithWrappedCFException(g);
2349 <    }
2350 <
2351 <    /**
2352 <     * runAfterEitherAsync result completes exceptionally if either
2353 <     * source cancelled
2354 <     */
2355 <    public void testRunAfterEitherAsync4() {
2356 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2357 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2358 <        Noop r = new Noop();
2359 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
2360 <        assertTrue(f.cancel(true));
2361 <        checkCompletedWithWrappedCancellationException(g);
2362 <
2363 <        r = new Noop();
2364 <        f = new CompletableFuture<>();
2365 <        f2 = new CompletableFuture<>();
2366 <        assertTrue(f2.cancel(true));
2367 <        g = f.runAfterEitherAsync(f2, r);
2368 <        checkCompletedWithWrappedCancellationException(g);
2369 <    }
2370 <
2371 <    /**
2372 <     * thenComposeAsync result completes normally after normal
2373 <     * completion of source
2374 <     */
2375 <    public void testThenComposeAsync() {
2376 <        CompletableFuture<Integer> f, g;
2377 <        CompletableFutureInc r;
2378 <
2379 <        f = new CompletableFuture<>();
2380 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2381 <        f.complete(one);
2382 <        checkCompletedNormally(g, two);
2383 <
2384 <        f = new CompletableFuture<>();
2385 <        f.complete(one);
2386 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2387 <        checkCompletedNormally(g, two);
2388 <    }
2389 <
2390 <    /**
2391 <     * thenComposeAsync result completes exceptionally after
2392 <     * exceptional completion of source
2393 <     */
2394 <    public void testThenComposeAsync2() {
2395 <        CompletableFuture<Integer> f, g;
2396 <        CompletableFutureInc r;
2397 <
2398 <        f = new CompletableFuture<>();
2399 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2400 <        f.completeExceptionally(new CFException());
2401 <        checkCompletedWithWrappedCFException(g);
2402 <        assertFalse(r.ran);
2403 <
2404 <        f = new CompletableFuture<>();
2405 <        f.completeExceptionally(new CFException());
2406 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2407 <        checkCompletedWithWrappedCFException(g);
2408 <        assertFalse(r.ran);
2409 <    }
2410 <
2411 <    /**
2412 <     * thenComposeAsync result completes exceptionally if action does
2413 <     */
2414 <    public void testThenComposeAsync3() {
2415 <        CompletableFuture<Integer> f, g;
2416 <        FailingCompletableFutureFunction r;
2417 <
2418 <        f = new CompletableFuture<>();
2419 <        g = f.thenComposeAsync(r = new FailingCompletableFutureFunction());
2420 <        f.complete(one);
2421 <        checkCompletedWithWrappedCFException(g);
2422 <
2423 <        f = new CompletableFuture<>();
2424 <        f.complete(one);
2425 <        g = f.thenComposeAsync(r = new FailingCompletableFutureFunction());
2426 <        checkCompletedWithWrappedCFException(g);
2427 <    }
2428 <
2429 <    /**
2430 <     * thenComposeAsync result completes exceptionally if source cancelled
2431 <     */
2432 <    public void testThenComposeAsync4() {
2433 <        CompletableFuture<Integer> f, g;
2434 <        CompletableFutureInc r;
2435 <
2436 <        f = new CompletableFuture<>();
2437 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2438 <        assertTrue(f.cancel(true));
2439 <        checkCompletedWithWrappedCancellationException(g);
2440 <
2441 <        f = new CompletableFuture<>();
2442 <        assertTrue(f.cancel(true));
2443 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2444 <        checkCompletedWithWrappedCancellationException(g);
2445 <    }
2446 <
2447 <    // async with explicit executors
2448 <
2449 <    /**
2450 <     * thenRunAsync result completes normally after normal completion of source
2451 <     */
2452 <    public void testThenRunAsyncE() {
2453 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2454 <        Noop r = new Noop();
2455 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2456 <        f.complete(null);
2457 <        checkCompletedNormally(g, null);
2458 <
2459 <        // reordered version
2460 <        f = new CompletableFuture<>();
2461 <        f.complete(null);
2462 <        r = new Noop();
2463 <        g = f.thenRunAsync(r, new ThreadExecutor());
2464 <        checkCompletedNormally(g, null);
2465 <    }
2466 <
2467 <    /**
2468 <     * thenRunAsync result completes exceptionally after exceptional
2469 <     * completion of source
2470 <     */
2471 <    public void testThenRunAsync2E() {
2472 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2473 <        Noop r = new Noop();
2474 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2475 <        f.completeExceptionally(new CFException());
2476 <        try {
2477 <            g.join();
2478 <            shouldThrow();
2479 <        } catch (CompletionException success) {}
2480 <        checkCompletedWithWrappedCFException(g);
2481 <    }
2482 <
2483 <    /**
2484 <     * thenRunAsync result completes exceptionally if action does
2485 <     */
2486 <    public void testThenRunAsync3E() {
2487 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2488 <        FailingNoop r = new FailingNoop();
2489 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2490 <        f.complete(null);
2491 <        checkCompletedWithWrappedCFException(g);
2492 <    }
2493 <
2494 <    /**
2495 <     * thenRunAsync result completes exceptionally if source cancelled
2496 <     */
2497 <    public void testThenRunAsync4E() {
2498 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2499 <        Noop r = new Noop();
2500 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2501 <        assertTrue(f.cancel(true));
2502 <        checkCompletedWithWrappedCancellationException(g);
2503 <    }
2504 <
2505 <    /**
2506 <     * thenApplyAsync result completes normally after normal completion of source
2507 <     */
2508 <    public void testThenApplyAsyncE() {
2509 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2510 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
2511 <        f.complete(one);
2512 <        checkCompletedNormally(g, two);
2513 <    }
2514 <
2515 <    /**
2516 <     * thenApplyAsync result completes exceptionally after exceptional
2517 <     * completion of source
2518 <     */
2519 <    public void testThenApplyAsync2E() {
2520 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2521 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
2522 <        f.completeExceptionally(new CFException());
2523 <        checkCompletedWithWrappedCFException(g);
2524 <    }
2525 <
2526 <    /**
2527 <     * thenApplyAsync result completes exceptionally if action does
2528 <     */
2529 <    public void testThenApplyAsync3E() {
2530 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2531 <        FailingFunction r = new FailingFunction();
2532 <        CompletableFuture<Integer> g = f.thenApplyAsync(r, new ThreadExecutor());
2533 <        f.complete(null);
2534 <        checkCompletedWithWrappedCFException(g);
2535 <    }
2536 <
2537 <    /**
2538 <     * thenApplyAsync result completes exceptionally if source cancelled
2539 <     */
2540 <    public void testThenApplyAsync4E() {
2541 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2542 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
2543 <        assertTrue(f.cancel(true));
2544 <        checkCompletedWithWrappedCancellationException(g);
2545 <    }
2546 <
2547 <    /**
2548 <     * thenAcceptAsync result completes normally after normal
2549 <     * completion of source
2550 <     */
2551 <    public void testThenAcceptAsyncE() {
2552 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2553 <        IncAction r = new IncAction();
2554 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2555 <        f.complete(one);
2556 <        checkCompletedNormally(g, null);
2557 <        assertEquals(r.value, 2);
2558 <    }
2559 <
2560 <    /**
2561 <     * thenAcceptAsync result completes exceptionally after exceptional
2562 <     * completion of source
2563 <     */
2564 <    public void testThenAcceptAsync2E() {
2565 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2566 <        IncAction r = new IncAction();
2567 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2568 <        f.completeExceptionally(new CFException());
2569 <        checkCompletedWithWrappedCFException(g);
2570 <    }
2571 <
2572 <    /**
2573 <     * thenAcceptAsync result completes exceptionally if action does
2574 <     */
2575 <    public void testThenAcceptAsync3E() {
2576 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2577 <        FailingConsumer r = new FailingConsumer();
2578 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2579 <        f.complete(null);
2580 <        checkCompletedWithWrappedCFException(g);
2581 <    }
2582 <
2583 <    /**
2584 <     * thenAcceptAsync result completes exceptionally if source cancelled
2585 <     */
2586 <    public void testThenAcceptAsync4E() {
2587 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2588 <        IncAction r = new IncAction();
2589 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2590 <        assertTrue(f.cancel(true));
2591 <        checkCompletedWithWrappedCancellationException(g);
2592 <    }
2593 <
2594 <    /**
2595 <     * applyToEitherAsync result completes normally after normal
2596 <     * completion of sources
2597 <     */
2598 <    public void testApplyToEitherAsyncE() {
2599 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2600 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2601 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2602 <        f.complete(one);
2603 <        checkCompletedNormally(g, two);
2604 <
2605 <        f = new CompletableFuture<>();
2606 <        f.complete(one);
2607 <        f2 = new CompletableFuture<>();
2608 <        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2609 <        checkCompletedNormally(g, two);
2610 <    }
2611 <
2612 <    /**
2613 <     * applyToEitherAsync result completes exceptionally after exceptional
2614 <     * completion of source
2615 <     */
2616 <    public void testApplyToEitherAsync2E() {
2617 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2618 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2619 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2620 <        f.completeExceptionally(new CFException());
2621 <        checkCompletedWithWrappedCFException(g);
2622 <
2623 <        f = new CompletableFuture<>();
2624 <        f2 = new CompletableFuture<>();
2625 <        f2.completeExceptionally(new CFException());
2626 <        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2627 <        f.complete(one);
2628 <        checkCompletedWithWrappedCFException(g);
2629 <    }
2630 <
2631 <    /**
2632 <     * applyToEitherAsync result completes exceptionally if action does
2633 <     */
2634 <    public void testApplyToEitherAsync3E() {
2635 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2636 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2637 <        FailingFunction r = new FailingFunction();
2638 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, r, new ThreadExecutor());
2639 <        f.complete(one);
2640 <        checkCompletedWithWrappedCFException(g);
2641 <    }
2642 <
2643 <    /**
2644 <     * applyToEitherAsync result completes exceptionally if either source cancelled
2645 <     */
2646 <    public void testApplyToEitherAsync4E() {
2647 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2648 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2649 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2650 <        assertTrue(f.cancel(true));
2651 <        checkCompletedWithWrappedCancellationException(g);
2652 <
2653 <        f = new CompletableFuture<>();
2654 <        f2 = new CompletableFuture<>();
2655 <        assertTrue(f2.cancel(true));
2656 <        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2657 <        checkCompletedWithWrappedCancellationException(g);
2658 <    }
2659 <
2660 <    /**
2661 <     * acceptEitherAsync result completes normally after normal
2662 <     * completion of sources
2663 <     */
2664 <    public void testAcceptEitherAsyncE() {
2665 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2666 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2667 <        IncAction r = new IncAction();
2668 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2669 <        f.complete(one);
2670 <        checkCompletedNormally(g, null);
2671 <        assertEquals(r.value, 2);
2672 <
2673 <        r = new IncAction();
2674 <        f = new CompletableFuture<>();
2675 <        f.complete(one);
2676 <        f2 = new CompletableFuture<>();
2677 <        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2678 <        checkCompletedNormally(g, null);
2679 <        assertEquals(r.value, 2);
2680 <    }
2681 <
2682 <    /**
2683 <     * acceptEitherAsync result completes exceptionally after exceptional
2684 <     * completion of source
2685 <     */
2686 <    public void testAcceptEitherAsync2E() {
2687 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2688 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2689 <        IncAction r = new IncAction();
2690 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2691 <        f.completeExceptionally(new CFException());
2692 <        checkCompletedWithWrappedCFException(g);
2693 <
2694 <        r = new IncAction();
2695 <        f = new CompletableFuture<>();
2696 <        f2 = new CompletableFuture<>();
2697 <        f2.completeExceptionally(new CFException());
2698 <        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2699 <        f.complete(one);
2700 <        checkCompletedWithWrappedCFException(g);
2701 <    }
2702 <
2703 <    /**
2704 <     * acceptEitherAsync result completes exceptionally if action does
2705 <     */
2706 <    public void testAcceptEitherAsync3E() {
2707 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2708 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2709 <        FailingConsumer r = new FailingConsumer();
2710 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2711 <        f.complete(one);
2712 <        checkCompletedWithWrappedCFException(g);
2713 <    }
2714 <
2715 <    /**
2716 <     * acceptEitherAsync result completes exceptionally if either
2717 <     * source cancelled
2718 <     */
2719 <    public void testAcceptEitherAsync4E() {
2720 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2721 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2722 <        IncAction r = new IncAction();
2723 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2724 <        assertTrue(f.cancel(true));
2725 <        checkCompletedWithWrappedCancellationException(g);
2726 <
2727 <        r = new IncAction();
2728 <        f = new CompletableFuture<>();
2729 <        f2 = new CompletableFuture<>();
2730 <        assertTrue(f2.cancel(true));
2731 <        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2732 <        checkCompletedWithWrappedCancellationException(g);
2733 <    }
2734 <
2735 <    /**
2736 <     * runAfterEitherAsync result completes normally after normal
2737 <     * completion of sources
2738 <     */
2739 <    public void testRunAfterEitherAsyncE() {
2740 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2741 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2742 <        Noop r = new Noop();
2743 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2744 <        f.complete(one);
2745 <        checkCompletedNormally(g, null);
2746 <        assertTrue(r.ran);
2747 <
2748 <        r = new Noop();
2749 <        f = new CompletableFuture<>();
2750 <        f.complete(one);
2751 <        f2 = new CompletableFuture<>();
2752 <        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2753 <        checkCompletedNormally(g, null);
2754 <        assertTrue(r.ran);
2755 <    }
2756 <
2757 <    /**
2758 <     * runAfterEitherAsync result completes exceptionally after exceptional
2759 <     * completion of source
2760 <     */
2761 <    public void testRunAfterEitherAsync2E() {
2762 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2763 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2764 <        Noop r = new Noop();
2765 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2766 <        f.completeExceptionally(new CFException());
2767 <        checkCompletedWithWrappedCFException(g);
2768 <
2769 <        r = new Noop();
2770 <        f = new CompletableFuture<>();
2771 <        f2 = new CompletableFuture<>();
2772 <        f2.completeExceptionally(new CFException());
2773 <        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2774 <        f.complete(one);
2775 <        checkCompletedWithWrappedCFException(g);
2776 <    }
2777 <
2778 <    /**
2779 <     * runAfterEitherAsync result completes exceptionally if action does
2780 <     */
2781 <    public void testRunAfterEitherAsync3E() {
2782 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2783 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2784 <        FailingNoop r = new FailingNoop();
2785 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2786 <        f.complete(one);
2787 <        checkCompletedWithWrappedCFException(g);
2788 <    }
2789 <
2790 <    /**
2791 <     * runAfterEitherAsync result completes exceptionally if either
2792 <     * source cancelled
2793 <     */
2794 <    public void testRunAfterEitherAsync4E() {
2795 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2796 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2797 <        Noop r = new Noop();
2798 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2799 <        assertTrue(f.cancel(true));
2800 <        checkCompletedWithWrappedCancellationException(g);
2801 <
2802 <        r = new Noop();
2803 <        f = new CompletableFuture<>();
2804 <        f2 = new CompletableFuture<>();
2805 <        assertTrue(f2.cancel(true));
2806 <        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2807 <        checkCompletedWithWrappedCancellationException(g);
2808 <    }
2809 <
2810 <    /**
2811 <     * thenComposeAsync result completes normally after normal
2812 <     * completion of source
2813 <     */
2814 <    public void testThenComposeAsyncE() {
2815 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2816 <        CompletableFutureInc r = new CompletableFutureInc();
2817 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2818 <        f.complete(one);
2819 <        checkCompletedNormally(g, two);
2820 <    }
2821 <
2822 <    /**
2823 <     * thenComposeAsync result completes exceptionally after
2824 <     * exceptional completion of source
2825 <     */
2826 <    public void testThenComposeAsync2E() {
2827 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2828 <        CompletableFutureInc r = new CompletableFutureInc();
2829 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2830 <        f.completeExceptionally(new CFException());
2831 <        checkCompletedWithWrappedCFException(g);
2832 <    }
2833 <
2834 <    /**
2835 <     * thenComposeAsync result completes exceptionally if action does
2836 <     */
2837 <    public void testThenComposeAsync3E() {
2838 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2839 <        FailingCompletableFutureFunction r = new FailingCompletableFutureFunction();
2840 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2841 <        f.complete(one);
2842 <        checkCompletedWithWrappedCFException(g);
2843 <    }
2503 >    public void testThenCompose_sourceCancelled() {
2504 >        for (ExecutionMode m : ExecutionMode.values())
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 >        if (createIncomplete) {
2513 >            checkIncomplete(g);
2514 >            assertTrue(f.cancel(mayInterruptIfRunning));
2515 >        }
2516  
2845    /**
2846     * thenComposeAsync result completes exceptionally if source cancelled
2847     */
2848    public void testThenComposeAsync4E() {
2849        CompletableFuture<Integer> f = new CompletableFuture<>();
2850        CompletableFutureInc r = new CompletableFutureInc();
2851        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2852        assertTrue(f.cancel(true));
2517          checkCompletedWithWrappedCancellationException(g);
2518 <    }
2518 >        checkCancelled(f);
2519 >    }}
2520  
2521      // other static methods
2522  
# Line 3051 | Line 2716 | public class CompletableFutureTest exten
2716       * whenComplete action executes on normal completion, propagating
2717       * source result.
2718       */
2719 <    public void testWhenComplete1() {
2720 <        final AtomicInteger a = new AtomicInteger();
2721 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2722 <        CompletableFuture<Integer> g =
2723 <            f.whenComplete((Integer x, Throwable t) -> a.getAndIncrement());
2724 <        f.complete(three);
2725 <        checkCompletedNormally(f, three);
2726 <        checkCompletedNormally(g, three);
2727 <        assertEquals(a.get(), 1);
2728 <    }
2729 <
2730 <    /**
2731 <     * whenComplete action executes on exceptional completion, propagating
2732 <     * source result.
2733 <     */
2734 <    public void testWhenComplete2() {
3070 <        final AtomicInteger a = new AtomicInteger();
3071 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3072 <        CompletableFuture<Integer> g =
3073 <            f.whenComplete((Integer x, Throwable t) -> a.getAndIncrement());
3074 <        f.completeExceptionally(new CFException());
3075 <        assertTrue(f.isCompletedExceptionally());
3076 <        assertTrue(g.isCompletedExceptionally());
3077 <        assertEquals(a.get(), 1);
3078 <    }
3079 <
3080 <    /**
3081 <     * If a whenComplete action throws an exception when triggered by
3082 <     * a normal completion, it completes exceptionally
3083 <     */
3084 <    public void testWhenComplete3() {
3085 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3086 <        CompletableFuture<Integer> g =
3087 <            f.whenComplete((Integer x, Throwable t) ->
3088 <                           { throw new CFException(); } );
3089 <        f.complete(three);
3090 <        checkCompletedNormally(f, three);
3091 <        assertTrue(g.isCompletedExceptionally());
3092 <        checkCompletedWithWrappedCFException(g);
3093 <    }
3094 <
3095 <    /**
3096 <     * whenCompleteAsync action executes on normal completion, propagating
3097 <     * source result.
3098 <     */
3099 <    public void testWhenCompleteAsync1() {
3100 <        final AtomicInteger a = new AtomicInteger();
3101 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3102 <        CompletableFuture<Integer> g =
3103 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement());
3104 <        f.complete(three);
3105 <        checkCompletedNormally(f, three);
3106 <        checkCompletedNormally(g, three);
3107 <        assertEquals(a.get(), 1);
3108 <    }
3109 <
3110 <    /**
3111 <     * whenCompleteAsync action executes on exceptional completion, propagating
3112 <     * source result.
3113 <     */
3114 <    public void testWhenCompleteAsync2() {
3115 <        final AtomicInteger a = new AtomicInteger();
3116 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3117 <        CompletableFuture<Integer> g =
3118 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement());
3119 <        f.completeExceptionally(new CFException());
3120 <        checkCompletedWithWrappedCFException(f);
3121 <        checkCompletedWithWrappedCFException(g);
3122 <    }
2719 >    public void testWhenComplete_normalCompletion1() {
2720 >        for (ExecutionMode m : ExecutionMode.values())
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 = 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  
2736 <    /**
2737 <     * If a whenCompleteAsync action throws an exception when
2738 <     * triggered by a normal completion, it completes exceptionally
2739 <     */
3128 <    public void testWhenCompleteAsync3() {
3129 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3130 <        CompletableFuture<Integer> g =
3131 <            f.whenCompleteAsync((Integer x, Throwable t) ->
3132 <                           { throw new CFException(); } );
3133 <        f.complete(three);
3134 <        checkCompletedNormally(f, three);
3135 <        checkCompletedWithWrappedCFException(g);
3136 <    }
2736 >        checkCompletedNormally(g, v1);
2737 >        checkCompletedNormally(f, v1);
2738 >        assertEquals(1, a.get());
2739 >    }}
2740  
2741      /**
2742 <     * whenCompleteAsync action executes on normal completion, propagating
2742 >     * whenComplete action executes on exceptional completion, propagating
2743       * source result.
2744       */
2745 <    public void testWhenCompleteAsync1e() {
2746 <        final AtomicInteger a = new AtomicInteger();
2747 <        ThreadExecutor exec = new ThreadExecutor();
2748 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2749 <        CompletableFuture<Integer> g =
2750 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement(),
2751 <                                exec);
2752 <        f.complete(three);
2753 <        checkCompletedNormally(f, three);
2754 <        checkCompletedNormally(g, three);
2755 <        assertEquals(a.get(), 1);
2756 <    }
2745 >    public void testWhenComplete_exceptionalCompletion() {
2746 >        for (ExecutionMode m : ExecutionMode.values())
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);
2754 >        final CompletableFuture<Integer> g = m.whenComplete
2755 >            (f,
2756 >             (Integer x, Throwable t) -> {
2757 >                threadAssertNull(x);
2758 >                threadAssertSame(t, ex);
2759 >                a.getAndIncrement();
2760 >            });
2761 >        if (createIncomplete) f.completeExceptionally(ex);
2762 >        checkCompletedWithWrappedCFException(f, ex);
2763 >        checkCompletedWithWrappedCFException(g, ex);
2764 >        assertEquals(1, a.get());
2765 >    }}
2766  
2767      /**
2768 <     * whenCompleteAsync action executes on exceptional completion, propagating
2769 <     * source result.
2768 >     * whenComplete action executes on cancelled source, propagating
2769 >     * CancellationException.
2770       */
2771 <    public void testWhenCompleteAsync2e() {
2772 <        final AtomicInteger a = new AtomicInteger();
2773 <        ThreadExecutor exec = new ThreadExecutor();
2774 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2775 <        CompletableFuture<Integer> g =
2776 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement(),
2777 <                                exec);
2778 <        f.completeExceptionally(new CFException());
2779 <        checkCompletedWithWrappedCFException(f);
2780 <        checkCompletedWithWrappedCFException(g);
2781 <    }
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 <    /**
2789 <     * If a whenCompleteAsync action throws an exception when triggered
2790 <     * by a normal completion, it completes exceptionally
2791 <     */
2792 <    public void testWhenCompleteAsync3e() {
3176 <        ThreadExecutor exec = new ThreadExecutor();
3177 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3178 <        CompletableFuture<Integer> g =
3179 <            f.whenCompleteAsync((Integer x, Throwable t) ->
3180 <                                { throw new CFException(); },
3181 <                                exec);
3182 <        f.complete(three);
3183 <        checkCompletedNormally(f, three);
3184 <        checkCompletedWithWrappedCFException(g);
3185 <    }
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 <     * handleAsync action completes normally with function value on
2796 <     * either normal or exceptional completion of source
2795 >     * If a whenComplete action throws an exception when triggered by
2796 >     * a normal completion, it completes exceptionally
2797       */
2798 <    public void testHandleAsync() {
2799 <        CompletableFuture<Integer> f, g;
2800 <        IntegerHandler r;
2801 <
2802 <        f = new CompletableFuture<>();
2803 <        g = f.handleAsync(r = new IntegerHandler());
2804 <        assertFalse(r.ran);
2805 <        f.completeExceptionally(new CFException());
2806 <        checkCompletedWithWrappedCFException(f);
2807 <        checkCompletedNormally(g, three);
2808 <        assertTrue(r.ran);
2809 <
2810 <        f = new CompletableFuture<>();
2811 <        g = f.handleAsync(r = new IntegerHandler());
2812 <        assertFalse(r.ran);
2813 <        f.completeExceptionally(new CFException());
2814 <        checkCompletedWithWrappedCFException(f);
2815 <        checkCompletedNormally(g, three);
2816 <        assertTrue(r.ran);
2817 <
2818 <        f = new CompletableFuture<>();
2819 <        g = f.handleAsync(r = new IntegerHandler());
3213 <        assertFalse(r.ran);
3214 <        f.complete(one);
3215 <        checkCompletedNormally(f, one);
3216 <        checkCompletedNormally(g, two);
3217 <        assertTrue(r.ran);
3218 <
3219 <        f = new CompletableFuture<>();
3220 <        g = f.handleAsync(r = new IntegerHandler());
3221 <        assertFalse(r.ran);
3222 <        f.complete(one);
3223 <        checkCompletedNormally(f, one);
3224 <        checkCompletedNormally(g, two);
3225 <        assertTrue(r.ran);
3226 <    }
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 >    {
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);
2807 >        final CompletableFuture<Integer> g = m.whenComplete
2808 >            (f,
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 >        assertEquals(1, a.get());
2819 >    }}
2820  
2821      /**
2822 <     * handleAsync action with Executor completes normally with
2823 <     * function value on either normal or exceptional completion of
2824 <     * source
2822 >     * If a whenComplete action throws an exception when triggered by
2823 >     * a source completion that also throws an exception, the source
2824 >     * exception takes precedence.
2825       */
2826 <    public void testHandleAsync2() {
2827 <        CompletableFuture<Integer> f, g;
2828 <        ThreadExecutor exec = new ThreadExecutor();
2829 <        IntegerHandler r;
2830 <
2831 <        f = new CompletableFuture<>();
2832 <        g = f.handleAsync(r = new IntegerHandler(), exec);
2833 <        assertFalse(r.ran);
2834 <        f.completeExceptionally(new CFException());
2835 <        checkCompletedWithWrappedCFException(f);
2836 <        checkCompletedNormally(g, three);
2837 <        assertTrue(r.ran);
2838 <
2839 <        f = new CompletableFuture<>();
2840 <        g = f.handleAsync(r = new IntegerHandler(), exec);
2841 <        assertFalse(r.ran);
2842 <        f.completeExceptionally(new CFException());
2843 <        checkCompletedWithWrappedCFException(f);
2844 <        checkCompletedNormally(g, three);
2845 <        assertTrue(r.ran);
2846 <
2847 <        f = new CompletableFuture<>();
2848 <        g = f.handleAsync(r = new IntegerHandler(), exec);
2849 <        assertFalse(r.ran);
2850 <        f.complete(one);
3258 <        checkCompletedNormally(f, one);
3259 <        checkCompletedNormally(g, two);
3260 <        assertTrue(r.ran);
3261 <
3262 <        f = new CompletableFuture<>();
3263 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3264 <        assertFalse(r.ran);
3265 <        f.complete(one);
3266 <        checkCompletedNormally(f, one);
3267 <        checkCompletedNormally(g, two);
3268 <        assertTrue(r.ran);
3269 <    }
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 >    {
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<>();
2835 >
2836 >        if (!createIncomplete) f.completeExceptionally(ex1);
2837 >        final CompletableFuture<Integer> g = m.whenComplete
2838 >            (f,
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 >        assertEquals(1, a.get());
2850 >    }}
2851  
2852   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines