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.38 by jsr166, Sun Jun 1 23:51:44 2014 UTC vs.
Revision 1.54 by jsr166, Mon Jun 2 21:32:24 2014 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines