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

Comparing jsr166/src/test/tck/CompletableFutureTest.java (file contents):
Revision 1.38 by jsr166, Sun Jun 1 23:51:44 2014 UTC vs.
Revision 1.48 by jsr166, Mon Jun 2 19:07:14 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(); }
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 734 | Line 936 | public class CompletableFutureTest exten
936          FailingNoop r = new FailingNoop();
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) f.complete(v1);
987  
786        f = new CompletableFuture<>();
787        f.complete(null);
788        g = f.thenRun(r = new Noop());
988          checkCompletedNormally(g, null);
989 <        assertTrue(r.ran);
990 <    }
989 >        checkCompletedNormally(f, v1);
990 >        assertEquals(1, r.invocationCount);
991 >    }}
992  
993      /**
994       * thenRun result completes exceptionally after exceptional
995       * completion of source
996       */
997 <    public void testThenRun2() {
998 <        CompletableFuture<Integer> f;
999 <        CompletableFuture<Void> g;
1000 <        Noop r;
1001 <
1002 <        f = new CompletableFuture<>();
1003 <        g = f.thenRun(r = new Noop());
1004 <        f.completeExceptionally(new CFException());
1005 <        checkCompletedWithWrappedCFException(g);
1006 <        assertFalse(r.ran);
997 >    public void testThenRun_exceptionalCompletion() {
998 >        for (ExecutionMode m : ExecutionMode.values())
999 >        for (boolean createIncomplete : new boolean[] { true, false })
1000 >    {
1001 >        final CFException ex = new CFException();
1002 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1003 >        final Noop r = new Noop();
1004 >        if (!createIncomplete) f.completeExceptionally(ex);
1005 >        final CompletableFuture<Void> g = m.thenRun(f, r);
1006 >        if (createIncomplete) f.completeExceptionally(ex);
1007  
1008 <        f = new CompletableFuture<>();
1009 <        f.completeExceptionally(new CFException());
1010 <        g = f.thenRun(r = new Noop());
1011 <        checkCompletedWithWrappedCFException(g);
812 <        assertFalse(r.ran);
813 <    }
1008 >        checkCompletedWithWrappedCFException(g, ex);
1009 >        checkCompletedWithWrappedCFException(f, ex);
1010 >        assertEquals(0, r.invocationCount);
1011 >    }}
1012  
1013      /**
1014 <     * thenRun result completes exceptionally if action does
1014 >     * thenRun result completes exceptionally if source cancelled
1015       */
1016 <    public void testThenRun3() {
1017 <        CompletableFuture<Integer> f;
1018 <        CompletableFuture<Void> g;
1019 <        FailingNoop r;
1020 <
1021 <        f = new CompletableFuture<>();
1022 <        g = f.thenRun(r = new FailingNoop());
1023 <        f.complete(null);
1024 <        checkCompletedWithWrappedCFException(g);
1016 >    public void testThenRun_sourceCancelled() {
1017 >        for (ExecutionMode m : ExecutionMode.values())
1018 >        for (boolean createIncomplete : new boolean[] { true, false })
1019 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1020 >    {
1021 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1022 >        final Noop r = new Noop();
1023 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1024 >        final CompletableFuture<Void> g = f.thenRun(r);
1025 >        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1026  
1027 <        f = new CompletableFuture<>();
1028 <        f.complete(null);
1029 <        g = f.thenRun(r = new FailingNoop());
1030 <        checkCompletedWithWrappedCFException(g);
832 <    }
1027 >        checkCompletedWithWrappedCancellationException(g);
1028 >        checkCancelled(f);
1029 >        assertEquals(0, r.invocationCount);
1030 >    }}
1031  
1032      /**
1033 <     * thenRun result completes exceptionally if source cancelled
1033 >     * thenRun result completes exceptionally if action does
1034       */
1035 <    public void testThenRun4() {
1036 <        CompletableFuture<Integer> f;
1037 <        CompletableFuture<Void> g;
1038 <        Noop r;
1039 <
1040 <        f = new CompletableFuture<>();
1041 <        g = f.thenRun(r = new Noop());
1042 <        assertTrue(f.cancel(true));
1043 <        checkCompletedWithWrappedCancellationException(g);
1035 >    public void testThenRun_actionFailed() {
1036 >        for (ExecutionMode m : ExecutionMode.values())
1037 >        for (boolean createIncomplete : new boolean[] { true, false })
1038 >        for (Integer v1 : new Integer[] { 1, null })
1039 >    {
1040 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1041 >        final FailingNoop r = new FailingNoop();
1042 >        if (!createIncomplete) f.complete(v1);
1043 >        final CompletableFuture<Void> g = f.thenRun(r);
1044 >        if (createIncomplete) f.complete(v1);
1045  
1046 <        f = new CompletableFuture<>();
1047 <        assertTrue(f.cancel(true));
1048 <        g = f.thenRun(r = new Noop());
850 <        checkCompletedWithWrappedCancellationException(g);
851 <    }
1046 >        checkCompletedWithWrappedCFException(g);
1047 >        checkCompletedNormally(f, v1);
1048 >    }}
1049  
1050      /**
1051       * thenApply result completes normally after normal completion of source
# Line 924 | Line 1121 | public class CompletableFutureTest exten
1121          CompletableFuture<Void> g = f.thenAccept(r);
1122          f.complete(one);
1123          checkCompletedWithWrappedCFException(g);
1124 <        assertTrue(r.ran);
1124 >        assertEquals(1, r.invocationCount);
1125      }
1126  
1127      /**
# Line 943 | Line 1140 | public class CompletableFutureTest exten
1140       * of sources
1141       */
1142      public void testThenCombine_normalCompletion1() {
1143 +        for (boolean createIncomplete : new boolean[] { true, false })
1144 +        for (boolean fFirst : new boolean[] { true, false })
1145          for (ExecutionMode m : ExecutionMode.values())
1146          for (Integer v1 : new Integer[] { 1, null })
1147 <        for (Integer v2 : new Integer[] { 2, null }) {
1148 <
950 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
951 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
952 <        final SubtractFunction r = new SubtractFunction();
953 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
954 <
955 <        f.complete(v1);
956 <        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);
963 <        }
964 <    }
965 <
966 <    public void testThenCombine_normalCompletion2() {
967 <        for (ExecutionMode m : ExecutionMode.values())
968 <        for (Integer v1 : new Integer[] { 1, null })
969 <        for (Integer v2 : new Integer[] { 2, null }) {
970 <
1147 >        for (Integer v2 : new Integer[] { 2, null })
1148 >    {
1149          final CompletableFuture<Integer> f = new CompletableFuture<>();
1150          final CompletableFuture<Integer> g = new CompletableFuture<>();
1151          final SubtractFunction r = new SubtractFunction();
1152 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1152 >        CompletableFuture<Integer> h = null;
1153 >        if (createIncomplete) h = m.thenCombine(f, g, r);
1154  
1155 <        g.complete(v2);
1156 <        checkIncomplete(h);
1157 <        assertFalse(r.ran());
1158 <        f.complete(v1);
1155 >        if (fFirst)
1156 >            f.complete(v1);
1157 >        else
1158 >            g.complete(v2);
1159 >        if (createIncomplete) checkIncomplete(h);
1160 >        assertEquals(0, r.invocationCount);
1161 >        if (!fFirst)
1162 >            f.complete(v1);
1163 >        else
1164 >            g.complete(v2);
1165 >        if (!createIncomplete) h = m.thenCombine(f, g, r);
1166  
1167          checkCompletedNormally(h, subtract(v1, v2));
1168          checkCompletedNormally(f, v1);
1169          checkCompletedNormally(g, v2);
1170 <        }
1171 <    }
986 <
987 <    public void testThenCombine_normalCompletion3() {
988 <        for (ExecutionMode m : ExecutionMode.values())
989 <        for (Integer v1 : new Integer[] { 1, null })
990 <        for (Integer v2 : new Integer[] { 2, null }) {
991 <
992 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
993 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
994 <        final SubtractFunction r = new SubtractFunction();
995 <
996 <        g.complete(v2);
997 <        f.complete(v1);
998 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
999 <
1000 <        checkCompletedNormally(h, subtract(v1, v2));
1001 <        checkCompletedNormally(f, v1);
1002 <        checkCompletedNormally(g, v2);
1003 <        }
1004 <    }
1005 <
1006 <    public void testThenCombine_normalCompletion4() {
1007 <        for (ExecutionMode m : ExecutionMode.values())
1008 <        for (Integer v1 : new Integer[] { 1, null })
1009 <        for (Integer v2 : new Integer[] { 2, null }) {
1010 <
1011 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1012 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1013 <        final SubtractFunction r = new SubtractFunction();
1014 <
1015 <        f.complete(v1);
1016 <        g.complete(v2);
1017 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1018 <
1019 <        checkCompletedNormally(h, subtract(v1, v2));
1020 <        checkCompletedNormally(f, v1);
1021 <        checkCompletedNormally(g, v2);
1022 <        }
1023 <    }
1170 >        assertEquals(1, r.invocationCount);
1171 >    }}
1172  
1173      /**
1174       * thenCombine result completes exceptionally after exceptional
# Line 1028 | Line 1176 | public class CompletableFutureTest exten
1176       */
1177      public void testThenCombine_exceptionalCompletion1() {
1178          for (ExecutionMode m : ExecutionMode.values())
1179 <        for (Integer v1 : new Integer[] { 1, null }) {
1180 <
1179 >        for (Integer v1 : new Integer[] { 1, null })
1180 >    {
1181          final CompletableFuture<Integer> f = new CompletableFuture<>();
1182          final CompletableFuture<Integer> g = new CompletableFuture<>();
1183          final SubtractFunction r = new SubtractFunction();
# Line 1042 | Line 1190 | public class CompletableFutureTest exten
1190  
1191          checkCompletedWithWrappedCFException(h, ex);
1192          checkCompletedWithWrappedCFException(f, ex);
1193 <        assertFalse(r.ran());
1193 >        assertEquals(0, r.invocationCount);
1194          checkCompletedNormally(g, v1);
1195 <        }
1048 <    }
1195 >    }}
1196  
1197      public void testThenCombine_exceptionalCompletion2() {
1198          for (ExecutionMode m : ExecutionMode.values())
1199 <        for (Integer v1 : new Integer[] { 1, null }) {
1200 <
1199 >        for (Integer v1 : new Integer[] { 1, null })
1200 >    {
1201          final CompletableFuture<Integer> f = new CompletableFuture<>();
1202          final CompletableFuture<Integer> g = new CompletableFuture<>();
1203          final SubtractFunction r = new SubtractFunction();
# Line 1063 | Line 1210 | public class CompletableFutureTest exten
1210  
1211          checkCompletedWithWrappedCFException(h, ex);
1212          checkCompletedWithWrappedCFException(g, ex);
1213 <        assertFalse(r.ran());
1213 >        assertEquals(0, r.invocationCount);
1214          checkCompletedNormally(f, v1);
1215 <        }
1069 <    }
1215 >    }}
1216  
1217      public void testThenCombine_exceptionalCompletion3() {
1218          for (ExecutionMode m : ExecutionMode.values())
1219 <        for (Integer v1 : new Integer[] { 1, null }) {
1220 <
1219 >        for (Integer v1 : new Integer[] { 1, null })
1220 >    {
1221          final CompletableFuture<Integer> f = new CompletableFuture<>();
1222          final CompletableFuture<Integer> g = new CompletableFuture<>();
1223          final SubtractFunction r = new SubtractFunction();
# Line 1083 | Line 1229 | public class CompletableFutureTest exten
1229  
1230          checkCompletedWithWrappedCFException(h, ex);
1231          checkCompletedWithWrappedCFException(g, ex);
1232 <        assertFalse(r.ran());
1232 >        assertEquals(0, r.invocationCount);
1233          checkCompletedNormally(f, v1);
1234 <        }
1089 <    }
1234 >    }}
1235  
1236      public void testThenCombine_exceptionalCompletion4() {
1237          for (ExecutionMode m : ExecutionMode.values())
1238 <        for (Integer v1 : new Integer[] { 1, null }) {
1239 <
1238 >        for (Integer v1 : new Integer[] { 1, null })
1239 >    {
1240          final CompletableFuture<Integer> f = new CompletableFuture<>();
1241          final CompletableFuture<Integer> g = new CompletableFuture<>();
1242          final SubtractFunction r = new SubtractFunction();
# Line 1103 | Line 1248 | public class CompletableFutureTest exten
1248  
1249          checkCompletedWithWrappedCFException(h, ex);
1250          checkCompletedWithWrappedCFException(f, ex);
1251 <        assertFalse(r.ran());
1251 >        assertEquals(0, r.invocationCount);
1252          checkCompletedNormally(g, v1);
1253 <        }
1109 <    }
1253 >    }}
1254  
1255      /**
1256       * thenCombine result completes exceptionally if action does
# Line 1114 | Line 1258 | public class CompletableFutureTest exten
1258      public void testThenCombine_actionFailed1() {
1259          for (ExecutionMode m : ExecutionMode.values())
1260          for (Integer v1 : new Integer[] { 1, null })
1261 <        for (Integer v2 : new Integer[] { 2, null }) {
1262 <
1261 >        for (Integer v2 : new Integer[] { 2, null })
1262 >    {
1263          final CompletableFuture<Integer> f = new CompletableFuture<>();
1264          final CompletableFuture<Integer> g = new CompletableFuture<>();
1265          final FailingBiFunction r = new FailingBiFunction();
# Line 1128 | Line 1272 | public class CompletableFutureTest exten
1272          checkCompletedWithWrappedCFException(h);
1273          checkCompletedNormally(f, v1);
1274          checkCompletedNormally(g, v2);
1275 <        }
1132 <    }
1275 >    }}
1276  
1277      public void testThenCombine_actionFailed2() {
1278          for (ExecutionMode m : ExecutionMode.values())
1279          for (Integer v1 : new Integer[] { 1, null })
1280 <        for (Integer v2 : new Integer[] { 2, null }) {
1281 <
1280 >        for (Integer v2 : new Integer[] { 2, null })
1281 >    {
1282          final CompletableFuture<Integer> f = new CompletableFuture<>();
1283          final CompletableFuture<Integer> g = new CompletableFuture<>();
1284          final FailingBiFunction r = new FailingBiFunction();
# Line 1148 | Line 1291 | public class CompletableFutureTest exten
1291          checkCompletedWithWrappedCFException(h);
1292          checkCompletedNormally(f, v1);
1293          checkCompletedNormally(g, v2);
1294 <        }
1152 <    }
1294 >    }}
1295  
1296      /**
1297       * thenCombine result completes exceptionally if either source cancelled
# Line 1157 | Line 1299 | public class CompletableFutureTest exten
1299      public void testThenCombine_sourceCancelled1() {
1300          for (ExecutionMode m : ExecutionMode.values())
1301          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1302 <        for (Integer v1 : new Integer[] { 1, null }) {
1303 <
1302 >        for (Integer v1 : new Integer[] { 1, null })
1303 >    {
1304          final CompletableFuture<Integer> f = new CompletableFuture<>();
1305          final CompletableFuture<Integer> g = new CompletableFuture<>();
1306          final SubtractFunction r = new SubtractFunction();
# Line 1170 | Line 1312 | public class CompletableFutureTest exten
1312  
1313          checkCompletedWithWrappedCancellationException(h);
1314          checkCancelled(f);
1315 <        assertFalse(r.ran());
1315 >        assertEquals(0, r.invocationCount);
1316          checkCompletedNormally(g, v1);
1317 <        }
1176 <    }
1317 >    }}
1318  
1319      public void testThenCombine_sourceCancelled2() {
1320          for (ExecutionMode m : ExecutionMode.values())
1321          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1322 <        for (Integer v1 : new Integer[] { 1, null }) {
1323 <
1322 >        for (Integer v1 : new Integer[] { 1, null })
1323 >    {
1324          final CompletableFuture<Integer> f = new CompletableFuture<>();
1325          final CompletableFuture<Integer> g = new CompletableFuture<>();
1326          final SubtractFunction r = new SubtractFunction();
# Line 1191 | Line 1332 | public class CompletableFutureTest exten
1332  
1333          checkCompletedWithWrappedCancellationException(h);
1334          checkCancelled(g);
1335 <        assertFalse(r.ran());
1335 >        assertEquals(0, r.invocationCount);
1336          checkCompletedNormally(f, v1);
1337 <        }
1197 <    }
1337 >    }}
1338  
1339      public void testThenCombine_sourceCancelled3() {
1340          for (ExecutionMode m : ExecutionMode.values())
1341          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1342 <        for (Integer v1 : new Integer[] { 1, null }) {
1343 <
1342 >        for (Integer v1 : new Integer[] { 1, null })
1343 >    {
1344          final CompletableFuture<Integer> f = new CompletableFuture<>();
1345          final CompletableFuture<Integer> g = new CompletableFuture<>();
1346          final SubtractFunction r = new SubtractFunction();
# Line 1211 | Line 1351 | public class CompletableFutureTest exten
1351  
1352          checkCompletedWithWrappedCancellationException(h);
1353          checkCancelled(g);
1354 <        assertFalse(r.ran());
1354 >        assertEquals(0, r.invocationCount);
1355          checkCompletedNormally(f, v1);
1356 <        }
1217 <    }
1356 >    }}
1357  
1358      public void testThenCombine_sourceCancelled4() {
1359          for (ExecutionMode m : ExecutionMode.values())
1360          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1361 <        for (Integer v1 : new Integer[] { 1, null }) {
1362 <
1361 >        for (Integer v1 : new Integer[] { 1, null })
1362 >    {
1363          final CompletableFuture<Integer> f = new CompletableFuture<>();
1364          final CompletableFuture<Integer> g = new CompletableFuture<>();
1365          final SubtractFunction r = new SubtractFunction();
# Line 1231 | Line 1370 | public class CompletableFutureTest exten
1370  
1371          checkCompletedWithWrappedCancellationException(h);
1372          checkCancelled(f);
1373 <        assertFalse(r.ran());
1373 >        assertEquals(0, r.invocationCount);
1374          checkCompletedNormally(g, v1);
1375 <        }
1237 <    }
1375 >    }}
1376  
1377      /**
1378       * thenAcceptBoth result completes normally after normal
# Line 1243 | Line 1381 | public class CompletableFutureTest exten
1381      public void testThenAcceptBoth_normalCompletion1() {
1382          for (ExecutionMode m : ExecutionMode.values())
1383          for (Integer v1 : new Integer[] { 1, null })
1384 <        for (Integer v2 : new Integer[] { 2, null }) {
1385 <
1384 >        for (Integer v2 : new Integer[] { 2, null })
1385 >    {
1386          final CompletableFuture<Integer> f = new CompletableFuture<>();
1387          final CompletableFuture<Integer> g = new CompletableFuture<>();
1388          final SubtractAction r = new SubtractAction();
# Line 1252 | Line 1390 | public class CompletableFutureTest exten
1390  
1391          f.complete(v1);
1392          checkIncomplete(h);
1393 <        assertFalse(r.ran());
1393 >        assertEquals(0, r.invocationCount);
1394          g.complete(v2);
1395  
1396          checkCompletedNormally(h, null);
1397 <        assertEquals(r.value, subtract(v1, v2));
1397 >        assertEquals(subtract(v1, v2), r.value);
1398          checkCompletedNormally(f, v1);
1399          checkCompletedNormally(g, v2);
1400 <        }
1263 <    }
1400 >    }}
1401  
1402      public void testThenAcceptBoth_normalCompletion2() {
1403          for (ExecutionMode m : ExecutionMode.values())
1404          for (Integer v1 : new Integer[] { 1, null })
1405 <        for (Integer v2 : new Integer[] { 2, null }) {
1406 <
1405 >        for (Integer v2 : new Integer[] { 2, null })
1406 >    {
1407          final CompletableFuture<Integer> f = new CompletableFuture<>();
1408          final CompletableFuture<Integer> g = new CompletableFuture<>();
1409          final SubtractAction r = new SubtractAction();
# Line 1274 | Line 1411 | public class CompletableFutureTest exten
1411  
1412          g.complete(v2);
1413          checkIncomplete(h);
1414 <        assertFalse(r.ran());
1414 >        assertEquals(0, r.invocationCount);
1415          f.complete(v1);
1416  
1417          checkCompletedNormally(h, null);
1418 <        assertEquals(r.value, subtract(v1, v2));
1418 >        assertEquals(subtract(v1, v2), r.value);
1419          checkCompletedNormally(f, v1);
1420          checkCompletedNormally(g, v2);
1421 <        }
1285 <    }
1421 >    }}
1422  
1423      public void testThenAcceptBoth_normalCompletion3() {
1424          for (ExecutionMode m : ExecutionMode.values())
1425          for (Integer v1 : new Integer[] { 1, null })
1426 <        for (Integer v2 : new Integer[] { 2, null }) {
1427 <
1426 >        for (Integer v2 : new Integer[] { 2, null })
1427 >    {
1428          final CompletableFuture<Integer> f = new CompletableFuture<>();
1429          final CompletableFuture<Integer> g = new CompletableFuture<>();
1430          final SubtractAction r = new SubtractAction();
# Line 1298 | Line 1434 | public class CompletableFutureTest exten
1434          final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1435  
1436          checkCompletedNormally(h, null);
1437 <        assertEquals(r.value, subtract(v1, v2));
1437 >        assertEquals(subtract(v1, v2), r.value);
1438          checkCompletedNormally(f, v1);
1439          checkCompletedNormally(g, v2);
1440 <        }
1305 <    }
1440 >    }}
1441  
1442      public void testThenAcceptBoth_normalCompletion4() {
1443          for (ExecutionMode m : ExecutionMode.values())
1444          for (Integer v1 : new Integer[] { 1, null })
1445 <        for (Integer v2 : new Integer[] { 2, null }) {
1446 <
1445 >        for (Integer v2 : new Integer[] { 2, null })
1446 >    {
1447          final CompletableFuture<Integer> f = new CompletableFuture<>();
1448          final CompletableFuture<Integer> g = new CompletableFuture<>();
1449          final SubtractAction r = new SubtractAction();
# Line 1318 | Line 1453 | public class CompletableFutureTest exten
1453          final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1454  
1455          checkCompletedNormally(h, null);
1456 <        assertEquals(r.value, subtract(v1, v2));
1456 >        assertEquals(subtract(v1, v2), r.value);
1457          checkCompletedNormally(f, v1);
1458          checkCompletedNormally(g, v2);
1459 <        }
1325 <    }
1459 >    }}
1460  
1461      /**
1462       * thenAcceptBoth result completes exceptionally after exceptional
# Line 1330 | Line 1464 | public class CompletableFutureTest exten
1464       */
1465      public void testThenAcceptBoth_exceptionalCompletion1() {
1466          for (ExecutionMode m : ExecutionMode.values())
1467 <        for (Integer v1 : new Integer[] { 1, null }) {
1468 <
1467 >        for (Integer v1 : new Integer[] { 1, null })
1468 >    {
1469          final CompletableFuture<Integer> f = new CompletableFuture<>();
1470          final CompletableFuture<Integer> g = new CompletableFuture<>();
1471          final SubtractAction r = new SubtractAction();
# Line 1344 | Line 1478 | public class CompletableFutureTest exten
1478  
1479          checkCompletedWithWrappedCFException(h, ex);
1480          checkCompletedWithWrappedCFException(f, ex);
1481 <        assertFalse(r.ran());
1481 >        assertEquals(0, r.invocationCount);
1482          checkCompletedNormally(g, v1);
1483 <        }
1350 <    }
1483 >    }}
1484  
1485      public void testThenAcceptBoth_exceptionalCompletion2() {
1486          for (ExecutionMode m : ExecutionMode.values())
1487 <        for (Integer v1 : new Integer[] { 1, null }) {
1488 <
1487 >        for (Integer v1 : new Integer[] { 1, null })
1488 >    {
1489          final CompletableFuture<Integer> f = new CompletableFuture<>();
1490          final CompletableFuture<Integer> g = new CompletableFuture<>();
1491          final SubtractAction r = new SubtractAction();
# Line 1365 | Line 1498 | public class CompletableFutureTest exten
1498  
1499          checkCompletedWithWrappedCFException(h, ex);
1500          checkCompletedWithWrappedCFException(g, ex);
1501 <        assertFalse(r.ran());
1501 >        assertEquals(0, r.invocationCount);
1502          checkCompletedNormally(f, v1);
1503 <        }
1371 <    }
1503 >    }}
1504  
1505      public void testThenAcceptBoth_exceptionalCompletion3() {
1506          for (ExecutionMode m : ExecutionMode.values())
1507 <        for (Integer v1 : new Integer[] { 1, null }) {
1508 <
1507 >        for (Integer v1 : new Integer[] { 1, null })
1508 >    {
1509          final CompletableFuture<Integer> f = new CompletableFuture<>();
1510          final CompletableFuture<Integer> g = new CompletableFuture<>();
1511          final SubtractAction r = new SubtractAction();
# Line 1385 | Line 1517 | public class CompletableFutureTest exten
1517  
1518          checkCompletedWithWrappedCFException(h, ex);
1519          checkCompletedWithWrappedCFException(g, ex);
1520 <        assertFalse(r.ran());
1520 >        assertEquals(0, r.invocationCount);
1521          checkCompletedNormally(f, v1);
1522 <        }
1391 <    }
1522 >    }}
1523  
1524      public void testThenAcceptBoth_exceptionalCompletion4() {
1525          for (ExecutionMode m : ExecutionMode.values())
1526 <        for (Integer v1 : new Integer[] { 1, null }) {
1527 <
1526 >        for (Integer v1 : new Integer[] { 1, null })
1527 >    {
1528          final CompletableFuture<Integer> f = new CompletableFuture<>();
1529          final CompletableFuture<Integer> g = new CompletableFuture<>();
1530          final SubtractAction r = new SubtractAction();
# Line 1405 | Line 1536 | public class CompletableFutureTest exten
1536  
1537          checkCompletedWithWrappedCFException(h, ex);
1538          checkCompletedWithWrappedCFException(f, ex);
1539 <        assertFalse(r.ran());
1539 >        assertEquals(0, r.invocationCount);
1540          checkCompletedNormally(g, v1);
1541 <        }
1411 <    }
1541 >    }}
1542  
1543      /**
1544       * thenAcceptBoth result completes exceptionally if action does
# Line 1416 | Line 1546 | public class CompletableFutureTest exten
1546      public void testThenAcceptBoth_actionFailed1() {
1547          for (ExecutionMode m : ExecutionMode.values())
1548          for (Integer v1 : new Integer[] { 1, null })
1549 <        for (Integer v2 : new Integer[] { 2, null }) {
1550 <
1549 >        for (Integer v2 : new Integer[] { 2, null })
1550 >    {
1551          final CompletableFuture<Integer> f = new CompletableFuture<>();
1552          final CompletableFuture<Integer> g = new CompletableFuture<>();
1553          final FailingBiConsumer r = new FailingBiConsumer();
# Line 1430 | Line 1560 | public class CompletableFutureTest exten
1560          checkCompletedWithWrappedCFException(h);
1561          checkCompletedNormally(f, v1);
1562          checkCompletedNormally(g, v2);
1563 <        }
1434 <    }
1563 >    }}
1564  
1565      public void testThenAcceptBoth_actionFailed2() {
1566          for (ExecutionMode m : ExecutionMode.values())
1567          for (Integer v1 : new Integer[] { 1, null })
1568 <        for (Integer v2 : new Integer[] { 2, null }) {
1569 <
1568 >        for (Integer v2 : new Integer[] { 2, null })
1569 >    {
1570          final CompletableFuture<Integer> f = new CompletableFuture<>();
1571          final CompletableFuture<Integer> g = new CompletableFuture<>();
1572          final FailingBiConsumer r = new FailingBiConsumer();
# Line 1450 | Line 1579 | public class CompletableFutureTest exten
1579          checkCompletedWithWrappedCFException(h);
1580          checkCompletedNormally(f, v1);
1581          checkCompletedNormally(g, v2);
1582 <        }
1454 <    }
1582 >    }}
1583  
1584      /**
1585       * thenAcceptBoth result completes exceptionally if either source cancelled
# Line 1459 | Line 1587 | public class CompletableFutureTest exten
1587      public void testThenAcceptBoth_sourceCancelled1() {
1588          for (ExecutionMode m : ExecutionMode.values())
1589          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1590 <        for (Integer v1 : new Integer[] { 1, null }) {
1591 <
1590 >        for (Integer v1 : new Integer[] { 1, null })
1591 >    {
1592          final CompletableFuture<Integer> f = new CompletableFuture<>();
1593          final CompletableFuture<Integer> g = new CompletableFuture<>();
1594          final SubtractAction r = new SubtractAction();
# Line 1472 | Line 1600 | public class CompletableFutureTest exten
1600  
1601          checkCompletedWithWrappedCancellationException(h);
1602          checkCancelled(f);
1603 <        assertFalse(r.ran());
1603 >        assertEquals(0, r.invocationCount);
1604          checkCompletedNormally(g, v1);
1605 <        }
1478 <    }
1605 >    }}
1606  
1607      public void testThenAcceptBoth_sourceCancelled2() {
1608          for (ExecutionMode m : ExecutionMode.values())
1609          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1610 <        for (Integer v1 : new Integer[] { 1, null }) {
1611 <
1610 >        for (Integer v1 : new Integer[] { 1, null })
1611 >    {
1612          final CompletableFuture<Integer> f = new CompletableFuture<>();
1613          final CompletableFuture<Integer> g = new CompletableFuture<>();
1614          final SubtractAction r = new SubtractAction();
# Line 1493 | Line 1620 | public class CompletableFutureTest exten
1620  
1621          checkCompletedWithWrappedCancellationException(h);
1622          checkCancelled(g);
1623 <        assertFalse(r.ran());
1623 >        assertEquals(0, r.invocationCount);
1624          checkCompletedNormally(f, v1);
1625 <        }
1499 <    }
1625 >    }}
1626  
1627      public void testThenAcceptBoth_sourceCancelled3() {
1628          for (ExecutionMode m : ExecutionMode.values())
1629          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1630 <        for (Integer v1 : new Integer[] { 1, null }) {
1631 <
1630 >        for (Integer v1 : new Integer[] { 1, null })
1631 >    {
1632          final CompletableFuture<Integer> f = new CompletableFuture<>();
1633          final CompletableFuture<Integer> g = new CompletableFuture<>();
1634          final SubtractAction r = new SubtractAction();
# Line 1513 | Line 1639 | public class CompletableFutureTest exten
1639  
1640          checkCompletedWithWrappedCancellationException(h);
1641          checkCancelled(g);
1642 <        assertFalse(r.ran());
1642 >        assertEquals(0, r.invocationCount);
1643          checkCompletedNormally(f, v1);
1644 <        }
1519 <    }
1644 >    }}
1645  
1646      public void testThenAcceptBoth_sourceCancelled4() {
1647          for (ExecutionMode m : ExecutionMode.values())
1648          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1649 <        for (Integer v1 : new Integer[] { 1, null }) {
1650 <
1649 >        for (Integer v1 : new Integer[] { 1, null })
1650 >    {
1651          final CompletableFuture<Integer> f = new CompletableFuture<>();
1652          final CompletableFuture<Integer> g = new CompletableFuture<>();
1653          final SubtractAction r = new SubtractAction();
# Line 1533 | Line 1658 | public class CompletableFutureTest exten
1658  
1659          checkCompletedWithWrappedCancellationException(h);
1660          checkCancelled(f);
1661 <        assertFalse(r.ran());
1661 >        assertEquals(0, r.invocationCount);
1662          checkCompletedNormally(g, v1);
1663 <        }
1539 <    }
1663 >    }}
1664  
1665      /**
1666       * runAfterBoth result completes normally after normal
# Line 1545 | Line 1669 | public class CompletableFutureTest exten
1669      public void testRunAfterBoth_normalCompletion1() {
1670          for (ExecutionMode m : ExecutionMode.values())
1671          for (Integer v1 : new Integer[] { 1, null })
1672 <        for (Integer v2 : new Integer[] { 2, null }) {
1673 <
1672 >        for (Integer v2 : new Integer[] { 2, null })
1673 >    {
1674          final CompletableFuture<Integer> f = new CompletableFuture<>();
1675          final CompletableFuture<Integer> g = new CompletableFuture<>();
1676          final Noop r = new Noop();
# Line 1554 | Line 1678 | public class CompletableFutureTest exten
1678  
1679          f.complete(v1);
1680          checkIncomplete(h);
1681 <        assertFalse(r.ran);
1681 >        assertEquals(0, r.invocationCount);
1682          g.complete(v2);
1683  
1684          checkCompletedNormally(h, null);
1685 <        assertTrue(r.ran);
1685 >        assertEquals(1, r.invocationCount);
1686          checkCompletedNormally(f, v1);
1687          checkCompletedNormally(g, v2);
1688 <        }
1565 <    }
1688 >    }}
1689  
1690      public void testRunAfterBoth_normalCompletion2() {
1691          for (ExecutionMode m : ExecutionMode.values())
1692          for (Integer v1 : new Integer[] { 1, null })
1693 <        for (Integer v2 : new Integer[] { 2, null }) {
1694 <
1693 >        for (Integer v2 : new Integer[] { 2, null })
1694 >    {
1695          final CompletableFuture<Integer> f = new CompletableFuture<>();
1696          final CompletableFuture<Integer> g = new CompletableFuture<>();
1697          final Noop r = new Noop();
# Line 1576 | Line 1699 | public class CompletableFutureTest exten
1699  
1700          g.complete(v2);
1701          checkIncomplete(h);
1702 <        assertFalse(r.ran);
1702 >        assertEquals(0, r.invocationCount);
1703          f.complete(v1);
1704  
1705          checkCompletedNormally(h, null);
1706 <        assertTrue(r.ran);
1706 >        assertEquals(1, r.invocationCount);
1707          checkCompletedNormally(f, v1);
1708          checkCompletedNormally(g, v2);
1709 <        }
1587 <    }
1709 >    }}
1710  
1711      public void testRunAfterBoth_normalCompletion3() {
1712          for (ExecutionMode m : ExecutionMode.values())
1713          for (Integer v1 : new Integer[] { 1, null })
1714 <        for (Integer v2 : new Integer[] { 2, null }) {
1715 <
1714 >        for (Integer v2 : new Integer[] { 2, null })
1715 >    {
1716          final CompletableFuture<Integer> f = new CompletableFuture<>();
1717          final CompletableFuture<Integer> g = new CompletableFuture<>();
1718          final Noop r = new Noop();
# Line 1600 | Line 1722 | public class CompletableFutureTest exten
1722          final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1723  
1724          checkCompletedNormally(h, null);
1725 <        assertTrue(r.ran);
1725 >        assertEquals(1, r.invocationCount);
1726          checkCompletedNormally(f, v1);
1727          checkCompletedNormally(g, v2);
1728 <        }
1607 <    }
1728 >    }}
1729  
1730      public void testRunAfterBoth_normalCompletion4() {
1731          for (ExecutionMode m : ExecutionMode.values())
1732          for (Integer v1 : new Integer[] { 1, null })
1733 <        for (Integer v2 : new Integer[] { 2, null }) {
1734 <
1733 >        for (Integer v2 : new Integer[] { 2, null })
1734 >    {
1735          final CompletableFuture<Integer> f = new CompletableFuture<>();
1736          final CompletableFuture<Integer> g = new CompletableFuture<>();
1737          final Noop r = new Noop();
# Line 1620 | Line 1741 | public class CompletableFutureTest exten
1741          final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1742  
1743          checkCompletedNormally(h, null);
1744 <        assertTrue(r.ran);
1744 >        assertEquals(1, r.invocationCount);
1745          checkCompletedNormally(f, v1);
1746          checkCompletedNormally(g, v2);
1747 <        }
1627 <    }
1747 >    }}
1748  
1749      /**
1750       * runAfterBoth result completes exceptionally after exceptional
# Line 1632 | Line 1752 | public class CompletableFutureTest exten
1752       */
1753      public void testRunAfterBoth_exceptionalCompletion1() {
1754          for (ExecutionMode m : ExecutionMode.values())
1755 <        for (Integer v1 : new Integer[] { 1, null }) {
1756 <
1755 >        for (Integer v1 : new Integer[] { 1, null })
1756 >    {
1757          final CompletableFuture<Integer> f = new CompletableFuture<>();
1758          final CompletableFuture<Integer> g = new CompletableFuture<>();
1759          final Noop r = new Noop();
# Line 1646 | Line 1766 | public class CompletableFutureTest exten
1766  
1767          checkCompletedWithWrappedCFException(h, ex);
1768          checkCompletedWithWrappedCFException(f, ex);
1769 <        assertFalse(r.ran);
1769 >        assertEquals(0, r.invocationCount);
1770          checkCompletedNormally(g, v1);
1771 <        }
1652 <    }
1771 >    }}
1772  
1773      public void testRunAfterBoth_exceptionalCompletion2() {
1774          for (ExecutionMode m : ExecutionMode.values())
1775 <        for (Integer v1 : new Integer[] { 1, null }) {
1776 <
1775 >        for (Integer v1 : new Integer[] { 1, null })
1776 >    {
1777          final CompletableFuture<Integer> f = new CompletableFuture<>();
1778          final CompletableFuture<Integer> g = new CompletableFuture<>();
1779          final Noop r = new Noop();
# Line 1667 | Line 1786 | public class CompletableFutureTest exten
1786  
1787          checkCompletedWithWrappedCFException(h, ex);
1788          checkCompletedWithWrappedCFException(g, ex);
1789 <        assertFalse(r.ran);
1789 >        assertEquals(0, r.invocationCount);
1790          checkCompletedNormally(f, v1);
1791 <        }
1673 <    }
1791 >    }}
1792  
1793      public void testRunAfterBoth_exceptionalCompletion3() {
1794          for (ExecutionMode m : ExecutionMode.values())
1795 <        for (Integer v1 : new Integer[] { 1, null }) {
1796 <
1795 >        for (Integer v1 : new Integer[] { 1, null })
1796 >    {
1797          final CompletableFuture<Integer> f = new CompletableFuture<>();
1798          final CompletableFuture<Integer> g = new CompletableFuture<>();
1799          final Noop r = new Noop();
# Line 1687 | Line 1805 | public class CompletableFutureTest exten
1805  
1806          checkCompletedWithWrappedCFException(h, ex);
1807          checkCompletedWithWrappedCFException(g, ex);
1808 <        assertFalse(r.ran);
1808 >        assertEquals(0, r.invocationCount);
1809          checkCompletedNormally(f, v1);
1810 <        }
1693 <    }
1810 >    }}
1811  
1812      public void testRunAfterBoth_exceptionalCompletion4() {
1813          for (ExecutionMode m : ExecutionMode.values())
1814 <        for (Integer v1 : new Integer[] { 1, null }) {
1815 <
1814 >        for (Integer v1 : new Integer[] { 1, null })
1815 >    {
1816          final CompletableFuture<Integer> f = new CompletableFuture<>();
1817          final CompletableFuture<Integer> g = new CompletableFuture<>();
1818          final Noop r = new Noop();
# Line 1707 | Line 1824 | public class CompletableFutureTest exten
1824  
1825          checkCompletedWithWrappedCFException(h, ex);
1826          checkCompletedWithWrappedCFException(f, ex);
1827 <        assertFalse(r.ran);
1827 >        assertEquals(0, r.invocationCount);
1828          checkCompletedNormally(g, v1);
1829 <        }
1713 <    }
1829 >    }}
1830  
1831      /**
1832       * runAfterBoth result completes exceptionally if action does
# Line 1718 | Line 1834 | public class CompletableFutureTest exten
1834      public void testRunAfterBoth_actionFailed1() {
1835          for (ExecutionMode m : ExecutionMode.values())
1836          for (Integer v1 : new Integer[] { 1, null })
1837 <        for (Integer v2 : new Integer[] { 2, null }) {
1838 <
1837 >        for (Integer v2 : new Integer[] { 2, null })
1838 >    {
1839          final CompletableFuture<Integer> f = new CompletableFuture<>();
1840          final CompletableFuture<Integer> g = new CompletableFuture<>();
1841          final FailingNoop r = new FailingNoop();
# Line 1732 | Line 1848 | public class CompletableFutureTest exten
1848          checkCompletedWithWrappedCFException(h);
1849          checkCompletedNormally(f, v1);
1850          checkCompletedNormally(g, v2);
1851 <        }
1736 <    }
1851 >    }}
1852  
1853      public void testRunAfterBoth_actionFailed2() {
1854          for (ExecutionMode m : ExecutionMode.values())
1855          for (Integer v1 : new Integer[] { 1, null })
1856 <        for (Integer v2 : new Integer[] { 2, null }) {
1857 <
1856 >        for (Integer v2 : new Integer[] { 2, null })
1857 >    {
1858          final CompletableFuture<Integer> f = new CompletableFuture<>();
1859          final CompletableFuture<Integer> g = new CompletableFuture<>();
1860          final FailingNoop r = new FailingNoop();
# Line 1752 | Line 1867 | public class CompletableFutureTest exten
1867          checkCompletedWithWrappedCFException(h);
1868          checkCompletedNormally(f, v1);
1869          checkCompletedNormally(g, v2);
1870 <        }
1756 <    }
1870 >    }}
1871  
1872      /**
1873       * runAfterBoth result completes exceptionally if either source cancelled
# Line 1761 | Line 1875 | public class CompletableFutureTest exten
1875      public void testRunAfterBoth_sourceCancelled1() {
1876          for (ExecutionMode m : ExecutionMode.values())
1877          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1878 <        for (Integer v1 : new Integer[] { 1, null }) {
1879 <
1878 >        for (Integer v1 : new Integer[] { 1, null })
1879 >    {
1880          final CompletableFuture<Integer> f = new CompletableFuture<>();
1881          final CompletableFuture<Integer> g = new CompletableFuture<>();
1882          final Noop r = new Noop();
# Line 1774 | Line 1888 | public class CompletableFutureTest exten
1888  
1889          checkCompletedWithWrappedCancellationException(h);
1890          checkCancelled(f);
1891 <        assertFalse(r.ran);
1891 >        assertEquals(0, r.invocationCount);
1892          checkCompletedNormally(g, v1);
1893 <        }
1780 <    }
1893 >    }}
1894  
1895      public void testRunAfterBoth_sourceCancelled2() {
1896          for (ExecutionMode m : ExecutionMode.values())
1897          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
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 Noop r = new Noop();
# Line 1795 | Line 1908 | public class CompletableFutureTest exten
1908  
1909          checkCompletedWithWrappedCancellationException(h);
1910          checkCancelled(g);
1911 <        assertFalse(r.ran);
1911 >        assertEquals(0, r.invocationCount);
1912          checkCompletedNormally(f, v1);
1913 <        }
1801 <    }
1913 >    }}
1914  
1915      public void testRunAfterBoth_sourceCancelled3() {
1916          for (ExecutionMode m : ExecutionMode.values())
1917          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1918 <        for (Integer v1 : new Integer[] { 1, null }) {
1919 <
1918 >        for (Integer v1 : new Integer[] { 1, null })
1919 >    {
1920          final CompletableFuture<Integer> f = new CompletableFuture<>();
1921          final CompletableFuture<Integer> g = new CompletableFuture<>();
1922          final Noop r = new Noop();
# Line 1815 | Line 1927 | public class CompletableFutureTest exten
1927  
1928          checkCompletedWithWrappedCancellationException(h);
1929          checkCancelled(g);
1930 <        assertFalse(r.ran);
1930 >        assertEquals(0, r.invocationCount);
1931          checkCompletedNormally(f, v1);
1932 <        }
1821 <    }
1932 >    }}
1933  
1934      public void testRunAfterBoth_sourceCancelled4() {
1935          for (ExecutionMode m : ExecutionMode.values())
1936          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1937 <        for (Integer v1 : new Integer[] { 1, null }) {
1938 <
1937 >        for (Integer v1 : new Integer[] { 1, null })
1938 >    {
1939          final CompletableFuture<Integer> f = new CompletableFuture<>();
1940          final CompletableFuture<Integer> g = new CompletableFuture<>();
1941          final Noop r = new Noop();
# Line 1835 | Line 1946 | public class CompletableFutureTest exten
1946  
1947          checkCompletedWithWrappedCancellationException(h);
1948          checkCancelled(f);
1949 <        assertFalse(r.ran);
1949 >        assertEquals(0, r.invocationCount);
1950          checkCompletedNormally(g, v1);
1951 <        }
1841 <    }
1951 >    }}
1952  
1953      /**
1954       * applyToEither result completes normally after normal completion
1955       * of either source
1956       */
1957 <    public void testApplyToEither() {
1958 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1959 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1960 <        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
1961 <        f.complete(one);
1962 <        checkCompletedNormally(g, two);
1963 <        f2.complete(one);
1964 <        checkCompletedNormally(g, two);
1957 >    public void testApplyToEither_normalCompletion1() {
1958 >        for (ExecutionMode m : ExecutionMode.values())
1959 >        for (Integer v1 : new Integer[] { 1, null })
1960 >        for (Integer v2 : new Integer[] { 2, null })
1961 >    {
1962 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1963 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1964 >        final IncFunction r = new IncFunction();
1965 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1966  
1967 <        f = new CompletableFuture<>();
1968 <        f.complete(one);
1969 <        f2 = new CompletableFuture<>();
1970 <        g = f.applyToEither(f2, inc);
1971 <        checkCompletedNormally(g, two);
1972 <    }
1967 >        f.complete(v1);
1968 >        checkCompletedNormally(h, inc(v1));
1969 >        g.complete(v2);
1970 >
1971 >        checkCompletedNormally(f, v1);
1972 >        checkCompletedNormally(g, v2);
1973 >        checkCompletedNormally(h, inc(v1));
1974 >    }}
1975 >
1976 >    public void testApplyToEither_normalCompletion2() {
1977 >        for (ExecutionMode m : ExecutionMode.values())
1978 >        for (Integer v1 : new Integer[] { 1, null })
1979 >        for (Integer v2 : new Integer[] { 2, null })
1980 >    {
1981 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1982 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1983 >        final IncFunction r = new IncFunction();
1984 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1985 >
1986 >        g.complete(v2);
1987 >        checkCompletedNormally(h, inc(v2));
1988 >        f.complete(v1);
1989 >
1990 >        checkCompletedNormally(f, v1);
1991 >        checkCompletedNormally(g, v2);
1992 >        checkCompletedNormally(h, inc(v2));
1993 >        }}
1994 >
1995 >    public void testApplyToEither_normalCompletion3() {
1996 >        for (ExecutionMode m : ExecutionMode.values())
1997 >        for (Integer v1 : new Integer[] { 1, null })
1998 >        for (Integer v2 : new Integer[] { 2, null })
1999 >    {
2000 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2001 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2002 >        final IncFunction r = new IncFunction();
2003 >
2004 >        f.complete(v1);
2005 >        g.complete(v2);
2006 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2007 >
2008 >        checkCompletedNormally(f, v1);
2009 >        checkCompletedNormally(g, v2);
2010 >
2011 >        // unspecified behavior
2012 >        assertTrue(Objects.equals(h.join(), inc(v1)) ||
2013 >                   Objects.equals(h.join(), inc(v2)));
2014 >        assertEquals(1, r.invocationCount);
2015 >    }}
2016  
2017      /**
2018       * applyToEither result completes exceptionally after exceptional
2019       * completion of either source
2020       */
2021 <    public void testApplyToEither2() {
2022 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2023 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2024 <        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
2025 <        f.completeExceptionally(new CFException());
2026 <        f2.complete(one);
2027 <        checkCompletedWithWrappedCFException(g);
2021 >    public void testApplyToEither_exceptionalCompletion1() {
2022 >        for (ExecutionMode m : ExecutionMode.values())
2023 >        for (Integer v1 : new Integer[] { 1, null })
2024 >    {
2025 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2026 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2027 >        final IncFunction r = new IncFunction();
2028 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2029 >        final CFException ex = new CFException();
2030  
2031 <        f = new CompletableFuture<>();
2032 <        f2 = new CompletableFuture<>();
2033 <        f2.completeExceptionally(new CFException());
2034 <        g = f.applyToEither(f2, inc);
2035 <        checkCompletedWithWrappedCFException(g);
2036 <    }
2031 >        f.completeExceptionally(ex);
2032 >        checkCompletedWithWrappedCFException(h, ex);
2033 >        g.complete(v1);
2034 >
2035 >        assertEquals(0, r.invocationCount);
2036 >        checkCompletedNormally(g, v1);
2037 >        checkCompletedWithWrappedCFException(f, ex);
2038 >        checkCompletedWithWrappedCFException(h, ex);
2039 >    }}
2040 >
2041 >    public void testApplyToEither_exceptionalCompletion2() {
2042 >        for (ExecutionMode m : ExecutionMode.values())
2043 >        for (Integer v1 : new Integer[] { 1, null })
2044 >    {
2045 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2046 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2047 >        final IncFunction r = new IncFunction();
2048 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2049 >        final CFException ex = new CFException();
2050 >
2051 >        g.completeExceptionally(ex);
2052 >        checkCompletedWithWrappedCFException(h, ex);
2053 >        f.complete(v1);
2054 >
2055 >        assertEquals(0, r.invocationCount);
2056 >        checkCompletedNormally(f, v1);
2057 >        checkCompletedWithWrappedCFException(g, ex);
2058 >        checkCompletedWithWrappedCFException(h, ex);
2059 >    }}
2060 >
2061 >    public void testApplyToEither_exceptionalCompletion3() {
2062 >        for (ExecutionMode m : ExecutionMode.values())
2063 >        for (Integer v1 : new Integer[] { 1, null })
2064 >    {
2065 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2066 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2067 >        final IncFunction r = new IncFunction();
2068 >        final CFException ex = new CFException();
2069 >
2070 >        g.completeExceptionally(ex);
2071 >        f.complete(v1);
2072 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2073 >
2074 >        // unspecified behavior
2075 >        Integer v;
2076 >        try {
2077 >            assertEquals(inc(v1), h.join());
2078 >            assertEquals(1, r.invocationCount);
2079 >        } catch (CompletionException ok) {
2080 >            checkCompletedWithWrappedCFException(h, ex);
2081 >            assertEquals(0, r.invocationCount);
2082 >        }
2083 >
2084 >        checkCompletedWithWrappedCFException(g, ex);
2085 >        checkCompletedNormally(f, v1);
2086 >    }}
2087 >
2088 >    public void testApplyToEither_exceptionalCompletion4() {
2089 >        for (ExecutionMode m : ExecutionMode.values())
2090 >        for (Integer v1 : new Integer[] { 1, null })
2091 >    {
2092 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2093 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2094 >        final IncFunction r = new IncFunction();
2095 >        final CFException ex = new CFException();
2096 >
2097 >        f.completeExceptionally(ex);
2098 >        g.complete(v1);
2099 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2100 >
2101 >        // unspecified behavior
2102 >        Integer v;
2103 >        try {
2104 >            assertEquals(inc(v1), h.join());
2105 >            assertEquals(1, r.invocationCount);
2106 >        } catch (CompletionException ok) {
2107 >            checkCompletedWithWrappedCFException(h, ex);
2108 >            assertEquals(0, r.invocationCount);
2109 >        }
2110 >
2111 >        checkCompletedWithWrappedCFException(f, ex);
2112 >        checkCompletedNormally(g, v1);
2113 >    }}
2114  
2115      /**
2116       * applyToEither result completes exceptionally if action does
2117       */
2118 <    public void testApplyToEither3() {
2119 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2120 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2121 <        FailingFunction r = new FailingFunction();
2122 <        CompletableFuture<Integer> g = f.applyToEither(f2, r);
2123 <        f2.complete(two);
2124 <        checkCompletedWithWrappedCFException(g);
2125 <    }
2118 >    public void testApplyToEither_actionFailed1() {
2119 >        for (ExecutionMode m : ExecutionMode.values())
2120 >        for (Integer v1 : new Integer[] { 1, null })
2121 >        for (Integer v2 : new Integer[] { 2, null })
2122 >    {
2123 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2124 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2125 >        final FailingFunction r = new FailingFunction();
2126 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2127 >
2128 >        f.complete(v1);
2129 >        checkCompletedWithWrappedCFException(h);
2130 >        g.complete(v2);
2131 >        checkCompletedNormally(f, v1);
2132 >        checkCompletedNormally(g, v2);
2133 >    }}
2134 >
2135 >    public void testApplyToEither_actionFailed2() {
2136 >        for (ExecutionMode m : ExecutionMode.values())
2137 >        for (Integer v1 : new Integer[] { 1, null })
2138 >        for (Integer v2 : new Integer[] { 2, null })
2139 >    {
2140 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2141 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2142 >        final FailingFunction r = new FailingFunction();
2143 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2144 >
2145 >        g.complete(v2);
2146 >        checkCompletedWithWrappedCFException(h);
2147 >        f.complete(v1);
2148 >        checkCompletedNormally(f, v1);
2149 >        checkCompletedNormally(g, v2);
2150 >    }}
2151  
2152      /**
2153       * applyToEither result completes exceptionally if either source cancelled
2154       */
2155 <    public void testApplyToEither4() {
2156 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2157 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2158 <        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
2159 <        assertTrue(f.cancel(true));
2160 <        checkCompletedWithWrappedCancellationException(g);
2161 <        f = new CompletableFuture<>();
2162 <        f2 = new CompletableFuture<>();
2163 <        assertTrue(f2.cancel(true));
2164 <        checkCompletedWithWrappedCancellationException(g);
2165 <    }
2155 >    public void testApplyToEither_sourceCancelled1() {
2156 >        for (ExecutionMode m : ExecutionMode.values())
2157 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2158 >        for (Integer v1 : new Integer[] { 1, null })
2159 >    {
2160 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2161 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2162 >        final IncFunction r = new IncFunction();
2163 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2164 >
2165 >        assertTrue(f.cancel(mayInterruptIfRunning));
2166 >        checkCompletedWithWrappedCancellationException(h);
2167 >        g.complete(v1);
2168 >
2169 >        checkCancelled(f);
2170 >        assertEquals(0, r.invocationCount);
2171 >        checkCompletedNormally(g, v1);
2172 >        checkCompletedWithWrappedCancellationException(h);
2173 >    }}
2174 >
2175 >    public void testApplyToEither_sourceCancelled2() {
2176 >        for (ExecutionMode m : ExecutionMode.values())
2177 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2178 >        for (Integer v1 : new Integer[] { 1, null })
2179 >    {
2180 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2181 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2182 >        final IncFunction r = new IncFunction();
2183 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2184 >
2185 >        assertTrue(g.cancel(mayInterruptIfRunning));
2186 >        checkCompletedWithWrappedCancellationException(h);
2187 >        f.complete(v1);
2188 >
2189 >        checkCancelled(g);
2190 >        assertEquals(0, r.invocationCount);
2191 >        checkCompletedNormally(f, v1);
2192 >        checkCompletedWithWrappedCancellationException(h);
2193 >    }}
2194 >
2195 >    public void testApplyToEither_sourceCancelled3() {
2196 >        for (ExecutionMode m : ExecutionMode.values())
2197 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2198 >        for (Integer v1 : new Integer[] { 1, null })
2199 >    {
2200 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2201 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2202 >        final IncFunction r = new IncFunction();
2203 >
2204 >        assertTrue(g.cancel(mayInterruptIfRunning));
2205 >        f.complete(v1);
2206 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2207 >
2208 >        // unspecified behavior
2209 >        Integer v;
2210 >        try {
2211 >            assertEquals(inc(v1), h.join());
2212 >            assertEquals(1, r.invocationCount);
2213 >        } catch (CompletionException ok) {
2214 >            checkCompletedWithWrappedCancellationException(h);
2215 >            assertEquals(0, r.invocationCount);
2216 >        }
2217 >
2218 >        checkCancelled(g);
2219 >        checkCompletedNormally(f, v1);
2220 >    }}
2221 >
2222 >    public void testApplyToEither_sourceCancelled4() {
2223 >        for (ExecutionMode m : ExecutionMode.values())
2224 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2225 >        for (Integer v1 : new Integer[] { 1, null })
2226 >    {
2227 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2228 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2229 >        final IncFunction r = new IncFunction();
2230 >
2231 >        assertTrue(f.cancel(mayInterruptIfRunning));
2232 >        g.complete(v1);
2233 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2234 >
2235 >        // unspecified behavior
2236 >        Integer v;
2237 >        try {
2238 >            assertEquals(inc(v1), h.join());
2239 >            assertEquals(1, r.invocationCount);
2240 >        } catch (CompletionException ok) {
2241 >            checkCompletedWithWrappedCancellationException(h);
2242 >            assertEquals(0, r.invocationCount);
2243 >        }
2244 >
2245 >        checkCancelled(f);
2246 >        checkCompletedNormally(g, v1);
2247 >    }}
2248  
2249      /**
2250       * acceptEither result completes normally after normal completion
2251       * of either source
2252       */
2253 <    public void testAcceptEither() {
2254 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2255 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2256 <        IncAction r = new IncAction();
2257 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
2258 <        f.complete(one);
2259 <        checkCompletedNormally(g, null);
2260 <        f2.complete(one);
2261 <        checkCompletedNormally(g, null);
1922 <        assertEquals(r.value, (Integer) 2);
2253 >    public void testAcceptEither_normalCompletion1() {
2254 >        for (ExecutionMode m : ExecutionMode.values())
2255 >        for (Integer v1 : new Integer[] { 1, null })
2256 >        for (Integer v2 : new Integer[] { 2, null })
2257 >    {
2258 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2259 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2260 >        final IncAction r = new IncAction();
2261 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2262  
2263 <        r = new IncAction();
2264 <        f = new CompletableFuture<>();
2265 <        f.complete(one);
2266 <        f2 = new CompletableFuture<>();
2267 <        g = f.acceptEither(f2, r);
2268 <        checkCompletedNormally(g, null);
2269 <        assertEquals(r.value, (Integer) 2);
2270 <    }
2263 >        f.complete(v1);
2264 >        checkCompletedNormally(h, null);
2265 >        assertEquals(inc(v1), r.value);
2266 >        g.complete(v2);
2267 >
2268 >        checkCompletedNormally(f, v1);
2269 >        checkCompletedNormally(g, v2);
2270 >        checkCompletedNormally(h, null);
2271 >    }}
2272 >
2273 >    public void testAcceptEither_normalCompletion2() {
2274 >        for (ExecutionMode m : ExecutionMode.values())
2275 >        for (Integer v1 : new Integer[] { 1, null })
2276 >        for (Integer v2 : new Integer[] { 2, null })
2277 >    {
2278 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2279 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2280 >        final IncAction r = new IncAction();
2281 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2282 >
2283 >        g.complete(v2);
2284 >        checkCompletedNormally(h, null);
2285 >        assertEquals(inc(v2), r.value);
2286 >        f.complete(v1);
2287 >
2288 >        checkCompletedNormally(f, v1);
2289 >        checkCompletedNormally(g, v2);
2290 >        checkCompletedNormally(h, null);
2291 >    }}
2292 >
2293 >    public void testAcceptEither_normalCompletion3() {
2294 >        for (ExecutionMode m : ExecutionMode.values())
2295 >        for (Integer v1 : new Integer[] { 1, null })
2296 >        for (Integer v2 : new Integer[] { 2, null })
2297 >    {
2298 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2299 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2300 >        final IncAction r = new IncAction();
2301 >
2302 >        f.complete(v1);
2303 >        g.complete(v2);
2304 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2305 >
2306 >        checkCompletedNormally(h, null);
2307 >        checkCompletedNormally(f, v1);
2308 >        checkCompletedNormally(g, v2);
2309 >
2310 >        // unspecified behavior
2311 >        assertTrue(Objects.equals(r.value, inc(v1)) ||
2312 >                   Objects.equals(r.value, inc(v2)));
2313 >    }}
2314  
2315      /**
2316       * acceptEither result completes exceptionally after exceptional
2317       * completion of either source
2318       */
2319 <    public void testAcceptEither2() {
2320 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2321 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2322 <        IncAction r = new IncAction();
2323 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
2324 <        f.completeExceptionally(new CFException());
2325 <        f2.complete(one);
2326 <        checkCompletedWithWrappedCFException(g);
2319 >    public void testAcceptEither_exceptionalCompletion1() {
2320 >        for (ExecutionMode m : ExecutionMode.values())
2321 >        for (Integer v1 : new Integer[] { 1, null })
2322 >    {
2323 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2324 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2325 >        final IncAction r = new IncAction();
2326 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2327 >        final CFException ex = new CFException();
2328  
2329 <        r = new IncAction();
2330 <        f = new CompletableFuture<>();
2331 <        f2 = new CompletableFuture<>();
2332 <        f2.completeExceptionally(new CFException());
2333 <        g = f.acceptEither(f2, r);
2334 <        checkCompletedWithWrappedCFException(g);
2335 <    }
2329 >        f.completeExceptionally(ex);
2330 >        checkCompletedWithWrappedCFException(h, ex);
2331 >        g.complete(v1);
2332 >
2333 >        assertEquals(0, r.invocationCount);
2334 >        checkCompletedNormally(g, v1);
2335 >        checkCompletedWithWrappedCFException(f, ex);
2336 >        checkCompletedWithWrappedCFException(h, ex);
2337 >    }}
2338 >
2339 >    public void testAcceptEither_exceptionalCompletion2() {
2340 >        for (ExecutionMode m : ExecutionMode.values())
2341 >        for (Integer v1 : new Integer[] { 1, null })
2342 >    {
2343 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2344 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2345 >        final IncAction r = new IncAction();
2346 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2347 >        final CFException ex = new CFException();
2348 >
2349 >        g.completeExceptionally(ex);
2350 >        checkCompletedWithWrappedCFException(h, ex);
2351 >        f.complete(v1);
2352 >
2353 >        assertEquals(0, r.invocationCount);
2354 >        checkCompletedNormally(f, v1);
2355 >        checkCompletedWithWrappedCFException(g, ex);
2356 >        checkCompletedWithWrappedCFException(h, ex);
2357 >    }}
2358 >
2359 >    public void testAcceptEither_exceptionalCompletion3() {
2360 >        for (ExecutionMode m : ExecutionMode.values())
2361 >        for (Integer v1 : new Integer[] { 1, null })
2362 >    {
2363 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2364 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2365 >        final IncAction r = new IncAction();
2366 >        final CFException ex = new CFException();
2367 >
2368 >        g.completeExceptionally(ex);
2369 >        f.complete(v1);
2370 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2371 >
2372 >        // unspecified behavior
2373 >        Integer v;
2374 >        try {
2375 >            assertNull(h.join());
2376 >            assertEquals(1, r.invocationCount);
2377 >            assertEquals(inc(v1), r.value);
2378 >        } catch (CompletionException ok) {
2379 >            checkCompletedWithWrappedCFException(h, ex);
2380 >            assertEquals(0, r.invocationCount);
2381 >        }
2382 >
2383 >        checkCompletedWithWrappedCFException(g, ex);
2384 >        checkCompletedNormally(f, v1);
2385 >    }}
2386 >
2387 >    public void testAcceptEither_exceptionalCompletion4() {
2388 >        for (ExecutionMode m : ExecutionMode.values())
2389 >        for (Integer v1 : new Integer[] { 1, null })
2390 >    {
2391 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2392 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2393 >        final IncAction r = new IncAction();
2394 >        final CFException ex = new CFException();
2395 >
2396 >        f.completeExceptionally(ex);
2397 >        g.complete(v1);
2398 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2399 >
2400 >        // unspecified behavior
2401 >        Integer v;
2402 >        try {
2403 >            assertNull(h.join());
2404 >            assertEquals(1, r.invocationCount);
2405 >            assertEquals(inc(v1), r.value);
2406 >        } catch (CompletionException ok) {
2407 >            checkCompletedWithWrappedCFException(h, ex);
2408 >            assertEquals(0, r.invocationCount);
2409 >        }
2410 >
2411 >        checkCompletedWithWrappedCFException(f, ex);
2412 >        checkCompletedNormally(g, v1);
2413 >    }}
2414  
2415      /**
2416       * acceptEither result completes exceptionally if action does
2417       */
2418 <    public void testAcceptEither3() {
2419 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2420 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2421 <        FailingConsumer r = new FailingConsumer();
2422 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
2423 <        f2.complete(two);
2424 <        checkCompletedWithWrappedCFException(g);
2425 <    }
2418 >    public void testAcceptEither_actionFailed1() {
2419 >        for (ExecutionMode m : ExecutionMode.values())
2420 >        for (Integer v1 : new Integer[] { 1, null })
2421 >        for (Integer v2 : new Integer[] { 2, null })
2422 >    {
2423 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2424 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2425 >        final FailingConsumer r = new FailingConsumer();
2426 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2427 >
2428 >        f.complete(v1);
2429 >        checkCompletedWithWrappedCFException(h);
2430 >        g.complete(v2);
2431 >        checkCompletedNormally(f, v1);
2432 >        checkCompletedNormally(g, v2);
2433 >    }}
2434 >
2435 >    public void testAcceptEither_actionFailed2() {
2436 >        for (ExecutionMode m : ExecutionMode.values())
2437 >        for (Integer v1 : new Integer[] { 1, null })
2438 >        for (Integer v2 : new Integer[] { 2, null })
2439 >    {
2440 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2441 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2442 >        final FailingConsumer r = new FailingConsumer();
2443 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2444 >
2445 >        g.complete(v2);
2446 >        checkCompletedWithWrappedCFException(h);
2447 >        f.complete(v1);
2448 >        checkCompletedNormally(f, v1);
2449 >        checkCompletedNormally(g, v2);
2450 >    }}
2451  
2452      /**
2453       * acceptEither result completes exceptionally if either source cancelled
2454       */
2455 <    public void testAcceptEither4() {
2456 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2457 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2458 <        IncAction r = new IncAction();
2459 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
2460 <        assertTrue(f.cancel(true));
2461 <        checkCompletedWithWrappedCancellationException(g);
2462 <        f = new CompletableFuture<>();
2463 <        f2 = new CompletableFuture<>();
2464 <        assertTrue(f2.cancel(true));
2465 <        checkCompletedWithWrappedCancellationException(g);
2466 <    }
2455 >    public void testAcceptEither_sourceCancelled1() {
2456 >        for (ExecutionMode m : ExecutionMode.values())
2457 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2458 >        for (Integer v1 : new Integer[] { 1, null })
2459 >    {
2460 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2461 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2462 >        final IncAction r = new IncAction();
2463 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2464 >
2465 >        assertTrue(f.cancel(mayInterruptIfRunning));
2466 >        checkCompletedWithWrappedCancellationException(h);
2467 >        g.complete(v1);
2468 >
2469 >        checkCancelled(f);
2470 >        assertEquals(0, r.invocationCount);
2471 >        checkCompletedNormally(g, v1);
2472 >        checkCompletedWithWrappedCancellationException(h);
2473 >    }}
2474 >
2475 >    public void testAcceptEither_sourceCancelled2() {
2476 >        for (ExecutionMode m : ExecutionMode.values())
2477 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2478 >        for (Integer v1 : new Integer[] { 1, null })
2479 >    {
2480 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2481 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2482 >        final IncAction r = new IncAction();
2483 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2484 >
2485 >        assertTrue(g.cancel(mayInterruptIfRunning));
2486 >        checkCompletedWithWrappedCancellationException(h);
2487 >        f.complete(v1);
2488 >
2489 >        checkCancelled(g);
2490 >        assertEquals(0, r.invocationCount);
2491 >        checkCompletedNormally(f, v1);
2492 >        checkCompletedWithWrappedCancellationException(h);
2493 >    }}
2494 >
2495 >    public void testAcceptEither_sourceCancelled3() {
2496 >        for (ExecutionMode m : ExecutionMode.values())
2497 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2498 >        for (Integer v1 : new Integer[] { 1, null })
2499 >    {
2500 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2501 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2502 >        final IncAction r = new IncAction();
2503 >
2504 >        assertTrue(g.cancel(mayInterruptIfRunning));
2505 >        f.complete(v1);
2506 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2507 >
2508 >        // unspecified behavior
2509 >        Integer v;
2510 >        try {
2511 >            assertNull(h.join());
2512 >            assertEquals(1, r.invocationCount);
2513 >            assertEquals(inc(v1), r.value);
2514 >        } catch (CompletionException ok) {
2515 >            checkCompletedWithWrappedCancellationException(h);
2516 >            assertEquals(0, r.invocationCount);
2517 >        }
2518 >
2519 >        checkCancelled(g);
2520 >        checkCompletedNormally(f, v1);
2521 >    }}
2522 >
2523 >    public void testAcceptEither_sourceCancelled4() {
2524 >        for (ExecutionMode m : ExecutionMode.values())
2525 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2526 >        for (Integer v1 : new Integer[] { 1, null })
2527 >    {
2528 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2529 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2530 >        final IncAction r = new IncAction();
2531 >
2532 >        assertTrue(f.cancel(mayInterruptIfRunning));
2533 >        g.complete(v1);
2534 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2535 >
2536 >        // unspecified behavior
2537 >        Integer v;
2538 >        try {
2539 >            assertNull(h.join());
2540 >            assertEquals(1, r.invocationCount);
2541 >            assertEquals(inc(v1), r.value);
2542 >        } catch (CompletionException ok) {
2543 >            checkCompletedWithWrappedCancellationException(h);
2544 >            assertEquals(0, r.invocationCount);
2545 >        }
2546 >
2547 >        checkCancelled(f);
2548 >        checkCompletedNormally(g, v1);
2549 >    }}
2550  
2551      /**
2552       * runAfterEither result completes normally after normal completion
2553       * of either source
2554       */
2555 <    public void testRunAfterEither() {
2556 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2557 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2558 <        Noop r = new Noop();
2559 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
2560 <        f.complete(one);
2561 <        checkCompletedNormally(g, null);
2562 <        f2.complete(one);
2563 <        checkCompletedNormally(g, null);
1995 <        assertTrue(r.ran);
2555 >    public void testRunAfterEither_normalCompletion1() {
2556 >        for (ExecutionMode m : ExecutionMode.values())
2557 >        for (Integer v1 : new Integer[] { 1, null })
2558 >        for (Integer v2 : new Integer[] { 2, null })
2559 >    {
2560 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2561 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2562 >        final Noop r = new Noop();
2563 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2564  
2565 <        r = new Noop();
2566 <        f = new CompletableFuture<>();
2567 <        f.complete(one);
2568 <        f2 = new CompletableFuture<>();
2569 <        g = f.runAfterEither(f2, r);
2570 <        checkCompletedNormally(g, null);
2571 <        assertTrue(r.ran);
2572 <    }
2565 >        f.complete(v1);
2566 >        checkCompletedNormally(h, null);
2567 >        assertEquals(1, r.invocationCount);
2568 >        g.complete(v2);
2569 >
2570 >        checkCompletedNormally(f, v1);
2571 >        checkCompletedNormally(g, v2);
2572 >        checkCompletedNormally(h, null);
2573 >        assertEquals(1, r.invocationCount);
2574 >    }}
2575 >
2576 >    public void testRunAfterEither_normalCompletion2() {
2577 >        for (ExecutionMode m : ExecutionMode.values())
2578 >        for (Integer v1 : new Integer[] { 1, null })
2579 >        for (Integer v2 : new Integer[] { 2, null })
2580 >    {
2581 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2582 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2583 >        final Noop r = new Noop();
2584 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2585 >
2586 >        g.complete(v2);
2587 >        checkCompletedNormally(h, null);
2588 >        assertEquals(1, r.invocationCount);
2589 >        f.complete(v1);
2590 >
2591 >        checkCompletedNormally(f, v1);
2592 >        checkCompletedNormally(g, v2);
2593 >        checkCompletedNormally(h, null);
2594 >        assertEquals(1, r.invocationCount);
2595 >        }}
2596 >
2597 >    public void testRunAfterEither_normalCompletion3() {
2598 >        for (ExecutionMode m : ExecutionMode.values())
2599 >        for (Integer v1 : new Integer[] { 1, null })
2600 >        for (Integer v2 : new Integer[] { 2, null })
2601 >    {
2602 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2603 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2604 >        final Noop r = new Noop();
2605 >
2606 >        f.complete(v1);
2607 >        g.complete(v2);
2608 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2609 >
2610 >        checkCompletedNormally(h, null);
2611 >        checkCompletedNormally(f, v1);
2612 >        checkCompletedNormally(g, v2);
2613 >        assertEquals(1, r.invocationCount);
2614 >    }}
2615  
2616      /**
2617       * runAfterEither result completes exceptionally after exceptional
2618       * completion of either source
2619       */
2620 <    public void testRunAfterEither2() {
2621 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2622 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2623 <        Noop r = new Noop();
2624 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
2625 <        f.completeExceptionally(new CFException());
2626 <        f2.complete(one);
2627 <        checkCompletedWithWrappedCFException(g);
2620 >    public void testRunAfterEither_exceptionalCompletion1() {
2621 >        for (ExecutionMode m : ExecutionMode.values())
2622 >        for (Integer v1 : new Integer[] { 1, null })
2623 >    {
2624 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2625 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2626 >        final Noop r = new Noop();
2627 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2628 >        final CFException ex = new CFException();
2629  
2630 <        r = new Noop();
2631 <        f = new CompletableFuture<>();
2632 <        f2 = new CompletableFuture<>();
2633 <        f2.completeExceptionally(new CFException());
2634 <        g = f.runAfterEither(f2, r);
2635 <        checkCompletedWithWrappedCFException(g);
2636 <    }
2630 >        f.completeExceptionally(ex);
2631 >        checkCompletedWithWrappedCFException(h, ex);
2632 >        g.complete(v1);
2633 >
2634 >        assertEquals(0, r.invocationCount);
2635 >        checkCompletedNormally(g, v1);
2636 >        checkCompletedWithWrappedCFException(f, ex);
2637 >        checkCompletedWithWrappedCFException(h, ex);
2638 >    }}
2639 >
2640 >    public void testRunAfterEither_exceptionalCompletion2() {
2641 >        for (ExecutionMode m : ExecutionMode.values())
2642 >        for (Integer v1 : new Integer[] { 1, null })
2643 >    {
2644 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2645 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2646 >        final Noop r = new Noop();
2647 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2648 >        final CFException ex = new CFException();
2649 >
2650 >        g.completeExceptionally(ex);
2651 >        checkCompletedWithWrappedCFException(h, ex);
2652 >        f.complete(v1);
2653 >
2654 >        assertEquals(0, r.invocationCount);
2655 >        checkCompletedNormally(f, v1);
2656 >        checkCompletedWithWrappedCFException(g, ex);
2657 >        checkCompletedWithWrappedCFException(h, ex);
2658 >    }}
2659 >
2660 >    public void testRunAfterEither_exceptionalCompletion3() {
2661 >        for (ExecutionMode m : ExecutionMode.values())
2662 >        for (Integer v1 : new Integer[] { 1, null })
2663 >    {
2664 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2665 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2666 >        final Noop r = new Noop();
2667 >        final CFException ex = new CFException();
2668 >
2669 >        g.completeExceptionally(ex);
2670 >        f.complete(v1);
2671 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2672 >
2673 >        // unspecified behavior
2674 >        Integer v;
2675 >        try {
2676 >            assertNull(h.join());
2677 >            assertEquals(1, r.invocationCount);
2678 >        } catch (CompletionException ok) {
2679 >            checkCompletedWithWrappedCFException(h, ex);
2680 >            assertEquals(0, r.invocationCount);
2681 >        }
2682 >
2683 >        checkCompletedWithWrappedCFException(g, ex);
2684 >        checkCompletedNormally(f, v1);
2685 >    }}
2686 >
2687 >    public void testRunAfterEither_exceptionalCompletion4() {
2688 >        for (ExecutionMode m : ExecutionMode.values())
2689 >        for (Integer v1 : new Integer[] { 1, null })
2690 >    {
2691 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2692 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2693 >        final Noop r = new Noop();
2694 >        final CFException ex = new CFException();
2695 >
2696 >        f.completeExceptionally(ex);
2697 >        g.complete(v1);
2698 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2699 >
2700 >        // unspecified behavior
2701 >        Integer v;
2702 >        try {
2703 >            assertNull(h.join());
2704 >            assertEquals(1, r.invocationCount);
2705 >        } catch (CompletionException ok) {
2706 >            checkCompletedWithWrappedCFException(h, ex);
2707 >            assertEquals(0, r.invocationCount);
2708 >        }
2709 >
2710 >        checkCompletedWithWrappedCFException(f, ex);
2711 >        checkCompletedNormally(g, v1);
2712 >    }}
2713  
2714      /**
2715       * runAfterEither result completes exceptionally if action does
2716       */
2717 <    public void testRunAfterEither3() {
2718 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2719 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2720 <        FailingNoop r = new FailingNoop();
2721 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
2722 <        f2.complete(two);
2723 <        checkCompletedWithWrappedCFException(g);
2724 <    }
2717 >    public void testRunAfterEither_actionFailed1() {
2718 >        for (ExecutionMode m : ExecutionMode.values())
2719 >        for (Integer v1 : new Integer[] { 1, null })
2720 >        for (Integer v2 : new Integer[] { 2, null })
2721 >    {
2722 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2723 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2724 >        final FailingNoop r = new FailingNoop();
2725 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2726 >
2727 >        f.complete(v1);
2728 >        checkCompletedWithWrappedCFException(h);
2729 >        g.complete(v2);
2730 >        checkCompletedNormally(f, v1);
2731 >        checkCompletedNormally(g, v2);
2732 >    }}
2733 >
2734 >    public void testRunAfterEither_actionFailed2() {
2735 >        for (ExecutionMode m : ExecutionMode.values())
2736 >        for (Integer v1 : new Integer[] { 1, null })
2737 >        for (Integer v2 : new Integer[] { 2, null })
2738 >    {
2739 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2740 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2741 >        final FailingNoop r = new FailingNoop();
2742 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2743 >
2744 >        g.complete(v2);
2745 >        checkCompletedWithWrappedCFException(h);
2746 >        f.complete(v1);
2747 >        checkCompletedNormally(f, v1);
2748 >        checkCompletedNormally(g, v2);
2749 >    }}
2750  
2751      /**
2752       * runAfterEither result completes exceptionally if either source cancelled
2753       */
2754 <    public void testRunAfterEither4() {
2755 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2756 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2757 <        Noop r = new Noop();
2758 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
2759 <        assertTrue(f.cancel(true));
2760 <        checkCompletedWithWrappedCancellationException(g);
2761 <        f = new CompletableFuture<>();
2762 <        f2 = new CompletableFuture<>();
2051 <        assertTrue(f2.cancel(true));
2052 <        checkCompletedWithWrappedCancellationException(g);
2053 <    }
2754 >    public void testRunAfterEither_sourceCancelled1() {
2755 >        for (ExecutionMode m : ExecutionMode.values())
2756 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2757 >        for (Integer v1 : new Integer[] { 1, null })
2758 >    {
2759 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2760 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2761 >        final Noop r = new Noop();
2762 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2763  
2764 <    /**
2765 <     * thenCompose result completes normally after normal completion of source
2766 <     */
2058 <    public void testThenCompose() {
2059 <        CompletableFuture<Integer> f, g;
2060 <        CompletableFutureInc r;
2764 >        assertTrue(f.cancel(mayInterruptIfRunning));
2765 >        checkCompletedWithWrappedCancellationException(h);
2766 >        g.complete(v1);
2767  
2768 <        f = new CompletableFuture<>();
2769 <        g = f.thenCompose(r = new CompletableFutureInc());
2770 <        f.complete(one);
2771 <        checkCompletedNormally(g, two);
2772 <        assertTrue(r.ran);
2768 >        checkCancelled(f);
2769 >        assertEquals(0, r.invocationCount);
2770 >        checkCompletedNormally(g, v1);
2771 >        checkCompletedWithWrappedCancellationException(h);
2772 >    }}
2773  
2774 <        f = new CompletableFuture<>();
2775 <        f.complete(one);
2776 <        g = f.thenCompose(r = new CompletableFutureInc());
2777 <        checkCompletedNormally(g, two);
2778 <        assertTrue(r.ran);
2779 <    }
2774 >    public void testRunAfterEither_sourceCancelled2() {
2775 >        for (ExecutionMode m : ExecutionMode.values())
2776 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2777 >        for (Integer v1 : new Integer[] { 1, null })
2778 >    {
2779 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2780 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2781 >        final Noop r = new Noop();
2782 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2783  
2784 <    /**
2785 <     * thenCompose result completes exceptionally after exceptional
2786 <     * completion of source
2078 <     */
2079 <    public void testThenCompose2() {
2080 <        CompletableFuture<Integer> f, g;
2081 <        CompletableFutureInc r;
2784 >        assertTrue(g.cancel(mayInterruptIfRunning));
2785 >        checkCompletedWithWrappedCancellationException(h);
2786 >        f.complete(v1);
2787  
2788 <        f = new CompletableFuture<>();
2789 <        g = f.thenCompose(r = new CompletableFutureInc());
2790 <        f.completeExceptionally(new CFException());
2791 <        checkCompletedWithWrappedCFException(g);
2788 >        checkCancelled(g);
2789 >        assertEquals(0, r.invocationCount);
2790 >        checkCompletedNormally(f, v1);
2791 >        checkCompletedWithWrappedCancellationException(h);
2792 >    }}
2793  
2794 <        f = new CompletableFuture<>();
2795 <        f.completeExceptionally(new CFException());
2796 <        g = f.thenCompose(r = new CompletableFutureInc());
2797 <        checkCompletedWithWrappedCFException(g);
2798 <    }
2794 >    public void testRunAfterEither_sourceCancelled3() {
2795 >        for (ExecutionMode m : ExecutionMode.values())
2796 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2797 >        for (Integer v1 : new Integer[] { 1, null })
2798 >    {
2799 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2800 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2801 >        final Noop r = new Noop();
2802  
2803 <    /**
2804 <     * thenCompose result completes exceptionally if action does
2805 <     */
2097 <    public void testThenCompose3() {
2098 <        CompletableFuture<Integer> f, g;
2099 <        FailingCompletableFutureFunction r;
2803 >        assertTrue(g.cancel(mayInterruptIfRunning));
2804 >        f.complete(v1);
2805 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2806  
2807 <        f = new CompletableFuture<>();
2808 <        g = f.thenCompose(r = new FailingCompletableFutureFunction());
2809 <        f.complete(one);
2810 <        checkCompletedWithWrappedCFException(g);
2807 >        // unspecified behavior
2808 >        Integer v;
2809 >        try {
2810 >            assertNull(h.join());
2811 >            assertEquals(1, r.invocationCount);
2812 >        } catch (CompletionException ok) {
2813 >            checkCompletedWithWrappedCancellationException(h);
2814 >            assertEquals(0, r.invocationCount);
2815 >        }
2816  
2817 <        f = new CompletableFuture<>();
2818 <        f.complete(one);
2819 <        g = f.thenCompose(r = new FailingCompletableFutureFunction());
2109 <        checkCompletedWithWrappedCFException(g);
2110 <    }
2817 >        checkCancelled(g);
2818 >        checkCompletedNormally(f, v1);
2819 >    }}
2820  
2821 <    /**
2822 <     * thenCompose result completes exceptionally if source cancelled
2823 <     */
2824 <    public void testThenCompose4() {
2825 <        CompletableFuture<Integer> f, g;
2826 <        CompletableFutureInc r;
2821 >    public void testRunAfterEither_sourceCancelled4() {
2822 >        for (ExecutionMode m : ExecutionMode.values())
2823 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2824 >        for (Integer v1 : new Integer[] { 1, null })
2825 >    {
2826 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2827 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2828 >        final Noop r = new Noop();
2829  
2830 <        f = new CompletableFuture<>();
2831 <        g = f.thenCompose(r = new CompletableFutureInc());
2832 <        assertTrue(f.cancel(true));
2122 <        checkCompletedWithWrappedCancellationException(g);
2830 >        assertTrue(f.cancel(mayInterruptIfRunning));
2831 >        g.complete(v1);
2832 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2833  
2834 <        f = new CompletableFuture<>();
2835 <        assertTrue(f.cancel(true));
2836 <        g = f.thenCompose(r = new CompletableFutureInc());
2837 <        checkCompletedWithWrappedCancellationException(g);
2838 <    }
2834 >        // unspecified behavior
2835 >        Integer v;
2836 >        try {
2837 >            assertNull(h.join());
2838 >            assertEquals(1, r.invocationCount);
2839 >        } catch (CompletionException ok) {
2840 >            checkCompletedWithWrappedCancellationException(h);
2841 >            assertEquals(0, r.invocationCount);
2842 >        }
2843  
2844 <    // asyncs
2844 >        checkCancelled(f);
2845 >        checkCompletedNormally(g, v1);
2846 >    }}
2847  
2848      /**
2849 <     * thenRunAsync result completes normally after normal completion of source
2849 >     * thenCompose result completes normally after normal completion of source
2850       */
2851 <    public void testThenRunAsync() {
2852 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2853 <        Noop r = new Noop();
2854 <        CompletableFuture<Void> g = f.thenRunAsync(r);
2855 <        f.complete(null);
2856 <        checkCompletedNormally(g, null);
2851 >    public void testThenCompose_normalCompletion() {
2852 >        for (ExecutionMode m : ExecutionMode.values())
2853 >        for (boolean createIncomplete : new boolean[] { true, false })
2854 >        for (Integer v1 : new Integer[] { 1, null })
2855 >    {
2856 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2857 >        final CompletableFutureInc r = new CompletableFutureInc();
2858 >        if (!createIncomplete) f.complete(v1);
2859 >        final CompletableFuture<Integer> g = f.thenCompose(r);
2860 >        if (createIncomplete) f.complete(v1);
2861  
2862 <        // reordered version
2863 <        f = new CompletableFuture<>();
2864 <        f.complete(null);
2865 <        r = new Noop();
2146 <        g = f.thenRunAsync(r);
2147 <        checkCompletedNormally(g, null);
2148 <    }
2862 >        checkCompletedNormally(g, inc(v1));
2863 >        checkCompletedNormally(f, v1);
2864 >        assertEquals(1, r.invocationCount);
2865 >    }}
2866  
2867      /**
2868 <     * thenRunAsync result completes exceptionally after exceptional
2868 >     * thenCompose result completes exceptionally after exceptional
2869       * completion of source
2870       */
2871 <    public void testThenRunAsync2() {
2872 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2873 <        Noop r = new Noop();
2874 <        CompletableFuture<Void> g = f.thenRunAsync(r);
2875 <        f.completeExceptionally(new CFException());
2876 <        try {
2877 <            g.join();
2878 <            shouldThrow();
2879 <        } catch (CompletionException success) {}
2880 <        checkCompletedWithWrappedCFException(g);
2881 <    }
2871 >    public void testThenCompose_exceptionalCompletion() {
2872 >        for (ExecutionMode m : ExecutionMode.values())
2873 >        for (boolean createIncomplete : new boolean[] { true, false })
2874 >    {
2875 >        final CFException ex = new CFException();
2876 >        final CompletableFutureInc r = new CompletableFutureInc();
2877 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2878 >        if (!createIncomplete) f.completeExceptionally(ex);
2879 >        final CompletableFuture<Integer> g = f.thenCompose(r);
2880 >        if (createIncomplete) f.completeExceptionally(ex);
2881 >
2882 >        checkCompletedWithWrappedCFException(g, ex);
2883 >        checkCompletedWithWrappedCFException(f, ex);
2884 >        assertEquals(0, r.invocationCount);
2885 >    }}
2886  
2887      /**
2888 <     * thenRunAsync result completes exceptionally if action does
2888 >     * thenCompose result completes exceptionally if action does
2889       */
2890 <    public void testThenRunAsync3() {
2891 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2892 <        FailingNoop r = new FailingNoop();
2893 <        CompletableFuture<Void> g = f.thenRunAsync(r);
2894 <        f.complete(null);
2890 >    public void testThenCompose_actionFailed() {
2891 >        for (ExecutionMode m : ExecutionMode.values())
2892 >        for (boolean createIncomplete : new boolean[] { true, false })
2893 >        for (Integer v1 : new Integer[] { 1, null })
2894 >    {
2895 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2896 >        final FailingCompletableFutureFunction r
2897 >            = new FailingCompletableFutureFunction();
2898 >        if (!createIncomplete) f.complete(v1);
2899 >        final CompletableFuture<Integer> g = f.thenCompose(r);
2900 >        if (createIncomplete) f.complete(v1);
2901 >
2902          checkCompletedWithWrappedCFException(g);
2903 <    }
2903 >        checkCompletedNormally(f, v1);
2904 >    }}
2905  
2906      /**
2907 <     * thenRunAsync result completes exceptionally if source cancelled
2907 >     * thenCompose result completes exceptionally if source cancelled
2908       */
2909 <    public void testThenRunAsync4() {
2910 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2911 <        Noop r = new Noop();
2912 <        CompletableFuture<Void> g = f.thenRunAsync(r);
2913 <        assertTrue(f.cancel(true));
2909 >    public void testThenCompose_sourceCancelled() {
2910 >        for (ExecutionMode m : ExecutionMode.values())
2911 >        for (boolean createIncomplete : new boolean[] { true, false })
2912 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2913 >    {
2914 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2915 >        final CompletableFutureInc r = new CompletableFutureInc();
2916 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2917 >        final CompletableFuture<Integer> g = f.thenCompose(r);
2918 >        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2919 >
2920          checkCompletedWithWrappedCancellationException(g);
2921 <    }
2921 >        checkCancelled(f);
2922 >    }}
2923 >
2924 >    // asyncs
2925  
2926      /**
2927       * thenApplyAsync result completes normally after normal completion of source
# Line 2274 | Line 3012 | public class CompletableFutureTest exten
3012          checkCompletedWithWrappedCancellationException(g);
3013      }
3014  
2277    /**
2278     * applyToEitherAsync result completes normally after normal
2279     * completion of sources
2280     */
2281    public void testApplyToEitherAsync() {
2282        CompletableFuture<Integer> f = new CompletableFuture<>();
2283        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2284        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
2285        f.complete(one);
2286        checkCompletedNormally(g, two);
2287
2288        f = new CompletableFuture<>();
2289        f.complete(one);
2290        f2 = new CompletableFuture<>();
2291        g = f.applyToEitherAsync(f2, inc);
2292        checkCompletedNormally(g, two);
2293    }
2294
2295    /**
2296     * applyToEitherAsync result completes exceptionally after exceptional
2297     * completion of source
2298     */
2299    public void testApplyToEitherAsync2() {
2300        CompletableFuture<Integer> f = new CompletableFuture<>();
2301        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2302        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
2303        f.completeExceptionally(new CFException());
2304        checkCompletedWithWrappedCFException(g);
2305
2306        f = new CompletableFuture<>();
2307        f2 = new CompletableFuture<>();
2308        f2.completeExceptionally(new CFException());
2309        g = f.applyToEitherAsync(f2, inc);
2310        f.complete(one);
2311        checkCompletedWithWrappedCFException(g);
2312    }
2313
2314    /**
2315     * applyToEitherAsync result completes exceptionally if action does
2316     */
2317    public void testApplyToEitherAsync3() {
2318        CompletableFuture<Integer> f = new CompletableFuture<>();
2319        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2320        FailingFunction r = new FailingFunction();
2321        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, r);
2322        f.complete(one);
2323        checkCompletedWithWrappedCFException(g);
2324    }
2325
2326    /**
2327     * applyToEitherAsync result completes exceptionally if either source cancelled
2328     */
2329    public void testApplyToEitherAsync4() {
2330        CompletableFuture<Integer> f = new CompletableFuture<>();
2331        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2332        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
2333        assertTrue(f.cancel(true));
2334        checkCompletedWithWrappedCancellationException(g);
2335
2336        f = new CompletableFuture<>();
2337        f2 = new CompletableFuture<>();
2338        assertTrue(f2.cancel(true));
2339        g = f.applyToEitherAsync(f2, inc);
2340        checkCompletedWithWrappedCancellationException(g);
2341    }
2342
2343    /**
2344     * acceptEitherAsync result completes normally after normal
2345     * completion of sources
2346     */
2347    public void testAcceptEitherAsync() {
2348        CompletableFuture<Integer> f = new CompletableFuture<>();
2349        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2350        IncAction r = new IncAction();
2351        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
2352        f.complete(one);
2353        checkCompletedNormally(g, null);
2354        assertEquals(r.value, (Integer) 2);
2355
2356        r = new IncAction();
2357        f = new CompletableFuture<>();
2358        f.complete(one);
2359        f2 = new CompletableFuture<>();
2360        g = f.acceptEitherAsync(f2, r);
2361        checkCompletedNormally(g, null);
2362        assertEquals(r.value, (Integer) 2);
2363    }
2364
2365    /**
2366     * acceptEitherAsync result completes exceptionally after exceptional
2367     * completion of source
2368     */
2369    public void testAcceptEitherAsync2() {
2370        CompletableFuture<Integer> f = new CompletableFuture<>();
2371        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2372        IncAction r = new IncAction();
2373        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
2374        f.completeExceptionally(new CFException());
2375        checkCompletedWithWrappedCFException(g);
2376
2377        r = new IncAction();
2378        f = new CompletableFuture<>();
2379        f2 = new CompletableFuture<>();
2380        f2.completeExceptionally(new CFException());
2381        g = f.acceptEitherAsync(f2, r);
2382        f.complete(one);
2383        checkCompletedWithWrappedCFException(g);
2384    }
2385
2386    /**
2387     * acceptEitherAsync result completes exceptionally if action does
2388     */
2389    public void testAcceptEitherAsync3() {
2390        CompletableFuture<Integer> f = new CompletableFuture<>();
2391        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2392        FailingConsumer r = new FailingConsumer();
2393        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
2394        f.complete(one);
2395        checkCompletedWithWrappedCFException(g);
2396    }
2397
2398    /**
2399     * acceptEitherAsync result completes exceptionally if either
2400     * source cancelled
2401     */
2402    public void testAcceptEitherAsync4() {
2403        CompletableFuture<Integer> f = new CompletableFuture<>();
2404        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2405        IncAction r = new IncAction();
2406        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
2407        assertTrue(f.cancel(true));
2408        checkCompletedWithWrappedCancellationException(g);
2409
2410        r = new IncAction();
2411        f = new CompletableFuture<>();
2412        f2 = new CompletableFuture<>();
2413        assertTrue(f2.cancel(true));
2414        g = f.acceptEitherAsync(f2, r);
2415        checkCompletedWithWrappedCancellationException(g);
2416    }
2417
2418    /**
2419     * runAfterEitherAsync result completes normally after normal
2420     * completion of sources
2421     */
2422    public void testRunAfterEitherAsync() {
2423        CompletableFuture<Integer> f = new CompletableFuture<>();
2424        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2425        Noop r = new Noop();
2426        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
2427        f.complete(one);
2428        checkCompletedNormally(g, null);
2429        assertTrue(r.ran);
2430
2431        r = new Noop();
2432        f = new CompletableFuture<>();
2433        f.complete(one);
2434        f2 = new CompletableFuture<>();
2435        g = f.runAfterEitherAsync(f2, r);
2436        checkCompletedNormally(g, null);
2437        assertTrue(r.ran);
2438    }
2439
2440    /**
2441     * runAfterEitherAsync result completes exceptionally after exceptional
2442     * completion of source
2443     */
2444    public void testRunAfterEitherAsync2() {
2445        CompletableFuture<Integer> f = new CompletableFuture<>();
2446        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2447        Noop r = new Noop();
2448        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
2449        f.completeExceptionally(new CFException());
2450        checkCompletedWithWrappedCFException(g);
2451
2452        r = new Noop();
2453        f = new CompletableFuture<>();
2454        f2 = new CompletableFuture<>();
2455        f2.completeExceptionally(new CFException());
2456        g = f.runAfterEitherAsync(f2, r);
2457        f.complete(one);
2458        checkCompletedWithWrappedCFException(g);
2459    }
2460
2461    /**
2462     * runAfterEitherAsync result completes exceptionally if action does
2463     */
2464    public void testRunAfterEitherAsync3() {
2465        CompletableFuture<Integer> f = new CompletableFuture<>();
2466        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2467        FailingNoop r = new FailingNoop();
2468        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
2469        f.complete(one);
2470        checkCompletedWithWrappedCFException(g);
2471    }
2472
2473    /**
2474     * runAfterEitherAsync result completes exceptionally if either
2475     * source cancelled
2476     */
2477    public void testRunAfterEitherAsync4() {
2478        CompletableFuture<Integer> f = new CompletableFuture<>();
2479        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2480        Noop r = new Noop();
2481        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
2482        assertTrue(f.cancel(true));
2483        checkCompletedWithWrappedCancellationException(g);
2484
2485        r = new Noop();
2486        f = new CompletableFuture<>();
2487        f2 = new CompletableFuture<>();
2488        assertTrue(f2.cancel(true));
2489        g = f.runAfterEitherAsync(f2, r);
2490        checkCompletedWithWrappedCancellationException(g);
2491    }
2492
2493    /**
2494     * thenComposeAsync result completes normally after normal
2495     * completion of source
2496     */
2497    public void testThenComposeAsync() {
2498        CompletableFuture<Integer> f, g;
2499        CompletableFutureInc r;
2500
2501        f = new CompletableFuture<>();
2502        g = f.thenComposeAsync(r = new CompletableFutureInc());
2503        f.complete(one);
2504        checkCompletedNormally(g, two);
2505
2506        f = new CompletableFuture<>();
2507        f.complete(one);
2508        g = f.thenComposeAsync(r = new CompletableFutureInc());
2509        checkCompletedNormally(g, two);
2510    }
2511
2512    /**
2513     * thenComposeAsync result completes exceptionally after
2514     * exceptional completion of source
2515     */
2516    public void testThenComposeAsync2() {
2517        CompletableFuture<Integer> f, g;
2518        CompletableFutureInc r;
2519
2520        f = new CompletableFuture<>();
2521        g = f.thenComposeAsync(r = new CompletableFutureInc());
2522        f.completeExceptionally(new CFException());
2523        checkCompletedWithWrappedCFException(g);
2524        assertFalse(r.ran);
2525
2526        f = new CompletableFuture<>();
2527        f.completeExceptionally(new CFException());
2528        g = f.thenComposeAsync(r = new CompletableFutureInc());
2529        checkCompletedWithWrappedCFException(g);
2530        assertFalse(r.ran);
2531    }
2532
2533    /**
2534     * thenComposeAsync result completes exceptionally if action does
2535     */
2536    public void testThenComposeAsync3() {
2537        CompletableFuture<Integer> f, g;
2538        FailingCompletableFutureFunction r;
2539
2540        f = new CompletableFuture<>();
2541        g = f.thenComposeAsync(r = new FailingCompletableFutureFunction());
2542        f.complete(one);
2543        checkCompletedWithWrappedCFException(g);
2544
2545        f = new CompletableFuture<>();
2546        f.complete(one);
2547        g = f.thenComposeAsync(r = new FailingCompletableFutureFunction());
2548        checkCompletedWithWrappedCFException(g);
2549    }
2550
2551    /**
2552     * thenComposeAsync result completes exceptionally if source cancelled
2553     */
2554    public void testThenComposeAsync4() {
2555        CompletableFuture<Integer> f, g;
2556        CompletableFutureInc r;
2557
2558        f = new CompletableFuture<>();
2559        g = f.thenComposeAsync(r = new CompletableFutureInc());
2560        assertTrue(f.cancel(true));
2561        checkCompletedWithWrappedCancellationException(g);
2562
2563        f = new CompletableFuture<>();
2564        assertTrue(f.cancel(true));
2565        g = f.thenComposeAsync(r = new CompletableFutureInc());
2566        checkCompletedWithWrappedCancellationException(g);
2567    }
2568
3015      // async with explicit executors
3016  
3017      /**
2572     * thenRunAsync result completes normally after normal completion of source
2573     */
2574    public void testThenRunAsyncE() {
2575        CompletableFuture<Integer> f = new CompletableFuture<>();
2576        Noop r = new Noop();
2577        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2578        f.complete(null);
2579        checkCompletedNormally(g, null);
2580
2581        // reordered version
2582        f = new CompletableFuture<>();
2583        f.complete(null);
2584        r = new Noop();
2585        g = f.thenRunAsync(r, new ThreadExecutor());
2586        checkCompletedNormally(g, null);
2587    }
2588
2589    /**
2590     * thenRunAsync result completes exceptionally after exceptional
2591     * completion of source
2592     */
2593    public void testThenRunAsync2E() {
2594        CompletableFuture<Integer> f = new CompletableFuture<>();
2595        Noop r = new Noop();
2596        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2597        f.completeExceptionally(new CFException());
2598        try {
2599            g.join();
2600            shouldThrow();
2601        } catch (CompletionException success) {}
2602        checkCompletedWithWrappedCFException(g);
2603    }
2604
2605    /**
2606     * thenRunAsync result completes exceptionally if action does
2607     */
2608    public void testThenRunAsync3E() {
2609        CompletableFuture<Integer> f = new CompletableFuture<>();
2610        FailingNoop r = new FailingNoop();
2611        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2612        f.complete(null);
2613        checkCompletedWithWrappedCFException(g);
2614    }
2615
2616    /**
2617     * thenRunAsync result completes exceptionally if source cancelled
2618     */
2619    public void testThenRunAsync4E() {
2620        CompletableFuture<Integer> f = new CompletableFuture<>();
2621        Noop r = new Noop();
2622        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2623        assertTrue(f.cancel(true));
2624        checkCompletedWithWrappedCancellationException(g);
2625    }
2626
2627    /**
3018       * thenApplyAsync result completes normally after normal completion of source
3019       */
3020      public void testThenApplyAsyncE() {
# Line 2713 | Line 3103 | public class CompletableFutureTest exten
3103          checkCompletedWithWrappedCancellationException(g);
3104      }
3105  
2716    /**
2717     * applyToEitherAsync result completes normally after normal
2718     * completion of sources
2719     */
2720    public void testApplyToEitherAsyncE() {
2721        CompletableFuture<Integer> f = new CompletableFuture<>();
2722        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2723        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2724        f.complete(one);
2725        checkCompletedNormally(g, two);
2726
2727        f = new CompletableFuture<>();
2728        f.complete(one);
2729        f2 = new CompletableFuture<>();
2730        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2731        checkCompletedNormally(g, two);
2732    }
2733
2734    /**
2735     * applyToEitherAsync result completes exceptionally after exceptional
2736     * completion of source
2737     */
2738    public void testApplyToEitherAsync2E() {
2739        CompletableFuture<Integer> f = new CompletableFuture<>();
2740        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2741        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2742        f.completeExceptionally(new CFException());
2743        checkCompletedWithWrappedCFException(g);
2744
2745        f = new CompletableFuture<>();
2746        f2 = new CompletableFuture<>();
2747        f2.completeExceptionally(new CFException());
2748        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2749        f.complete(one);
2750        checkCompletedWithWrappedCFException(g);
2751    }
2752
2753    /**
2754     * applyToEitherAsync result completes exceptionally if action does
2755     */
2756    public void testApplyToEitherAsync3E() {
2757        CompletableFuture<Integer> f = new CompletableFuture<>();
2758        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2759        FailingFunction r = new FailingFunction();
2760        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, r, new ThreadExecutor());
2761        f.complete(one);
2762        checkCompletedWithWrappedCFException(g);
2763    }
2764
2765    /**
2766     * applyToEitherAsync result completes exceptionally if either source cancelled
2767     */
2768    public void testApplyToEitherAsync4E() {
2769        CompletableFuture<Integer> f = new CompletableFuture<>();
2770        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2771        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2772        assertTrue(f.cancel(true));
2773        checkCompletedWithWrappedCancellationException(g);
2774
2775        f = new CompletableFuture<>();
2776        f2 = new CompletableFuture<>();
2777        assertTrue(f2.cancel(true));
2778        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2779        checkCompletedWithWrappedCancellationException(g);
2780    }
2781
2782    /**
2783     * acceptEitherAsync result completes normally after normal
2784     * completion of sources
2785     */
2786    public void testAcceptEitherAsyncE() {
2787        CompletableFuture<Integer> f = new CompletableFuture<>();
2788        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2789        IncAction r = new IncAction();
2790        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2791        f.complete(one);
2792        checkCompletedNormally(g, null);
2793        assertEquals(r.value, (Integer) 2);
2794
2795        r = new IncAction();
2796        f = new CompletableFuture<>();
2797        f.complete(one);
2798        f2 = new CompletableFuture<>();
2799        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2800        checkCompletedNormally(g, null);
2801        assertEquals(r.value, (Integer) 2);
2802    }
2803
2804    /**
2805     * acceptEitherAsync result completes exceptionally after exceptional
2806     * completion of source
2807     */
2808    public void testAcceptEitherAsync2E() {
2809        CompletableFuture<Integer> f = new CompletableFuture<>();
2810        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2811        IncAction r = new IncAction();
2812        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2813        f.completeExceptionally(new CFException());
2814        checkCompletedWithWrappedCFException(g);
2815
2816        r = new IncAction();
2817        f = new CompletableFuture<>();
2818        f2 = new CompletableFuture<>();
2819        f2.completeExceptionally(new CFException());
2820        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2821        f.complete(one);
2822        checkCompletedWithWrappedCFException(g);
2823    }
2824
2825    /**
2826     * acceptEitherAsync result completes exceptionally if action does
2827     */
2828    public void testAcceptEitherAsync3E() {
2829        CompletableFuture<Integer> f = new CompletableFuture<>();
2830        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2831        FailingConsumer r = new FailingConsumer();
2832        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2833        f.complete(one);
2834        checkCompletedWithWrappedCFException(g);
2835    }
2836
2837    /**
2838     * acceptEitherAsync result completes exceptionally if either
2839     * source cancelled
2840     */
2841    public void testAcceptEitherAsync4E() {
2842        CompletableFuture<Integer> f = new CompletableFuture<>();
2843        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2844        IncAction r = new IncAction();
2845        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2846        assertTrue(f.cancel(true));
2847        checkCompletedWithWrappedCancellationException(g);
2848
2849        r = new IncAction();
2850        f = new CompletableFuture<>();
2851        f2 = new CompletableFuture<>();
2852        assertTrue(f2.cancel(true));
2853        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2854        checkCompletedWithWrappedCancellationException(g);
2855    }
2856
2857    /**
2858     * runAfterEitherAsync result completes normally after normal
2859     * completion of sources
2860     */
2861    public void testRunAfterEitherAsyncE() {
2862        CompletableFuture<Integer> f = new CompletableFuture<>();
2863        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2864        Noop r = new Noop();
2865        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2866        f.complete(one);
2867        checkCompletedNormally(g, null);
2868        assertTrue(r.ran);
2869
2870        r = new Noop();
2871        f = new CompletableFuture<>();
2872        f.complete(one);
2873        f2 = new CompletableFuture<>();
2874        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2875        checkCompletedNormally(g, null);
2876        assertTrue(r.ran);
2877    }
2878
2879    /**
2880     * runAfterEitherAsync result completes exceptionally after exceptional
2881     * completion of source
2882     */
2883    public void testRunAfterEitherAsync2E() {
2884        CompletableFuture<Integer> f = new CompletableFuture<>();
2885        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2886        Noop r = new Noop();
2887        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2888        f.completeExceptionally(new CFException());
2889        checkCompletedWithWrappedCFException(g);
2890
2891        r = new Noop();
2892        f = new CompletableFuture<>();
2893        f2 = new CompletableFuture<>();
2894        f2.completeExceptionally(new CFException());
2895        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2896        f.complete(one);
2897        checkCompletedWithWrappedCFException(g);
2898    }
2899
2900    /**
2901     * runAfterEitherAsync result completes exceptionally if action does
2902     */
2903    public void testRunAfterEitherAsync3E() {
2904        CompletableFuture<Integer> f = new CompletableFuture<>();
2905        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2906        FailingNoop r = new FailingNoop();
2907        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2908        f.complete(one);
2909        checkCompletedWithWrappedCFException(g);
2910    }
2911
2912    /**
2913     * runAfterEitherAsync result completes exceptionally if either
2914     * source cancelled
2915     */
2916    public void testRunAfterEitherAsync4E() {
2917        CompletableFuture<Integer> f = new CompletableFuture<>();
2918        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2919        Noop r = new Noop();
2920        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2921        assertTrue(f.cancel(true));
2922        checkCompletedWithWrappedCancellationException(g);
2923
2924        r = new Noop();
2925        f = new CompletableFuture<>();
2926        f2 = new CompletableFuture<>();
2927        assertTrue(f2.cancel(true));
2928        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2929        checkCompletedWithWrappedCancellationException(g);
2930    }
2931
2932    /**
2933     * thenComposeAsync result completes normally after normal
2934     * completion of source
2935     */
2936    public void testThenComposeAsyncE() {
2937        CompletableFuture<Integer> f = new CompletableFuture<>();
2938        CompletableFutureInc r = new CompletableFutureInc();
2939        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2940        f.complete(one);
2941        checkCompletedNormally(g, two);
2942    }
2943
2944    /**
2945     * thenComposeAsync result completes exceptionally after
2946     * exceptional completion of source
2947     */
2948    public void testThenComposeAsync2E() {
2949        CompletableFuture<Integer> f = new CompletableFuture<>();
2950        CompletableFutureInc r = new CompletableFutureInc();
2951        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2952        f.completeExceptionally(new CFException());
2953        checkCompletedWithWrappedCFException(g);
2954    }
2955
2956    /**
2957     * thenComposeAsync result completes exceptionally if action does
2958     */
2959    public void testThenComposeAsync3E() {
2960        CompletableFuture<Integer> f = new CompletableFuture<>();
2961        FailingCompletableFutureFunction r = new FailingCompletableFutureFunction();
2962        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2963        f.complete(one);
2964        checkCompletedWithWrappedCFException(g);
2965    }
2966
2967    /**
2968     * thenComposeAsync result completes exceptionally if source cancelled
2969     */
2970    public void testThenComposeAsync4E() {
2971        CompletableFuture<Integer> f = new CompletableFuture<>();
2972        CompletableFutureInc r = new CompletableFutureInc();
2973        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2974        assertTrue(f.cancel(true));
2975        checkCompletedWithWrappedCancellationException(g);
2976    }
2977
3106      // other static methods
3107  
3108      /**
# Line 3173 | Line 3301 | public class CompletableFutureTest exten
3301       * whenComplete action executes on normal completion, propagating
3302       * source result.
3303       */
3304 <    public void testWhenComplete1() {
3305 <        final AtomicInteger a = new AtomicInteger();
3306 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3307 <        CompletableFuture<Integer> g =
3308 <            f.whenComplete((Integer x, Throwable t) -> a.getAndIncrement());
3309 <        f.complete(three);
3310 <        checkCompletedNormally(f, three);
3311 <        checkCompletedNormally(g, three);
3312 <        assertEquals(a.get(), 1);
3313 <    }
3314 <
3315 <    /**
3316 <     * whenComplete action executes on exceptional completion, propagating
3317 <     * source result.
3318 <     */
3319 <    public void testWhenComplete2() {
3192 <        final AtomicInteger a = new AtomicInteger();
3193 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3194 <        CompletableFuture<Integer> g =
3195 <            f.whenComplete((Integer x, Throwable t) -> a.getAndIncrement());
3196 <        f.completeExceptionally(new CFException());
3197 <        assertTrue(f.isCompletedExceptionally());
3198 <        assertTrue(g.isCompletedExceptionally());
3199 <        assertEquals(a.get(), 1);
3200 <    }
3201 <
3202 <    /**
3203 <     * If a whenComplete action throws an exception when triggered by
3204 <     * a normal completion, it completes exceptionally
3205 <     */
3206 <    public void testWhenComplete3() {
3207 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3208 <        CompletableFuture<Integer> g =
3209 <            f.whenComplete((Integer x, Throwable t) ->
3210 <                           { throw new CFException(); } );
3211 <        f.complete(three);
3212 <        checkCompletedNormally(f, three);
3213 <        assertTrue(g.isCompletedExceptionally());
3214 <        checkCompletedWithWrappedCFException(g);
3215 <    }
3216 <
3217 <    /**
3218 <     * whenCompleteAsync action executes on normal completion, propagating
3219 <     * source result.
3220 <     */
3221 <    public void testWhenCompleteAsync1() {
3222 <        final AtomicInteger a = new AtomicInteger();
3223 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3224 <        CompletableFuture<Integer> g =
3225 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement());
3226 <        f.complete(three);
3227 <        checkCompletedNormally(f, three);
3228 <        checkCompletedNormally(g, three);
3229 <        assertEquals(a.get(), 1);
3230 <    }
3231 <
3232 <    /**
3233 <     * whenCompleteAsync action executes on exceptional completion, propagating
3234 <     * source result.
3235 <     */
3236 <    public void testWhenCompleteAsync2() {
3237 <        final AtomicInteger a = new AtomicInteger();
3238 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3239 <        CompletableFuture<Integer> g =
3240 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement());
3241 <        f.completeExceptionally(new CFException());
3242 <        checkCompletedWithWrappedCFException(f);
3243 <        checkCompletedWithWrappedCFException(g);
3244 <    }
3304 >    public void testWhenComplete_normalCompletion1() {
3305 >        for (ExecutionMode m : ExecutionMode.values())
3306 >        for (boolean createIncomplete : new boolean[] { true, false })
3307 >        for (Integer v1 : new Integer[] { 1, null })
3308 >    {
3309 >        final AtomicInteger a = new AtomicInteger(0);
3310 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
3311 >        if (!createIncomplete) f.complete(v1);
3312 >        final CompletableFuture<Integer> g = m.whenComplete
3313 >            (f,
3314 >             (Integer x, Throwable t) -> {
3315 >                threadAssertSame(x, v1);
3316 >                threadAssertNull(t);
3317 >                a.getAndIncrement();
3318 >            });
3319 >        if (createIncomplete) f.complete(v1);
3320  
3321 <    /**
3322 <     * If a whenCompleteAsync action throws an exception when
3323 <     * triggered by a normal completion, it completes exceptionally
3324 <     */
3250 <    public void testWhenCompleteAsync3() {
3251 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3252 <        CompletableFuture<Integer> g =
3253 <            f.whenCompleteAsync((Integer x, Throwable t) ->
3254 <                           { throw new CFException(); } );
3255 <        f.complete(three);
3256 <        checkCompletedNormally(f, three);
3257 <        checkCompletedWithWrappedCFException(g);
3258 <    }
3321 >        checkCompletedNormally(g, v1);
3322 >        checkCompletedNormally(f, v1);
3323 >        assertEquals(1, a.get());
3324 >    }}
3325  
3326      /**
3327 <     * whenCompleteAsync action executes on normal completion, propagating
3327 >     * whenComplete action executes on exceptional completion, propagating
3328       * source result.
3329       */
3330 <    public void testWhenCompleteAsync1e() {
3331 <        final AtomicInteger a = new AtomicInteger();
3332 <        ThreadExecutor exec = new ThreadExecutor();
3333 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3334 <        CompletableFuture<Integer> g =
3335 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement(),
3336 <                                exec);
3337 <        f.complete(three);
3338 <        checkCompletedNormally(f, three);
3339 <        checkCompletedNormally(g, three);
3340 <        assertEquals(a.get(), 1);
3341 <    }
3330 >    public void testWhenComplete_exceptionalCompletion() {
3331 >        for (ExecutionMode m : ExecutionMode.values())
3332 >        for (boolean createIncomplete : new boolean[] { true, false })
3333 >        for (Integer v1 : new Integer[] { 1, null })
3334 >    {
3335 >        final AtomicInteger a = new AtomicInteger(0);
3336 >        final CFException ex = new CFException();
3337 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
3338 >        if (!createIncomplete) f.completeExceptionally(ex);
3339 >        final CompletableFuture<Integer> g = m.whenComplete
3340 >            (f,
3341 >             (Integer x, Throwable t) -> {
3342 >                threadAssertNull(x);
3343 >                threadAssertSame(t, ex);
3344 >                a.getAndIncrement();
3345 >            });
3346 >        if (createIncomplete) f.completeExceptionally(ex);
3347 >        checkCompletedWithWrappedCFException(f, ex);
3348 >        checkCompletedWithWrappedCFException(g, ex);
3349 >        assertEquals(1, a.get());
3350 >    }}
3351  
3352      /**
3353 <     * whenCompleteAsync action executes on exceptional completion, propagating
3354 <     * source result.
3353 >     * whenComplete action executes on cancelled source, propagating
3354 >     * CancellationException.
3355       */
3356 <    public void testWhenCompleteAsync2e() {
3357 <        final AtomicInteger a = new AtomicInteger();
3358 <        ThreadExecutor exec = new ThreadExecutor();
3359 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3360 <        CompletableFuture<Integer> g =
3361 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement(),
3362 <                                exec);
3363 <        f.completeExceptionally(new CFException());
3364 <        checkCompletedWithWrappedCFException(f);
3365 <        checkCompletedWithWrappedCFException(g);
3366 <    }
3356 >    public void testWhenComplete_sourceCancelled() {
3357 >        for (ExecutionMode m : ExecutionMode.values())
3358 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3359 >        for (boolean createIncomplete : new boolean[] { true, false })
3360 >    {
3361 >        final AtomicInteger a = new AtomicInteger(0);
3362 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
3363 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
3364 >        final CompletableFuture<Integer> g = m.whenComplete
3365 >            (f,
3366 >             (Integer x, Throwable t) -> {
3367 >                threadAssertNull(x);
3368 >                threadAssertTrue(t instanceof CancellationException);
3369 >                a.getAndIncrement();
3370 >            });
3371 >        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
3372  
3373 <    /**
3374 <     * If a whenCompleteAsync action throws an exception when triggered
3375 <     * by a normal completion, it completes exceptionally
3376 <     */
3377 <    public void testWhenCompleteAsync3e() {
3298 <        ThreadExecutor exec = new ThreadExecutor();
3299 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3300 <        CompletableFuture<Integer> g =
3301 <            f.whenCompleteAsync((Integer x, Throwable t) ->
3302 <                                { throw new CFException(); },
3303 <                                exec);
3304 <        f.complete(three);
3305 <        checkCompletedNormally(f, three);
3306 <        checkCompletedWithWrappedCFException(g);
3307 <    }
3373 >        //try { g.join(); } catch (Throwable t) { throw new Error(t); }
3374 >        checkCompletedWithWrappedCancellationException(g);
3375 >        checkCancelled(f);
3376 >        assertEquals(1, a.get());
3377 >    }}
3378  
3379      /**
3380 <     * handleAsync action completes normally with function value on
3381 <     * either normal or exceptional completion of source
3380 >     * If a whenComplete action throws an exception when triggered by
3381 >     * a normal completion, it completes exceptionally
3382       */
3383 <    public void testHandleAsync() {
3384 <        CompletableFuture<Integer> f, g;
3385 <        IntegerHandler r;
3386 <
3387 <        f = new CompletableFuture<>();
3388 <        g = f.handleAsync(r = new IntegerHandler());
3389 <        assertFalse(r.ran);
3390 <        f.completeExceptionally(new CFException());
3391 <        checkCompletedWithWrappedCFException(f);
3392 <        checkCompletedNormally(g, three);
3393 <        assertTrue(r.ran);
3394 <
3395 <        f = new CompletableFuture<>();
3396 <        g = f.handleAsync(r = new IntegerHandler());
3397 <        assertFalse(r.ran);
3398 <        f.completeExceptionally(new CFException());
3399 <        checkCompletedWithWrappedCFException(f);
3400 <        checkCompletedNormally(g, three);
3401 <        assertTrue(r.ran);
3402 <
3403 <        f = new CompletableFuture<>();
3404 <        g = f.handleAsync(r = new IntegerHandler());
3335 <        assertFalse(r.ran);
3336 <        f.complete(one);
3337 <        checkCompletedNormally(f, one);
3338 <        checkCompletedNormally(g, two);
3339 <        assertTrue(r.ran);
3340 <
3341 <        f = new CompletableFuture<>();
3342 <        g = f.handleAsync(r = new IntegerHandler());
3343 <        assertFalse(r.ran);
3344 <        f.complete(one);
3345 <        checkCompletedNormally(f, one);
3346 <        checkCompletedNormally(g, two);
3347 <        assertTrue(r.ran);
3348 <    }
3383 >    public void testWhenComplete_actionFailed() {
3384 >        for (boolean createIncomplete : new boolean[] { true, false })
3385 >        for (ExecutionMode m : ExecutionMode.values())
3386 >        for (Integer v1 : new Integer[] { 1, null })
3387 >    {
3388 >        final AtomicInteger a = new AtomicInteger(0);
3389 >        final CFException ex = new CFException();
3390 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
3391 >        if (!createIncomplete) f.complete(v1);
3392 >        final CompletableFuture<Integer> g = m.whenComplete
3393 >            (f,
3394 >             (Integer x, Throwable t) -> {
3395 >                threadAssertSame(x, v1);
3396 >                threadAssertNull(t);
3397 >                a.getAndIncrement();
3398 >                throw ex;
3399 >            });
3400 >        if (createIncomplete) f.complete(v1);
3401 >        checkCompletedNormally(f, v1);
3402 >        checkCompletedWithWrappedCFException(g, ex);
3403 >        assertEquals(1, a.get());
3404 >    }}
3405  
3406      /**
3407 <     * handleAsync action with Executor completes normally with
3408 <     * function value on either normal or exceptional completion of
3409 <     * source
3407 >     * If a whenComplete action throws an exception when triggered by
3408 >     * a source completion that also throws an exception, the source
3409 >     * exception takes precedence.
3410       */
3411 <    public void testHandleAsync2() {
3412 <        CompletableFuture<Integer> f, g;
3413 <        ThreadExecutor exec = new ThreadExecutor();
3414 <        IntegerHandler r;
3415 <
3416 <        f = new CompletableFuture<>();
3417 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3418 <        assertFalse(r.ran);
3419 <        f.completeExceptionally(new CFException());
3420 <        checkCompletedWithWrappedCFException(f);
3421 <        checkCompletedNormally(g, three);
3422 <        assertTrue(r.ran);
3423 <
3424 <        f = new CompletableFuture<>();
3425 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3426 <        assertFalse(r.ran);
3427 <        f.completeExceptionally(new CFException());
3428 <        checkCompletedWithWrappedCFException(f);
3429 <        checkCompletedNormally(g, three);
3430 <        assertTrue(r.ran);
3431 <
3432 <        f = new CompletableFuture<>();
3433 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3434 <        assertFalse(r.ran);
3435 <        f.complete(one);
3380 <        checkCompletedNormally(f, one);
3381 <        checkCompletedNormally(g, two);
3382 <        assertTrue(r.ran);
3383 <
3384 <        f = new CompletableFuture<>();
3385 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3386 <        assertFalse(r.ran);
3387 <        f.complete(one);
3388 <        checkCompletedNormally(f, one);
3389 <        checkCompletedNormally(g, two);
3390 <        assertTrue(r.ran);
3391 <    }
3411 >    public void testWhenComplete_actionFailedSourceFailed() {
3412 >        for (boolean createIncomplete : new boolean[] { true, false })
3413 >        for (ExecutionMode m : ExecutionMode.values())
3414 >        for (Integer v1 : new Integer[] { 1, null })
3415 >    {
3416 >        final AtomicInteger a = new AtomicInteger(0);
3417 >        final CFException ex1 = new CFException();
3418 >        final CFException ex2 = new CFException();
3419 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
3420 >
3421 >        if (!createIncomplete) f.completeExceptionally(ex1);
3422 >        final CompletableFuture<Integer> g = m.whenComplete
3423 >            (f,
3424 >             (Integer x, Throwable t) -> {
3425 >                threadAssertSame(t, ex1);
3426 >                threadAssertNull(x);
3427 >                a.getAndIncrement();
3428 >                throw ex2;
3429 >            });
3430 >        if (createIncomplete) f.completeExceptionally(ex1);
3431 >
3432 >        checkCompletedWithWrappedCFException(f, ex1);
3433 >        checkCompletedWithWrappedCFException(g, ex1);
3434 >        assertEquals(1, a.get());
3435 >    }}
3436  
3437   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines