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.39 by jsr166, Mon Jun 2 00:46:52 2014 UTC vs.
Revision 1.55 by jsr166, Mon Jun 2 21:41:37 2014 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines