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.53 by jsr166, Mon Jun 2 20:20:47 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 +        assertEquals(1, r.invocationCount);
1268 +    }}
1269 +
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 +    {
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          }
842    }
1293  
1294 <    public void testThenCombine_normalCompletion2() {
1294 >        checkCompletedWithWrappedCFException(h, ex);
1295 >        assertEquals(0, r.invocationCount);
1296 >        checkCompletedNormally(fFirst ? f : g, v1);
1297 >        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1298 >    }}
1299 >
1300 >    /**
1301 >     * thenCombine result completes exceptionally if action does
1302 >     */
1303 >    public void testThenCombine_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 }) {
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 >    }}
1326  
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 +    {
1337          final CompletableFuture<Integer> f = new CompletableFuture<>();
1338          final CompletableFuture<Integer> g = new CompletableFuture<>();
1339          final SubtractFunction r = new SubtractFunction();
1340 +
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 +        if (createIncomplete) {
1346 +            checkIncomplete(h);
1347 +            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1348 +        }
1349  
1350 <        g.complete(v2);
1351 <        checkIncomplete(h);
1352 <        assertFalse(r.ran());
1353 <        f.complete(v1);
1350 >        checkCompletedWithWrappedCancellationException(h);
1351 >        checkCancelled(!fFirst ? f : g);
1352 >        assertEquals(0, r.invocationCount);
1353 >        checkCompletedNormally(fFirst ? f : g, v1);
1354 >    }}
1355  
1356 <        checkCompletedNormally(h, subtract(v1, v2));
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 >    {
1367 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1368 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1369 >        final SubtractAction r = new SubtractAction();
1370 >
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, null);
1382 >        assertEquals(subtract(v1, v2), r.value);
1383          checkCompletedNormally(f, v1);
1384          checkCompletedNormally(g, v2);
1385 +    }}
1386 +
1387 +    /**
1388 +     * thenAcceptBoth result completes exceptionally after exceptional
1389 +     * completion of either source
1390 +     */
1391 +    public void testThenAcceptBoth_exceptionalCompletion() {
1392 +        for (ExecutionMode m : ExecutionMode.values())
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<>();
1399 +        final CFException ex = new CFException();
1400 +        final SubtractAction r = new SubtractAction();
1401 +
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          }
863    }
1410  
1411 <    public void testThenCombine_normalCompletion3() {
1411 >        checkCompletedWithWrappedCFException(h, ex);
1412 >        assertEquals(0, r.invocationCount);
1413 >        checkCompletedNormally(fFirst ? f : g, v1);
1414 >        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1415 >    }}
1416 >
1417 >    /**
1418 >     * thenAcceptBoth result completes exceptionally if action does
1419 >     */
1420 >    public void testThenAcceptBoth_actionFailed() {
1421          for (ExecutionMode m : ExecutionMode.values())
1422 +        for (boolean fFirst : new boolean[] { true, false })
1423          for (Integer v1 : new Integer[] { 1, null })
1424 <        for (Integer v2 : new Integer[] { 2, null }) {
1424 >        for (Integer v2 : new Integer[] { 2, null })
1425 >    {
1426 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1427 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1428 >        final FailingBiConsumer r = new FailingBiConsumer();
1429 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1430 >
1431 >        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);
1440 >        checkCompletedNormally(f, v1);
1441 >        checkCompletedNormally(g, v2);
1442 >    }}
1443  
1444 +    /**
1445 +     * thenAcceptBoth result completes exceptionally if either source cancelled
1446 +     */
1447 +    public void testThenAcceptBoth_sourceCancelled() {
1448 +        for (ExecutionMode m : ExecutionMode.values())
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 SubtractFunction r = new SubtractFunction();
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_normalCompletion1() {
1478 +        for (ExecutionMode m : ExecutionMode.values())
1479 +        for (Integer v1 : new Integer[] { 1, null })
1480 +        for (Integer v2 : new Integer[] { 2, null })
1481 +    {
1482 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
1483 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
1484 +        final Noop r = new Noop();
1485 +        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1486 +
1487 +        f.complete(v1);
1488 +        checkIncomplete(h);
1489 +        assertEquals(0, r.invocationCount);
1490          g.complete(v2);
1491 +
1492 +        checkCompletedNormally(h, null);
1493 +        assertEquals(1, r.invocationCount);
1494 +        checkCompletedNormally(f, v1);
1495 +        checkCompletedNormally(g, v2);
1496 +    }}
1497 +
1498 +    public void testRunAfterBoth_normalCompletion2() {
1499 +        for (ExecutionMode m : ExecutionMode.values())
1500 +        for (Integer v1 : new Integer[] { 1, null })
1501 +        for (Integer v2 : new Integer[] { 2, null })
1502 +    {
1503 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
1504 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
1505 +        final Noop r = new Noop();
1506 +        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1507 +
1508 +        g.complete(v2);
1509 +        checkIncomplete(h);
1510 +        assertEquals(0, r.invocationCount);
1511          f.complete(v1);
876        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1512  
1513 <        checkCompletedNormally(h, subtract(v1, v2));
1513 >        checkCompletedNormally(h, null);
1514 >        assertEquals(1, r.invocationCount);
1515          checkCompletedNormally(f, v1);
1516          checkCompletedNormally(g, v2);
1517 <        }
882 <    }
1517 >    }}
1518  
1519 <    public void testThenCombine_normalCompletion4() {
1519 >    public void testRunAfterBoth_normalCompletion3() {
1520          for (ExecutionMode m : ExecutionMode.values())
1521          for (Integer v1 : new Integer[] { 1, null })
1522 <        for (Integer v2 : new Integer[] { 2, null }) {
1522 >        for (Integer v2 : new Integer[] { 2, null })
1523 >    {
1524 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1525 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1526 >        final Noop r = new Noop();
1527 >
1528 >        g.complete(v2);
1529 >        f.complete(v1);
1530 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1531 >
1532 >        checkCompletedNormally(h, null);
1533 >        assertEquals(1, r.invocationCount);
1534 >        checkCompletedNormally(f, v1);
1535 >        checkCompletedNormally(g, v2);
1536 >    }}
1537  
1538 +    public void testRunAfterBoth_normalCompletion4() {
1539 +        for (ExecutionMode m : ExecutionMode.values())
1540 +        for (Integer v1 : new Integer[] { 1, null })
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 SubtractFunction r = new SubtractFunction();
1545 >        final Noop r = new Noop();
1546  
1547          f.complete(v1);
1548          g.complete(v2);
1549 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1549 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1550  
1551 <        checkCompletedNormally(h, subtract(v1, v2));
1551 >        checkCompletedNormally(h, null);
1552 >        assertEquals(1, r.invocationCount);
1553          checkCompletedNormally(f, v1);
1554          checkCompletedNormally(g, v2);
1555 <        }
901 <    }
1555 >    }}
1556  
1557      /**
1558 <     * thenCombine result completes exceptionally after exceptional
1558 >     * runAfterBoth result completes exceptionally after exceptional
1559       * completion of either source
1560       */
1561 <    public void testThenCombine_exceptionalCompletion1() {
1561 >    public void testRunAfterBoth_exceptionalCompletion1() {
1562          for (ExecutionMode m : ExecutionMode.values())
1563 <        for (Integer v1 : new Integer[] { 1, null }) {
1564 <
1563 >        for (Integer v1 : new Integer[] { 1, null })
1564 >    {
1565          final CompletableFuture<Integer> f = new CompletableFuture<>();
1566          final CompletableFuture<Integer> g = new CompletableFuture<>();
1567 <        final SubtractFunction r = new SubtractFunction();
1568 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1567 >        final Noop r = new Noop();
1568 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1569          final CFException ex = new CFException();
1570  
1571          f.completeExceptionally(ex);
# Line 920 | Line 1574 | public class CompletableFutureTest exten
1574  
1575          checkCompletedWithWrappedCFException(h, ex);
1576          checkCompletedWithWrappedCFException(f, ex);
1577 <        assertFalse(r.ran());
1577 >        assertEquals(0, r.invocationCount);
1578          checkCompletedNormally(g, v1);
1579 <        }
926 <    }
1579 >    }}
1580  
1581 <    public void testThenCombine_exceptionalCompletion2() {
1581 >    public void testRunAfterBoth_exceptionalCompletion2() {
1582          for (ExecutionMode m : ExecutionMode.values())
1583 <        for (Integer v1 : new Integer[] { 1, null }) {
1584 <
1583 >        for (Integer v1 : new Integer[] { 1, null })
1584 >    {
1585          final CompletableFuture<Integer> f = new CompletableFuture<>();
1586          final CompletableFuture<Integer> g = new CompletableFuture<>();
1587 <        final SubtractFunction r = new SubtractFunction();
1588 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1587 >        final Noop r = new Noop();
1588 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1589          final CFException ex = new CFException();
1590  
1591          g.completeExceptionally(ex);
# Line 941 | Line 1594 | public class CompletableFutureTest exten
1594  
1595          checkCompletedWithWrappedCFException(h, ex);
1596          checkCompletedWithWrappedCFException(g, ex);
1597 <        assertFalse(r.ran());
1597 >        assertEquals(0, r.invocationCount);
1598          checkCompletedNormally(f, v1);
1599 <        }
947 <    }
1599 >    }}
1600  
1601 <    public void testThenCombine_exceptionalCompletion3() {
1601 >    public void testRunAfterBoth_exceptionalCompletion3() {
1602          for (ExecutionMode m : ExecutionMode.values())
1603 <        for (Integer v1 : new Integer[] { 1, null }) {
1604 <
1603 >        for (Integer v1 : new Integer[] { 1, null })
1604 >    {
1605          final CompletableFuture<Integer> f = new CompletableFuture<>();
1606          final CompletableFuture<Integer> g = new CompletableFuture<>();
1607 <        final SubtractFunction r = new SubtractFunction();
1607 >        final Noop r = new Noop();
1608          final CFException ex = new CFException();
1609  
1610          g.completeExceptionally(ex);
1611          f.complete(v1);
1612 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1612 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1613  
1614          checkCompletedWithWrappedCFException(h, ex);
1615          checkCompletedWithWrappedCFException(g, ex);
1616 <        assertFalse(r.ran());
1616 >        assertEquals(0, r.invocationCount);
1617          checkCompletedNormally(f, v1);
1618 <        }
967 <    }
1618 >    }}
1619  
1620 <    public void testThenCombine_exceptionalCompletion4() {
1620 >    public void testRunAfterBoth_exceptionalCompletion4() {
1621          for (ExecutionMode m : ExecutionMode.values())
1622 <        for (Integer v1 : new Integer[] { 1, null }) {
1623 <
1622 >        for (Integer v1 : new Integer[] { 1, null })
1623 >    {
1624          final CompletableFuture<Integer> f = new CompletableFuture<>();
1625          final CompletableFuture<Integer> g = new CompletableFuture<>();
1626 <        final SubtractFunction r = new SubtractFunction();
1626 >        final Noop r = new Noop();
1627          final CFException ex = new CFException();
1628  
1629          f.completeExceptionally(ex);
1630          g.complete(v1);
1631 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1631 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1632  
1633          checkCompletedWithWrappedCFException(h, ex);
1634          checkCompletedWithWrappedCFException(f, ex);
1635 <        assertFalse(r.ran());
1635 >        assertEquals(0, r.invocationCount);
1636          checkCompletedNormally(g, v1);
1637 <        }
987 <    }
1637 >    }}
1638  
1639      /**
1640 <     * thenCombine result completes exceptionally if action does
1640 >     * runAfterBoth result completes exceptionally if action does
1641       */
1642 <    public void testThenCombine_actionFailed1() {
1642 >    public void testRunAfterBoth_actionFailed1() {
1643          for (ExecutionMode m : ExecutionMode.values())
1644          for (Integer v1 : new Integer[] { 1, null })
1645 <        for (Integer v2 : new Integer[] { 2, null }) {
1646 <
1645 >        for (Integer v2 : new Integer[] { 2, null })
1646 >    {
1647          final CompletableFuture<Integer> f = new CompletableFuture<>();
1648          final CompletableFuture<Integer> g = new CompletableFuture<>();
1649 <        final FailingBiFunction r = new FailingBiFunction();
1650 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1649 >        final FailingRunnable r = new FailingRunnable();
1650 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1651  
1652          f.complete(v1);
1653          checkIncomplete(h);
# Line 1006 | Line 1656 | public class CompletableFutureTest exten
1656          checkCompletedWithWrappedCFException(h);
1657          checkCompletedNormally(f, v1);
1658          checkCompletedNormally(g, v2);
1659 <        }
1010 <    }
1659 >    }}
1660  
1661 <    public void testThenCombine_actionFailed2() {
1661 >    public void testRunAfterBoth_actionFailed2() {
1662          for (ExecutionMode m : ExecutionMode.values())
1663          for (Integer v1 : new Integer[] { 1, null })
1664 <        for (Integer v2 : new Integer[] { 2, null }) {
1665 <
1664 >        for (Integer v2 : new Integer[] { 2, null })
1665 >    {
1666          final CompletableFuture<Integer> f = new CompletableFuture<>();
1667          final CompletableFuture<Integer> g = new CompletableFuture<>();
1668 <        final FailingBiFunction r = new FailingBiFunction();
1669 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1668 >        final FailingRunnable r = new FailingRunnable();
1669 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1670  
1671          g.complete(v2);
1672          checkIncomplete(h);
# Line 1026 | Line 1675 | public class CompletableFutureTest exten
1675          checkCompletedWithWrappedCFException(h);
1676          checkCompletedNormally(f, v1);
1677          checkCompletedNormally(g, v2);
1678 <        }
1030 <    }
1678 >    }}
1679  
1680      /**
1681 <     * thenCombine result completes exceptionally if either source cancelled
1681 >     * runAfterBoth result completes exceptionally if either source cancelled
1682       */
1683 <    public void testThenCombine_sourceCancelled1() {
1683 >    public void testRunAfterBoth_sourceCancelled1() {
1684          for (ExecutionMode m : ExecutionMode.values())
1685          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1686 <        for (Integer v1 : new Integer[] { 1, null }) {
1687 <
1686 >        for (Integer v1 : new Integer[] { 1, null })
1687 >    {
1688          final CompletableFuture<Integer> f = new CompletableFuture<>();
1689          final CompletableFuture<Integer> g = new CompletableFuture<>();
1690 <        final SubtractFunction r = new SubtractFunction();
1691 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1690 >        final Noop r = new Noop();
1691 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1692  
1693          assertTrue(f.cancel(mayInterruptIfRunning));
1694          checkIncomplete(h);
# Line 1048 | Line 1696 | public class CompletableFutureTest exten
1696  
1697          checkCompletedWithWrappedCancellationException(h);
1698          checkCancelled(f);
1699 <        assertFalse(r.ran());
1699 >        assertEquals(0, r.invocationCount);
1700          checkCompletedNormally(g, v1);
1701 <        }
1054 <    }
1701 >    }}
1702  
1703 <    public void testThenCombine_sourceCancelled2() {
1703 >    public void testRunAfterBoth_sourceCancelled2() {
1704          for (ExecutionMode m : ExecutionMode.values())
1705          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1706 <        for (Integer v1 : new Integer[] { 1, null }) {
1707 <
1706 >        for (Integer v1 : new Integer[] { 1, null })
1707 >    {
1708          final CompletableFuture<Integer> f = new CompletableFuture<>();
1709          final CompletableFuture<Integer> g = new CompletableFuture<>();
1710 <        final SubtractFunction r = new SubtractFunction();
1711 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1710 >        final Noop r = new Noop();
1711 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1712  
1713          assertTrue(g.cancel(mayInterruptIfRunning));
1714          checkIncomplete(h);
# Line 1069 | Line 1716 | public class CompletableFutureTest exten
1716  
1717          checkCompletedWithWrappedCancellationException(h);
1718          checkCancelled(g);
1719 <        assertFalse(r.ran());
1719 >        assertEquals(0, r.invocationCount);
1720          checkCompletedNormally(f, v1);
1721 <        }
1075 <    }
1721 >    }}
1722  
1723 <    public void testThenCombine_sourceCancelled3() {
1723 >    public void testRunAfterBoth_sourceCancelled3() {
1724          for (ExecutionMode m : ExecutionMode.values())
1725          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1726 <        for (Integer v1 : new Integer[] { 1, null }) {
1727 <
1726 >        for (Integer v1 : new Integer[] { 1, null })
1727 >    {
1728          final CompletableFuture<Integer> f = new CompletableFuture<>();
1729          final CompletableFuture<Integer> g = new CompletableFuture<>();
1730 <        final SubtractFunction r = new SubtractFunction();
1730 >        final Noop r = new Noop();
1731  
1732          assertTrue(g.cancel(mayInterruptIfRunning));
1733          f.complete(v1);
1734 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1734 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1735  
1736          checkCompletedWithWrappedCancellationException(h);
1737          checkCancelled(g);
1738 <        assertFalse(r.ran());
1738 >        assertEquals(0, r.invocationCount);
1739          checkCompletedNormally(f, v1);
1740 <        }
1095 <    }
1740 >    }}
1741  
1742 <    public void testThenCombine_sourceCancelled4() {
1742 >    public void testRunAfterBoth_sourceCancelled4() {
1743          for (ExecutionMode m : ExecutionMode.values())
1744          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1745 <        for (Integer v1 : new Integer[] { 1, null }) {
1746 <
1745 >        for (Integer v1 : new Integer[] { 1, null })
1746 >    {
1747          final CompletableFuture<Integer> f = new CompletableFuture<>();
1748          final CompletableFuture<Integer> g = new CompletableFuture<>();
1749 <        final SubtractFunction r = new SubtractFunction();
1749 >        final Noop r = new Noop();
1750  
1751          assertTrue(f.cancel(mayInterruptIfRunning));
1752          g.complete(v1);
1753 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1753 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1754  
1755          checkCompletedWithWrappedCancellationException(h);
1756          checkCancelled(f);
1757 <        assertFalse(r.ran());
1757 >        assertEquals(0, r.invocationCount);
1758          checkCompletedNormally(g, v1);
1759 <        }
1115 <    }
1759 >    }}
1760  
1761      /**
1762 <     * thenAcceptBoth result completes normally after normal
1763 <     * completion of sources
1762 >     * applyToEither result completes normally after normal completion
1763 >     * of either source
1764       */
1765 <    public void testThenAcceptBoth_normalCompletion1() {
1765 >    public void testApplyToEither_normalCompletion1() {
1766          for (ExecutionMode m : ExecutionMode.values())
1767          for (Integer v1 : new Integer[] { 1, null })
1768 <        for (Integer v2 : new Integer[] { 2, null }) {
1769 <
1768 >        for (Integer v2 : new Integer[] { 2, null })
1769 >    {
1770          final CompletableFuture<Integer> f = new CompletableFuture<>();
1771          final CompletableFuture<Integer> g = new CompletableFuture<>();
1772 <        final SubtractAction r = new SubtractAction();
1773 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1772 >        final IncFunction r = new IncFunction();
1773 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1774  
1775          f.complete(v1);
1776 <        checkIncomplete(h);
1133 <        assertFalse(r.ran());
1134 <        g.complete(v2);
1135 <
1136 <        checkCompletedNormally(h, null);
1137 <        assertEquals(r.value, subtract(v1, v2));
1138 <        checkCompletedNormally(f, v1);
1139 <        checkCompletedNormally(g, v2);
1140 <        }
1141 <    }
1142 <
1143 <    public void testThenAcceptBoth_normalCompletion2() {
1144 <        for (ExecutionMode m : ExecutionMode.values())
1145 <        for (Integer v1 : new Integer[] { 1, null })
1146 <        for (Integer v2 : new Integer[] { 2, null }) {
1147 <
1148 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1149 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1150 <        final SubtractAction r = new SubtractAction();
1151 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1152 <
1776 >        checkCompletedNormally(h, inc(v1));
1777          g.complete(v2);
1154        checkIncomplete(h);
1155        assertFalse(r.ran());
1156        f.complete(v1);
1778  
1158        checkCompletedNormally(h, null);
1159        assertEquals(r.value, subtract(v1, v2));
1779          checkCompletedNormally(f, v1);
1780          checkCompletedNormally(g, v2);
1781 <        }
1782 <    }
1781 >        checkCompletedNormally(h, inc(v1));
1782 >    }}
1783  
1784 <    public void testThenAcceptBoth_normalCompletion3() {
1784 >    public void testApplyToEither_normalCompletion2() {
1785          for (ExecutionMode m : ExecutionMode.values())
1786          for (Integer v1 : new Integer[] { 1, null })
1787 <        for (Integer v2 : new Integer[] { 2, null }) {
1788 <
1787 >        for (Integer v2 : new Integer[] { 2, null })
1788 >    {
1789          final CompletableFuture<Integer> f = new CompletableFuture<>();
1790          final CompletableFuture<Integer> g = new CompletableFuture<>();
1791 <        final SubtractAction r = new SubtractAction();
1791 >        final IncFunction r = new IncFunction();
1792 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1793  
1794          g.complete(v2);
1795 +        checkCompletedNormally(h, inc(v2));
1796          f.complete(v1);
1176        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1797  
1178        checkCompletedNormally(h, null);
1179        assertEquals(r.value, subtract(v1, v2));
1798          checkCompletedNormally(f, v1);
1799          checkCompletedNormally(g, v2);
1800 <        }
1801 <    }
1800 >        checkCompletedNormally(h, inc(v2));
1801 >        }}
1802  
1803 <    public void testThenAcceptBoth_normalCompletion4() {
1803 >    public void testApplyToEither_normalCompletion3() {
1804          for (ExecutionMode m : ExecutionMode.values())
1805          for (Integer v1 : new Integer[] { 1, null })
1806 <        for (Integer v2 : new Integer[] { 2, null }) {
1807 <
1806 >        for (Integer v2 : new Integer[] { 2, null })
1807 >    {
1808          final CompletableFuture<Integer> f = new CompletableFuture<>();
1809          final CompletableFuture<Integer> g = new CompletableFuture<>();
1810 <        final SubtractAction r = new SubtractAction();
1810 >        final IncFunction r = new IncFunction();
1811  
1812          f.complete(v1);
1813          g.complete(v2);
1814 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1814 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1815  
1198        checkCompletedNormally(h, null);
1199        assertEquals(r.value, subtract(v1, v2));
1816          checkCompletedNormally(f, v1);
1817          checkCompletedNormally(g, v2);
1818 <        }
1819 <    }
1818 >
1819 >        // unspecified behavior
1820 >        assertTrue(Objects.equals(h.join(), inc(v1)) ||
1821 >                   Objects.equals(h.join(), inc(v2)));
1822 >        assertEquals(1, r.invocationCount);
1823 >    }}
1824  
1825      /**
1826 <     * thenAcceptBoth result completes exceptionally after exceptional
1826 >     * applyToEither result completes exceptionally after exceptional
1827       * completion of either source
1828       */
1829 <    public void testThenAcceptBoth_exceptionalCompletion1() {
1829 >    public void testApplyToEither_exceptionalCompletion1() {
1830          for (ExecutionMode m : ExecutionMode.values())
1831 <        for (Integer v1 : new Integer[] { 1, null }) {
1832 <
1831 >        for (Integer v1 : new Integer[] { 1, null })
1832 >    {
1833          final CompletableFuture<Integer> f = new CompletableFuture<>();
1834          final CompletableFuture<Integer> g = new CompletableFuture<>();
1835 <        final SubtractAction r = new SubtractAction();
1836 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1835 >        final IncFunction r = new IncFunction();
1836 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1837          final CFException ex = new CFException();
1838  
1839          f.completeExceptionally(ex);
1840 <        checkIncomplete(h);
1840 >        checkCompletedWithWrappedCFException(h, ex);
1841          g.complete(v1);
1842  
1843 <        checkCompletedWithWrappedCFException(h, ex);
1224 <        checkCompletedWithWrappedCFException(f, ex);
1225 <        assertFalse(r.ran());
1843 >        assertEquals(0, r.invocationCount);
1844          checkCompletedNormally(g, v1);
1845 <        }
1846 <    }
1845 >        checkCompletedWithWrappedCFException(f, ex);
1846 >        checkCompletedWithWrappedCFException(h, ex);
1847 >    }}
1848  
1849 <    public void testThenAcceptBoth_exceptionalCompletion2() {
1849 >    public void testApplyToEither_exceptionalCompletion2() {
1850          for (ExecutionMode m : ExecutionMode.values())
1851 <        for (Integer v1 : new Integer[] { 1, null }) {
1852 <
1851 >        for (Integer v1 : new Integer[] { 1, null })
1852 >    {
1853          final CompletableFuture<Integer> f = new CompletableFuture<>();
1854          final CompletableFuture<Integer> g = new CompletableFuture<>();
1855 <        final SubtractAction r = new SubtractAction();
1856 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1855 >        final IncFunction r = new IncFunction();
1856 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1857          final CFException ex = new CFException();
1858  
1859          g.completeExceptionally(ex);
1860 <        checkIncomplete(h);
1860 >        checkCompletedWithWrappedCFException(h, ex);
1861          f.complete(v1);
1862  
1863 <        checkCompletedWithWrappedCFException(h, ex);
1245 <        checkCompletedWithWrappedCFException(g, ex);
1246 <        assertFalse(r.ran());
1863 >        assertEquals(0, r.invocationCount);
1864          checkCompletedNormally(f, v1);
1865 <        }
1866 <    }
1865 >        checkCompletedWithWrappedCFException(g, ex);
1866 >        checkCompletedWithWrappedCFException(h, ex);
1867 >    }}
1868  
1869 <    public void testThenAcceptBoth_exceptionalCompletion3() {
1869 >    public void testApplyToEither_exceptionalCompletion3() {
1870          for (ExecutionMode m : ExecutionMode.values())
1871 <        for (Integer v1 : new Integer[] { 1, null }) {
1872 <
1871 >        for (Integer v1 : new Integer[] { 1, null })
1872 >    {
1873          final CompletableFuture<Integer> f = new CompletableFuture<>();
1874          final CompletableFuture<Integer> g = new CompletableFuture<>();
1875 <        final SubtractAction r = new SubtractAction();
1875 >        final IncFunction r = new IncFunction();
1876          final CFException ex = new CFException();
1877  
1878          g.completeExceptionally(ex);
1879          f.complete(v1);
1880 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1880 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1881 >
1882 >        // unspecified behavior
1883 >        Integer v;
1884 >        try {
1885 >            assertEquals(inc(v1), h.join());
1886 >            assertEquals(1, r.invocationCount);
1887 >        } catch (CompletionException ok) {
1888 >            checkCompletedWithWrappedCFException(h, ex);
1889 >            assertEquals(0, r.invocationCount);
1890 >        }
1891  
1264        checkCompletedWithWrappedCFException(h, ex);
1892          checkCompletedWithWrappedCFException(g, ex);
1266        assertFalse(r.ran());
1893          checkCompletedNormally(f, v1);
1894 <        }
1269 <    }
1894 >    }}
1895  
1896 <    public void testThenAcceptBoth_exceptionalCompletion4() {
1896 >    public void testApplyToEither_exceptionalCompletion4() {
1897          for (ExecutionMode m : ExecutionMode.values())
1898 <        for (Integer v1 : new Integer[] { 1, null }) {
1899 <
1898 >        for (Integer v1 : new Integer[] { 1, null })
1899 >    {
1900          final CompletableFuture<Integer> f = new CompletableFuture<>();
1901          final CompletableFuture<Integer> g = new CompletableFuture<>();
1902 <        final SubtractAction r = new SubtractAction();
1902 >        final IncFunction r = new IncFunction();
1903          final CFException ex = new CFException();
1904  
1905          f.completeExceptionally(ex);
1906          g.complete(v1);
1907 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1907 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1908 >
1909 >        // unspecified behavior
1910 >        Integer v;
1911 >        try {
1912 >            assertEquals(inc(v1), h.join());
1913 >            assertEquals(1, r.invocationCount);
1914 >        } catch (CompletionException ok) {
1915 >            checkCompletedWithWrappedCFException(h, ex);
1916 >            assertEquals(0, r.invocationCount);
1917 >        }
1918  
1284        checkCompletedWithWrappedCFException(h, ex);
1919          checkCompletedWithWrappedCFException(f, ex);
1286        assertFalse(r.ran());
1920          checkCompletedNormally(g, v1);
1921 <        }
1289 <    }
1921 >    }}
1922  
1923      /**
1924 <     * thenAcceptBoth result completes exceptionally if action does
1924 >     * applyToEither result completes exceptionally if action does
1925       */
1926 <    public void testThenAcceptBoth_actionFailed1() {
1926 >    public void testApplyToEither_actionFailed1() {
1927          for (ExecutionMode m : ExecutionMode.values())
1928          for (Integer v1 : new Integer[] { 1, null })
1929 <        for (Integer v2 : new Integer[] { 2, null }) {
1930 <
1929 >        for (Integer v2 : new Integer[] { 2, null })
1930 >    {
1931          final CompletableFuture<Integer> f = new CompletableFuture<>();
1932          final CompletableFuture<Integer> g = new CompletableFuture<>();
1933 <        final FailingBiConsumer r = new FailingBiConsumer();
1934 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1933 >        final FailingFunction r = new FailingFunction();
1934 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1935  
1936          f.complete(v1);
1305        checkIncomplete(h);
1306        g.complete(v2);
1307
1937          checkCompletedWithWrappedCFException(h);
1938 +        g.complete(v2);
1939          checkCompletedNormally(f, v1);
1940          checkCompletedNormally(g, v2);
1941 <        }
1312 <    }
1941 >    }}
1942  
1943 <    public void testThenAcceptBoth_actionFailed2() {
1943 >    public void testApplyToEither_actionFailed2() {
1944          for (ExecutionMode m : ExecutionMode.values())
1945          for (Integer v1 : new Integer[] { 1, null })
1946 <        for (Integer v2 : new Integer[] { 2, null }) {
1947 <
1946 >        for (Integer v2 : new Integer[] { 2, null })
1947 >    {
1948          final CompletableFuture<Integer> f = new CompletableFuture<>();
1949          final CompletableFuture<Integer> g = new CompletableFuture<>();
1950 <        final FailingBiConsumer r = new FailingBiConsumer();
1951 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1950 >        final FailingFunction r = new FailingFunction();
1951 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1952  
1953          g.complete(v2);
1325        checkIncomplete(h);
1326        f.complete(v1);
1327
1954          checkCompletedWithWrappedCFException(h);
1955 +        f.complete(v1);
1956          checkCompletedNormally(f, v1);
1957          checkCompletedNormally(g, v2);
1958 <        }
1332 <    }
1958 >    }}
1959  
1960      /**
1961 <     * thenAcceptBoth result completes exceptionally if either source cancelled
1961 >     * applyToEither result completes exceptionally if either source cancelled
1962       */
1963 <    public void testThenAcceptBoth_sourceCancelled1() {
1963 >    public void testApplyToEither_sourceCancelled1() {
1964          for (ExecutionMode m : ExecutionMode.values())
1965          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1966 <        for (Integer v1 : new Integer[] { 1, null }) {
1967 <
1966 >        for (Integer v1 : new Integer[] { 1, null })
1967 >    {
1968          final CompletableFuture<Integer> f = new CompletableFuture<>();
1969          final CompletableFuture<Integer> g = new CompletableFuture<>();
1970 <        final SubtractAction r = new SubtractAction();
1971 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1970 >        final IncFunction r = new IncFunction();
1971 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1972  
1973          assertTrue(f.cancel(mayInterruptIfRunning));
1974 <        checkIncomplete(h);
1974 >        checkCompletedWithWrappedCancellationException(h);
1975          g.complete(v1);
1976  
1351        checkCompletedWithWrappedCancellationException(h);
1977          checkCancelled(f);
1978 <        assertFalse(r.ran());
1978 >        assertEquals(0, r.invocationCount);
1979          checkCompletedNormally(g, v1);
1980 <        }
1981 <    }
1980 >        checkCompletedWithWrappedCancellationException(h);
1981 >    }}
1982  
1983 <    public void testThenAcceptBoth_sourceCancelled2() {
1983 >    public void testApplyToEither_sourceCancelled2() {
1984          for (ExecutionMode m : ExecutionMode.values())
1985          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1986 <        for (Integer v1 : new Integer[] { 1, null }) {
1987 <
1986 >        for (Integer v1 : new Integer[] { 1, null })
1987 >    {
1988          final CompletableFuture<Integer> f = new CompletableFuture<>();
1989          final CompletableFuture<Integer> g = new CompletableFuture<>();
1990 <        final SubtractAction r = new SubtractAction();
1991 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1990 >        final IncFunction r = new IncFunction();
1991 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1992  
1993          assertTrue(g.cancel(mayInterruptIfRunning));
1994 <        checkIncomplete(h);
1994 >        checkCompletedWithWrappedCancellationException(h);
1995          f.complete(v1);
1996  
1372        checkCompletedWithWrappedCancellationException(h);
1997          checkCancelled(g);
1998 <        assertFalse(r.ran());
1998 >        assertEquals(0, r.invocationCount);
1999          checkCompletedNormally(f, v1);
2000 <        }
2001 <    }
2000 >        checkCompletedWithWrappedCancellationException(h);
2001 >    }}
2002  
2003 <    public void testThenAcceptBoth_sourceCancelled3() {
2003 >    public void testApplyToEither_sourceCancelled3() {
2004          for (ExecutionMode m : ExecutionMode.values())
2005          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2006 <        for (Integer v1 : new Integer[] { 1, null }) {
2007 <
2006 >        for (Integer v1 : new Integer[] { 1, null })
2007 >    {
2008          final CompletableFuture<Integer> f = new CompletableFuture<>();
2009          final CompletableFuture<Integer> g = new CompletableFuture<>();
2010 <        final SubtractAction r = new SubtractAction();
2010 >        final IncFunction r = new IncFunction();
2011  
2012          assertTrue(g.cancel(mayInterruptIfRunning));
2013          f.complete(v1);
2014 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
2014 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2015 >
2016 >        // unspecified behavior
2017 >        Integer v;
2018 >        try {
2019 >            assertEquals(inc(v1), h.join());
2020 >            assertEquals(1, r.invocationCount);
2021 >        } catch (CompletionException ok) {
2022 >            checkCompletedWithWrappedCancellationException(h);
2023 >            assertEquals(0, r.invocationCount);
2024 >        }
2025  
1392        checkCompletedWithWrappedCancellationException(h);
2026          checkCancelled(g);
1394        assertFalse(r.ran());
2027          checkCompletedNormally(f, v1);
2028 <        }
1397 <    }
2028 >    }}
2029  
2030 <    public void testThenAcceptBoth_sourceCancelled4() {
2030 >    public void testApplyToEither_sourceCancelled4() {
2031          for (ExecutionMode m : ExecutionMode.values())
2032          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2033 <        for (Integer v1 : new Integer[] { 1, null }) {
2034 <
2033 >        for (Integer v1 : new Integer[] { 1, null })
2034 >    {
2035          final CompletableFuture<Integer> f = new CompletableFuture<>();
2036          final CompletableFuture<Integer> g = new CompletableFuture<>();
2037 <        final SubtractAction r = new SubtractAction();
2037 >        final IncFunction r = new IncFunction();
2038  
2039          assertTrue(f.cancel(mayInterruptIfRunning));
2040          g.complete(v1);
2041 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
2041 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2042 >
2043 >        // unspecified behavior
2044 >        Integer v;
2045 >        try {
2046 >            assertEquals(inc(v1), h.join());
2047 >            assertEquals(1, r.invocationCount);
2048 >        } catch (CompletionException ok) {
2049 >            checkCompletedWithWrappedCancellationException(h);
2050 >            assertEquals(0, r.invocationCount);
2051 >        }
2052  
1412        checkCompletedWithWrappedCancellationException(h);
2053          checkCancelled(f);
1414        assertFalse(r.ran());
2054          checkCompletedNormally(g, v1);
2055 <        }
1417 <    }
2055 >    }}
2056  
2057      /**
2058 <     * runAfterBoth result completes normally after normal
2059 <     * completion of sources
2058 >     * acceptEither result completes normally after normal completion
2059 >     * of either source
2060       */
2061 <    public void testRunAfterBoth_normalCompletion1() {
2061 >    public void testAcceptEither_normalCompletion1() {
2062          for (ExecutionMode m : ExecutionMode.values())
2063          for (Integer v1 : new Integer[] { 1, null })
2064 <        for (Integer v2 : new Integer[] { 2, null }) {
2065 <
2064 >        for (Integer v2 : new Integer[] { 2, null })
2065 >    {
2066          final CompletableFuture<Integer> f = new CompletableFuture<>();
2067          final CompletableFuture<Integer> g = new CompletableFuture<>();
2068 <        final Noop r = new Noop();
2069 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2068 >        final IncAction r = new IncAction();
2069 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2070  
2071          f.complete(v1);
1434        checkIncomplete(h);
1435        assertFalse(r.ran);
1436        g.complete(v2);
1437
2072          checkCompletedNormally(h, null);
2073 <        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 <
2073 >        assertEquals(inc(v1), r.value);
2074          g.complete(v2);
1456        checkIncomplete(h);
1457        assertFalse(r.ran);
1458        f.complete(v1);
2075  
1460        checkCompletedNormally(h, null);
1461        assertTrue(r.ran);
2076          checkCompletedNormally(f, v1);
2077          checkCompletedNormally(g, v2);
2078 <        }
2079 <    }
2078 >        checkCompletedNormally(h, null);
2079 >    }}
2080  
2081 <    public void testRunAfterBoth_normalCompletion3() {
2081 >    public void testAcceptEither_normalCompletion2() {
2082          for (ExecutionMode m : ExecutionMode.values())
2083          for (Integer v1 : new Integer[] { 1, null })
2084 <        for (Integer v2 : new Integer[] { 2, null }) {
2085 <
2084 >        for (Integer v2 : new Integer[] { 2, null })
2085 >    {
2086          final CompletableFuture<Integer> f = new CompletableFuture<>();
2087          final CompletableFuture<Integer> g = new CompletableFuture<>();
2088 <        final Noop r = new Noop();
2088 >        final IncAction r = new IncAction();
2089 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2090  
2091          g.complete(v2);
2092 +        checkCompletedNormally(h, null);
2093 +        assertEquals(inc(v2), r.value);
2094          f.complete(v1);
1478        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2095  
1480        checkCompletedNormally(h, null);
1481        assertTrue(r.ran);
2096          checkCompletedNormally(f, v1);
2097          checkCompletedNormally(g, v2);
2098 <        }
2099 <    }
2098 >        checkCompletedNormally(h, null);
2099 >    }}
2100  
2101 <    public void testRunAfterBoth_normalCompletion4() {
2101 >    public void testAcceptEither_normalCompletion3() {
2102          for (ExecutionMode m : ExecutionMode.values())
2103          for (Integer v1 : new Integer[] { 1, null })
2104 <        for (Integer v2 : new Integer[] { 2, null }) {
2105 <
2104 >        for (Integer v2 : new Integer[] { 2, null })
2105 >    {
2106          final CompletableFuture<Integer> f = new CompletableFuture<>();
2107          final CompletableFuture<Integer> g = new CompletableFuture<>();
2108 <        final Noop r = new Noop();
2108 >        final IncAction r = new IncAction();
2109  
2110          f.complete(v1);
2111          g.complete(v2);
2112 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2112 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2113  
2114          checkCompletedNormally(h, null);
1501        assertTrue(r.ran);
2115          checkCompletedNormally(f, v1);
2116          checkCompletedNormally(g, v2);
2117 <        }
2118 <    }
2117 >
2118 >        // unspecified behavior
2119 >        assertTrue(Objects.equals(r.value, inc(v1)) ||
2120 >                   Objects.equals(r.value, inc(v2)));
2121 >    }}
2122  
2123      /**
2124 <     * runAfterBoth result completes exceptionally after exceptional
2124 >     * acceptEither result completes exceptionally after exceptional
2125       * completion of either source
2126       */
2127 <    public void testRunAfterBoth_exceptionalCompletion1() {
2127 >    public void testAcceptEither_exceptionalCompletion1() {
2128          for (ExecutionMode m : ExecutionMode.values())
2129 <        for (Integer v1 : new Integer[] { 1, null }) {
2130 <
2129 >        for (Integer v1 : new Integer[] { 1, null })
2130 >    {
2131          final CompletableFuture<Integer> f = new CompletableFuture<>();
2132          final CompletableFuture<Integer> g = new CompletableFuture<>();
2133 <        final Noop r = new Noop();
2134 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2133 >        final IncAction r = new IncAction();
2134 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2135          final CFException ex = new CFException();
2136  
2137          f.completeExceptionally(ex);
2138 <        checkIncomplete(h);
2138 >        checkCompletedWithWrappedCFException(h, ex);
2139          g.complete(v1);
2140  
2141 <        checkCompletedWithWrappedCFException(h, ex);
1526 <        checkCompletedWithWrappedCFException(f, ex);
1527 <        assertFalse(r.ran);
2141 >        assertEquals(0, r.invocationCount);
2142          checkCompletedNormally(g, v1);
2143 <        }
2144 <    }
2143 >        checkCompletedWithWrappedCFException(f, ex);
2144 >        checkCompletedWithWrappedCFException(h, ex);
2145 >    }}
2146  
2147 <    public void testRunAfterBoth_exceptionalCompletion2() {
2147 >    public void testAcceptEither_exceptionalCompletion2() {
2148          for (ExecutionMode m : ExecutionMode.values())
2149 <        for (Integer v1 : new Integer[] { 1, null }) {
2150 <
2149 >        for (Integer v1 : new Integer[] { 1, null })
2150 >    {
2151          final CompletableFuture<Integer> f = new CompletableFuture<>();
2152          final CompletableFuture<Integer> g = new CompletableFuture<>();
2153 <        final Noop r = new Noop();
2154 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2153 >        final IncAction r = new IncAction();
2154 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2155          final CFException ex = new CFException();
2156  
2157          g.completeExceptionally(ex);
2158 <        checkIncomplete(h);
2158 >        checkCompletedWithWrappedCFException(h, ex);
2159          f.complete(v1);
2160  
2161 <        checkCompletedWithWrappedCFException(h, ex);
1547 <        checkCompletedWithWrappedCFException(g, ex);
1548 <        assertFalse(r.ran);
2161 >        assertEquals(0, r.invocationCount);
2162          checkCompletedNormally(f, v1);
2163 <        }
2164 <    }
2163 >        checkCompletedWithWrappedCFException(g, ex);
2164 >        checkCompletedWithWrappedCFException(h, ex);
2165 >    }}
2166  
2167 <    public void testRunAfterBoth_exceptionalCompletion3() {
2167 >    public void testAcceptEither_exceptionalCompletion3() {
2168          for (ExecutionMode m : ExecutionMode.values())
2169 <        for (Integer v1 : new Integer[] { 1, null }) {
2170 <
2169 >        for (Integer v1 : new Integer[] { 1, null })
2170 >    {
2171          final CompletableFuture<Integer> f = new CompletableFuture<>();
2172          final CompletableFuture<Integer> g = new CompletableFuture<>();
2173 <        final Noop r = new Noop();
2173 >        final IncAction r = new IncAction();
2174          final CFException ex = new CFException();
2175  
2176          g.completeExceptionally(ex);
2177          f.complete(v1);
2178 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2178 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2179 >
2180 >        // unspecified behavior
2181 >        Integer v;
2182 >        try {
2183 >            assertNull(h.join());
2184 >            assertEquals(1, r.invocationCount);
2185 >            assertEquals(inc(v1), r.value);
2186 >        } catch (CompletionException ok) {
2187 >            checkCompletedWithWrappedCFException(h, ex);
2188 >            assertEquals(0, r.invocationCount);
2189 >        }
2190  
1566        checkCompletedWithWrappedCFException(h, ex);
2191          checkCompletedWithWrappedCFException(g, ex);
1568        assertFalse(r.ran);
2192          checkCompletedNormally(f, v1);
2193 <        }
1571 <    }
2193 >    }}
2194  
2195 <    public void testRunAfterBoth_exceptionalCompletion4() {
2195 >    public void testAcceptEither_exceptionalCompletion4() {
2196          for (ExecutionMode m : ExecutionMode.values())
2197 <        for (Integer v1 : new Integer[] { 1, null }) {
2198 <
2197 >        for (Integer v1 : new Integer[] { 1, null })
2198 >    {
2199          final CompletableFuture<Integer> f = new CompletableFuture<>();
2200          final CompletableFuture<Integer> g = new CompletableFuture<>();
2201 <        final Noop r = new Noop();
2201 >        final IncAction r = new IncAction();
2202          final CFException ex = new CFException();
2203  
2204          f.completeExceptionally(ex);
2205          g.complete(v1);
2206 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2206 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2207 >
2208 >        // unspecified behavior
2209 >        Integer v;
2210 >        try {
2211 >            assertNull(h.join());
2212 >            assertEquals(1, r.invocationCount);
2213 >            assertEquals(inc(v1), r.value);
2214 >        } catch (CompletionException ok) {
2215 >            checkCompletedWithWrappedCFException(h, ex);
2216 >            assertEquals(0, r.invocationCount);
2217 >        }
2218  
1586        checkCompletedWithWrappedCFException(h, ex);
2219          checkCompletedWithWrappedCFException(f, ex);
1588        assertFalse(r.ran);
2220          checkCompletedNormally(g, v1);
2221 <        }
1591 <    }
2221 >    }}
2222  
2223      /**
2224 <     * runAfterBoth result completes exceptionally if action does
2224 >     * acceptEither result completes exceptionally if action does
2225       */
2226 <    public void testRunAfterBoth_actionFailed1() {
2226 >    public void testAcceptEither_actionFailed1() {
2227          for (ExecutionMode m : ExecutionMode.values())
2228          for (Integer v1 : new Integer[] { 1, null })
2229 <        for (Integer v2 : new Integer[] { 2, null }) {
2230 <
2229 >        for (Integer v2 : new Integer[] { 2, null })
2230 >    {
2231          final CompletableFuture<Integer> f = new CompletableFuture<>();
2232          final CompletableFuture<Integer> g = new CompletableFuture<>();
2233 <        final FailingNoop r = new FailingNoop();
2234 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2233 >        final FailingConsumer r = new FailingConsumer();
2234 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2235  
2236          f.complete(v1);
1607        checkIncomplete(h);
1608        g.complete(v2);
1609
2237          checkCompletedWithWrappedCFException(h);
2238 +        g.complete(v2);
2239          checkCompletedNormally(f, v1);
2240          checkCompletedNormally(g, v2);
2241 <        }
1614 <    }
2241 >    }}
2242  
2243 <    public void testRunAfterBoth_actionFailed2() {
2243 >    public void testAcceptEither_actionFailed2() {
2244          for (ExecutionMode m : ExecutionMode.values())
2245          for (Integer v1 : new Integer[] { 1, null })
2246 <        for (Integer v2 : new Integer[] { 2, null }) {
2247 <
2246 >        for (Integer v2 : new Integer[] { 2, null })
2247 >    {
2248          final CompletableFuture<Integer> f = new CompletableFuture<>();
2249          final CompletableFuture<Integer> g = new CompletableFuture<>();
2250 <        final FailingNoop r = new FailingNoop();
2251 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2250 >        final FailingConsumer r = new FailingConsumer();
2251 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2252  
2253          g.complete(v2);
1627        checkIncomplete(h);
1628        f.complete(v1);
1629
2254          checkCompletedWithWrappedCFException(h);
2255 +        f.complete(v1);
2256          checkCompletedNormally(f, v1);
2257          checkCompletedNormally(g, v2);
2258 <        }
1634 <    }
2258 >    }}
2259  
2260      /**
2261 <     * runAfterBoth result completes exceptionally if either source cancelled
2261 >     * acceptEither result completes exceptionally if either source cancelled
2262       */
2263 <    public void testRunAfterBoth_sourceCancelled1() {
2263 >    public void testAcceptEither_sourceCancelled1() {
2264          for (ExecutionMode m : ExecutionMode.values())
2265          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2266 <        for (Integer v1 : new Integer[] { 1, null }) {
2267 <
2266 >        for (Integer v1 : new Integer[] { 1, null })
2267 >    {
2268          final CompletableFuture<Integer> f = new CompletableFuture<>();
2269          final CompletableFuture<Integer> g = new CompletableFuture<>();
2270 <        final Noop r = new Noop();
2271 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2270 >        final IncAction r = new IncAction();
2271 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2272  
2273          assertTrue(f.cancel(mayInterruptIfRunning));
2274 <        checkIncomplete(h);
2274 >        checkCompletedWithWrappedCancellationException(h);
2275          g.complete(v1);
2276  
1653        checkCompletedWithWrappedCancellationException(h);
2277          checkCancelled(f);
2278 <        assertFalse(r.ran);
2278 >        assertEquals(0, r.invocationCount);
2279          checkCompletedNormally(g, v1);
2280 <        }
2281 <    }
2280 >        checkCompletedWithWrappedCancellationException(h);
2281 >    }}
2282  
2283 <    public void testRunAfterBoth_sourceCancelled2() {
2283 >    public void testAcceptEither_sourceCancelled2() {
2284          for (ExecutionMode m : ExecutionMode.values())
2285          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2286 <        for (Integer v1 : new Integer[] { 1, null }) {
2287 <
2286 >        for (Integer v1 : new Integer[] { 1, null })
2287 >    {
2288          final CompletableFuture<Integer> f = new CompletableFuture<>();
2289          final CompletableFuture<Integer> g = new CompletableFuture<>();
2290 <        final Noop r = new Noop();
2291 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2290 >        final IncAction r = new IncAction();
2291 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2292  
2293          assertTrue(g.cancel(mayInterruptIfRunning));
2294 <        checkIncomplete(h);
2294 >        checkCompletedWithWrappedCancellationException(h);
2295          f.complete(v1);
2296  
1674        checkCompletedWithWrappedCancellationException(h);
2297          checkCancelled(g);
2298 <        assertFalse(r.ran);
2298 >        assertEquals(0, r.invocationCount);
2299          checkCompletedNormally(f, v1);
2300 <        }
2301 <    }
2300 >        checkCompletedWithWrappedCancellationException(h);
2301 >    }}
2302  
2303 <    public void testRunAfterBoth_sourceCancelled3() {
2303 >    public void testAcceptEither_sourceCancelled3() {
2304          for (ExecutionMode m : ExecutionMode.values())
2305          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2306 <        for (Integer v1 : new Integer[] { 1, null }) {
2307 <
2306 >        for (Integer v1 : new Integer[] { 1, null })
2307 >    {
2308          final CompletableFuture<Integer> f = new CompletableFuture<>();
2309          final CompletableFuture<Integer> g = new CompletableFuture<>();
2310 <        final Noop r = new Noop();
2310 >        final IncAction r = new IncAction();
2311  
2312          assertTrue(g.cancel(mayInterruptIfRunning));
2313          f.complete(v1);
2314 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2314 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2315 >
2316 >        // unspecified behavior
2317 >        Integer v;
2318 >        try {
2319 >            assertNull(h.join());
2320 >            assertEquals(1, r.invocationCount);
2321 >            assertEquals(inc(v1), r.value);
2322 >        } catch (CompletionException ok) {
2323 >            checkCompletedWithWrappedCancellationException(h);
2324 >            assertEquals(0, r.invocationCount);
2325 >        }
2326  
1694        checkCompletedWithWrappedCancellationException(h);
2327          checkCancelled(g);
1696        assertFalse(r.ran);
2328          checkCompletedNormally(f, v1);
2329 <        }
1699 <    }
2329 >    }}
2330  
2331 <    public void testRunAfterBoth_sourceCancelled4() {
2331 >    public void testAcceptEither_sourceCancelled4() {
2332          for (ExecutionMode m : ExecutionMode.values())
2333          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2334 <        for (Integer v1 : new Integer[] { 1, null }) {
2335 <
2334 >        for (Integer v1 : new Integer[] { 1, null })
2335 >    {
2336          final CompletableFuture<Integer> f = new CompletableFuture<>();
2337          final CompletableFuture<Integer> g = new CompletableFuture<>();
2338 <        final Noop r = new Noop();
2338 >        final IncAction r = new IncAction();
2339  
2340          assertTrue(f.cancel(mayInterruptIfRunning));
2341          g.complete(v1);
2342 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2342 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2343 >
2344 >        // unspecified behavior
2345 >        Integer v;
2346 >        try {
2347 >            assertNull(h.join());
2348 >            assertEquals(1, r.invocationCount);
2349 >            assertEquals(inc(v1), r.value);
2350 >        } catch (CompletionException ok) {
2351 >            checkCompletedWithWrappedCancellationException(h);
2352 >            assertEquals(0, r.invocationCount);
2353 >        }
2354  
1714        checkCompletedWithWrappedCancellationException(h);
2355          checkCancelled(f);
1716        assertFalse(r.ran);
2356          checkCompletedNormally(g, v1);
2357 <        }
1719 <    }
2357 >    }}
2358  
2359      /**
2360 <     * applyToEither result completes normally after normal completion
2360 >     * runAfterEither result completes normally after normal completion
2361       * of either source
2362       */
2363 <    public void testApplyToEither() {
2364 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2365 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2366 <        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
2367 <        f.complete(one);
2368 <        checkCompletedNormally(g, two);
2369 <        f2.complete(one);
2370 <        checkCompletedNormally(g, two);
2371 <
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 <    }
2363 >    public void testRunAfterEither_normalCompletion1() {
2364 >        for (ExecutionMode m : ExecutionMode.values())
2365 >        for (Integer v1 : new Integer[] { 1, null })
2366 >        for (Integer v2 : new Integer[] { 2, null })
2367 >    {
2368 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2369 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2370 >        final Noop r = new Noop();
2371 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2372  
2373 <    /**
2374 <     * acceptEither result completes normally after normal completion
2375 <     * of either source
2376 <     */
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);
2373 >        f.complete(v1);
2374 >        checkCompletedNormally(h, null);
2375 >        assertEquals(1, r.invocationCount);
2376 >        g.complete(v2);
2377  
2378 <        r = new IncAction();
2379 <        f = new CompletableFuture<>();
2380 <        f.complete(one);
2381 <        f2 = new CompletableFuture<>();
2382 <        g = f.acceptEither(f2, r);
1807 <        checkCompletedNormally(g, null);
1808 <        assertEquals(r.value, 2);
1809 <    }
2378 >        checkCompletedNormally(f, v1);
2379 >        checkCompletedNormally(g, v2);
2380 >        checkCompletedNormally(h, null);
2381 >        assertEquals(1, r.invocationCount);
2382 >    }}
2383  
2384 <    /**
2385 <     * acceptEither result completes exceptionally after exceptional
2386 <     * completion of either source
2387 <     */
2388 <    public void testAcceptEither2() {
2389 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2390 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2391 <        IncAction r = new IncAction();
2392 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
1820 <        f.completeExceptionally(new CFException());
1821 <        f2.complete(one);
1822 <        checkCompletedWithWrappedCFException(g);
2384 >    public void testRunAfterEither_normalCompletion2() {
2385 >        for (ExecutionMode m : ExecutionMode.values())
2386 >        for (Integer v1 : new Integer[] { 1, null })
2387 >        for (Integer v2 : new Integer[] { 2, null })
2388 >    {
2389 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2390 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2391 >        final Noop r = new Noop();
2392 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2393  
2394 <        r = new IncAction();
2395 <        f = new CompletableFuture<>();
2396 <        f2 = new CompletableFuture<>();
2397 <        f2.completeExceptionally(new CFException());
1828 <        g = f.acceptEither(f2, r);
1829 <        checkCompletedWithWrappedCFException(g);
1830 <    }
2394 >        g.complete(v2);
2395 >        checkCompletedNormally(h, null);
2396 >        assertEquals(1, r.invocationCount);
2397 >        f.complete(v1);
2398  
2399 <    /**
2400 <     * acceptEither result completes exceptionally if action does
2401 <     */
2402 <    public void testAcceptEither3() {
2403 <        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 <    }
2399 >        checkCompletedNormally(f, v1);
2400 >        checkCompletedNormally(g, v2);
2401 >        checkCompletedNormally(h, null);
2402 >        assertEquals(1, r.invocationCount);
2403 >        }}
2404  
2405 <    /**
2406 <     * acceptEither result completes exceptionally if either source cancelled
2407 <     */
2408 <    public void testAcceptEither4() {
2409 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2410 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2411 <        IncAction r = new IncAction();
2412 <        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 <    }
2405 >    public void testRunAfterEither_normalCompletion3() {
2406 >        for (ExecutionMode m : ExecutionMode.values())
2407 >        for (Integer v1 : new Integer[] { 1, null })
2408 >        for (Integer v2 : new Integer[] { 2, null })
2409 >    {
2410 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2411 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2412 >        final Noop r = new Noop();
2413  
2414 <    /**
2415 <     * runAfterEither result completes normally after normal completion
2416 <     * 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);
2414 >        f.complete(v1);
2415 >        g.complete(v2);
2416 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2417  
2418 <        r = new Noop();
2419 <        f = new CompletableFuture<>();
2420 <        f.complete(one);
2421 <        f2 = new CompletableFuture<>();
2422 <        g = f.runAfterEither(f2, r);
1880 <        checkCompletedNormally(g, null);
1881 <        assertTrue(r.ran);
1882 <    }
2418 >        checkCompletedNormally(h, null);
2419 >        checkCompletedNormally(f, v1);
2420 >        checkCompletedNormally(g, v2);
2421 >        assertEquals(1, r.invocationCount);
2422 >    }}
2423  
2424      /**
2425       * runAfterEither result completes exceptionally after exceptional
2426       * completion of either source
2427       */
2428 <    public void testRunAfterEither2() {
2429 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2430 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2431 <        Noop r = new Noop();
2432 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
2433 <        f.completeExceptionally(new CFException());
2434 <        f2.complete(one);
2435 <        checkCompletedWithWrappedCFException(g);
2436 <
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 <    }
1932 <
1933 <    /**
1934 <     * thenCompose result completes normally after normal completion of source
1935 <     */
1936 <    public void testThenCompose() {
1937 <        CompletableFuture<Integer> f, g;
1938 <        CompletableFutureInc r;
1939 <
1940 <        f = new CompletableFuture<>();
1941 <        g = f.thenCompose(r = new CompletableFutureInc());
1942 <        f.complete(one);
1943 <        checkCompletedNormally(g, two);
1944 <        assertTrue(r.ran);
1945 <
1946 <        f = new CompletableFuture<>();
1947 <        f.complete(one);
1948 <        g = f.thenCompose(r = new CompletableFutureInc());
1949 <        checkCompletedNormally(g, two);
1950 <        assertTrue(r.ran);
1951 <    }
1952 <
1953 <    /**
1954 <     * thenCompose result completes exceptionally after exceptional
1955 <     * completion of source
1956 <     */
1957 <    public void testThenCompose2() {
1958 <        CompletableFuture<Integer> f, g;
1959 <        CompletableFutureInc r;
1960 <
1961 <        f = new CompletableFuture<>();
1962 <        g = f.thenCompose(r = new CompletableFutureInc());
1963 <        f.completeExceptionally(new CFException());
1964 <        checkCompletedWithWrappedCFException(g);
1965 <
1966 <        f = new CompletableFuture<>();
1967 <        f.completeExceptionally(new CFException());
1968 <        g = f.thenCompose(r = new CompletableFutureInc());
1969 <        checkCompletedWithWrappedCFException(g);
1970 <    }
1971 <
1972 <    /**
1973 <     * thenCompose result completes exceptionally if action does
1974 <     */
1975 <    public void testThenCompose3() {
1976 <        CompletableFuture<Integer> f, g;
1977 <        FailingCompletableFutureFunction r;
1978 <
1979 <        f = new CompletableFuture<>();
1980 <        g = f.thenCompose(r = new FailingCompletableFutureFunction());
1981 <        f.complete(one);
1982 <        checkCompletedWithWrappedCFException(g);
2428 >    public void testRunAfterEither_exceptionalCompletion1() {
2429 >        for (ExecutionMode m : ExecutionMode.values())
2430 >        for (Integer v1 : new Integer[] { 1, null })
2431 >    {
2432 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2433 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2434 >        final Noop r = new Noop();
2435 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2436 >        final CFException ex = new CFException();
2437  
2438 <        f = new CompletableFuture<>();
2439 <        f.complete(one);
2440 <        g = f.thenCompose(r = new FailingCompletableFutureFunction());
1987 <        checkCompletedWithWrappedCFException(g);
1988 <    }
2438 >        f.completeExceptionally(ex);
2439 >        checkCompletedWithWrappedCFException(h, ex);
2440 >        g.complete(v1);
2441  
2442 <    /**
2443 <     * thenCompose result completes exceptionally if source cancelled
2444 <     */
2445 <    public void testThenCompose4() {
2446 <        CompletableFuture<Integer> f, g;
1995 <        CompletableFutureInc r;
2442 >        assertEquals(0, r.invocationCount);
2443 >        checkCompletedNormally(g, v1);
2444 >        checkCompletedWithWrappedCFException(f, ex);
2445 >        checkCompletedWithWrappedCFException(h, ex);
2446 >    }}
2447  
2448 <        f = new CompletableFuture<>();
2449 <        g = f.thenCompose(r = new CompletableFutureInc());
2450 <        assertTrue(f.cancel(true));
2451 <        checkCompletedWithWrappedCancellationException(g);
2448 >    public void testRunAfterEither_exceptionalCompletion2() {
2449 >        for (ExecutionMode m : ExecutionMode.values())
2450 >        for (Integer v1 : new Integer[] { 1, null })
2451 >    {
2452 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2453 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2454 >        final Noop r = new Noop();
2455 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2456 >        final CFException ex = new CFException();
2457  
2458 <        f = new CompletableFuture<>();
2459 <        assertTrue(f.cancel(true));
2460 <        g = f.thenCompose(r = new CompletableFutureInc());
2005 <        checkCompletedWithWrappedCancellationException(g);
2006 <    }
2458 >        g.completeExceptionally(ex);
2459 >        checkCompletedWithWrappedCFException(h, ex);
2460 >        f.complete(v1);
2461  
2462 <    // asyncs
2462 >        assertEquals(0, r.invocationCount);
2463 >        checkCompletedNormally(f, v1);
2464 >        checkCompletedWithWrappedCFException(g, ex);
2465 >        checkCompletedWithWrappedCFException(h, ex);
2466 >    }}
2467  
2468 <    /**
2469 <     * thenRunAsync result completes normally after normal completion of source
2470 <     */
2471 <    public void testThenRunAsync() {
2472 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2473 <        Noop r = new Noop();
2474 <        CompletableFuture<Void> g = f.thenRunAsync(r);
2475 <        f.complete(null);
2018 <        checkCompletedNormally(g, null);
2468 >    public void testRunAfterEither_exceptionalCompletion3() {
2469 >        for (ExecutionMode m : ExecutionMode.values())
2470 >        for (Integer v1 : new Integer[] { 1, null })
2471 >    {
2472 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2473 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2474 >        final Noop r = new Noop();
2475 >        final CFException ex = new CFException();
2476  
2477 <        // reordered version
2478 <        f = new CompletableFuture<>();
2479 <        f.complete(null);
2023 <        r = new Noop();
2024 <        g = f.thenRunAsync(r);
2025 <        checkCompletedNormally(g, null);
2026 <    }
2477 >        g.completeExceptionally(ex);
2478 >        f.complete(v1);
2479 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2480  
2481 <    /**
2482 <     * 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());
2481 >        // unspecified behavior
2482 >        Integer v;
2483          try {
2484 <            g.join();
2485 <            shouldThrow();
2486 <        } catch (CompletionException success) {}
2487 <        checkCompletedWithWrappedCFException(g);
2488 <    }
2489 <
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 <    }
2484 >            assertNull(h.join());
2485 >            assertEquals(1, r.invocationCount);
2486 >        } catch (CompletionException ok) {
2487 >            checkCompletedWithWrappedCFException(h, ex);
2488 >            assertEquals(0, r.invocationCount);
2489 >        }
2490  
2491 <    // async with explicit executors
2491 >        checkCompletedWithWrappedCFException(g, ex);
2492 >        checkCompletedNormally(f, v1);
2493 >    }}
2494  
2495 <    /**
2496 <     * thenRunAsync result completes normally after normal completion of source
2497 <     */
2498 <    public void testThenRunAsyncE() {
2499 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2500 <        Noop r = new Noop();
2501 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2502 <        f.complete(null);
2457 <        checkCompletedNormally(g, null);
2495 >    public void testRunAfterEither_exceptionalCompletion4() {
2496 >        for (ExecutionMode m : ExecutionMode.values())
2497 >        for (Integer v1 : new Integer[] { 1, null })
2498 >    {
2499 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2500 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2501 >        final Noop r = new Noop();
2502 >        final CFException ex = new CFException();
2503  
2504 <        // reordered version
2505 <        f = new CompletableFuture<>();
2506 <        f.complete(null);
2462 <        r = new Noop();
2463 <        g = f.thenRunAsync(r, new ThreadExecutor());
2464 <        checkCompletedNormally(g, null);
2465 <    }
2504 >        f.completeExceptionally(ex);
2505 >        g.complete(v1);
2506 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2507  
2508 <    /**
2509 <     * 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());
2508 >        // unspecified behavior
2509 >        Integer v;
2510          try {
2511 <            g.join();
2512 <            shouldThrow();
2513 <        } catch (CompletionException success) {}
2514 <        checkCompletedWithWrappedCFException(g);
2515 <    }
2516 <
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 <    }
2511 >            assertNull(h.join());
2512 >            assertEquals(1, r.invocationCount);
2513 >        } catch (CompletionException ok) {
2514 >            checkCompletedWithWrappedCFException(h, ex);
2515 >            assertEquals(0, r.invocationCount);
2516 >        }
2517  
2518 <    /**
2519 <     * thenApplyAsync result completes exceptionally if source cancelled
2520 <     */
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 <    }
2518 >        checkCompletedWithWrappedCFException(f, ex);
2519 >        checkCompletedNormally(g, v1);
2520 >    }}
2521  
2522      /**
2523 <     * thenAcceptAsync result completes normally after normal
2549 <     * completion of source
2523 >     * runAfterEither result completes exceptionally if action does
2524       */
2525 <    public void testThenAcceptAsyncE() {
2526 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2527 <        IncAction r = new IncAction();
2528 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2529 <        f.complete(one);
2530 <        checkCompletedNormally(g, null);
2531 <        assertEquals(r.value, 2);
2532 <    }
2525 >    public void testRunAfterEither_actionFailed1() {
2526 >        for (ExecutionMode m : ExecutionMode.values())
2527 >        for (Integer v1 : new Integer[] { 1, null })
2528 >        for (Integer v2 : new Integer[] { 2, null })
2529 >    {
2530 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2531 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2532 >        final FailingRunnable r = new FailingRunnable();
2533 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2534  
2535 <    /**
2536 <     * thenAcceptAsync result completes exceptionally after exceptional
2537 <     * completion of source
2538 <     */
2539 <    public void testThenAcceptAsync2E() {
2540 <        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 <    }
2535 >        f.complete(v1);
2536 >        checkCompletedWithWrappedCFException(h);
2537 >        g.complete(v2);
2538 >        checkCompletedNormally(f, v1);
2539 >        checkCompletedNormally(g, v2);
2540 >    }}
2541  
2542 <    /**
2543 <     * thenAcceptAsync result completes exceptionally if action does
2544 <     */
2545 <    public void testThenAcceptAsync3E() {
2546 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2547 <        FailingConsumer r = new FailingConsumer();
2548 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2549 <        f.complete(null);
2550 <        checkCompletedWithWrappedCFException(g);
2581 <    }
2542 >    public void testRunAfterEither_actionFailed2() {
2543 >        for (ExecutionMode m : ExecutionMode.values())
2544 >        for (Integer v1 : new Integer[] { 1, null })
2545 >        for (Integer v2 : new Integer[] { 2, null })
2546 >    {
2547 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2548 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2549 >        final FailingRunnable r = new FailingRunnable();
2550 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2551  
2552 <    /**
2553 <     * thenAcceptAsync result completes exceptionally if source cancelled
2554 <     */
2555 <    public void testThenAcceptAsync4E() {
2556 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2557 <        IncAction r = new IncAction();
2589 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2590 <        assertTrue(f.cancel(true));
2591 <        checkCompletedWithWrappedCancellationException(g);
2592 <    }
2552 >        g.complete(v2);
2553 >        checkCompletedWithWrappedCFException(h);
2554 >        f.complete(v1);
2555 >        checkCompletedNormally(f, v1);
2556 >        checkCompletedNormally(g, v2);
2557 >    }}
2558  
2559      /**
2560 <     * applyToEitherAsync result completes normally after normal
2596 <     * completion of sources
2560 >     * runAfterEither result completes exceptionally if either source cancelled
2561       */
2562 <    public void testApplyToEitherAsyncE() {
2563 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2564 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2565 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2566 <        f.complete(one);
2567 <        checkCompletedNormally(g, two);
2562 >    public void testRunAfterEither_sourceCancelled1() {
2563 >        for (ExecutionMode m : ExecutionMode.values())
2564 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2565 >        for (Integer v1 : new Integer[] { 1, null })
2566 >    {
2567 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2568 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2569 >        final Noop r = new Noop();
2570 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2571  
2572 <        f = new CompletableFuture<>();
2573 <        f.complete(one);
2574 <        f2 = new CompletableFuture<>();
2608 <        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2609 <        checkCompletedNormally(g, two);
2610 <    }
2572 >        assertTrue(f.cancel(mayInterruptIfRunning));
2573 >        checkCompletedWithWrappedCancellationException(h);
2574 >        g.complete(v1);
2575  
2576 <    /**
2577 <     * applyToEitherAsync result completes exceptionally after exceptional
2578 <     * completion of source
2579 <     */
2580 <    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);
2576 >        checkCancelled(f);
2577 >        assertEquals(0, r.invocationCount);
2578 >        checkCompletedNormally(g, v1);
2579 >        checkCompletedWithWrappedCancellationException(h);
2580 >    }}
2581  
2582 <        f = new CompletableFuture<>();
2583 <        f2 = new CompletableFuture<>();
2584 <        f2.completeExceptionally(new CFException());
2585 <        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2586 <        f.complete(one);
2587 <        checkCompletedWithWrappedCFException(g);
2588 <    }
2582 >    public void testRunAfterEither_sourceCancelled2() {
2583 >        for (ExecutionMode m : ExecutionMode.values())
2584 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2585 >        for (Integer v1 : new Integer[] { 1, null })
2586 >    {
2587 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2588 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2589 >        final Noop r = new Noop();
2590 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2591  
2592 <    /**
2593 <     * applyToEitherAsync result completes exceptionally if action does
2594 <     */
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 <    }
2592 >        assertTrue(g.cancel(mayInterruptIfRunning));
2593 >        checkCompletedWithWrappedCancellationException(h);
2594 >        f.complete(v1);
2595  
2596 <    /**
2597 <     * applyToEitherAsync result completes exceptionally if either source cancelled
2598 <     */
2599 <    public void testApplyToEitherAsync4E() {
2600 <        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);
2596 >        checkCancelled(g);
2597 >        assertEquals(0, r.invocationCount);
2598 >        checkCompletedNormally(f, v1);
2599 >        checkCompletedWithWrappedCancellationException(h);
2600 >    }}
2601  
2602 <        f = new CompletableFuture<>();
2603 <        f2 = new CompletableFuture<>();
2604 <        assertTrue(f2.cancel(true));
2605 <        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2606 <        checkCompletedWithWrappedCancellationException(g);
2607 <    }
2602 >    public void testRunAfterEither_sourceCancelled3() {
2603 >        for (ExecutionMode m : ExecutionMode.values())
2604 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2605 >        for (Integer v1 : new Integer[] { 1, null })
2606 >    {
2607 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2608 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2609 >        final Noop r = new Noop();
2610  
2611 <    /**
2612 <     * acceptEitherAsync result completes normally after normal
2613 <     * 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);
2611 >        assertTrue(g.cancel(mayInterruptIfRunning));
2612 >        f.complete(v1);
2613 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2614  
2615 <        r = new IncAction();
2616 <        f = new CompletableFuture<>();
2617 <        f.complete(one);
2618 <        f2 = new CompletableFuture<>();
2619 <        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2620 <        checkCompletedNormally(g, null);
2621 <        assertEquals(r.value, 2);
2622 <    }
2615 >        // unspecified behavior
2616 >        Integer v;
2617 >        try {
2618 >            assertNull(h.join());
2619 >            assertEquals(1, r.invocationCount);
2620 >        } catch (CompletionException ok) {
2621 >            checkCompletedWithWrappedCancellationException(h);
2622 >            assertEquals(0, r.invocationCount);
2623 >        }
2624  
2625 <    /**
2626 <     * acceptEitherAsync result completes exceptionally after exceptional
2627 <     * 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);
2625 >        checkCancelled(g);
2626 >        checkCompletedNormally(f, v1);
2627 >    }}
2628  
2629 <        r = new IncAction();
2630 <        f = new CompletableFuture<>();
2631 <        f2 = new CompletableFuture<>();
2632 <        f2.completeExceptionally(new CFException());
2633 <        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2634 <        f.complete(one);
2635 <        checkCompletedWithWrappedCFException(g);
2636 <    }
2629 >    public void testRunAfterEither_sourceCancelled4() {
2630 >        for (ExecutionMode m : ExecutionMode.values())
2631 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2632 >        for (Integer v1 : new Integer[] { 1, null })
2633 >    {
2634 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2635 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2636 >        final Noop r = new Noop();
2637  
2638 <    /**
2639 <     * acceptEitherAsync result completes exceptionally if action does
2640 <     */
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 <    }
2638 >        assertTrue(f.cancel(mayInterruptIfRunning));
2639 >        g.complete(v1);
2640 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2641  
2642 <    /**
2643 <     * acceptEitherAsync result completes exceptionally if either
2644 <     * source cancelled
2645 <     */
2646 <    public void testAcceptEitherAsync4E() {
2647 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2648 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2649 <        IncAction r = new IncAction();
2650 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2724 <        assertTrue(f.cancel(true));
2725 <        checkCompletedWithWrappedCancellationException(g);
2642 >        // unspecified behavior
2643 >        Integer v;
2644 >        try {
2645 >            assertNull(h.join());
2646 >            assertEquals(1, r.invocationCount);
2647 >        } catch (CompletionException ok) {
2648 >            checkCompletedWithWrappedCancellationException(h);
2649 >            assertEquals(0, r.invocationCount);
2650 >        }
2651  
2652 <        r = new IncAction();
2653 <        f = new CompletableFuture<>();
2654 <        f2 = new CompletableFuture<>();
2730 <        assertTrue(f2.cancel(true));
2731 <        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2732 <        checkCompletedWithWrappedCancellationException(g);
2733 <    }
2652 >        checkCancelled(f);
2653 >        checkCompletedNormally(g, v1);
2654 >    }}
2655  
2656      /**
2657 <     * runAfterEitherAsync result completes normally after normal
2737 <     * completion of sources
2657 >     * thenCompose result completes normally after normal completion of source
2658       */
2659 <    public void testRunAfterEitherAsyncE() {
2660 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2661 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2662 <        Noop r = new Noop();
2663 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2664 <        f.complete(one);
2665 <        checkCompletedNormally(g, null);
2666 <        assertTrue(r.ran);
2659 >    public void testThenCompose_normalCompletion() {
2660 >        for (ExecutionMode m : ExecutionMode.values())
2661 >        for (boolean createIncomplete : new boolean[] { true, false })
2662 >        for (Integer v1 : new Integer[] { 1, null })
2663 >    {
2664 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2665 >        final CompletableFutureInc r = new CompletableFutureInc();
2666 >        if (!createIncomplete) f.complete(v1);
2667 >        final CompletableFuture<Integer> g = f.thenCompose(r);
2668 >        if (createIncomplete) f.complete(v1);
2669  
2670 <        r = new Noop();
2671 <        f = new CompletableFuture<>();
2672 <        f.complete(one);
2673 <        f2 = new CompletableFuture<>();
2752 <        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2753 <        checkCompletedNormally(g, null);
2754 <        assertTrue(r.ran);
2755 <    }
2670 >        checkCompletedNormally(g, inc(v1));
2671 >        checkCompletedNormally(f, v1);
2672 >        assertEquals(1, r.invocationCount);
2673 >    }}
2674  
2675      /**
2676 <     * runAfterEitherAsync result completes exceptionally after exceptional
2676 >     * thenCompose result completes exceptionally after exceptional
2677       * completion of source
2678       */
2679 <    public void testRunAfterEitherAsync2E() {
2680 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2681 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2682 <        Noop r = new Noop();
2683 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2684 <        f.completeExceptionally(new CFException());
2685 <        checkCompletedWithWrappedCFException(g);
2686 <
2687 <        r = new Noop();
2688 <        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);
2679 >    public void testThenCompose_exceptionalCompletion() {
2680 >        for (ExecutionMode m : ExecutionMode.values())
2681 >        for (boolean createIncomplete : new boolean[] { true, false })
2682 >    {
2683 >        final CFException ex = new CFException();
2684 >        final CompletableFutureInc r = new CompletableFutureInc();
2685 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2686 >        if (!createIncomplete) f.completeExceptionally(ex);
2687 >        final CompletableFuture<Integer> g = f.thenCompose(r);
2688 >        if (createIncomplete) f.completeExceptionally(ex);
2689  
2690 <        r = new Noop();
2691 <        f = new CompletableFuture<>();
2692 <        f2 = new CompletableFuture<>();
2693 <        assertTrue(f2.cancel(true));
2806 <        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2807 <        checkCompletedWithWrappedCancellationException(g);
2808 <    }
2690 >        checkCompletedWithWrappedCFException(g, ex);
2691 >        checkCompletedWithWrappedCFException(f, ex);
2692 >        assertEquals(0, r.invocationCount);
2693 >    }}
2694  
2695      /**
2696 <     * thenComposeAsync result completes normally after normal
2812 <     * completion of source
2696 >     * thenCompose result completes exceptionally if action does
2697       */
2698 <    public void testThenComposeAsyncE() {
2699 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2700 <        CompletableFutureInc r = new CompletableFutureInc();
2701 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2702 <        f.complete(one);
2703 <        checkCompletedNormally(g, two);
2704 <    }
2698 >    public void testThenCompose_actionFailed() {
2699 >        for (ExecutionMode m : ExecutionMode.values())
2700 >        for (boolean createIncomplete : new boolean[] { true, false })
2701 >        for (Integer v1 : new Integer[] { 1, null })
2702 >    {
2703 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2704 >        final FailingCompletableFutureFunction r
2705 >            = new FailingCompletableFutureFunction();
2706 >        if (!createIncomplete) f.complete(v1);
2707 >        final CompletableFuture<Integer> g = f.thenCompose(r);
2708 >        if (createIncomplete) f.complete(v1);
2709  
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());
2710          checkCompletedWithWrappedCFException(g);
2711 <    }
2711 >        checkCompletedNormally(f, v1);
2712 >    }}
2713  
2714      /**
2715 <     * thenComposeAsync result completes exceptionally if action does
2715 >     * thenCompose result completes exceptionally if source cancelled
2716       */
2717 <    public void testThenComposeAsync3E() {
2718 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2719 <        FailingCompletableFutureFunction r = new FailingCompletableFutureFunction();
2720 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2721 <        f.complete(one);
2722 <        checkCompletedWithWrappedCFException(g);
2723 <    }
2717 >    public void testThenCompose_sourceCancelled() {
2718 >        for (ExecutionMode m : ExecutionMode.values())
2719 >        for (boolean createIncomplete : new boolean[] { true, false })
2720 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2721 >    {
2722 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2723 >        final CompletableFutureInc r = new CompletableFutureInc();
2724 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2725 >        final CompletableFuture<Integer> g = f.thenCompose(r);
2726 >        if (createIncomplete) {
2727 >            checkIncomplete(g);
2728 >            assertTrue(f.cancel(mayInterruptIfRunning));
2729 >        }
2730  
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));
2731          checkCompletedWithWrappedCancellationException(g);
2732 <    }
2732 >        checkCancelled(f);
2733 >    }}
2734  
2735      // other static methods
2736  
# Line 3051 | Line 2930 | public class CompletableFutureTest exten
2930       * whenComplete action executes on normal completion, propagating
2931       * source result.
2932       */
2933 <    public void testWhenComplete1() {
2934 <        final AtomicInteger a = new AtomicInteger();
2935 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2936 <        CompletableFuture<Integer> g =
2937 <            f.whenComplete((Integer x, Throwable t) -> a.getAndIncrement());
2938 <        f.complete(three);
2939 <        checkCompletedNormally(f, three);
2940 <        checkCompletedNormally(g, three);
2941 <        assertEquals(a.get(), 1);
2942 <    }
2943 <
2944 <    /**
2945 <     * whenComplete action executes on exceptional completion, propagating
2946 <     * source result.
2947 <     */
2948 <    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 <    }
2933 >    public void testWhenComplete_normalCompletion1() {
2934 >        for (ExecutionMode m : ExecutionMode.values())
2935 >        for (boolean createIncomplete : new boolean[] { true, false })
2936 >        for (Integer v1 : new Integer[] { 1, null })
2937 >    {
2938 >        final AtomicInteger a = new AtomicInteger(0);
2939 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2940 >        if (!createIncomplete) f.complete(v1);
2941 >        final CompletableFuture<Integer> g = m.whenComplete
2942 >            (f,
2943 >             (Integer x, Throwable t) -> {
2944 >                threadAssertSame(x, v1);
2945 >                threadAssertNull(t);
2946 >                a.getAndIncrement();
2947 >            });
2948 >        if (createIncomplete) f.complete(v1);
2949  
2950 <    /**
2951 <     * If a whenCompleteAsync action throws an exception when
2952 <     * triggered by a normal completion, it completes exceptionally
2953 <     */
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 <    }
2950 >        checkCompletedNormally(g, v1);
2951 >        checkCompletedNormally(f, v1);
2952 >        assertEquals(1, a.get());
2953 >    }}
2954  
2955      /**
2956 <     * whenCompleteAsync action executes on normal completion, propagating
2956 >     * whenComplete action executes on exceptional completion, propagating
2957       * source result.
2958       */
2959 <    public void testWhenCompleteAsync1e() {
2960 <        final AtomicInteger a = new AtomicInteger();
2961 <        ThreadExecutor exec = new ThreadExecutor();
2962 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2963 <        CompletableFuture<Integer> g =
2964 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement(),
2965 <                                exec);
2966 <        f.complete(three);
2967 <        checkCompletedNormally(f, three);
2968 <        checkCompletedNormally(g, three);
2969 <        assertEquals(a.get(), 1);
2970 <    }
2959 >    public void testWhenComplete_exceptionalCompletion() {
2960 >        for (ExecutionMode m : ExecutionMode.values())
2961 >        for (boolean createIncomplete : new boolean[] { true, false })
2962 >        for (Integer v1 : new Integer[] { 1, null })
2963 >    {
2964 >        final AtomicInteger a = new AtomicInteger(0);
2965 >        final CFException ex = new CFException();
2966 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2967 >        if (!createIncomplete) f.completeExceptionally(ex);
2968 >        final CompletableFuture<Integer> g = m.whenComplete
2969 >            (f,
2970 >             (Integer x, Throwable t) -> {
2971 >                threadAssertNull(x);
2972 >                threadAssertSame(t, ex);
2973 >                a.getAndIncrement();
2974 >            });
2975 >        if (createIncomplete) f.completeExceptionally(ex);
2976 >        checkCompletedWithWrappedCFException(f, ex);
2977 >        checkCompletedWithWrappedCFException(g, ex);
2978 >        assertEquals(1, a.get());
2979 >    }}
2980  
2981      /**
2982 <     * whenCompleteAsync action executes on exceptional completion, propagating
2983 <     * source result.
2982 >     * whenComplete action executes on cancelled source, propagating
2983 >     * CancellationException.
2984       */
2985 <    public void testWhenCompleteAsync2e() {
2986 <        final AtomicInteger a = new AtomicInteger();
2987 <        ThreadExecutor exec = new ThreadExecutor();
2988 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2989 <        CompletableFuture<Integer> g =
2990 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement(),
2991 <                                exec);
2992 <        f.completeExceptionally(new CFException());
2993 <        checkCompletedWithWrappedCFException(f);
2994 <        checkCompletedWithWrappedCFException(g);
2995 <    }
2985 >    public void testWhenComplete_sourceCancelled() {
2986 >        for (ExecutionMode m : ExecutionMode.values())
2987 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2988 >        for (boolean createIncomplete : new boolean[] { true, false })
2989 >    {
2990 >        final AtomicInteger a = new AtomicInteger(0);
2991 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2992 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2993 >        final CompletableFuture<Integer> g = m.whenComplete
2994 >            (f,
2995 >             (Integer x, Throwable t) -> {
2996 >                threadAssertNull(x);
2997 >                threadAssertTrue(t instanceof CancellationException);
2998 >                a.getAndIncrement();
2999 >            });
3000 >        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
3001  
3002 <    /**
3003 <     * If a whenCompleteAsync action throws an exception when triggered
3004 <     * by a normal completion, it completes exceptionally
3005 <     */
3006 <    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 <    }
3002 >        //try { g.join(); } catch (Throwable t) { throw new Error(t); }
3003 >        checkCompletedWithWrappedCancellationException(g);
3004 >        checkCancelled(f);
3005 >        assertEquals(1, a.get());
3006 >    }}
3007  
3008      /**
3009 <     * handleAsync action completes normally with function value on
3010 <     * either normal or exceptional completion of source
3009 >     * If a whenComplete action throws an exception when triggered by
3010 >     * a normal completion, it completes exceptionally
3011       */
3012 <    public void testHandleAsync() {
3013 <        CompletableFuture<Integer> f, g;
3014 <        IntegerHandler r;
3015 <
3016 <        f = new CompletableFuture<>();
3017 <        g = f.handleAsync(r = new IntegerHandler());
3018 <        assertFalse(r.ran);
3019 <        f.completeExceptionally(new CFException());
3020 <        checkCompletedWithWrappedCFException(f);
3021 <        checkCompletedNormally(g, three);
3022 <        assertTrue(r.ran);
3023 <
3024 <        f = new CompletableFuture<>();
3025 <        g = f.handleAsync(r = new IntegerHandler());
3026 <        assertFalse(r.ran);
3027 <        f.completeExceptionally(new CFException());
3028 <        checkCompletedWithWrappedCFException(f);
3029 <        checkCompletedNormally(g, three);
3030 <        assertTrue(r.ran);
3031 <
3032 <        f = new CompletableFuture<>();
3033 <        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 <    }
3012 >    public void testWhenComplete_actionFailed() {
3013 >        for (boolean createIncomplete : new boolean[] { true, false })
3014 >        for (ExecutionMode m : ExecutionMode.values())
3015 >        for (Integer v1 : new Integer[] { 1, null })
3016 >    {
3017 >        final AtomicInteger a = new AtomicInteger(0);
3018 >        final CFException ex = new CFException();
3019 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
3020 >        if (!createIncomplete) f.complete(v1);
3021 >        final CompletableFuture<Integer> g = m.whenComplete
3022 >            (f,
3023 >             (Integer x, Throwable t) -> {
3024 >                threadAssertSame(x, v1);
3025 >                threadAssertNull(t);
3026 >                a.getAndIncrement();
3027 >                throw ex;
3028 >            });
3029 >        if (createIncomplete) f.complete(v1);
3030 >        checkCompletedNormally(f, v1);
3031 >        checkCompletedWithWrappedCFException(g, ex);
3032 >        assertEquals(1, a.get());
3033 >    }}
3034  
3035      /**
3036 <     * handleAsync action with Executor completes normally with
3037 <     * function value on either normal or exceptional completion of
3038 <     * source
3036 >     * If a whenComplete action throws an exception when triggered by
3037 >     * a source completion that also throws an exception, the source
3038 >     * exception takes precedence.
3039       */
3040 <    public void testHandleAsync2() {
3041 <        CompletableFuture<Integer> f, g;
3042 <        ThreadExecutor exec = new ThreadExecutor();
3043 <        IntegerHandler r;
3044 <
3045 <        f = new CompletableFuture<>();
3046 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3047 <        assertFalse(r.ran);
3048 <        f.completeExceptionally(new CFException());
3049 <        checkCompletedWithWrappedCFException(f);
3050 <        checkCompletedNormally(g, three);
3051 <        assertTrue(r.ran);
3052 <
3053 <        f = new CompletableFuture<>();
3054 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3055 <        assertFalse(r.ran);
3056 <        f.completeExceptionally(new CFException());
3057 <        checkCompletedWithWrappedCFException(f);
3058 <        checkCompletedNormally(g, three);
3059 <        assertTrue(r.ran);
3060 <
3061 <        f = new CompletableFuture<>();
3062 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3063 <        assertFalse(r.ran);
3064 <        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 <    }
3040 >    public void testWhenComplete_actionFailedSourceFailed() {
3041 >        for (boolean createIncomplete : new boolean[] { true, false })
3042 >        for (ExecutionMode m : ExecutionMode.values())
3043 >        for (Integer v1 : new Integer[] { 1, null })
3044 >    {
3045 >        final AtomicInteger a = new AtomicInteger(0);
3046 >        final CFException ex1 = new CFException();
3047 >        final CFException ex2 = new CFException();
3048 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
3049 >
3050 >        if (!createIncomplete) f.completeExceptionally(ex1);
3051 >        final CompletableFuture<Integer> g = m.whenComplete
3052 >            (f,
3053 >             (Integer x, Throwable t) -> {
3054 >                threadAssertSame(t, ex1);
3055 >                threadAssertNull(x);
3056 >                a.getAndIncrement();
3057 >                throw ex2;
3058 >            });
3059 >        if (createIncomplete) f.completeExceptionally(ex1);
3060 >
3061 >        checkCompletedWithWrappedCFException(f, ex1);
3062 >        checkCompletedWithWrappedCFException(g, ex1);
3063 >        assertEquals(1, a.get());
3064 >    }}
3065  
3066   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines