ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/test/tck/CompletableFutureTest.java
(Generate patch)

Comparing jsr166/src/test/tck/CompletableFutureTest.java (file contents):
Revision 1.39 by jsr166, Mon Jun 2 00:46:52 2014 UTC vs.
Revision 1.53 by jsr166, Mon Jun 2 20:20:47 2014 UTC

# Line 17 | Line 17 | import java.util.concurrent.Future;
17   import java.util.concurrent.CompletableFuture;
18   import java.util.concurrent.CompletionException;
19   import java.util.concurrent.CompletionStage;
20 + import java.util.concurrent.ForkJoinPool;
21 + import java.util.concurrent.ForkJoinTask;
22   import java.util.concurrent.TimeoutException;
23   import java.util.concurrent.atomic.AtomicInteger;
24   import static java.util.concurrent.TimeUnit.MILLISECONDS;
# Line 247 | Line 249 | public class CompletableFutureTest exten
249          f = new CompletableFuture<>();
250          f.obtrudeValue(three);
251          checkCompletedNormally(f, three);
252 +        f.obtrudeValue(null);
253 +        checkCompletedNormally(f, null);
254          f = new CompletableFuture<>();
255          f.completeExceptionally(new CFException());
256          f.obtrudeValue(four);
# Line 279 | Line 283 | public class CompletableFutureTest exten
283       */
284      public void testGetNumberOfDependents() {
285          CompletableFuture<Integer> f = new CompletableFuture<>();
286 <        assertEquals(f.getNumberOfDependents(), 0);
286 >        assertEquals(0, f.getNumberOfDependents());
287          CompletableFuture g = f.thenRun(new Noop());
288 <        assertEquals(f.getNumberOfDependents(), 1);
289 <        assertEquals(g.getNumberOfDependents(), 0);
288 >        assertEquals(1, f.getNumberOfDependents());
289 >        assertEquals(0, g.getNumberOfDependents());
290          CompletableFuture h = f.thenRun(new Noop());
291 <        assertEquals(f.getNumberOfDependents(), 2);
291 >        assertEquals(2, f.getNumberOfDependents());
292          f.complete(1);
293          checkCompletedNormally(g, null);
294 <        assertEquals(f.getNumberOfDependents(), 0);
295 <        assertEquals(g.getNumberOfDependents(), 0);
294 >        assertEquals(0, f.getNumberOfDependents());
295 >        assertEquals(0, g.getNumberOfDependents());
296      }
297  
298      /**
# Line 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 <     * thenAccept result completes normally after normal completion of source
1130 >     * thenApply result completes exceptionally if action does
1131       */
1132 <    public void testThenAccept() {
1133 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1134 <        IncAction r = new IncAction();
1135 <        CompletableFuture<Void> g = f.thenAccept(r);
1136 <        f.complete(one);
1137 <        checkCompletedNormally(g, null);
1138 <        assertEquals(r.value, (Integer) 2);
1139 <    }
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  
906    /**
907     * thenAccept result completes exceptionally after exceptional
908     * completion of source
909     */
910    public void testThenAccept2() {
911        CompletableFuture<Integer> f = new CompletableFuture<>();
912        IncAction r = new IncAction();
913        CompletableFuture<Void> g = f.thenAccept(r);
914        f.completeExceptionally(new CFException());
1146          checkCompletedWithWrappedCFException(g);
1147 <    }
1147 >        checkCompletedNormally(f, v1);
1148 >    }}
1149  
1150      /**
1151 <     * thenAccept result completes exceptionally if action does
1151 >     * thenAccept result completes normally after normal completion of source
1152       */
1153 <    public void testThenAccept3() {
1154 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1155 <        FailingConsumer r = new FailingConsumer();
1156 <        CompletableFuture<Void> g = f.thenAccept(r);
1157 <        f.complete(one);
1158 <        checkCompletedWithWrappedCFException(g);
1159 <        assertTrue(r.ran);
1160 <    }
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 <    /**
1168 <     * thenAccept result completes exceptionally if source cancelled
1169 <     */
1170 <    public void testThenAccept4() {
1171 <        CompletableFuture<Integer> f = new CompletableFuture<>();
935 <        IncAction r = new IncAction();
936 <        CompletableFuture<Void> g = f.thenAccept(r);
937 <        assertTrue(f.cancel(true));
938 <        checkCompletedWithWrappedCancellationException(g);
939 <    }
1167 >        checkCompletedNormally(g, null);
1168 >        checkCompletedNormally(f, v1);
1169 >        assertEquals(1, r.invocationCount);
1170 >        assertEquals(inc(v1), r.value);
1171 >    }}
1172  
1173      /**
1174 <     * thenCombine result completes normally after normal completion
1175 <     * of sources
1174 >     * thenAccept result completes exceptionally after exceptional
1175 >     * completion of source
1176       */
1177 <    public void testThenCombine_normalCompletion1() {
1177 >    public void testThenAccept_exceptionalCompletion() {
1178          for (ExecutionMode m : ExecutionMode.values())
1179 <        for (Integer v1 : new Integer[] { 1, null })
1180 <        for (Integer v2 : new Integer[] { 2, null }) {
1181 <
1179 >        for (boolean createIncomplete : new boolean[] { true, false })
1180 >    {
1181 >        final CFException ex = new CFException();
1182          final CompletableFuture<Integer> f = new CompletableFuture<>();
1183 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1184 <        final SubtractFunction r = new SubtractFunction();
1185 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1186 <
1187 <        f.complete(v1);
1188 <        checkIncomplete(h);
957 <        assertFalse(r.ran());
958 <        g.complete(v2);
959 <
960 <        checkCompletedNormally(h, subtract(v1, v2));
961 <        checkCompletedNormally(f, v1);
962 <        checkCompletedNormally(g, v2);
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          }
964    }
1190  
1191 <    public void testThenCombine_normalCompletion2() {
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 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 <        for (Integer v2 : new Integer[] { 2, null }) {
970 <
1203 >    {
1204          final CompletableFuture<Integer> f = new CompletableFuture<>();
1205 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1206 <        final SubtractFunction r = new SubtractFunction();
1207 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1208 <
1209 <        g.complete(v2);
1210 <        checkIncomplete(h);
1211 <        assertFalse(r.ran());
979 <        f.complete(v1);
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 <        checkCompletedNormally(h, subtract(v1, v2));
1213 >        checkCompletedWithWrappedCFException(g);
1214          checkCompletedNormally(f, v1);
1215 <        checkCompletedNormally(g, v2);
984 <        }
985 <    }
1215 >    }}
1216  
1217 <    public void testThenCombine_normalCompletion3() {
1217 >    /**
1218 >     * thenAccept result completes exceptionally if source cancelled
1219 >     */
1220 >    public void testThenAccept_sourceCancelled() {
1221          for (ExecutionMode m : ExecutionMode.values())
1222 <        for (Integer v1 : new Integer[] { 1, null })
1223 <        for (Integer v2 : new Integer[] { 2, null }) {
1224 <
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 CompletableFuture<Integer> g = new CompletableFuture<>();
1227 <        final SubtractFunction r = new SubtractFunction();
1228 <
1229 <        g.complete(v2);
1230 <        f.complete(v1);
1231 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
999 <
1000 <        checkCompletedNormally(h, subtract(v1, v2));
1001 <        checkCompletedNormally(f, v1);
1002 <        checkCompletedNormally(g, v2);
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          }
1004    }
1233  
1234 <    public void testThenCombine_normalCompletion4() {
1234 >        checkCompletedWithWrappedCancellationException(g);
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_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();
1253  
1254 <        f.complete(v1);
1255 <        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      /**
1271       * thenCombine result completes exceptionally after exceptional
1272       * completion of either source
1273       */
1274 <    public void testThenCombine_exceptionalCompletion1() {
1030 <        for (ExecutionMode m : ExecutionMode.values())
1031 <        for (Integer v1 : new Integer[] { 1, null }) {
1032 <
1033 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1034 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1035 <        final SubtractFunction r = new SubtractFunction();
1036 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1037 <        final CFException ex = new CFException();
1038 <
1039 <        f.completeExceptionally(ex);
1040 <        checkIncomplete(h);
1041 <        g.complete(v1);
1042 <
1043 <        checkCompletedWithWrappedCFException(h, ex);
1044 <        checkCompletedWithWrappedCFException(f, ex);
1045 <        assertFalse(r.ran());
1046 <        checkCompletedNormally(g, v1);
1047 <        }
1048 <    }
1049 <
1050 <    public void testThenCombine_exceptionalCompletion2() {
1274 >    public void testThenCombine_exceptionalCompletion() {
1275          for (ExecutionMode m : ExecutionMode.values())
1276 <        for (Integer v1 : new Integer[] { 1, null }) {
1277 <
1276 >        for (boolean createIncomplete : new boolean[] { true, false })
1277 >        for (boolean fFirst : new boolean[] { true, false })
1278 >        for (Integer v1 : new Integer[] { 1, null })
1279 >    {
1280          final CompletableFuture<Integer> f = new CompletableFuture<>();
1281          final CompletableFuture<Integer> g = new CompletableFuture<>();
1056        final SubtractFunction r = new SubtractFunction();
1057        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1282          final CFException ex = new CFException();
1059
1060        g.completeExceptionally(ex);
1061        checkIncomplete(h);
1062        f.complete(v1);
1063
1064        checkCompletedWithWrappedCFException(h, ex);
1065        checkCompletedWithWrappedCFException(g, ex);
1066        assertFalse(r.ran());
1067        checkCompletedNormally(f, v1);
1068        }
1069    }
1070
1071    public void testThenCombine_exceptionalCompletion3() {
1072        for (ExecutionMode m : ExecutionMode.values())
1073        for (Integer v1 : new Integer[] { 1, null }) {
1074
1075        final CompletableFuture<Integer> f = new CompletableFuture<>();
1076        final CompletableFuture<Integer> g = new CompletableFuture<>();
1283          final SubtractFunction r = new SubtractFunction();
1078        final CFException ex = new CFException();
1284  
1285 <        g.completeExceptionally(ex);
1286 <        f.complete(v1);
1285 >        (fFirst ? f : g).complete(v1);
1286 >        if (!createIncomplete)
1287 >            (!fFirst ? f : g).completeExceptionally(ex);
1288          final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1289 <
1290 <        checkCompletedWithWrappedCFException(h, ex);
1291 <        checkCompletedWithWrappedCFException(g, ex);
1086 <        assertFalse(r.ran());
1087 <        checkCompletedNormally(f, v1);
1289 >        if (createIncomplete) {
1290 >            checkIncomplete(h);
1291 >            (!fFirst ? f : g).completeExceptionally(ex);
1292          }
1089    }
1090
1091    public void testThenCombine_exceptionalCompletion4() {
1092        for (ExecutionMode m : ExecutionMode.values())
1093        for (Integer v1 : new Integer[] { 1, null }) {
1094
1095        final CompletableFuture<Integer> f = new CompletableFuture<>();
1096        final CompletableFuture<Integer> g = new CompletableFuture<>();
1097        final SubtractFunction r = new SubtractFunction();
1098        final CFException ex = new CFException();
1099
1100        f.completeExceptionally(ex);
1101        g.complete(v1);
1102        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1293  
1294          checkCompletedWithWrappedCFException(h, ex);
1295 <        checkCompletedWithWrappedCFException(f, ex);
1296 <        assertFalse(r.ran());
1297 <        checkCompletedNormally(g, v1);
1298 <        }
1109 <    }
1295 >        assertEquals(0, r.invocationCount);
1296 >        checkCompletedNormally(fFirst ? f : g, v1);
1297 >        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1298 >    }}
1299  
1300      /**
1301       * thenCombine result completes exceptionally if action does
1302       */
1303 <    public void testThenCombine_actionFailed1() {
1303 >    public void testThenCombine_actionFailed() {
1304          for (ExecutionMode m : ExecutionMode.values())
1305 +        for (boolean fFirst : new boolean[] { true, false })
1306          for (Integer v1 : new Integer[] { 1, null })
1307 <        for (Integer v2 : new Integer[] { 2, null }) {
1308 <
1307 >        for (Integer v2 : new Integer[] { 2, null })
1308 >    {
1309          final CompletableFuture<Integer> f = new CompletableFuture<>();
1310          final CompletableFuture<Integer> g = new CompletableFuture<>();
1311          final FailingBiFunction r = new FailingBiFunction();
1312          final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1313  
1314 <        f.complete(v1);
1315 <        checkIncomplete(h);
1316 <        g.complete(v2);
1317 <
1318 <        checkCompletedWithWrappedCFException(h);
1319 <        checkCompletedNormally(f, v1);
1130 <        checkCompletedNormally(g, v2);
1314 >        if (fFirst) {
1315 >            f.complete(v1);
1316 >            g.complete(v2);
1317 >        } else {
1318 >            g.complete(v2);
1319 >            f.complete(v1);
1320          }
1132    }
1133
1134    public void testThenCombine_actionFailed2() {
1135        for (ExecutionMode m : ExecutionMode.values())
1136        for (Integer v1 : new Integer[] { 1, null })
1137        for (Integer v2 : new Integer[] { 2, null }) {
1138
1139        final CompletableFuture<Integer> f = new CompletableFuture<>();
1140        final CompletableFuture<Integer> g = new CompletableFuture<>();
1141        final FailingBiFunction r = new FailingBiFunction();
1142        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1143
1144        g.complete(v2);
1145        checkIncomplete(h);
1146        f.complete(v1);
1321  
1322          checkCompletedWithWrappedCFException(h);
1323          checkCompletedNormally(f, v1);
1324          checkCompletedNormally(g, v2);
1325 <        }
1152 <    }
1325 >    }}
1326  
1327      /**
1328       * thenCombine result completes exceptionally if either source cancelled
1329       */
1330 <    public void testThenCombine_sourceCancelled1() {
1158 <        for (ExecutionMode m : ExecutionMode.values())
1159 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1160 <        for (Integer v1 : new Integer[] { 1, null }) {
1161 <
1162 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1163 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1164 <        final SubtractFunction r = new SubtractFunction();
1165 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1166 <
1167 <        assertTrue(f.cancel(mayInterruptIfRunning));
1168 <        checkIncomplete(h);
1169 <        g.complete(v1);
1170 <
1171 <        checkCompletedWithWrappedCancellationException(h);
1172 <        checkCancelled(f);
1173 <        assertFalse(r.ran());
1174 <        checkCompletedNormally(g, v1);
1175 <        }
1176 <    }
1177 <
1178 <    public void testThenCombine_sourceCancelled2() {
1330 >    public void testThenCombine_sourceCancelled() {
1331          for (ExecutionMode m : ExecutionMode.values())
1332          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1333 <        for (Integer v1 : new Integer[] { 1, null }) {
1334 <
1335 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1336 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1185 <        final SubtractFunction r = new SubtractFunction();
1186 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1187 <
1188 <        assertTrue(g.cancel(mayInterruptIfRunning));
1189 <        checkIncomplete(h);
1190 <        f.complete(v1);
1191 <
1192 <        checkCompletedWithWrappedCancellationException(h);
1193 <        checkCancelled(g);
1194 <        assertFalse(r.ran());
1195 <        checkCompletedNormally(f, v1);
1196 <        }
1197 <    }
1198 <
1199 <    public void testThenCombine_sourceCancelled3() {
1200 <        for (ExecutionMode m : ExecutionMode.values())
1201 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1202 <        for (Integer v1 : new Integer[] { 1, null }) {
1203 <
1333 >        for (boolean createIncomplete : new boolean[] { true, false })
1334 >        for (boolean fFirst : new boolean[] { true, false })
1335 >        for (Integer v1 : new Integer[] { 1, null })
1336 >    {
1337          final CompletableFuture<Integer> f = new CompletableFuture<>();
1338          final CompletableFuture<Integer> g = new CompletableFuture<>();
1339          final SubtractFunction r = new SubtractFunction();
1340  
1341 <        assertTrue(g.cancel(mayInterruptIfRunning));
1342 <        f.complete(v1);
1341 >        (fFirst ? f : g).complete(v1);
1342 >        if (!createIncomplete)
1343 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1344          final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1345 <
1346 <        checkCompletedWithWrappedCancellationException(h);
1347 <        checkCancelled(g);
1214 <        assertFalse(r.ran());
1215 <        checkCompletedNormally(f, v1);
1345 >        if (createIncomplete) {
1346 >            checkIncomplete(h);
1347 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1348          }
1217    }
1218
1219    public void testThenCombine_sourceCancelled4() {
1220        for (ExecutionMode m : ExecutionMode.values())
1221        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1222        for (Integer v1 : new Integer[] { 1, null }) {
1223
1224        final CompletableFuture<Integer> f = new CompletableFuture<>();
1225        final CompletableFuture<Integer> g = new CompletableFuture<>();
1226        final SubtractFunction r = new SubtractFunction();
1227
1228        assertTrue(f.cancel(mayInterruptIfRunning));
1229        g.complete(v1);
1230        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1349  
1350          checkCompletedWithWrappedCancellationException(h);
1351 <        checkCancelled(f);
1352 <        assertFalse(r.ran());
1353 <        checkCompletedNormally(g, v1);
1354 <        }
1237 <    }
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_normalCompletion1() {
1244 <        for (ExecutionMode m : ExecutionMode.values())
1245 <        for (Integer v1 : new Integer[] { 1, null })
1246 <        for (Integer v2 : new Integer[] { 2, null }) {
1247 <
1248 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1249 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1250 <        final SubtractAction r = new SubtractAction();
1251 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1252 <
1253 <        f.complete(v1);
1254 <        checkIncomplete(h);
1255 <        assertFalse(r.ran());
1256 <        g.complete(v2);
1257 <
1258 <        checkCompletedNormally(h, null);
1259 <        assertEquals(r.value, subtract(v1, v2));
1260 <        checkCompletedNormally(f, v1);
1261 <        checkCompletedNormally(g, v2);
1262 <        }
1263 <    }
1264 <
1265 <    public void testThenAcceptBoth_normalCompletion2() {
1266 <        for (ExecutionMode m : ExecutionMode.values())
1267 <        for (Integer v1 : new Integer[] { 1, null })
1268 <        for (Integer v2 : new Integer[] { 2, null }) {
1269 <
1270 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1271 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1272 <        final SubtractAction r = new SubtractAction();
1273 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1274 <
1275 <        g.complete(v2);
1276 <        checkIncomplete(h);
1277 <        assertFalse(r.ran());
1278 <        f.complete(v1);
1279 <
1280 <        checkCompletedNormally(h, null);
1281 <        assertEquals(r.value, subtract(v1, v2));
1282 <        checkCompletedNormally(f, v1);
1283 <        checkCompletedNormally(g, v2);
1284 <        }
1285 <    }
1286 <
1287 <    public void testThenAcceptBoth_normalCompletion3() {
1360 >    public void testThenAcceptBoth_normalCompletion() {
1361          for (ExecutionMode m : ExecutionMode.values())
1362 +        for (boolean createIncomplete : new boolean[] { true, false })
1363 +        for (boolean fFirst : new boolean[] { true, false })
1364          for (Integer v1 : new Integer[] { 1, null })
1365 <        for (Integer v2 : new Integer[] { 2, null }) {
1366 <
1365 >        for (Integer v2 : new Integer[] { 2, null })
1366 >    {
1367          final CompletableFuture<Integer> f = new CompletableFuture<>();
1368          final CompletableFuture<Integer> g = new CompletableFuture<>();
1369          final SubtractAction r = new SubtractAction();
1370  
1371 <        g.complete(v2);
1372 <        f.complete(v1);
1371 >        if (fFirst) f.complete(v1); else g.complete(v2);
1372 >        if (!createIncomplete)
1373 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1374          final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1375 <
1376 <        checkCompletedNormally(h, null);
1377 <        assertEquals(r.value, subtract(v1, v2));
1378 <        checkCompletedNormally(f, v1);
1303 <        checkCompletedNormally(g, v2);
1375 >        if (createIncomplete) {
1376 >            checkIncomplete(h);
1377 >            assertEquals(0, r.invocationCount);
1378 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1379          }
1305    }
1306
1307    public void testThenAcceptBoth_normalCompletion4() {
1308        for (ExecutionMode m : ExecutionMode.values())
1309        for (Integer v1 : new Integer[] { 1, null })
1310        for (Integer v2 : new Integer[] { 2, null }) {
1311
1312        final CompletableFuture<Integer> f = new CompletableFuture<>();
1313        final CompletableFuture<Integer> g = new CompletableFuture<>();
1314        final SubtractAction r = new SubtractAction();
1315
1316        f.complete(v1);
1317        g.complete(v2);
1318        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1380  
1381          checkCompletedNormally(h, null);
1382 <        assertEquals(r.value, subtract(v1, v2));
1382 >        assertEquals(subtract(v1, v2), r.value);
1383          checkCompletedNormally(f, v1);
1384          checkCompletedNormally(g, v2);
1385 <        }
1325 <    }
1385 >    }}
1386  
1387      /**
1388       * thenAcceptBoth result completes exceptionally after exceptional
1389       * completion of either source
1390       */
1391 <    public void testThenAcceptBoth_exceptionalCompletion1() {
1332 <        for (ExecutionMode m : ExecutionMode.values())
1333 <        for (Integer v1 : new Integer[] { 1, null }) {
1334 <
1335 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1336 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1337 <        final SubtractAction r = new SubtractAction();
1338 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1339 <        final CFException ex = new CFException();
1340 <
1341 <        f.completeExceptionally(ex);
1342 <        checkIncomplete(h);
1343 <        g.complete(v1);
1344 <
1345 <        checkCompletedWithWrappedCFException(h, ex);
1346 <        checkCompletedWithWrappedCFException(f, ex);
1347 <        assertFalse(r.ran());
1348 <        checkCompletedNormally(g, v1);
1349 <        }
1350 <    }
1351 <
1352 <    public void testThenAcceptBoth_exceptionalCompletion2() {
1391 >    public void testThenAcceptBoth_exceptionalCompletion() {
1392          for (ExecutionMode m : ExecutionMode.values())
1393 <        for (Integer v1 : new Integer[] { 1, null }) {
1394 <
1393 >        for (boolean createIncomplete : new boolean[] { true, false })
1394 >        for (boolean fFirst : new boolean[] { true, false })
1395 >        for (Integer v1 : new Integer[] { 1, null })
1396 >    {
1397          final CompletableFuture<Integer> f = new CompletableFuture<>();
1398          final CompletableFuture<Integer> g = new CompletableFuture<>();
1358        final SubtractAction r = new SubtractAction();
1359        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1399          final CFException ex = new CFException();
1361
1362        g.completeExceptionally(ex);
1363        checkIncomplete(h);
1364        f.complete(v1);
1365
1366        checkCompletedWithWrappedCFException(h, ex);
1367        checkCompletedWithWrappedCFException(g, ex);
1368        assertFalse(r.ran());
1369        checkCompletedNormally(f, v1);
1370        }
1371    }
1372
1373    public void testThenAcceptBoth_exceptionalCompletion3() {
1374        for (ExecutionMode m : ExecutionMode.values())
1375        for (Integer v1 : new Integer[] { 1, null }) {
1376
1377        final CompletableFuture<Integer> f = new CompletableFuture<>();
1378        final CompletableFuture<Integer> g = new CompletableFuture<>();
1400          final SubtractAction r = new SubtractAction();
1380        final CFException ex = new CFException();
1401  
1402 <        g.completeExceptionally(ex);
1403 <        f.complete(v1);
1402 >        (fFirst ? f : g).complete(v1);
1403 >        if (!createIncomplete)
1404 >            (!fFirst ? f : g).completeExceptionally(ex);
1405          final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1406 <
1407 <        checkCompletedWithWrappedCFException(h, ex);
1408 <        checkCompletedWithWrappedCFException(g, ex);
1388 <        assertFalse(r.ran());
1389 <        checkCompletedNormally(f, v1);
1406 >        if (createIncomplete) {
1407 >            checkIncomplete(h);
1408 >            (!fFirst ? f : g).completeExceptionally(ex);
1409          }
1391    }
1392
1393    public void testThenAcceptBoth_exceptionalCompletion4() {
1394        for (ExecutionMode m : ExecutionMode.values())
1395        for (Integer v1 : new Integer[] { 1, null }) {
1396
1397        final CompletableFuture<Integer> f = new CompletableFuture<>();
1398        final CompletableFuture<Integer> g = new CompletableFuture<>();
1399        final SubtractAction r = new SubtractAction();
1400        final CFException ex = new CFException();
1401
1402        f.completeExceptionally(ex);
1403        g.complete(v1);
1404        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1410  
1411          checkCompletedWithWrappedCFException(h, ex);
1412 <        checkCompletedWithWrappedCFException(f, ex);
1413 <        assertFalse(r.ran());
1414 <        checkCompletedNormally(g, v1);
1415 <        }
1411 <    }
1412 >        assertEquals(0, r.invocationCount);
1413 >        checkCompletedNormally(fFirst ? f : g, v1);
1414 >        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1415 >    }}
1416  
1417      /**
1418       * thenAcceptBoth result completes exceptionally if action does
1419       */
1420 <    public void testThenAcceptBoth_actionFailed1() {
1420 >    public void testThenAcceptBoth_actionFailed() {
1421          for (ExecutionMode m : ExecutionMode.values())
1422 +        for (boolean fFirst : new boolean[] { true, false })
1423          for (Integer v1 : new Integer[] { 1, null })
1424 <        for (Integer v2 : new Integer[] { 2, null }) {
1425 <
1424 >        for (Integer v2 : new Integer[] { 2, null })
1425 >    {
1426          final CompletableFuture<Integer> f = new CompletableFuture<>();
1427          final CompletableFuture<Integer> g = new CompletableFuture<>();
1428          final FailingBiConsumer r = new FailingBiConsumer();
1429          final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1430  
1431 <        f.complete(v1);
1432 <        checkIncomplete(h);
1433 <        g.complete(v2);
1434 <
1435 <        checkCompletedWithWrappedCFException(h);
1436 <        checkCompletedNormally(f, v1);
1432 <        checkCompletedNormally(g, v2);
1431 >        if (fFirst) {
1432 >            f.complete(v1);
1433 >            g.complete(v2);
1434 >        } else {
1435 >            g.complete(v2);
1436 >            f.complete(v1);
1437          }
1434    }
1435
1436    public void testThenAcceptBoth_actionFailed2() {
1437        for (ExecutionMode m : ExecutionMode.values())
1438        for (Integer v1 : new Integer[] { 1, null })
1439        for (Integer v2 : new Integer[] { 2, null }) {
1440
1441        final CompletableFuture<Integer> f = new CompletableFuture<>();
1442        final CompletableFuture<Integer> g = new CompletableFuture<>();
1443        final FailingBiConsumer r = new FailingBiConsumer();
1444        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1445
1446        g.complete(v2);
1447        checkIncomplete(h);
1448        f.complete(v1);
1438  
1439          checkCompletedWithWrappedCFException(h);
1440          checkCompletedNormally(f, v1);
1441          checkCompletedNormally(g, v2);
1442 <        }
1454 <    }
1442 >    }}
1443  
1444      /**
1445       * thenAcceptBoth result completes exceptionally if either source cancelled
1446       */
1447 <    public void testThenAcceptBoth_sourceCancelled1() {
1460 <        for (ExecutionMode m : ExecutionMode.values())
1461 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1462 <        for (Integer v1 : new Integer[] { 1, null }) {
1463 <
1464 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1465 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1466 <        final SubtractAction r = new SubtractAction();
1467 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1468 <
1469 <        assertTrue(f.cancel(mayInterruptIfRunning));
1470 <        checkIncomplete(h);
1471 <        g.complete(v1);
1472 <
1473 <        checkCompletedWithWrappedCancellationException(h);
1474 <        checkCancelled(f);
1475 <        assertFalse(r.ran());
1476 <        checkCompletedNormally(g, v1);
1477 <        }
1478 <    }
1479 <
1480 <    public void testThenAcceptBoth_sourceCancelled2() {
1481 <        for (ExecutionMode m : ExecutionMode.values())
1482 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1483 <        for (Integer v1 : new Integer[] { 1, null }) {
1484 <
1485 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1486 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1487 <        final SubtractAction r = new SubtractAction();
1488 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1489 <
1490 <        assertTrue(g.cancel(mayInterruptIfRunning));
1491 <        checkIncomplete(h);
1492 <        f.complete(v1);
1493 <
1494 <        checkCompletedWithWrappedCancellationException(h);
1495 <        checkCancelled(g);
1496 <        assertFalse(r.ran());
1497 <        checkCompletedNormally(f, v1);
1498 <        }
1499 <    }
1500 <
1501 <    public void testThenAcceptBoth_sourceCancelled3() {
1447 >    public void testThenAcceptBoth_sourceCancelled() {
1448          for (ExecutionMode m : ExecutionMode.values())
1449          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1450 <        for (Integer v1 : new Integer[] { 1, null }) {
1451 <
1450 >        for (boolean createIncomplete : new boolean[] { true, false })
1451 >        for (boolean fFirst : new boolean[] { true, false })
1452 >        for (Integer v1 : new Integer[] { 1, null })
1453 >    {
1454          final CompletableFuture<Integer> f = new CompletableFuture<>();
1455          final CompletableFuture<Integer> g = new CompletableFuture<>();
1456          final SubtractAction r = new SubtractAction();
1457  
1458 <        assertTrue(g.cancel(mayInterruptIfRunning));
1459 <        f.complete(v1);
1458 >        (fFirst ? f : g).complete(v1);
1459 >        if (!createIncomplete)
1460 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1461          final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1462 <
1463 <        checkCompletedWithWrappedCancellationException(h);
1464 <        checkCancelled(g);
1516 <        assertFalse(r.ran());
1517 <        checkCompletedNormally(f, v1);
1462 >        if (createIncomplete) {
1463 >            checkIncomplete(h);
1464 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1465          }
1519    }
1520
1521    public void testThenAcceptBoth_sourceCancelled4() {
1522        for (ExecutionMode m : ExecutionMode.values())
1523        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1524        for (Integer v1 : new Integer[] { 1, null }) {
1525
1526        final CompletableFuture<Integer> f = new CompletableFuture<>();
1527        final CompletableFuture<Integer> g = new CompletableFuture<>();
1528        final SubtractAction r = new SubtractAction();
1529
1530        assertTrue(f.cancel(mayInterruptIfRunning));
1531        g.complete(v1);
1532        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1466  
1467          checkCompletedWithWrappedCancellationException(h);
1468 <        checkCancelled(f);
1469 <        assertFalse(r.ran());
1470 <        checkCompletedNormally(g, v1);
1471 <        }
1539 <    }
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
# Line 1545 | Line 1477 | public class CompletableFutureTest exten
1477      public void testRunAfterBoth_normalCompletion1() {
1478          for (ExecutionMode m : ExecutionMode.values())
1479          for (Integer v1 : new Integer[] { 1, null })
1480 <        for (Integer v2 : new Integer[] { 2, null }) {
1481 <
1480 >        for (Integer v2 : new Integer[] { 2, null })
1481 >    {
1482          final CompletableFuture<Integer> f = new CompletableFuture<>();
1483          final CompletableFuture<Integer> g = new CompletableFuture<>();
1484          final Noop r = new Noop();
# Line 1554 | Line 1486 | public class CompletableFutureTest exten
1486  
1487          f.complete(v1);
1488          checkIncomplete(h);
1489 <        assertFalse(r.ran);
1489 >        assertEquals(0, r.invocationCount);
1490          g.complete(v2);
1491  
1492          checkCompletedNormally(h, null);
1493 <        assertTrue(r.ran);
1493 >        assertEquals(1, r.invocationCount);
1494          checkCompletedNormally(f, v1);
1495          checkCompletedNormally(g, v2);
1496 <        }
1565 <    }
1496 >    }}
1497  
1498      public void testRunAfterBoth_normalCompletion2() {
1499          for (ExecutionMode m : ExecutionMode.values())
1500          for (Integer v1 : new Integer[] { 1, null })
1501 <        for (Integer v2 : new Integer[] { 2, null }) {
1502 <
1501 >        for (Integer v2 : new Integer[] { 2, null })
1502 >    {
1503          final CompletableFuture<Integer> f = new CompletableFuture<>();
1504          final CompletableFuture<Integer> g = new CompletableFuture<>();
1505          final Noop r = new Noop();
# Line 1576 | Line 1507 | public class CompletableFutureTest exten
1507  
1508          g.complete(v2);
1509          checkIncomplete(h);
1510 <        assertFalse(r.ran);
1510 >        assertEquals(0, r.invocationCount);
1511          f.complete(v1);
1512  
1513          checkCompletedNormally(h, null);
1514 <        assertTrue(r.ran);
1514 >        assertEquals(1, r.invocationCount);
1515          checkCompletedNormally(f, v1);
1516          checkCompletedNormally(g, v2);
1517 <        }
1587 <    }
1517 >    }}
1518  
1519      public void testRunAfterBoth_normalCompletion3() {
1520          for (ExecutionMode m : ExecutionMode.values())
1521          for (Integer v1 : new Integer[] { 1, null })
1522 <        for (Integer v2 : new Integer[] { 2, null }) {
1523 <
1522 >        for (Integer v2 : new Integer[] { 2, null })
1523 >    {
1524          final CompletableFuture<Integer> f = new CompletableFuture<>();
1525          final CompletableFuture<Integer> g = new CompletableFuture<>();
1526          final Noop r = new Noop();
# Line 1600 | Line 1530 | public class CompletableFutureTest exten
1530          final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1531  
1532          checkCompletedNormally(h, null);
1533 <        assertTrue(r.ran);
1533 >        assertEquals(1, r.invocationCount);
1534          checkCompletedNormally(f, v1);
1535          checkCompletedNormally(g, v2);
1536 <        }
1607 <    }
1536 >    }}
1537  
1538      public void testRunAfterBoth_normalCompletion4() {
1539          for (ExecutionMode m : ExecutionMode.values())
1540          for (Integer v1 : new Integer[] { 1, null })
1541 <        for (Integer v2 : new Integer[] { 2, null }) {
1542 <
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 Noop r = new Noop();
# Line 1620 | Line 1549 | public class CompletableFutureTest exten
1549          final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1550  
1551          checkCompletedNormally(h, null);
1552 <        assertTrue(r.ran);
1552 >        assertEquals(1, r.invocationCount);
1553          checkCompletedNormally(f, v1);
1554          checkCompletedNormally(g, v2);
1555 <        }
1627 <    }
1555 >    }}
1556  
1557      /**
1558       * runAfterBoth result completes exceptionally after exceptional
# Line 1632 | Line 1560 | public class CompletableFutureTest exten
1560       */
1561      public void testRunAfterBoth_exceptionalCompletion1() {
1562          for (ExecutionMode m : ExecutionMode.values())
1563 <        for (Integer v1 : new Integer[] { 1, null }) {
1564 <
1563 >        for (Integer v1 : new Integer[] { 1, null })
1564 >    {
1565          final CompletableFuture<Integer> f = new CompletableFuture<>();
1566          final CompletableFuture<Integer> g = new CompletableFuture<>();
1567          final Noop r = new Noop();
# Line 1646 | Line 1574 | public class CompletableFutureTest exten
1574  
1575          checkCompletedWithWrappedCFException(h, ex);
1576          checkCompletedWithWrappedCFException(f, ex);
1577 <        assertFalse(r.ran);
1577 >        assertEquals(0, r.invocationCount);
1578          checkCompletedNormally(g, v1);
1579 <        }
1652 <    }
1579 >    }}
1580  
1581      public void testRunAfterBoth_exceptionalCompletion2() {
1582          for (ExecutionMode m : ExecutionMode.values())
1583 <        for (Integer v1 : new Integer[] { 1, null }) {
1584 <
1583 >        for (Integer v1 : new Integer[] { 1, null })
1584 >    {
1585          final CompletableFuture<Integer> f = new CompletableFuture<>();
1586          final CompletableFuture<Integer> g = new CompletableFuture<>();
1587          final Noop r = new Noop();
# Line 1667 | Line 1594 | public class CompletableFutureTest exten
1594  
1595          checkCompletedWithWrappedCFException(h, ex);
1596          checkCompletedWithWrappedCFException(g, ex);
1597 <        assertFalse(r.ran);
1597 >        assertEquals(0, r.invocationCount);
1598          checkCompletedNormally(f, v1);
1599 <        }
1673 <    }
1599 >    }}
1600  
1601      public void testRunAfterBoth_exceptionalCompletion3() {
1602          for (ExecutionMode m : ExecutionMode.values())
1603 <        for (Integer v1 : new Integer[] { 1, null }) {
1604 <
1603 >        for (Integer v1 : new Integer[] { 1, null })
1604 >    {
1605          final CompletableFuture<Integer> f = new CompletableFuture<>();
1606          final CompletableFuture<Integer> g = new CompletableFuture<>();
1607          final Noop r = new Noop();
# Line 1687 | Line 1613 | public class CompletableFutureTest exten
1613  
1614          checkCompletedWithWrappedCFException(h, ex);
1615          checkCompletedWithWrappedCFException(g, ex);
1616 <        assertFalse(r.ran);
1616 >        assertEquals(0, r.invocationCount);
1617          checkCompletedNormally(f, v1);
1618 <        }
1693 <    }
1618 >    }}
1619  
1620      public void testRunAfterBoth_exceptionalCompletion4() {
1621          for (ExecutionMode m : ExecutionMode.values())
1622 <        for (Integer v1 : new Integer[] { 1, null }) {
1623 <
1622 >        for (Integer v1 : new Integer[] { 1, null })
1623 >    {
1624          final CompletableFuture<Integer> f = new CompletableFuture<>();
1625          final CompletableFuture<Integer> g = new CompletableFuture<>();
1626          final Noop r = new Noop();
# Line 1707 | Line 1632 | public class CompletableFutureTest exten
1632  
1633          checkCompletedWithWrappedCFException(h, ex);
1634          checkCompletedWithWrappedCFException(f, ex);
1635 <        assertFalse(r.ran);
1635 >        assertEquals(0, r.invocationCount);
1636          checkCompletedNormally(g, v1);
1637 <        }
1713 <    }
1637 >    }}
1638  
1639      /**
1640       * runAfterBoth result completes exceptionally if action does
# Line 1718 | Line 1642 | public class CompletableFutureTest exten
1642      public void testRunAfterBoth_actionFailed1() {
1643          for (ExecutionMode m : ExecutionMode.values())
1644          for (Integer v1 : new Integer[] { 1, null })
1645 <        for (Integer v2 : new Integer[] { 2, null }) {
1646 <
1645 >        for (Integer v2 : new Integer[] { 2, null })
1646 >    {
1647          final CompletableFuture<Integer> f = new CompletableFuture<>();
1648          final CompletableFuture<Integer> g = new CompletableFuture<>();
1649 <        final FailingNoop r = new FailingNoop();
1649 >        final FailingRunnable r = new FailingRunnable();
1650          final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1651  
1652          f.complete(v1);
# Line 1732 | Line 1656 | public class CompletableFutureTest exten
1656          checkCompletedWithWrappedCFException(h);
1657          checkCompletedNormally(f, v1);
1658          checkCompletedNormally(g, v2);
1659 <        }
1736 <    }
1659 >    }}
1660  
1661      public void testRunAfterBoth_actionFailed2() {
1662          for (ExecutionMode m : ExecutionMode.values())
1663          for (Integer v1 : new Integer[] { 1, null })
1664 <        for (Integer v2 : new Integer[] { 2, null }) {
1665 <
1664 >        for (Integer v2 : new Integer[] { 2, null })
1665 >    {
1666          final CompletableFuture<Integer> f = new CompletableFuture<>();
1667          final CompletableFuture<Integer> g = new CompletableFuture<>();
1668 <        final FailingNoop r = new FailingNoop();
1668 >        final FailingRunnable r = new FailingRunnable();
1669          final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1670  
1671          g.complete(v2);
# Line 1752 | Line 1675 | public class CompletableFutureTest exten
1675          checkCompletedWithWrappedCFException(h);
1676          checkCompletedNormally(f, v1);
1677          checkCompletedNormally(g, v2);
1678 <        }
1756 <    }
1678 >    }}
1679  
1680      /**
1681       * runAfterBoth result completes exceptionally if either source cancelled
# Line 1761 | Line 1683 | public class CompletableFutureTest exten
1683      public void testRunAfterBoth_sourceCancelled1() {
1684          for (ExecutionMode m : ExecutionMode.values())
1685          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1686 <        for (Integer v1 : new Integer[] { 1, null }) {
1687 <
1686 >        for (Integer v1 : new Integer[] { 1, null })
1687 >    {
1688          final CompletableFuture<Integer> f = new CompletableFuture<>();
1689          final CompletableFuture<Integer> g = new CompletableFuture<>();
1690          final Noop r = new Noop();
# Line 1774 | Line 1696 | public class CompletableFutureTest exten
1696  
1697          checkCompletedWithWrappedCancellationException(h);
1698          checkCancelled(f);
1699 <        assertFalse(r.ran);
1699 >        assertEquals(0, r.invocationCount);
1700          checkCompletedNormally(g, v1);
1701 <        }
1780 <    }
1701 >    }}
1702  
1703      public void testRunAfterBoth_sourceCancelled2() {
1704          for (ExecutionMode m : ExecutionMode.values())
1705          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1706 <        for (Integer v1 : new Integer[] { 1, null }) {
1707 <
1706 >        for (Integer v1 : new Integer[] { 1, null })
1707 >    {
1708          final CompletableFuture<Integer> f = new CompletableFuture<>();
1709          final CompletableFuture<Integer> g = new CompletableFuture<>();
1710          final Noop r = new Noop();
# Line 1795 | Line 1716 | public class CompletableFutureTest exten
1716  
1717          checkCompletedWithWrappedCancellationException(h);
1718          checkCancelled(g);
1719 <        assertFalse(r.ran);
1719 >        assertEquals(0, r.invocationCount);
1720          checkCompletedNormally(f, v1);
1721 <        }
1801 <    }
1721 >    }}
1722  
1723      public void testRunAfterBoth_sourceCancelled3() {
1724          for (ExecutionMode m : ExecutionMode.values())
1725          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1726 <        for (Integer v1 : new Integer[] { 1, null }) {
1727 <
1726 >        for (Integer v1 : new Integer[] { 1, null })
1727 >    {
1728          final CompletableFuture<Integer> f = new CompletableFuture<>();
1729          final CompletableFuture<Integer> g = new CompletableFuture<>();
1730          final Noop r = new Noop();
# Line 1815 | Line 1735 | public class CompletableFutureTest exten
1735  
1736          checkCompletedWithWrappedCancellationException(h);
1737          checkCancelled(g);
1738 <        assertFalse(r.ran);
1738 >        assertEquals(0, r.invocationCount);
1739          checkCompletedNormally(f, v1);
1740 <        }
1821 <    }
1740 >    }}
1741  
1742      public void testRunAfterBoth_sourceCancelled4() {
1743          for (ExecutionMode m : ExecutionMode.values())
1744          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1745 <        for (Integer v1 : new Integer[] { 1, null }) {
1746 <
1745 >        for (Integer v1 : new Integer[] { 1, null })
1746 >    {
1747          final CompletableFuture<Integer> f = new CompletableFuture<>();
1748          final CompletableFuture<Integer> g = new CompletableFuture<>();
1749          final Noop r = new Noop();
# Line 1835 | Line 1754 | public class CompletableFutureTest exten
1754  
1755          checkCompletedWithWrappedCancellationException(h);
1756          checkCancelled(f);
1757 <        assertFalse(r.ran);
1757 >        assertEquals(0, r.invocationCount);
1758          checkCompletedNormally(g, v1);
1759 <        }
1841 <    }
1759 >    }}
1760  
1761      /**
1762       * applyToEither result completes normally after normal completion
# Line 1847 | Line 1765 | public class CompletableFutureTest exten
1765      public void testApplyToEither_normalCompletion1() {
1766          for (ExecutionMode m : ExecutionMode.values())
1767          for (Integer v1 : new Integer[] { 1, null })
1768 <        for (Integer v2 : new Integer[] { 2, null }) {
1769 <
1768 >        for (Integer v2 : new Integer[] { 2, null })
1769 >    {
1770          final CompletableFuture<Integer> f = new CompletableFuture<>();
1771          final CompletableFuture<Integer> g = new CompletableFuture<>();
1772          final IncFunction r = new IncFunction();
# Line 1861 | Line 1779 | public class CompletableFutureTest exten
1779          checkCompletedNormally(f, v1);
1780          checkCompletedNormally(g, v2);
1781          checkCompletedNormally(h, inc(v1));
1782 <        }
1865 <    }
1782 >    }}
1783  
1784      public void testApplyToEither_normalCompletion2() {
1785          for (ExecutionMode m : ExecutionMode.values())
1786          for (Integer v1 : new Integer[] { 1, null })
1787 <        for (Integer v2 : new Integer[] { 2, null }) {
1788 <
1787 >        for (Integer v2 : new Integer[] { 2, null })
1788 >    {
1789          final CompletableFuture<Integer> f = new CompletableFuture<>();
1790          final CompletableFuture<Integer> g = new CompletableFuture<>();
1791          final IncFunction r = new IncFunction();
# Line 1881 | Line 1798 | public class CompletableFutureTest exten
1798          checkCompletedNormally(f, v1);
1799          checkCompletedNormally(g, v2);
1800          checkCompletedNormally(h, inc(v2));
1801 <        }
1802 <    }
1801 >        }}
1802 >
1803      public void testApplyToEither_normalCompletion3() {
1804          for (ExecutionMode m : ExecutionMode.values())
1805          for (Integer v1 : new Integer[] { 1, null })
1806 <        for (Integer v2 : new Integer[] { 2, null }) {
1807 <
1806 >        for (Integer v2 : new Integer[] { 2, null })
1807 >    {
1808          final CompletableFuture<Integer> f = new CompletableFuture<>();
1809          final CompletableFuture<Integer> g = new CompletableFuture<>();
1810          final IncFunction r = new IncFunction();
# Line 1902 | Line 1819 | public class CompletableFutureTest exten
1819          // unspecified behavior
1820          assertTrue(Objects.equals(h.join(), inc(v1)) ||
1821                     Objects.equals(h.join(), inc(v2)));
1822 <        }
1823 <    }
1822 >        assertEquals(1, r.invocationCount);
1823 >    }}
1824  
1825      /**
1826       * applyToEither result completes exceptionally after exceptional
# Line 1911 | Line 1828 | public class CompletableFutureTest exten
1828       */
1829      public void testApplyToEither_exceptionalCompletion1() {
1830          for (ExecutionMode m : ExecutionMode.values())
1831 <        for (Integer v1 : new Integer[] { 1, null }) {
1832 <
1831 >        for (Integer v1 : new Integer[] { 1, null })
1832 >    {
1833          final CompletableFuture<Integer> f = new CompletableFuture<>();
1834          final CompletableFuture<Integer> g = new CompletableFuture<>();
1835          final IncFunction r = new IncFunction();
# Line 1923 | Line 1840 | public class CompletableFutureTest exten
1840          checkCompletedWithWrappedCFException(h, ex);
1841          g.complete(v1);
1842  
1843 <        assertFalse(r.ran());
1843 >        assertEquals(0, r.invocationCount);
1844          checkCompletedNormally(g, v1);
1845          checkCompletedWithWrappedCFException(f, ex);
1846          checkCompletedWithWrappedCFException(h, ex);
1847 <        }
1931 <    }
1847 >    }}
1848  
1849      public void testApplyToEither_exceptionalCompletion2() {
1850          for (ExecutionMode m : ExecutionMode.values())
1851 <        for (Integer v1 : new Integer[] { 1, null }) {
1852 <
1851 >        for (Integer v1 : new Integer[] { 1, null })
1852 >    {
1853          final CompletableFuture<Integer> f = new CompletableFuture<>();
1854          final CompletableFuture<Integer> g = new CompletableFuture<>();
1855          final IncFunction r = new IncFunction();
# Line 1944 | Line 1860 | public class CompletableFutureTest exten
1860          checkCompletedWithWrappedCFException(h, ex);
1861          f.complete(v1);
1862  
1863 <        assertFalse(r.ran());
1863 >        assertEquals(0, r.invocationCount);
1864          checkCompletedNormally(f, v1);
1865          checkCompletedWithWrappedCFException(g, ex);
1866          checkCompletedWithWrappedCFException(h, ex);
1867 <        }
1952 <    }
1867 >    }}
1868  
1869      public void testApplyToEither_exceptionalCompletion3() {
1870          for (ExecutionMode m : ExecutionMode.values())
1871 <        for (Integer v1 : new Integer[] { 1, null }) {
1872 <
1871 >        for (Integer v1 : new Integer[] { 1, null })
1872 >    {
1873          final CompletableFuture<Integer> f = new CompletableFuture<>();
1874          final CompletableFuture<Integer> g = new CompletableFuture<>();
1875          final IncFunction r = new IncFunction();
# Line 1967 | Line 1882 | public class CompletableFutureTest exten
1882          // unspecified behavior
1883          Integer v;
1884          try {
1885 <            assertEquals(h.join(), inc(v1));
1886 <            assertTrue(r.ran());
1885 >            assertEquals(inc(v1), h.join());
1886 >            assertEquals(1, r.invocationCount);
1887          } catch (CompletionException ok) {
1888              checkCompletedWithWrappedCFException(h, ex);
1889 <            assertFalse(r.ran());
1889 >            assertEquals(0, r.invocationCount);
1890          }
1891  
1892          checkCompletedWithWrappedCFException(g, ex);
1893          checkCompletedNormally(f, v1);
1894 <        }
1980 <    }
1894 >    }}
1895  
1896      public void testApplyToEither_exceptionalCompletion4() {
1897          for (ExecutionMode m : ExecutionMode.values())
1898 <        for (Integer v1 : new Integer[] { 1, null }) {
1899 <
1898 >        for (Integer v1 : new Integer[] { 1, null })
1899 >    {
1900          final CompletableFuture<Integer> f = new CompletableFuture<>();
1901          final CompletableFuture<Integer> g = new CompletableFuture<>();
1902          final IncFunction r = new IncFunction();
# Line 1995 | Line 1909 | public class CompletableFutureTest exten
1909          // unspecified behavior
1910          Integer v;
1911          try {
1912 <            assertEquals(h.join(), inc(v1));
1913 <            assertTrue(r.ran());
1912 >            assertEquals(inc(v1), h.join());
1913 >            assertEquals(1, r.invocationCount);
1914          } catch (CompletionException ok) {
1915              checkCompletedWithWrappedCFException(h, ex);
1916 <            assertFalse(r.ran());
1916 >            assertEquals(0, r.invocationCount);
1917          }
1918  
1919          checkCompletedWithWrappedCFException(f, ex);
2006        assertFalse(r.ran());
1920          checkCompletedNormally(g, v1);
1921 <        }
2009 <    }
1921 >    }}
1922  
1923      /**
1924       * applyToEither result completes exceptionally if action does
# Line 2014 | Line 1926 | public class CompletableFutureTest exten
1926      public void testApplyToEither_actionFailed1() {
1927          for (ExecutionMode m : ExecutionMode.values())
1928          for (Integer v1 : new Integer[] { 1, null })
1929 <        for (Integer v2 : new Integer[] { 2, null }) {
1930 <
1929 >        for (Integer v2 : new Integer[] { 2, null })
1930 >    {
1931          final CompletableFuture<Integer> f = new CompletableFuture<>();
1932          final CompletableFuture<Integer> g = new CompletableFuture<>();
1933          final FailingFunction r = new FailingFunction();
# Line 2026 | Line 1938 | public class CompletableFutureTest exten
1938          g.complete(v2);
1939          checkCompletedNormally(f, v1);
1940          checkCompletedNormally(g, v2);
1941 <        }
2030 <    }
1941 >    }}
1942  
1943      public void testApplyToEither_actionFailed2() {
1944          for (ExecutionMode m : ExecutionMode.values())
1945          for (Integer v1 : new Integer[] { 1, null })
1946 <        for (Integer v2 : new Integer[] { 2, null }) {
1947 <
1946 >        for (Integer v2 : new Integer[] { 2, null })
1947 >    {
1948          final CompletableFuture<Integer> f = new CompletableFuture<>();
1949          final CompletableFuture<Integer> g = new CompletableFuture<>();
1950          final FailingFunction r = new FailingFunction();
# Line 2044 | Line 1955 | public class CompletableFutureTest exten
1955          f.complete(v1);
1956          checkCompletedNormally(f, v1);
1957          checkCompletedNormally(g, v2);
1958 <        }
2048 <    }
1958 >    }}
1959  
1960      /**
1961       * applyToEither result completes exceptionally if either source cancelled
# Line 2053 | Line 1963 | public class CompletableFutureTest exten
1963      public void testApplyToEither_sourceCancelled1() {
1964          for (ExecutionMode m : ExecutionMode.values())
1965          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1966 <        for (Integer v1 : new Integer[] { 1, null }) {
1967 <
1966 >        for (Integer v1 : new Integer[] { 1, null })
1967 >    {
1968          final CompletableFuture<Integer> f = new CompletableFuture<>();
1969          final CompletableFuture<Integer> g = new CompletableFuture<>();
1970          final IncFunction r = new IncFunction();
# Line 2065 | Line 1975 | public class CompletableFutureTest exten
1975          g.complete(v1);
1976  
1977          checkCancelled(f);
1978 <        assertFalse(r.ran());
1978 >        assertEquals(0, r.invocationCount);
1979          checkCompletedNormally(g, v1);
1980          checkCompletedWithWrappedCancellationException(h);
1981 <        }
2072 <    }
1981 >    }}
1982  
1983      public void testApplyToEither_sourceCancelled2() {
1984          for (ExecutionMode m : ExecutionMode.values())
1985          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1986 <        for (Integer v1 : new Integer[] { 1, null }) {
1987 <
1986 >        for (Integer v1 : new Integer[] { 1, null })
1987 >    {
1988          final CompletableFuture<Integer> f = new CompletableFuture<>();
1989          final CompletableFuture<Integer> g = new CompletableFuture<>();
1990          final IncFunction r = new IncFunction();
# Line 2086 | Line 1995 | public class CompletableFutureTest exten
1995          f.complete(v1);
1996  
1997          checkCancelled(g);
1998 <        assertFalse(r.ran());
1998 >        assertEquals(0, r.invocationCount);
1999          checkCompletedNormally(f, v1);
2000          checkCompletedWithWrappedCancellationException(h);
2001 <        }
2093 <    }
2001 >    }}
2002  
2003      public void testApplyToEither_sourceCancelled3() {
2004          for (ExecutionMode m : ExecutionMode.values())
2005          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2006 <        for (Integer v1 : new Integer[] { 1, null }) {
2007 <
2006 >        for (Integer v1 : new Integer[] { 1, null })
2007 >    {
2008          final CompletableFuture<Integer> f = new CompletableFuture<>();
2009          final CompletableFuture<Integer> g = new CompletableFuture<>();
2010          final IncFunction r = new IncFunction();
# Line 2108 | Line 2016 | public class CompletableFutureTest exten
2016          // unspecified behavior
2017          Integer v;
2018          try {
2019 <            assertEquals(h.join(), inc(v1));
2020 <            assertTrue(r.ran());
2019 >            assertEquals(inc(v1), h.join());
2020 >            assertEquals(1, r.invocationCount);
2021          } catch (CompletionException ok) {
2022              checkCompletedWithWrappedCancellationException(h);
2023 <            assertFalse(r.ran());
2023 >            assertEquals(0, r.invocationCount);
2024          }
2025  
2026          checkCancelled(g);
2027          checkCompletedNormally(f, v1);
2028 <        }
2121 <    }
2028 >    }}
2029  
2030      public void testApplyToEither_sourceCancelled4() {
2031          for (ExecutionMode m : ExecutionMode.values())
2032          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2033 <        for (Integer v1 : new Integer[] { 1, null }) {
2034 <
2033 >        for (Integer v1 : new Integer[] { 1, null })
2034 >    {
2035          final CompletableFuture<Integer> f = new CompletableFuture<>();
2036          final CompletableFuture<Integer> g = new CompletableFuture<>();
2037          final IncFunction r = new IncFunction();
# Line 2136 | Line 2043 | public class CompletableFutureTest exten
2043          // unspecified behavior
2044          Integer v;
2045          try {
2046 <            assertEquals(h.join(), inc(v1));
2047 <            assertTrue(r.ran());
2046 >            assertEquals(inc(v1), h.join());
2047 >            assertEquals(1, r.invocationCount);
2048          } catch (CompletionException ok) {
2049              checkCompletedWithWrappedCancellationException(h);
2050 <            assertFalse(r.ran());
2050 >            assertEquals(0, r.invocationCount);
2051          }
2052  
2053          checkCancelled(f);
2054          checkCompletedNormally(g, v1);
2055 <        }
2149 <    }
2055 >    }}
2056  
2057      /**
2058       * acceptEither result completes normally after normal completion
2059       * of either source
2060       */
2061 <    public void testAcceptEither() {
2062 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2063 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2064 <        IncAction r = new IncAction();
2065 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
2066 <        f.complete(one);
2067 <        checkCompletedNormally(g, null);
2068 <        f2.complete(one);
2069 <        checkCompletedNormally(g, null);
2164 <        assertEquals(r.value, (Integer) 2);
2165 <
2166 <        r = new IncAction();
2167 <        f = new CompletableFuture<>();
2168 <        f.complete(one);
2169 <        f2 = new CompletableFuture<>();
2170 <        g = f.acceptEither(f2, r);
2171 <        checkCompletedNormally(g, null);
2172 <        assertEquals(r.value, (Integer) 2);
2173 <    }
2174 <
2175 <    /**
2176 <     * acceptEither result completes exceptionally after exceptional
2177 <     * completion of either source
2178 <     */
2179 <    public void testAcceptEither2() {
2180 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2181 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2182 <        IncAction r = new IncAction();
2183 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
2184 <        f.completeExceptionally(new CFException());
2185 <        f2.complete(one);
2186 <        checkCompletedWithWrappedCFException(g);
2187 <
2188 <        r = new IncAction();
2189 <        f = new CompletableFuture<>();
2190 <        f2 = new CompletableFuture<>();
2191 <        f2.completeExceptionally(new CFException());
2192 <        g = f.acceptEither(f2, r);
2193 <        checkCompletedWithWrappedCFException(g);
2194 <    }
2195 <
2196 <    /**
2197 <     * acceptEither result completes exceptionally if action does
2198 <     */
2199 <    public void testAcceptEither3() {
2200 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2201 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2202 <        FailingConsumer r = new FailingConsumer();
2203 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
2204 <        f2.complete(two);
2205 <        checkCompletedWithWrappedCFException(g);
2206 <    }
2207 <
2208 <    /**
2209 <     * acceptEither result completes exceptionally if either source cancelled
2210 <     */
2211 <    public void testAcceptEither4() {
2212 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2213 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2214 <        IncAction r = new IncAction();
2215 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
2216 <        assertTrue(f.cancel(true));
2217 <        checkCompletedWithWrappedCancellationException(g);
2218 <        f = new CompletableFuture<>();
2219 <        f2 = new CompletableFuture<>();
2220 <        assertTrue(f2.cancel(true));
2221 <        checkCompletedWithWrappedCancellationException(g);
2222 <    }
2061 >    public void testAcceptEither_normalCompletion1() {
2062 >        for (ExecutionMode m : ExecutionMode.values())
2063 >        for (Integer v1 : new Integer[] { 1, null })
2064 >        for (Integer v2 : new Integer[] { 2, null })
2065 >    {
2066 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2067 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2068 >        final IncAction r = new IncAction();
2069 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2070  
2071 <    /**
2072 <     * runAfterEither result completes normally after normal completion
2073 <     * of either source
2074 <     */
2228 <    public void testRunAfterEither() {
2229 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2230 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2231 <        Noop r = new Noop();
2232 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
2233 <        f.complete(one);
2234 <        checkCompletedNormally(g, null);
2235 <        f2.complete(one);
2236 <        checkCompletedNormally(g, null);
2237 <        assertTrue(r.ran);
2071 >        f.complete(v1);
2072 >        checkCompletedNormally(h, null);
2073 >        assertEquals(inc(v1), r.value);
2074 >        g.complete(v2);
2075  
2076 <        r = new Noop();
2077 <        f = new CompletableFuture<>();
2078 <        f.complete(one);
2079 <        f2 = new CompletableFuture<>();
2243 <        g = f.runAfterEither(f2, r);
2244 <        checkCompletedNormally(g, null);
2245 <        assertTrue(r.ran);
2246 <    }
2076 >        checkCompletedNormally(f, v1);
2077 >        checkCompletedNormally(g, v2);
2078 >        checkCompletedNormally(h, null);
2079 >    }}
2080  
2081 <    /**
2082 <     * runAfterEither result completes exceptionally after exceptional
2083 <     * completion of either source
2084 <     */
2085 <    public void testRunAfterEither2() {
2086 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2087 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2088 <        Noop r = new Noop();
2089 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
2257 <        f.completeExceptionally(new CFException());
2258 <        f2.complete(one);
2259 <        checkCompletedWithWrappedCFException(g);
2081 >    public void testAcceptEither_normalCompletion2() {
2082 >        for (ExecutionMode m : ExecutionMode.values())
2083 >        for (Integer v1 : new Integer[] { 1, null })
2084 >        for (Integer v2 : new Integer[] { 2, null })
2085 >    {
2086 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2087 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2088 >        final IncAction r = new IncAction();
2089 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2090  
2091 <        r = new Noop();
2092 <        f = new CompletableFuture<>();
2093 <        f2 = new CompletableFuture<>();
2094 <        f2.completeExceptionally(new CFException());
2265 <        g = f.runAfterEither(f2, r);
2266 <        checkCompletedWithWrappedCFException(g);
2267 <    }
2091 >        g.complete(v2);
2092 >        checkCompletedNormally(h, null);
2093 >        assertEquals(inc(v2), r.value);
2094 >        f.complete(v1);
2095  
2096 <    /**
2097 <     * runAfterEither result completes exceptionally if action does
2098 <     */
2099 <    public void testRunAfterEither3() {
2273 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2274 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2275 <        FailingNoop r = new FailingNoop();
2276 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
2277 <        f2.complete(two);
2278 <        checkCompletedWithWrappedCFException(g);
2279 <    }
2096 >        checkCompletedNormally(f, v1);
2097 >        checkCompletedNormally(g, v2);
2098 >        checkCompletedNormally(h, null);
2099 >    }}
2100  
2101 <    /**
2102 <     * runAfterEither result completes exceptionally if either source cancelled
2103 <     */
2104 <    public void testRunAfterEither4() {
2105 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2106 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2107 <        Noop r = new Noop();
2108 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
2289 <        assertTrue(f.cancel(true));
2290 <        checkCompletedWithWrappedCancellationException(g);
2291 <        f = new CompletableFuture<>();
2292 <        f2 = new CompletableFuture<>();
2293 <        assertTrue(f2.cancel(true));
2294 <        checkCompletedWithWrappedCancellationException(g);
2295 <    }
2101 >    public void testAcceptEither_normalCompletion3() {
2102 >        for (ExecutionMode m : ExecutionMode.values())
2103 >        for (Integer v1 : new Integer[] { 1, null })
2104 >        for (Integer v2 : new Integer[] { 2, null })
2105 >    {
2106 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2107 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2108 >        final IncAction r = new IncAction();
2109  
2110 <    /**
2111 <     * thenCompose result completes normally after normal completion of source
2112 <     */
2300 <    public void testThenCompose() {
2301 <        CompletableFuture<Integer> f, g;
2302 <        CompletableFutureInc r;
2110 >        f.complete(v1);
2111 >        g.complete(v2);
2112 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2113  
2114 <        f = new CompletableFuture<>();
2115 <        g = f.thenCompose(r = new CompletableFutureInc());
2116 <        f.complete(one);
2307 <        checkCompletedNormally(g, two);
2308 <        assertTrue(r.ran);
2114 >        checkCompletedNormally(h, null);
2115 >        checkCompletedNormally(f, v1);
2116 >        checkCompletedNormally(g, v2);
2117  
2118 <        f = new CompletableFuture<>();
2119 <        f.complete(one);
2120 <        g = f.thenCompose(r = new CompletableFutureInc());
2121 <        checkCompletedNormally(g, two);
2314 <        assertTrue(r.ran);
2315 <    }
2118 >        // unspecified behavior
2119 >        assertTrue(Objects.equals(r.value, inc(v1)) ||
2120 >                   Objects.equals(r.value, inc(v2)));
2121 >    }}
2122  
2123      /**
2124 <     * thenCompose result completes exceptionally after exceptional
2125 <     * completion of source
2124 >     * acceptEither result completes exceptionally after exceptional
2125 >     * completion of either source
2126       */
2127 <    public void testThenCompose2() {
2128 <        CompletableFuture<Integer> f, g;
2129 <        CompletableFutureInc r;
2127 >    public void testAcceptEither_exceptionalCompletion1() {
2128 >        for (ExecutionMode m : ExecutionMode.values())
2129 >        for (Integer v1 : new Integer[] { 1, null })
2130 >    {
2131 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2132 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2133 >        final IncAction r = new IncAction();
2134 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2135 >        final CFException ex = new CFException();
2136  
2137 <        f = new CompletableFuture<>();
2138 <        g = f.thenCompose(r = new CompletableFutureInc());
2139 <        f.completeExceptionally(new CFException());
2328 <        checkCompletedWithWrappedCFException(g);
2137 >        f.completeExceptionally(ex);
2138 >        checkCompletedWithWrappedCFException(h, ex);
2139 >        g.complete(v1);
2140  
2141 <        f = new CompletableFuture<>();
2142 <        f.completeExceptionally(new CFException());
2143 <        g = f.thenCompose(r = new CompletableFutureInc());
2144 <        checkCompletedWithWrappedCFException(g);
2145 <    }
2141 >        assertEquals(0, r.invocationCount);
2142 >        checkCompletedNormally(g, v1);
2143 >        checkCompletedWithWrappedCFException(f, ex);
2144 >        checkCompletedWithWrappedCFException(h, ex);
2145 >    }}
2146  
2147 <    /**
2148 <     * thenCompose result completes exceptionally if action does
2149 <     */
2150 <    public void testThenCompose3() {
2151 <        CompletableFuture<Integer> f, g;
2152 <        FailingCompletableFutureFunction r;
2147 >    public void testAcceptEither_exceptionalCompletion2() {
2148 >        for (ExecutionMode m : ExecutionMode.values())
2149 >        for (Integer v1 : new Integer[] { 1, null })
2150 >    {
2151 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2152 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2153 >        final IncAction r = new IncAction();
2154 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2155 >        final CFException ex = new CFException();
2156  
2157 <        f = new CompletableFuture<>();
2158 <        g = f.thenCompose(r = new FailingCompletableFutureFunction());
2159 <        f.complete(one);
2346 <        checkCompletedWithWrappedCFException(g);
2157 >        g.completeExceptionally(ex);
2158 >        checkCompletedWithWrappedCFException(h, ex);
2159 >        f.complete(v1);
2160  
2161 <        f = new CompletableFuture<>();
2162 <        f.complete(one);
2163 <        g = f.thenCompose(r = new FailingCompletableFutureFunction());
2164 <        checkCompletedWithWrappedCFException(g);
2165 <    }
2161 >        assertEquals(0, r.invocationCount);
2162 >        checkCompletedNormally(f, v1);
2163 >        checkCompletedWithWrappedCFException(g, ex);
2164 >        checkCompletedWithWrappedCFException(h, ex);
2165 >    }}
2166  
2167 <    /**
2168 <     * thenCompose result completes exceptionally if source cancelled
2169 <     */
2170 <    public void testThenCompose4() {
2171 <        CompletableFuture<Integer> f, g;
2172 <        CompletableFutureInc r;
2167 >    public void testAcceptEither_exceptionalCompletion3() {
2168 >        for (ExecutionMode m : ExecutionMode.values())
2169 >        for (Integer v1 : new Integer[] { 1, null })
2170 >    {
2171 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2172 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2173 >        final IncAction r = new IncAction();
2174 >        final CFException ex = new CFException();
2175  
2176 <        f = new CompletableFuture<>();
2177 <        g = f.thenCompose(r = new CompletableFutureInc());
2178 <        assertTrue(f.cancel(true));
2364 <        checkCompletedWithWrappedCancellationException(g);
2176 >        g.completeExceptionally(ex);
2177 >        f.complete(v1);
2178 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2179  
2180 <        f = new CompletableFuture<>();
2181 <        assertTrue(f.cancel(true));
2182 <        g = f.thenCompose(r = new CompletableFutureInc());
2183 <        checkCompletedWithWrappedCancellationException(g);
2184 <    }
2180 >        // unspecified behavior
2181 >        Integer v;
2182 >        try {
2183 >            assertNull(h.join());
2184 >            assertEquals(1, r.invocationCount);
2185 >            assertEquals(inc(v1), r.value);
2186 >        } catch (CompletionException ok) {
2187 >            checkCompletedWithWrappedCFException(h, ex);
2188 >            assertEquals(0, r.invocationCount);
2189 >        }
2190  
2191 <    // asyncs
2191 >        checkCompletedWithWrappedCFException(g, ex);
2192 >        checkCompletedNormally(f, v1);
2193 >    }}
2194  
2195 <    /**
2196 <     * thenRunAsync result completes normally after normal completion of source
2197 <     */
2198 <    public void testThenRunAsync() {
2199 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2200 <        Noop r = new Noop();
2201 <        CompletableFuture<Void> g = f.thenRunAsync(r);
2202 <        f.complete(null);
2382 <        checkCompletedNormally(g, null);
2195 >    public void testAcceptEither_exceptionalCompletion4() {
2196 >        for (ExecutionMode m : ExecutionMode.values())
2197 >        for (Integer v1 : new Integer[] { 1, null })
2198 >    {
2199 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2200 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2201 >        final IncAction r = new IncAction();
2202 >        final CFException ex = new CFException();
2203  
2204 <        // reordered version
2205 <        f = new CompletableFuture<>();
2206 <        f.complete(null);
2387 <        r = new Noop();
2388 <        g = f.thenRunAsync(r);
2389 <        checkCompletedNormally(g, null);
2390 <    }
2204 >        f.completeExceptionally(ex);
2205 >        g.complete(v1);
2206 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2207  
2208 <    /**
2209 <     * thenRunAsync result completes exceptionally after exceptional
2394 <     * completion of source
2395 <     */
2396 <    public void testThenRunAsync2() {
2397 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2398 <        Noop r = new Noop();
2399 <        CompletableFuture<Void> g = f.thenRunAsync(r);
2400 <        f.completeExceptionally(new CFException());
2208 >        // unspecified behavior
2209 >        Integer v;
2210          try {
2211 <            g.join();
2212 <            shouldThrow();
2213 <        } catch (CompletionException success) {}
2214 <        checkCompletedWithWrappedCFException(g);
2215 <    }
2211 >            assertNull(h.join());
2212 >            assertEquals(1, r.invocationCount);
2213 >            assertEquals(inc(v1), r.value);
2214 >        } catch (CompletionException ok) {
2215 >            checkCompletedWithWrappedCFException(h, ex);
2216 >            assertEquals(0, r.invocationCount);
2217 >        }
2218  
2219 <    /**
2220 <     * thenRunAsync result completes exceptionally if action does
2221 <     */
2411 <    public void testThenRunAsync3() {
2412 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2413 <        FailingNoop r = new FailingNoop();
2414 <        CompletableFuture<Void> g = f.thenRunAsync(r);
2415 <        f.complete(null);
2416 <        checkCompletedWithWrappedCFException(g);
2417 <    }
2219 >        checkCompletedWithWrappedCFException(f, ex);
2220 >        checkCompletedNormally(g, v1);
2221 >    }}
2222  
2223      /**
2224 <     * thenRunAsync result completes exceptionally if source cancelled
2224 >     * acceptEither result completes exceptionally if action does
2225       */
2226 <    public void testThenRunAsync4() {
2227 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2228 <        Noop r = new Noop();
2229 <        CompletableFuture<Void> g = f.thenRunAsync(r);
2230 <        assertTrue(f.cancel(true));
2231 <        checkCompletedWithWrappedCancellationException(g);
2232 <    }
2226 >    public void testAcceptEither_actionFailed1() {
2227 >        for (ExecutionMode m : ExecutionMode.values())
2228 >        for (Integer v1 : new Integer[] { 1, null })
2229 >        for (Integer v2 : new Integer[] { 2, null })
2230 >    {
2231 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2232 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2233 >        final FailingConsumer r = new FailingConsumer();
2234 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2235  
2236 <    /**
2237 <     * thenApplyAsync result completes normally after normal completion of source
2238 <     */
2239 <    public void testThenApplyAsync() {
2240 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2241 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
2436 <        f.complete(one);
2437 <        checkCompletedNormally(g, two);
2438 <    }
2236 >        f.complete(v1);
2237 >        checkCompletedWithWrappedCFException(h);
2238 >        g.complete(v2);
2239 >        checkCompletedNormally(f, v1);
2240 >        checkCompletedNormally(g, v2);
2241 >    }}
2242  
2243 <    /**
2244 <     * thenApplyAsync result completes exceptionally after exceptional
2245 <     * completion of source
2246 <     */
2247 <    public void testThenApplyAsync2() {
2248 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2249 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
2250 <        f.completeExceptionally(new CFException());
2251 <        checkCompletedWithWrappedCFException(g);
2449 <    }
2243 >    public void testAcceptEither_actionFailed2() {
2244 >        for (ExecutionMode m : ExecutionMode.values())
2245 >        for (Integer v1 : new Integer[] { 1, null })
2246 >        for (Integer v2 : new Integer[] { 2, null })
2247 >    {
2248 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2249 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2250 >        final FailingConsumer r = new FailingConsumer();
2251 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2252  
2253 <    /**
2254 <     * thenApplyAsync result completes exceptionally if action does
2255 <     */
2256 <    public void testThenApplyAsync3() {
2257 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2258 <        FailingFunction r = new FailingFunction();
2457 <        CompletableFuture<Integer> g = f.thenApplyAsync(r);
2458 <        f.complete(null);
2459 <        checkCompletedWithWrappedCFException(g);
2460 <    }
2253 >        g.complete(v2);
2254 >        checkCompletedWithWrappedCFException(h);
2255 >        f.complete(v1);
2256 >        checkCompletedNormally(f, v1);
2257 >        checkCompletedNormally(g, v2);
2258 >    }}
2259  
2260      /**
2261 <     * thenApplyAsync result completes exceptionally if source cancelled
2261 >     * acceptEither result completes exceptionally if either source cancelled
2262       */
2263 <    public void testThenApplyAsync4() {
2264 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2265 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
2266 <        assertTrue(f.cancel(true));
2267 <        checkCompletedWithWrappedCancellationException(g);
2268 <    }
2263 >    public void testAcceptEither_sourceCancelled1() {
2264 >        for (ExecutionMode m : ExecutionMode.values())
2265 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2266 >        for (Integer v1 : new Integer[] { 1, null })
2267 >    {
2268 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2269 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2270 >        final IncAction r = new IncAction();
2271 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2272  
2273 <    /**
2274 <     * thenAcceptAsync result completes normally after normal
2275 <     * completion of source
2475 <     */
2476 <    public void testThenAcceptAsync() {
2477 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2478 <        IncAction r = new IncAction();
2479 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2480 <        f.complete(one);
2481 <        checkCompletedNormally(g, null);
2482 <        assertEquals(r.value, (Integer) 2);
2483 <    }
2273 >        assertTrue(f.cancel(mayInterruptIfRunning));
2274 >        checkCompletedWithWrappedCancellationException(h);
2275 >        g.complete(v1);
2276  
2277 <    /**
2278 <     * thenAcceptAsync result completes exceptionally after exceptional
2279 <     * completion of source
2280 <     */
2281 <    public void testThenAcceptAsync2() {
2490 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2491 <        IncAction r = new IncAction();
2492 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2493 <        f.completeExceptionally(new CFException());
2494 <        checkCompletedWithWrappedCFException(g);
2495 <    }
2277 >        checkCancelled(f);
2278 >        assertEquals(0, r.invocationCount);
2279 >        checkCompletedNormally(g, v1);
2280 >        checkCompletedWithWrappedCancellationException(h);
2281 >    }}
2282  
2283 <    /**
2284 <     * thenAcceptAsync result completes exceptionally if action does
2285 <     */
2286 <    public void testThenAcceptAsync3() {
2287 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2288 <        FailingConsumer r = new FailingConsumer();
2289 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2290 <        f.complete(null);
2291 <        checkCompletedWithWrappedCFException(g);
2506 <    }
2283 >    public void testAcceptEither_sourceCancelled2() {
2284 >        for (ExecutionMode m : ExecutionMode.values())
2285 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2286 >        for (Integer v1 : new Integer[] { 1, null })
2287 >    {
2288 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2289 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2290 >        final IncAction r = new IncAction();
2291 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2292  
2293 <    /**
2294 <     * thenAcceptAsync result completes exceptionally if source cancelled
2295 <     */
2511 <    public void testThenAcceptAsync4() {
2512 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2513 <        IncAction r = new IncAction();
2514 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2515 <        assertTrue(f.cancel(true));
2516 <        checkCompletedWithWrappedCancellationException(g);
2517 <    }
2293 >        assertTrue(g.cancel(mayInterruptIfRunning));
2294 >        checkCompletedWithWrappedCancellationException(h);
2295 >        f.complete(v1);
2296  
2297 <    /**
2298 <     * acceptEitherAsync result completes normally after normal
2299 <     * completion of sources
2300 <     */
2301 <    public void testAcceptEitherAsync() {
2524 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2525 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2526 <        IncAction r = new IncAction();
2527 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
2528 <        f.complete(one);
2529 <        checkCompletedNormally(g, null);
2530 <        assertEquals(r.value, (Integer) 2);
2297 >        checkCancelled(g);
2298 >        assertEquals(0, r.invocationCount);
2299 >        checkCompletedNormally(f, v1);
2300 >        checkCompletedWithWrappedCancellationException(h);
2301 >    }}
2302  
2303 <        r = new IncAction();
2304 <        f = new CompletableFuture<>();
2305 <        f.complete(one);
2306 <        f2 = new CompletableFuture<>();
2307 <        g = f.acceptEitherAsync(f2, r);
2308 <        checkCompletedNormally(g, null);
2309 <        assertEquals(r.value, (Integer) 2);
2310 <    }
2303 >    public void testAcceptEither_sourceCancelled3() {
2304 >        for (ExecutionMode m : ExecutionMode.values())
2305 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2306 >        for (Integer v1 : new Integer[] { 1, null })
2307 >    {
2308 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2309 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2310 >        final IncAction r = new IncAction();
2311  
2312 <    /**
2313 <     * acceptEitherAsync result completes exceptionally after exceptional
2314 <     * completion of source
2544 <     */
2545 <    public void testAcceptEitherAsync2() {
2546 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2547 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2548 <        IncAction r = new IncAction();
2549 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
2550 <        f.completeExceptionally(new CFException());
2551 <        checkCompletedWithWrappedCFException(g);
2312 >        assertTrue(g.cancel(mayInterruptIfRunning));
2313 >        f.complete(v1);
2314 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2315  
2316 <        r = new IncAction();
2317 <        f = new CompletableFuture<>();
2318 <        f2 = new CompletableFuture<>();
2319 <        f2.completeExceptionally(new CFException());
2320 <        g = f.acceptEitherAsync(f2, r);
2321 <        f.complete(one);
2322 <        checkCompletedWithWrappedCFException(g);
2323 <    }
2316 >        // unspecified behavior
2317 >        Integer v;
2318 >        try {
2319 >            assertNull(h.join());
2320 >            assertEquals(1, r.invocationCount);
2321 >            assertEquals(inc(v1), r.value);
2322 >        } catch (CompletionException ok) {
2323 >            checkCompletedWithWrappedCancellationException(h);
2324 >            assertEquals(0, r.invocationCount);
2325 >        }
2326  
2327 <    /**
2328 <     * acceptEitherAsync result completes exceptionally if action does
2329 <     */
2565 <    public void testAcceptEitherAsync3() {
2566 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2567 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2568 <        FailingConsumer r = new FailingConsumer();
2569 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
2570 <        f.complete(one);
2571 <        checkCompletedWithWrappedCFException(g);
2572 <    }
2327 >        checkCancelled(g);
2328 >        checkCompletedNormally(f, v1);
2329 >    }}
2330  
2331 <    /**
2332 <     * acceptEitherAsync result completes exceptionally if either
2333 <     * source cancelled
2334 <     */
2335 <    public void testAcceptEitherAsync4() {
2336 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2337 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2338 <        IncAction r = new IncAction();
2582 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
2583 <        assertTrue(f.cancel(true));
2584 <        checkCompletedWithWrappedCancellationException(g);
2331 >    public void testAcceptEither_sourceCancelled4() {
2332 >        for (ExecutionMode m : ExecutionMode.values())
2333 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2334 >        for (Integer v1 : new Integer[] { 1, null })
2335 >    {
2336 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2337 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2338 >        final IncAction r = new IncAction();
2339  
2340 <        r = new IncAction();
2341 <        f = new CompletableFuture<>();
2342 <        f2 = new CompletableFuture<>();
2589 <        assertTrue(f2.cancel(true));
2590 <        g = f.acceptEitherAsync(f2, r);
2591 <        checkCompletedWithWrappedCancellationException(g);
2592 <    }
2340 >        assertTrue(f.cancel(mayInterruptIfRunning));
2341 >        g.complete(v1);
2342 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2343  
2344 <    /**
2345 <     * runAfterEitherAsync result completes normally after normal
2346 <     * completion of sources
2347 <     */
2348 <    public void testRunAfterEitherAsync() {
2349 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2350 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2351 <        Noop r = new Noop();
2352 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
2353 <        f.complete(one);
2604 <        checkCompletedNormally(g, null);
2605 <        assertTrue(r.ran);
2344 >        // unspecified behavior
2345 >        Integer v;
2346 >        try {
2347 >            assertNull(h.join());
2348 >            assertEquals(1, r.invocationCount);
2349 >            assertEquals(inc(v1), r.value);
2350 >        } catch (CompletionException ok) {
2351 >            checkCompletedWithWrappedCancellationException(h);
2352 >            assertEquals(0, r.invocationCount);
2353 >        }
2354  
2355 <        r = new Noop();
2356 <        f = new CompletableFuture<>();
2357 <        f.complete(one);
2610 <        f2 = new CompletableFuture<>();
2611 <        g = f.runAfterEitherAsync(f2, r);
2612 <        checkCompletedNormally(g, null);
2613 <        assertTrue(r.ran);
2614 <    }
2355 >        checkCancelled(f);
2356 >        checkCompletedNormally(g, v1);
2357 >    }}
2358  
2359      /**
2360 <     * runAfterEitherAsync result completes exceptionally after exceptional
2361 <     * completion of source
2360 >     * runAfterEither result completes normally after normal completion
2361 >     * of either source
2362       */
2363 <    public void testRunAfterEitherAsync2() {
2364 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2365 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2366 <        Noop r = new Noop();
2367 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
2368 <        f.completeExceptionally(new CFException());
2369 <        checkCompletedWithWrappedCFException(g);
2363 >    public void testRunAfterEither_normalCompletion1() {
2364 >        for (ExecutionMode m : ExecutionMode.values())
2365 >        for (Integer v1 : new Integer[] { 1, null })
2366 >        for (Integer v2 : new Integer[] { 2, null })
2367 >    {
2368 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2369 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2370 >        final Noop r = new Noop();
2371 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2372  
2373 <        r = new Noop();
2374 <        f = new CompletableFuture<>();
2375 <        f2 = new CompletableFuture<>();
2376 <        f2.completeExceptionally(new CFException());
2632 <        g = f.runAfterEitherAsync(f2, r);
2633 <        f.complete(one);
2634 <        checkCompletedWithWrappedCFException(g);
2635 <    }
2373 >        f.complete(v1);
2374 >        checkCompletedNormally(h, null);
2375 >        assertEquals(1, r.invocationCount);
2376 >        g.complete(v2);
2377  
2378 <    /**
2379 <     * runAfterEitherAsync result completes exceptionally if action does
2380 <     */
2381 <    public void testRunAfterEitherAsync3() {
2382 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2642 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2643 <        FailingNoop r = new FailingNoop();
2644 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
2645 <        f.complete(one);
2646 <        checkCompletedWithWrappedCFException(g);
2647 <    }
2378 >        checkCompletedNormally(f, v1);
2379 >        checkCompletedNormally(g, v2);
2380 >        checkCompletedNormally(h, null);
2381 >        assertEquals(1, r.invocationCount);
2382 >    }}
2383  
2384 <    /**
2385 <     * runAfterEitherAsync result completes exceptionally if either
2386 <     * source cancelled
2387 <     */
2388 <    public void testRunAfterEitherAsync4() {
2389 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2390 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2391 <        Noop r = new Noop();
2392 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
2658 <        assertTrue(f.cancel(true));
2659 <        checkCompletedWithWrappedCancellationException(g);
2384 >    public void testRunAfterEither_normalCompletion2() {
2385 >        for (ExecutionMode m : ExecutionMode.values())
2386 >        for (Integer v1 : new Integer[] { 1, null })
2387 >        for (Integer v2 : new Integer[] { 2, null })
2388 >    {
2389 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2390 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2391 >        final Noop r = new Noop();
2392 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2393  
2394 <        r = new Noop();
2395 <        f = new CompletableFuture<>();
2396 <        f2 = new CompletableFuture<>();
2397 <        assertTrue(f2.cancel(true));
2665 <        g = f.runAfterEitherAsync(f2, r);
2666 <        checkCompletedWithWrappedCancellationException(g);
2667 <    }
2394 >        g.complete(v2);
2395 >        checkCompletedNormally(h, null);
2396 >        assertEquals(1, r.invocationCount);
2397 >        f.complete(v1);
2398  
2399 <    /**
2400 <     * thenComposeAsync result completes normally after normal
2401 <     * completion of source
2402 <     */
2403 <    public void testThenComposeAsync() {
2674 <        CompletableFuture<Integer> f, g;
2675 <        CompletableFutureInc r;
2399 >        checkCompletedNormally(f, v1);
2400 >        checkCompletedNormally(g, v2);
2401 >        checkCompletedNormally(h, null);
2402 >        assertEquals(1, r.invocationCount);
2403 >        }}
2404  
2405 <        f = new CompletableFuture<>();
2406 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2407 <        f.complete(one);
2408 <        checkCompletedNormally(g, two);
2405 >    public void testRunAfterEither_normalCompletion3() {
2406 >        for (ExecutionMode m : ExecutionMode.values())
2407 >        for (Integer v1 : new Integer[] { 1, null })
2408 >        for (Integer v2 : new Integer[] { 2, null })
2409 >    {
2410 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2411 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2412 >        final Noop r = new Noop();
2413  
2414 <        f = new CompletableFuture<>();
2415 <        f.complete(one);
2416 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2417 <        checkCompletedNormally(g, two);
2418 <    }
2414 >        f.complete(v1);
2415 >        g.complete(v2);
2416 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2417 >
2418 >        checkCompletedNormally(h, null);
2419 >        checkCompletedNormally(f, v1);
2420 >        checkCompletedNormally(g, v2);
2421 >        assertEquals(1, r.invocationCount);
2422 >    }}
2423  
2424      /**
2425 <     * thenComposeAsync result completes exceptionally after
2426 <     * exceptional completion of source
2425 >     * runAfterEither result completes exceptionally after exceptional
2426 >     * completion of either source
2427       */
2428 <    public void testThenComposeAsync2() {
2429 <        CompletableFuture<Integer> f, g;
2430 <        CompletableFutureInc r;
2428 >    public void testRunAfterEither_exceptionalCompletion1() {
2429 >        for (ExecutionMode m : ExecutionMode.values())
2430 >        for (Integer v1 : new Integer[] { 1, null })
2431 >    {
2432 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2433 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2434 >        final Noop r = new Noop();
2435 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2436 >        final CFException ex = new CFException();
2437  
2438 <        f = new CompletableFuture<>();
2439 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2440 <        f.completeExceptionally(new CFException());
2699 <        checkCompletedWithWrappedCFException(g);
2700 <        assertFalse(r.ran);
2438 >        f.completeExceptionally(ex);
2439 >        checkCompletedWithWrappedCFException(h, ex);
2440 >        g.complete(v1);
2441  
2442 <        f = new CompletableFuture<>();
2443 <        f.completeExceptionally(new CFException());
2444 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2445 <        checkCompletedWithWrappedCFException(g);
2446 <        assertFalse(r.ran);
2707 <    }
2442 >        assertEquals(0, r.invocationCount);
2443 >        checkCompletedNormally(g, v1);
2444 >        checkCompletedWithWrappedCFException(f, ex);
2445 >        checkCompletedWithWrappedCFException(h, ex);
2446 >    }}
2447  
2448 <    /**
2449 <     * thenComposeAsync result completes exceptionally if action does
2450 <     */
2451 <    public void testThenComposeAsync3() {
2452 <        CompletableFuture<Integer> f, g;
2453 <        FailingCompletableFutureFunction r;
2448 >    public void testRunAfterEither_exceptionalCompletion2() {
2449 >        for (ExecutionMode m : ExecutionMode.values())
2450 >        for (Integer v1 : new Integer[] { 1, null })
2451 >    {
2452 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2453 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2454 >        final Noop r = new Noop();
2455 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2456 >        final CFException ex = new CFException();
2457  
2458 <        f = new CompletableFuture<>();
2459 <        g = f.thenComposeAsync(r = new FailingCompletableFutureFunction());
2460 <        f.complete(one);
2719 <        checkCompletedWithWrappedCFException(g);
2458 >        g.completeExceptionally(ex);
2459 >        checkCompletedWithWrappedCFException(h, ex);
2460 >        f.complete(v1);
2461  
2462 <        f = new CompletableFuture<>();
2463 <        f.complete(one);
2464 <        g = f.thenComposeAsync(r = new FailingCompletableFutureFunction());
2465 <        checkCompletedWithWrappedCFException(g);
2466 <    }
2462 >        assertEquals(0, r.invocationCount);
2463 >        checkCompletedNormally(f, v1);
2464 >        checkCompletedWithWrappedCFException(g, ex);
2465 >        checkCompletedWithWrappedCFException(h, ex);
2466 >    }}
2467  
2468 <    /**
2469 <     * thenComposeAsync result completes exceptionally if source cancelled
2470 <     */
2471 <    public void testThenComposeAsync4() {
2472 <        CompletableFuture<Integer> f, g;
2473 <        CompletableFutureInc r;
2468 >    public void testRunAfterEither_exceptionalCompletion3() {
2469 >        for (ExecutionMode m : ExecutionMode.values())
2470 >        for (Integer v1 : new Integer[] { 1, null })
2471 >    {
2472 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2473 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2474 >        final Noop r = new Noop();
2475 >        final CFException ex = new CFException();
2476  
2477 <        f = new CompletableFuture<>();
2478 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2479 <        assertTrue(f.cancel(true));
2737 <        checkCompletedWithWrappedCancellationException(g);
2477 >        g.completeExceptionally(ex);
2478 >        f.complete(v1);
2479 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2480  
2481 <        f = new CompletableFuture<>();
2482 <        assertTrue(f.cancel(true));
2483 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2484 <        checkCompletedWithWrappedCancellationException(g);
2485 <    }
2481 >        // unspecified behavior
2482 >        Integer v;
2483 >        try {
2484 >            assertNull(h.join());
2485 >            assertEquals(1, r.invocationCount);
2486 >        } catch (CompletionException ok) {
2487 >            checkCompletedWithWrappedCFException(h, ex);
2488 >            assertEquals(0, r.invocationCount);
2489 >        }
2490  
2491 <    // async with explicit executors
2491 >        checkCompletedWithWrappedCFException(g, ex);
2492 >        checkCompletedNormally(f, v1);
2493 >    }}
2494  
2495 <    /**
2496 <     * thenRunAsync result completes normally after normal completion of source
2497 <     */
2498 <    public void testThenRunAsyncE() {
2499 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2500 <        Noop r = new Noop();
2501 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2502 <        f.complete(null);
2755 <        checkCompletedNormally(g, null);
2495 >    public void testRunAfterEither_exceptionalCompletion4() {
2496 >        for (ExecutionMode m : ExecutionMode.values())
2497 >        for (Integer v1 : new Integer[] { 1, null })
2498 >    {
2499 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2500 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2501 >        final Noop r = new Noop();
2502 >        final CFException ex = new CFException();
2503  
2504 <        // reordered version
2505 <        f = new CompletableFuture<>();
2506 <        f.complete(null);
2760 <        r = new Noop();
2761 <        g = f.thenRunAsync(r, new ThreadExecutor());
2762 <        checkCompletedNormally(g, null);
2763 <    }
2504 >        f.completeExceptionally(ex);
2505 >        g.complete(v1);
2506 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2507  
2508 <    /**
2509 <     * thenRunAsync result completes exceptionally after exceptional
2767 <     * completion of source
2768 <     */
2769 <    public void testThenRunAsync2E() {
2770 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2771 <        Noop r = new Noop();
2772 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2773 <        f.completeExceptionally(new CFException());
2508 >        // unspecified behavior
2509 >        Integer v;
2510          try {
2511 <            g.join();
2512 <            shouldThrow();
2513 <        } catch (CompletionException success) {}
2514 <        checkCompletedWithWrappedCFException(g);
2515 <    }
2511 >            assertNull(h.join());
2512 >            assertEquals(1, r.invocationCount);
2513 >        } catch (CompletionException ok) {
2514 >            checkCompletedWithWrappedCFException(h, ex);
2515 >            assertEquals(0, r.invocationCount);
2516 >        }
2517  
2518 <    /**
2519 <     * thenRunAsync result completes exceptionally if action does
2520 <     */
2784 <    public void testThenRunAsync3E() {
2785 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2786 <        FailingNoop r = new FailingNoop();
2787 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2788 <        f.complete(null);
2789 <        checkCompletedWithWrappedCFException(g);
2790 <    }
2518 >        checkCompletedWithWrappedCFException(f, ex);
2519 >        checkCompletedNormally(g, v1);
2520 >    }}
2521  
2522      /**
2523 <     * thenRunAsync result completes exceptionally if source cancelled
2523 >     * runAfterEither result completes exceptionally if action does
2524       */
2525 <    public void testThenRunAsync4E() {
2526 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2527 <        Noop r = new Noop();
2528 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2529 <        assertTrue(f.cancel(true));
2530 <        checkCompletedWithWrappedCancellationException(g);
2531 <    }
2525 >    public void testRunAfterEither_actionFailed1() {
2526 >        for (ExecutionMode m : ExecutionMode.values())
2527 >        for (Integer v1 : new Integer[] { 1, null })
2528 >        for (Integer v2 : new Integer[] { 2, null })
2529 >    {
2530 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2531 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2532 >        final FailingRunnable r = new FailingRunnable();
2533 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2534  
2535 <    /**
2536 <     * thenApplyAsync result completes normally after normal completion of source
2537 <     */
2538 <    public void testThenApplyAsyncE() {
2539 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2540 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
2809 <        f.complete(one);
2810 <        checkCompletedNormally(g, two);
2811 <    }
2535 >        f.complete(v1);
2536 >        checkCompletedWithWrappedCFException(h);
2537 >        g.complete(v2);
2538 >        checkCompletedNormally(f, v1);
2539 >        checkCompletedNormally(g, v2);
2540 >    }}
2541  
2542 <    /**
2543 <     * thenApplyAsync result completes exceptionally after exceptional
2544 <     * completion of source
2545 <     */
2546 <    public void testThenApplyAsync2E() {
2547 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2548 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
2549 <        f.completeExceptionally(new CFException());
2550 <        checkCompletedWithWrappedCFException(g);
2822 <    }
2542 >    public void testRunAfterEither_actionFailed2() {
2543 >        for (ExecutionMode m : ExecutionMode.values())
2544 >        for (Integer v1 : new Integer[] { 1, null })
2545 >        for (Integer v2 : new Integer[] { 2, null })
2546 >    {
2547 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2548 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2549 >        final FailingRunnable r = new FailingRunnable();
2550 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2551  
2552 <    /**
2553 <     * thenApplyAsync result completes exceptionally if action does
2554 <     */
2555 <    public void testThenApplyAsync3E() {
2556 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2557 <        FailingFunction r = new FailingFunction();
2830 <        CompletableFuture<Integer> g = f.thenApplyAsync(r, new ThreadExecutor());
2831 <        f.complete(null);
2832 <        checkCompletedWithWrappedCFException(g);
2833 <    }
2552 >        g.complete(v2);
2553 >        checkCompletedWithWrappedCFException(h);
2554 >        f.complete(v1);
2555 >        checkCompletedNormally(f, v1);
2556 >        checkCompletedNormally(g, v2);
2557 >    }}
2558  
2559      /**
2560 <     * thenApplyAsync result completes exceptionally if source cancelled
2560 >     * runAfterEither result completes exceptionally if either source cancelled
2561       */
2562 <    public void testThenApplyAsync4E() {
2563 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2564 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
2565 <        assertTrue(f.cancel(true));
2566 <        checkCompletedWithWrappedCancellationException(g);
2567 <    }
2562 >    public void testRunAfterEither_sourceCancelled1() {
2563 >        for (ExecutionMode m : ExecutionMode.values())
2564 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2565 >        for (Integer v1 : new Integer[] { 1, null })
2566 >    {
2567 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2568 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2569 >        final Noop r = new Noop();
2570 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2571  
2572 <    /**
2573 <     * thenAcceptAsync result completes normally after normal
2574 <     * completion of source
2848 <     */
2849 <    public void testThenAcceptAsyncE() {
2850 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2851 <        IncAction r = new IncAction();
2852 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2853 <        f.complete(one);
2854 <        checkCompletedNormally(g, null);
2855 <        assertEquals(r.value, (Integer) 2);
2856 <    }
2572 >        assertTrue(f.cancel(mayInterruptIfRunning));
2573 >        checkCompletedWithWrappedCancellationException(h);
2574 >        g.complete(v1);
2575  
2576 <    /**
2577 <     * thenAcceptAsync result completes exceptionally after exceptional
2578 <     * completion of source
2579 <     */
2580 <    public void testThenAcceptAsync2E() {
2863 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2864 <        IncAction r = new IncAction();
2865 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2866 <        f.completeExceptionally(new CFException());
2867 <        checkCompletedWithWrappedCFException(g);
2868 <    }
2576 >        checkCancelled(f);
2577 >        assertEquals(0, r.invocationCount);
2578 >        checkCompletedNormally(g, v1);
2579 >        checkCompletedWithWrappedCancellationException(h);
2580 >    }}
2581  
2582 <    /**
2583 <     * thenAcceptAsync result completes exceptionally if action does
2584 <     */
2585 <    public void testThenAcceptAsync3E() {
2586 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2587 <        FailingConsumer r = new FailingConsumer();
2588 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2589 <        f.complete(null);
2590 <        checkCompletedWithWrappedCFException(g);
2879 <    }
2582 >    public void testRunAfterEither_sourceCancelled2() {
2583 >        for (ExecutionMode m : ExecutionMode.values())
2584 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2585 >        for (Integer v1 : new Integer[] { 1, null })
2586 >    {
2587 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2588 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2589 >        final Noop r = new Noop();
2590 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2591  
2592 <    /**
2593 <     * thenAcceptAsync result completes exceptionally if source cancelled
2594 <     */
2884 <    public void testThenAcceptAsync4E() {
2885 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2886 <        IncAction r = new IncAction();
2887 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2888 <        assertTrue(f.cancel(true));
2889 <        checkCompletedWithWrappedCancellationException(g);
2890 <    }
2592 >        assertTrue(g.cancel(mayInterruptIfRunning));
2593 >        checkCompletedWithWrappedCancellationException(h);
2594 >        f.complete(v1);
2595  
2596 <    /**
2597 <     * acceptEitherAsync result completes normally after normal
2598 <     * completion of sources
2599 <     */
2600 <    public void testAcceptEitherAsyncE() {
2897 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2898 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2899 <        IncAction r = new IncAction();
2900 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2901 <        f.complete(one);
2902 <        checkCompletedNormally(g, null);
2903 <        assertEquals(r.value, (Integer) 2);
2596 >        checkCancelled(g);
2597 >        assertEquals(0, r.invocationCount);
2598 >        checkCompletedNormally(f, v1);
2599 >        checkCompletedWithWrappedCancellationException(h);
2600 >    }}
2601  
2602 <        r = new IncAction();
2603 <        f = new CompletableFuture<>();
2604 <        f.complete(one);
2605 <        f2 = new CompletableFuture<>();
2606 <        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2607 <        checkCompletedNormally(g, null);
2608 <        assertEquals(r.value, (Integer) 2);
2609 <    }
2602 >    public void testRunAfterEither_sourceCancelled3() {
2603 >        for (ExecutionMode m : ExecutionMode.values())
2604 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2605 >        for (Integer v1 : new Integer[] { 1, null })
2606 >    {
2607 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2608 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2609 >        final Noop r = new Noop();
2610  
2611 <    /**
2612 <     * acceptEitherAsync result completes exceptionally after exceptional
2613 <     * completion of source
2917 <     */
2918 <    public void testAcceptEitherAsync2E() {
2919 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2920 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2921 <        IncAction r = new IncAction();
2922 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2923 <        f.completeExceptionally(new CFException());
2924 <        checkCompletedWithWrappedCFException(g);
2611 >        assertTrue(g.cancel(mayInterruptIfRunning));
2612 >        f.complete(v1);
2613 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2614  
2615 <        r = new IncAction();
2616 <        f = new CompletableFuture<>();
2617 <        f2 = new CompletableFuture<>();
2618 <        f2.completeExceptionally(new CFException());
2619 <        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2620 <        f.complete(one);
2621 <        checkCompletedWithWrappedCFException(g);
2622 <    }
2615 >        // unspecified behavior
2616 >        Integer v;
2617 >        try {
2618 >            assertNull(h.join());
2619 >            assertEquals(1, r.invocationCount);
2620 >        } catch (CompletionException ok) {
2621 >            checkCompletedWithWrappedCancellationException(h);
2622 >            assertEquals(0, r.invocationCount);
2623 >        }
2624  
2625 <    /**
2626 <     * acceptEitherAsync result completes exceptionally if action does
2627 <     */
2938 <    public void testAcceptEitherAsync3E() {
2939 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2940 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2941 <        FailingConsumer r = new FailingConsumer();
2942 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2943 <        f.complete(one);
2944 <        checkCompletedWithWrappedCFException(g);
2945 <    }
2625 >        checkCancelled(g);
2626 >        checkCompletedNormally(f, v1);
2627 >    }}
2628  
2629 <    /**
2630 <     * acceptEitherAsync result completes exceptionally if either
2631 <     * source cancelled
2632 <     */
2633 <    public void testAcceptEitherAsync4E() {
2634 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2635 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2636 <        IncAction r = new IncAction();
2955 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2956 <        assertTrue(f.cancel(true));
2957 <        checkCompletedWithWrappedCancellationException(g);
2629 >    public void testRunAfterEither_sourceCancelled4() {
2630 >        for (ExecutionMode m : ExecutionMode.values())
2631 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2632 >        for (Integer v1 : new Integer[] { 1, null })
2633 >    {
2634 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2635 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2636 >        final Noop r = new Noop();
2637  
2638 <        r = new IncAction();
2639 <        f = new CompletableFuture<>();
2640 <        f2 = new CompletableFuture<>();
2962 <        assertTrue(f2.cancel(true));
2963 <        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2964 <        checkCompletedWithWrappedCancellationException(g);
2965 <    }
2638 >        assertTrue(f.cancel(mayInterruptIfRunning));
2639 >        g.complete(v1);
2640 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2641  
2642 <    /**
2643 <     * runAfterEitherAsync result completes normally after normal
2644 <     * completion of sources
2645 <     */
2646 <    public void testRunAfterEitherAsyncE() {
2647 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2648 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2649 <        Noop r = new Noop();
2650 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2976 <        f.complete(one);
2977 <        checkCompletedNormally(g, null);
2978 <        assertTrue(r.ran);
2642 >        // unspecified behavior
2643 >        Integer v;
2644 >        try {
2645 >            assertNull(h.join());
2646 >            assertEquals(1, r.invocationCount);
2647 >        } catch (CompletionException ok) {
2648 >            checkCompletedWithWrappedCancellationException(h);
2649 >            assertEquals(0, r.invocationCount);
2650 >        }
2651  
2652 <        r = new Noop();
2653 <        f = new CompletableFuture<>();
2654 <        f.complete(one);
2983 <        f2 = new CompletableFuture<>();
2984 <        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2985 <        checkCompletedNormally(g, null);
2986 <        assertTrue(r.ran);
2987 <    }
2652 >        checkCancelled(f);
2653 >        checkCompletedNormally(g, v1);
2654 >    }}
2655  
2656      /**
2657 <     * runAfterEitherAsync result completes exceptionally after exceptional
2991 <     * completion of source
2657 >     * thenCompose result completes normally after normal completion of source
2658       */
2659 <    public void testRunAfterEitherAsync2E() {
2660 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2661 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2662 <        Noop r = new Noop();
2663 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2664 <        f.completeExceptionally(new CFException());
2665 <        checkCompletedWithWrappedCFException(g);
2666 <
2667 <        r = new Noop();
2668 <        f = new CompletableFuture<>();
3003 <        f2 = new CompletableFuture<>();
3004 <        f2.completeExceptionally(new CFException());
3005 <        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
3006 <        f.complete(one);
3007 <        checkCompletedWithWrappedCFException(g);
3008 <    }
2659 >    public void testThenCompose_normalCompletion() {
2660 >        for (ExecutionMode m : ExecutionMode.values())
2661 >        for (boolean createIncomplete : new boolean[] { true, false })
2662 >        for (Integer v1 : new Integer[] { 1, null })
2663 >    {
2664 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2665 >        final CompletableFutureInc r = new CompletableFutureInc();
2666 >        if (!createIncomplete) f.complete(v1);
2667 >        final CompletableFuture<Integer> g = f.thenCompose(r);
2668 >        if (createIncomplete) f.complete(v1);
2669  
2670 <    /**
2671 <     * runAfterEitherAsync result completes exceptionally if action does
2672 <     */
2673 <    public void testRunAfterEitherAsync3E() {
3014 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3015 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
3016 <        FailingNoop r = new FailingNoop();
3017 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
3018 <        f.complete(one);
3019 <        checkCompletedWithWrappedCFException(g);
3020 <    }
2670 >        checkCompletedNormally(g, inc(v1));
2671 >        checkCompletedNormally(f, v1);
2672 >        assertEquals(1, r.invocationCount);
2673 >    }}
2674  
2675      /**
2676 <     * runAfterEitherAsync result completes exceptionally if either
2677 <     * source cancelled
2676 >     * thenCompose result completes exceptionally after exceptional
2677 >     * completion of source
2678       */
2679 <    public void testRunAfterEitherAsync4E() {
2680 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2681 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2682 <        Noop r = new Noop();
2683 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2684 <        assertTrue(f.cancel(true));
2685 <        checkCompletedWithWrappedCancellationException(g);
2679 >    public void testThenCompose_exceptionalCompletion() {
2680 >        for (ExecutionMode m : ExecutionMode.values())
2681 >        for (boolean createIncomplete : new boolean[] { true, false })
2682 >    {
2683 >        final CFException ex = new CFException();
2684 >        final CompletableFutureInc r = new CompletableFutureInc();
2685 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2686 >        if (!createIncomplete) f.completeExceptionally(ex);
2687 >        final CompletableFuture<Integer> g = f.thenCompose(r);
2688 >        if (createIncomplete) f.completeExceptionally(ex);
2689  
2690 <        r = new Noop();
2691 <        f = new CompletableFuture<>();
2692 <        f2 = new CompletableFuture<>();
2693 <        assertTrue(f2.cancel(true));
3038 <        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
3039 <        checkCompletedWithWrappedCancellationException(g);
3040 <    }
2690 >        checkCompletedWithWrappedCFException(g, ex);
2691 >        checkCompletedWithWrappedCFException(f, ex);
2692 >        assertEquals(0, r.invocationCount);
2693 >    }}
2694  
2695      /**
2696 <     * thenComposeAsync result completes normally after normal
3044 <     * completion of source
2696 >     * thenCompose result completes exceptionally if action does
2697       */
2698 <    public void testThenComposeAsyncE() {
2699 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2700 <        CompletableFutureInc r = new CompletableFutureInc();
2701 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2702 <        f.complete(one);
2703 <        checkCompletedNormally(g, two);
2704 <    }
2698 >    public void testThenCompose_actionFailed() {
2699 >        for (ExecutionMode m : ExecutionMode.values())
2700 >        for (boolean createIncomplete : new boolean[] { true, false })
2701 >        for (Integer v1 : new Integer[] { 1, null })
2702 >    {
2703 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2704 >        final FailingCompletableFutureFunction r
2705 >            = new FailingCompletableFutureFunction();
2706 >        if (!createIncomplete) f.complete(v1);
2707 >        final CompletableFuture<Integer> g = f.thenCompose(r);
2708 >        if (createIncomplete) f.complete(v1);
2709  
3054    /**
3055     * thenComposeAsync result completes exceptionally after
3056     * exceptional completion of source
3057     */
3058    public void testThenComposeAsync2E() {
3059        CompletableFuture<Integer> f = new CompletableFuture<>();
3060        CompletableFutureInc r = new CompletableFutureInc();
3061        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
3062        f.completeExceptionally(new CFException());
2710          checkCompletedWithWrappedCFException(g);
2711 <    }
2711 >        checkCompletedNormally(f, v1);
2712 >    }}
2713  
2714      /**
2715 <     * thenComposeAsync result completes exceptionally if action does
2715 >     * thenCompose result completes exceptionally if source cancelled
2716       */
2717 <    public void testThenComposeAsync3E() {
2718 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2719 <        FailingCompletableFutureFunction r = new FailingCompletableFutureFunction();
2720 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2721 <        f.complete(one);
2722 <        checkCompletedWithWrappedCFException(g);
2723 <    }
2717 >    public void testThenCompose_sourceCancelled() {
2718 >        for (ExecutionMode m : ExecutionMode.values())
2719 >        for (boolean createIncomplete : new boolean[] { true, false })
2720 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2721 >    {
2722 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2723 >        final CompletableFutureInc r = new CompletableFutureInc();
2724 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2725 >        final CompletableFuture<Integer> g = f.thenCompose(r);
2726 >        if (createIncomplete) {
2727 >            checkIncomplete(g);
2728 >            assertTrue(f.cancel(mayInterruptIfRunning));
2729 >        }
2730  
3077    /**
3078     * thenComposeAsync result completes exceptionally if source cancelled
3079     */
3080    public void testThenComposeAsync4E() {
3081        CompletableFuture<Integer> f = new CompletableFuture<>();
3082        CompletableFutureInc r = new CompletableFutureInc();
3083        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
3084        assertTrue(f.cancel(true));
2731          checkCompletedWithWrappedCancellationException(g);
2732 <    }
2732 >        checkCancelled(f);
2733 >    }}
2734  
2735      // other static methods
2736  
# Line 3283 | Line 2930 | public class CompletableFutureTest exten
2930       * whenComplete action executes on normal completion, propagating
2931       * source result.
2932       */
2933 <    public void testWhenComplete1() {
2934 <        final AtomicInteger a = new AtomicInteger();
2935 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2936 <        CompletableFuture<Integer> g =
2937 <            f.whenComplete((Integer x, Throwable t) -> a.getAndIncrement());
2938 <        f.complete(three);
2939 <        checkCompletedNormally(f, three);
2940 <        checkCompletedNormally(g, three);
2941 <        assertEquals(a.get(), 1);
2942 <    }
2943 <
2944 <    /**
2945 <     * whenComplete action executes on exceptional completion, propagating
2946 <     * source result.
2947 <     */
2948 <    public void testWhenComplete2() {
3302 <        final AtomicInteger a = new AtomicInteger();
3303 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3304 <        CompletableFuture<Integer> g =
3305 <            f.whenComplete((Integer x, Throwable t) -> a.getAndIncrement());
3306 <        f.completeExceptionally(new CFException());
3307 <        assertTrue(f.isCompletedExceptionally());
3308 <        assertTrue(g.isCompletedExceptionally());
3309 <        assertEquals(a.get(), 1);
3310 <    }
3311 <
3312 <    /**
3313 <     * If a whenComplete action throws an exception when triggered by
3314 <     * a normal completion, it completes exceptionally
3315 <     */
3316 <    public void testWhenComplete3() {
3317 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3318 <        CompletableFuture<Integer> g =
3319 <            f.whenComplete((Integer x, Throwable t) ->
3320 <                           { throw new CFException(); } );
3321 <        f.complete(three);
3322 <        checkCompletedNormally(f, three);
3323 <        assertTrue(g.isCompletedExceptionally());
3324 <        checkCompletedWithWrappedCFException(g);
3325 <    }
3326 <
3327 <    /**
3328 <     * whenCompleteAsync action executes on normal completion, propagating
3329 <     * source result.
3330 <     */
3331 <    public void testWhenCompleteAsync1() {
3332 <        final AtomicInteger a = new AtomicInteger();
3333 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3334 <        CompletableFuture<Integer> g =
3335 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement());
3336 <        f.complete(three);
3337 <        checkCompletedNormally(f, three);
3338 <        checkCompletedNormally(g, three);
3339 <        assertEquals(a.get(), 1);
3340 <    }
3341 <
3342 <    /**
3343 <     * whenCompleteAsync action executes on exceptional completion, propagating
3344 <     * source result.
3345 <     */
3346 <    public void testWhenCompleteAsync2() {
3347 <        final AtomicInteger a = new AtomicInteger();
3348 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3349 <        CompletableFuture<Integer> g =
3350 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement());
3351 <        f.completeExceptionally(new CFException());
3352 <        checkCompletedWithWrappedCFException(f);
3353 <        checkCompletedWithWrappedCFException(g);
3354 <    }
2933 >    public void testWhenComplete_normalCompletion1() {
2934 >        for (ExecutionMode m : ExecutionMode.values())
2935 >        for (boolean createIncomplete : new boolean[] { true, false })
2936 >        for (Integer v1 : new Integer[] { 1, null })
2937 >    {
2938 >        final AtomicInteger a = new AtomicInteger(0);
2939 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2940 >        if (!createIncomplete) f.complete(v1);
2941 >        final CompletableFuture<Integer> g = m.whenComplete
2942 >            (f,
2943 >             (Integer x, Throwable t) -> {
2944 >                threadAssertSame(x, v1);
2945 >                threadAssertNull(t);
2946 >                a.getAndIncrement();
2947 >            });
2948 >        if (createIncomplete) f.complete(v1);
2949  
2950 <    /**
2951 <     * If a whenCompleteAsync action throws an exception when
2952 <     * triggered by a normal completion, it completes exceptionally
2953 <     */
3360 <    public void testWhenCompleteAsync3() {
3361 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3362 <        CompletableFuture<Integer> g =
3363 <            f.whenCompleteAsync((Integer x, Throwable t) ->
3364 <                           { throw new CFException(); } );
3365 <        f.complete(three);
3366 <        checkCompletedNormally(f, three);
3367 <        checkCompletedWithWrappedCFException(g);
3368 <    }
2950 >        checkCompletedNormally(g, v1);
2951 >        checkCompletedNormally(f, v1);
2952 >        assertEquals(1, a.get());
2953 >    }}
2954  
2955      /**
2956 <     * whenCompleteAsync action executes on normal completion, propagating
2956 >     * whenComplete action executes on exceptional completion, propagating
2957       * source result.
2958       */
2959 <    public void testWhenCompleteAsync1e() {
2960 <        final AtomicInteger a = new AtomicInteger();
2961 <        ThreadExecutor exec = new ThreadExecutor();
2962 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2963 <        CompletableFuture<Integer> g =
2964 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement(),
2965 <                                exec);
2966 <        f.complete(three);
2967 <        checkCompletedNormally(f, three);
2968 <        checkCompletedNormally(g, three);
2969 <        assertEquals(a.get(), 1);
2970 <    }
2959 >    public void testWhenComplete_exceptionalCompletion() {
2960 >        for (ExecutionMode m : ExecutionMode.values())
2961 >        for (boolean createIncomplete : new boolean[] { true, false })
2962 >        for (Integer v1 : new Integer[] { 1, null })
2963 >    {
2964 >        final AtomicInteger a = new AtomicInteger(0);
2965 >        final CFException ex = new CFException();
2966 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2967 >        if (!createIncomplete) f.completeExceptionally(ex);
2968 >        final CompletableFuture<Integer> g = m.whenComplete
2969 >            (f,
2970 >             (Integer x, Throwable t) -> {
2971 >                threadAssertNull(x);
2972 >                threadAssertSame(t, ex);
2973 >                a.getAndIncrement();
2974 >            });
2975 >        if (createIncomplete) f.completeExceptionally(ex);
2976 >        checkCompletedWithWrappedCFException(f, ex);
2977 >        checkCompletedWithWrappedCFException(g, ex);
2978 >        assertEquals(1, a.get());
2979 >    }}
2980  
2981      /**
2982 <     * whenCompleteAsync action executes on exceptional completion, propagating
2983 <     * source result.
2982 >     * whenComplete action executes on cancelled source, propagating
2983 >     * CancellationException.
2984       */
2985 <    public void testWhenCompleteAsync2e() {
2986 <        final AtomicInteger a = new AtomicInteger();
2987 <        ThreadExecutor exec = new ThreadExecutor();
2988 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2989 <        CompletableFuture<Integer> g =
2990 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement(),
2991 <                                exec);
2992 <        f.completeExceptionally(new CFException());
2993 <        checkCompletedWithWrappedCFException(f);
2994 <        checkCompletedWithWrappedCFException(g);
2995 <    }
2985 >    public void testWhenComplete_sourceCancelled() {
2986 >        for (ExecutionMode m : ExecutionMode.values())
2987 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2988 >        for (boolean createIncomplete : new boolean[] { true, false })
2989 >    {
2990 >        final AtomicInteger a = new AtomicInteger(0);
2991 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2992 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2993 >        final CompletableFuture<Integer> g = m.whenComplete
2994 >            (f,
2995 >             (Integer x, Throwable t) -> {
2996 >                threadAssertNull(x);
2997 >                threadAssertTrue(t instanceof CancellationException);
2998 >                a.getAndIncrement();
2999 >            });
3000 >        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
3001  
3002 <    /**
3003 <     * If a whenCompleteAsync action throws an exception when triggered
3004 <     * by a normal completion, it completes exceptionally
3005 <     */
3006 <    public void testWhenCompleteAsync3e() {
3408 <        ThreadExecutor exec = new ThreadExecutor();
3409 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3410 <        CompletableFuture<Integer> g =
3411 <            f.whenCompleteAsync((Integer x, Throwable t) ->
3412 <                                { throw new CFException(); },
3413 <                                exec);
3414 <        f.complete(three);
3415 <        checkCompletedNormally(f, three);
3416 <        checkCompletedWithWrappedCFException(g);
3417 <    }
3002 >        //try { g.join(); } catch (Throwable t) { throw new Error(t); }
3003 >        checkCompletedWithWrappedCancellationException(g);
3004 >        checkCancelled(f);
3005 >        assertEquals(1, a.get());
3006 >    }}
3007  
3008      /**
3009 <     * handleAsync action completes normally with function value on
3010 <     * either normal or exceptional completion of source
3009 >     * If a whenComplete action throws an exception when triggered by
3010 >     * a normal completion, it completes exceptionally
3011       */
3012 <    public void testHandleAsync() {
3013 <        CompletableFuture<Integer> f, g;
3014 <        IntegerHandler r;
3015 <
3016 <        f = new CompletableFuture<>();
3017 <        g = f.handleAsync(r = new IntegerHandler());
3018 <        assertFalse(r.ran);
3019 <        f.completeExceptionally(new CFException());
3020 <        checkCompletedWithWrappedCFException(f);
3021 <        checkCompletedNormally(g, three);
3022 <        assertTrue(r.ran);
3023 <
3024 <        f = new CompletableFuture<>();
3025 <        g = f.handleAsync(r = new IntegerHandler());
3026 <        assertFalse(r.ran);
3027 <        f.completeExceptionally(new CFException());
3028 <        checkCompletedWithWrappedCFException(f);
3029 <        checkCompletedNormally(g, three);
3030 <        assertTrue(r.ran);
3031 <
3032 <        f = new CompletableFuture<>();
3033 <        g = f.handleAsync(r = new IntegerHandler());
3445 <        assertFalse(r.ran);
3446 <        f.complete(one);
3447 <        checkCompletedNormally(f, one);
3448 <        checkCompletedNormally(g, two);
3449 <        assertTrue(r.ran);
3450 <
3451 <        f = new CompletableFuture<>();
3452 <        g = f.handleAsync(r = new IntegerHandler());
3453 <        assertFalse(r.ran);
3454 <        f.complete(one);
3455 <        checkCompletedNormally(f, one);
3456 <        checkCompletedNormally(g, two);
3457 <        assertTrue(r.ran);
3458 <    }
3012 >    public void testWhenComplete_actionFailed() {
3013 >        for (boolean createIncomplete : new boolean[] { true, false })
3014 >        for (ExecutionMode m : ExecutionMode.values())
3015 >        for (Integer v1 : new Integer[] { 1, null })
3016 >    {
3017 >        final AtomicInteger a = new AtomicInteger(0);
3018 >        final CFException ex = new CFException();
3019 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
3020 >        if (!createIncomplete) f.complete(v1);
3021 >        final CompletableFuture<Integer> g = m.whenComplete
3022 >            (f,
3023 >             (Integer x, Throwable t) -> {
3024 >                threadAssertSame(x, v1);
3025 >                threadAssertNull(t);
3026 >                a.getAndIncrement();
3027 >                throw ex;
3028 >            });
3029 >        if (createIncomplete) f.complete(v1);
3030 >        checkCompletedNormally(f, v1);
3031 >        checkCompletedWithWrappedCFException(g, ex);
3032 >        assertEquals(1, a.get());
3033 >    }}
3034  
3035      /**
3036 <     * handleAsync action with Executor completes normally with
3037 <     * function value on either normal or exceptional completion of
3038 <     * source
3036 >     * If a whenComplete action throws an exception when triggered by
3037 >     * a source completion that also throws an exception, the source
3038 >     * exception takes precedence.
3039       */
3040 <    public void testHandleAsync2() {
3041 <        CompletableFuture<Integer> f, g;
3042 <        ThreadExecutor exec = new ThreadExecutor();
3043 <        IntegerHandler r;
3044 <
3045 <        f = new CompletableFuture<>();
3046 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3047 <        assertFalse(r.ran);
3048 <        f.completeExceptionally(new CFException());
3049 <        checkCompletedWithWrappedCFException(f);
3050 <        checkCompletedNormally(g, three);
3051 <        assertTrue(r.ran);
3052 <
3053 <        f = new CompletableFuture<>();
3054 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3055 <        assertFalse(r.ran);
3056 <        f.completeExceptionally(new CFException());
3057 <        checkCompletedWithWrappedCFException(f);
3058 <        checkCompletedNormally(g, three);
3059 <        assertTrue(r.ran);
3060 <
3061 <        f = new CompletableFuture<>();
3062 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3063 <        assertFalse(r.ran);
3064 <        f.complete(one);
3490 <        checkCompletedNormally(f, one);
3491 <        checkCompletedNormally(g, two);
3492 <        assertTrue(r.ran);
3493 <
3494 <        f = new CompletableFuture<>();
3495 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3496 <        assertFalse(r.ran);
3497 <        f.complete(one);
3498 <        checkCompletedNormally(f, one);
3499 <        checkCompletedNormally(g, two);
3500 <        assertTrue(r.ran);
3501 <    }
3040 >    public void testWhenComplete_actionFailedSourceFailed() {
3041 >        for (boolean createIncomplete : new boolean[] { true, false })
3042 >        for (ExecutionMode m : ExecutionMode.values())
3043 >        for (Integer v1 : new Integer[] { 1, null })
3044 >    {
3045 >        final AtomicInteger a = new AtomicInteger(0);
3046 >        final CFException ex1 = new CFException();
3047 >        final CFException ex2 = new CFException();
3048 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
3049 >
3050 >        if (!createIncomplete) f.completeExceptionally(ex1);
3051 >        final CompletableFuture<Integer> g = m.whenComplete
3052 >            (f,
3053 >             (Integer x, Throwable t) -> {
3054 >                threadAssertSame(t, ex1);
3055 >                threadAssertNull(x);
3056 >                a.getAndIncrement();
3057 >                throw ex2;
3058 >            });
3059 >        if (createIncomplete) f.completeExceptionally(ex1);
3060 >
3061 >        checkCompletedWithWrappedCFException(f, ex1);
3062 >        checkCompletedWithWrappedCFException(g, ex1);
3063 >        assertEquals(1, a.get());
3064 >    }}
3065  
3066   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines