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.40 by jsr166, Mon Jun 2 01:11:53 2014 UTC vs.
Revision 1.50 by jsr166, Mon Jun 2 19:32:57 2014 UTC

# Line 17 | Line 17 | import java.util.concurrent.Future;
17   import java.util.concurrent.CompletableFuture;
18   import java.util.concurrent.CompletionException;
19   import java.util.concurrent.CompletionStage;
20 + import java.util.concurrent.ForkJoinPool;
21 + import java.util.concurrent.ForkJoinTask;
22   import java.util.concurrent.TimeoutException;
23   import java.util.concurrent.atomic.AtomicInteger;
24   import static java.util.concurrent.TimeUnit.MILLISECONDS;
# Line 247 | Line 249 | public class CompletableFutureTest exten
249          f = new CompletableFuture<>();
250          f.obtrudeValue(three);
251          checkCompletedNormally(f, three);
252 +        f.obtrudeValue(null);
253 +        checkCompletedNormally(f, null);
254          f = new CompletableFuture<>();
255          f.completeExceptionally(new CFException());
256          f.obtrudeValue(four);
# Line 279 | Line 283 | public class CompletableFutureTest exten
283       */
284      public void testGetNumberOfDependents() {
285          CompletableFuture<Integer> f = new CompletableFuture<>();
286 <        assertEquals(f.getNumberOfDependents(), 0);
286 >        assertEquals(0, f.getNumberOfDependents());
287          CompletableFuture g = f.thenRun(new Noop());
288 <        assertEquals(f.getNumberOfDependents(), 1);
289 <        assertEquals(g.getNumberOfDependents(), 0);
288 >        assertEquals(1, f.getNumberOfDependents());
289 >        assertEquals(0, g.getNumberOfDependents());
290          CompletableFuture h = f.thenRun(new Noop());
291 <        assertEquals(f.getNumberOfDependents(), 2);
291 >        assertEquals(2, f.getNumberOfDependents());
292          f.complete(1);
293          checkCompletedNormally(g, null);
294 <        assertEquals(f.getNumberOfDependents(), 0);
295 <        assertEquals(g.getNumberOfDependents(), 0);
294 >        assertEquals(0, f.getNumberOfDependents());
295 >        assertEquals(0, g.getNumberOfDependents());
296      }
297  
298      /**
# Line 339 | Line 343 | public class CompletableFutureTest exten
343      static final class IncAction implements Consumer<Integer> {
344          int invocationCount = 0;
345          Integer value;
342        public boolean ran() { return invocationCount == 1; }
346          public void accept(Integer x) {
347              invocationCount++;
348              value = inc(x);
# Line 348 | Line 351 | public class CompletableFutureTest exten
351      static final class IncFunction implements Function<Integer,Integer> {
352          int invocationCount = 0;
353          Integer value;
351        public boolean ran() { return invocationCount == 1; }
354          public Integer apply(Integer x) {
355              invocationCount++;
356              return value = inc(x);
# Line 358 | Line 360 | public class CompletableFutureTest exten
360          int invocationCount = 0;
361          Integer value;
362          // Check this action was invoked exactly once when result is computed.
361        public boolean ran() { return invocationCount == 1; }
363          public void accept(Integer x, Integer y) {
364              invocationCount++;
365              value = subtract(x, y);
# Line 368 | Line 369 | public class CompletableFutureTest exten
369          int invocationCount = 0;
370          Integer value;
371          // Check this action was invoked exactly once when result is computed.
371        public boolean ran() { return invocationCount == 1; }
372          public Integer apply(Integer x, Integer y) {
373              invocationCount++;
374              return value = subtract(x, y);
375          }
376      }
377      static final class Noop implements Runnable {
378 <        boolean ran;
379 <        public void run() { ran = true; }
378 >        int invocationCount = 0;
379 >        public void run() {
380 >            invocationCount++;
381 >        }
382      }
383  
384      static final class FailingSupplier implements Supplier<Integer> {
385 <        boolean ran;
386 <        public Integer get() { ran = true; throw new CFException(); }
385 >        int invocationCount = 0;
386 >        public Integer get() {
387 >            invocationCount++;
388 >            throw new CFException();
389 >        }
390      }
391      static final class FailingConsumer implements Consumer<Integer> {
392 <        boolean ran;
393 <        public void accept(Integer x) { ran = true; throw new CFException(); }
392 >        int invocationCount = 0;
393 >        public void accept(Integer x) {
394 >            invocationCount++;
395 >            throw new CFException();
396 >        }
397      }
398      static final class FailingBiConsumer implements BiConsumer<Integer, Integer> {
399 <        boolean ran;
400 <        public void accept(Integer x, Integer y) { ran = true; throw new CFException(); }
399 >        int invocationCount = 0;
400 >        public void accept(Integer x, Integer y) {
401 >            invocationCount++;
402 >            throw new CFException();
403 >        }
404      }
405      static final class FailingFunction implements Function<Integer, Integer> {
406 <        boolean ran;
407 <        public Integer apply(Integer x) { ran = true; throw new CFException(); }
406 >        int invocationCount = 0;
407 >        public Integer apply(Integer x) {
408 >            invocationCount++;
409 >            throw new CFException();
410 >        }
411      }
412      static final class FailingBiFunction implements BiFunction<Integer, Integer, Integer> {
413 <        boolean ran;
414 <        public Integer apply(Integer x, Integer y) { ran = true; throw new CFException(); }
413 >        int invocationCount = 0;
414 >        public Integer apply(Integer x, Integer y) {
415 >            invocationCount++;
416 >            throw new CFException();
417 >        }
418      }
419 <    static final class FailingNoop implements Runnable {
420 <        boolean ran;
421 <        public void run() { ran = true; throw new CFException(); }
419 >    static final class FailingRunnable implements Runnable {
420 >        int invocationCount = 0;
421 >        public void run() {
422 >            invocationCount++;
423 >            throw new CFException();
424 >        }
425      }
426  
427      static final class CompletableFutureInc
428          implements Function<Integer, CompletableFuture<Integer>> {
429 <        boolean ran;
429 >        int invocationCount = 0;
430          public CompletableFuture<Integer> apply(Integer x) {
431 <            ran = true;
431 >            invocationCount++;
432              CompletableFuture<Integer> f = new CompletableFuture<>();
433 <            f.complete(Integer.valueOf(x.intValue() + 1));
433 >            f.complete(inc(x));
434              return f;
435          }
436      }
437  
438      static final class FailingCompletableFutureFunction
439          implements Function<Integer, CompletableFuture<Integer>> {
440 <        boolean ran;
440 >        int invocationCount = 0;
441          public CompletableFuture<Integer> apply(Integer x) {
442 <            ran = true; throw new CFException();
442 >            invocationCount++;
443 >            throw new CFException();
444          }
445      }
446  
# Line 433 | Line 454 | public class CompletableFutureTest exten
454          }
455      }
456  
436    static final class ExceptionToInteger implements Function<Throwable, Integer> {
437        public Integer apply(Throwable x) { return Integer.valueOf(3); }
438    }
439
440    static final class IntegerHandler implements BiFunction<Integer, Throwable, Integer> {
441        boolean ran;
442        public Integer apply(Integer x, Throwable t) {
443            ran = true;
444            return (t == null) ? two : three;
445        }
446    }
447
457      /**
458       * Permits the testing of parallel code for the 3 different
459       * execution modes without repeating all the testing code.
460       */
461      enum ExecutionMode {
462          DEFAULT {
463 +            public void checkExecutionMode() {
464 +                assertNull(ForkJoinTask.getPool());
465 +            }
466 +            public <T> CompletableFuture<Void> thenRun
467 +                (CompletableFuture<T> f, Runnable a) {
468 +                return f.thenRun(a);
469 +            }
470 +            public <T> CompletableFuture<Void> thenAccept
471 +                (CompletableFuture<T> f, Consumer<? super T> a) {
472 +                return f.thenAccept(a);
473 +            }
474 +            public <T,U> CompletableFuture<U> thenApply
475 +                (CompletableFuture<T> f, Function<? super T,U> a) {
476 +                return f.thenApply(a);
477 +            }
478 +            public <T,U> CompletableFuture<U> thenCompose
479 +                (CompletableFuture<T> f,
480 +                 Function<? super T,? extends CompletionStage<U>> a) {
481 +                return f.thenCompose(a);
482 +            }
483 +            public <T,U> CompletableFuture<U> handle
484 +                (CompletableFuture<T> f,
485 +                 BiFunction<? super T,Throwable,? extends U> a) {
486 +                return f.handle(a);
487 +            }
488 +            public <T> CompletableFuture<T> whenComplete
489 +                (CompletableFuture<T> f,
490 +                 BiConsumer<? super T,? super Throwable> a) {
491 +                return f.whenComplete(a);
492 +            }
493              public <T,U> CompletableFuture<Void> runAfterBoth
494                  (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
495                  return f.runAfterBoth(g, a);
# Line 467 | Line 506 | public class CompletableFutureTest exten
506                   BiFunction<? super T,? super U,? extends V> a) {
507                  return f.thenCombine(g, a);
508              }
509 <            public <T,U> CompletableFuture<U> applyToEither
509 >            public <T> CompletableFuture<Void> runAfterEither
510                  (CompletableFuture<T> f,
511 <                 CompletionStage<? extends T> g,
512 <                 Function<? super T,U> a) {
513 <                return f.applyToEither(g, a);
511 >                 CompletionStage<?> g,
512 >                 java.lang.Runnable a) {
513 >                return f.runAfterEither(g, a);
514              }
515              public <T> CompletableFuture<Void> acceptEither
516                  (CompletableFuture<T> f,
# Line 479 | Line 518 | public class CompletableFutureTest exten
518                   Consumer<? super T> a) {
519                  return f.acceptEither(g, a);
520              }
521 <            public <T> CompletableFuture<Void> runAfterEither
521 >            public <T,U> CompletableFuture<U> applyToEither
522                  (CompletableFuture<T> f,
523 <                 CompletionStage<?> g,
524 <                 java.lang.Runnable a) {
525 <                return f.runAfterEither(g, a);
523 >                 CompletionStage<? extends T> g,
524 >                 Function<? super T,U> a) {
525 >                return f.applyToEither(g, a);
526 >            }
527 >        },
528 >
529 >        ASYNC {
530 >            public void checkExecutionMode() {
531 >                assertSame(ForkJoinPool.commonPool(),
532 >                           ForkJoinTask.getPool());
533 >            }
534 >            public <T> CompletableFuture<Void> thenRun
535 >                (CompletableFuture<T> f, Runnable a) {
536 >                return f.thenRunAsync(a);
537 >            }
538 >            public <T> CompletableFuture<Void> thenAccept
539 >                (CompletableFuture<T> f, Consumer<? super T> a) {
540 >                return f.thenAcceptAsync(a);
541 >            }
542 >            public <T,U> CompletableFuture<U> thenApply
543 >                (CompletableFuture<T> f, Function<? super T,U> a) {
544 >                return f.thenApplyAsync(a);
545              }
546              public <T,U> CompletableFuture<U> thenCompose
547                  (CompletableFuture<T> f,
548                   Function<? super T,? extends CompletionStage<U>> a) {
549 <                return f.thenCompose(a);
549 >                return f.thenComposeAsync(a);
550 >            }
551 >            public <T,U> CompletableFuture<U> handle
552 >                (CompletableFuture<T> f,
553 >                 BiFunction<? super T,Throwable,? extends U> a) {
554 >                return f.handleAsync(a);
555              }
556              public <T> CompletableFuture<T> whenComplete
557                  (CompletableFuture<T> f,
558                   BiConsumer<? super T,? super Throwable> a) {
559 <                return f.whenComplete(a);
559 >                return f.whenCompleteAsync(a);
560              }
498        },
499
500 //             /** Experimental way to do more testing */
501 //         REVERSE_DEFAULT {
502 //             public <T,U> CompletableFuture<Void> runAfterBoth
503 //                 (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
504 //                 return g.runAfterBoth(f, a);
505 //             }
506 //             public <T,U> CompletableFuture<Void> thenAcceptBoth
507 //                 (CompletableFuture<T> f,
508 //                  CompletionStage<? extends U> g,
509 //                  BiConsumer<? super T,? super U> a) {
510 //                 return DEFAULT.thenAcceptBoth(f, g, a);
511 //             }
512 //         },
513
514        DEFAULT_ASYNC {
561              public <T,U> CompletableFuture<Void> runAfterBoth
562                  (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
563                  return f.runAfterBothAsync(g, a);
# Line 528 | Line 574 | public class CompletableFutureTest exten
574                   BiFunction<? super T,? super U,? extends V> a) {
575                  return f.thenCombineAsync(g, a);
576              }
577 <            public <T,U> CompletableFuture<U> applyToEither
577 >            public <T> CompletableFuture<Void> runAfterEither
578                  (CompletableFuture<T> f,
579 <                 CompletionStage<? extends T> g,
580 <                 Function<? super T,U> a) {
581 <                return f.applyToEitherAsync(g, a);
579 >                 CompletionStage<?> g,
580 >                 java.lang.Runnable a) {
581 >                return f.runAfterEitherAsync(g, a);
582              }
583              public <T> CompletableFuture<Void> acceptEither
584                  (CompletableFuture<T> f,
# Line 540 | Line 586 | public class CompletableFutureTest exten
586                   Consumer<? super T> a) {
587                  return f.acceptEitherAsync(g, a);
588              }
589 <            public <T> CompletableFuture<Void> runAfterEither
589 >            public <T,U> CompletableFuture<U> applyToEither
590                  (CompletableFuture<T> f,
591 <                 CompletionStage<?> g,
592 <                 java.lang.Runnable a) {
593 <                return f.runAfterEitherAsync(g, a);
591 >                 CompletionStage<? extends T> g,
592 >                 Function<? super T,U> a) {
593 >                return f.applyToEitherAsync(g, a);
594 >            }
595 >        },
596 >
597 >        EXECUTOR {
598 >            public void checkExecutionMode() {
599 >                //TODO
600 >            }
601 >            public <T> CompletableFuture<Void> thenRun
602 >                (CompletableFuture<T> f, Runnable a) {
603 >                return f.thenRunAsync(a, new ThreadExecutor());
604 >            }
605 >            public <T> CompletableFuture<Void> thenAccept
606 >                (CompletableFuture<T> f, Consumer<? super T> a) {
607 >                return f.thenAcceptAsync(a, new ThreadExecutor());
608 >            }
609 >            public <T,U> CompletableFuture<U> thenApply
610 >                (CompletableFuture<T> f, Function<? super T,U> a) {
611 >                return f.thenApplyAsync(a, new ThreadExecutor());
612              }
613              public <T,U> CompletableFuture<U> thenCompose
614                  (CompletableFuture<T> f,
615                   Function<? super T,? extends CompletionStage<U>> a) {
616 <                return f.thenComposeAsync(a);
616 >                return f.thenComposeAsync(a, new ThreadExecutor());
617 >            }
618 >            public <T,U> CompletableFuture<U> handle
619 >                (CompletableFuture<T> f,
620 >                 BiFunction<? super T,Throwable,? extends U> a) {
621 >                return f.handleAsync(a, new ThreadExecutor());
622              }
623              public <T> CompletableFuture<T> whenComplete
624                  (CompletableFuture<T> f,
625                   BiConsumer<? super T,? super Throwable> a) {
626 <                return f.whenCompleteAsync(a);
626 >                return f.whenCompleteAsync(a, new ThreadExecutor());
627              }
559        },
560
561 //         REVERSE_DEFAULT_ASYNC {
562 //             public <T,U> CompletableFuture<Void> runAfterBoth
563 //                 (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
564 //                 return f.runAfterBothAsync(g, a);
565 //             }
566 //             public <T,U> CompletableFuture<Void> thenAcceptBoth
567 //                 (CompletableFuture<T> f,
568 //                  CompletionStage<? extends U> g,
569 //                  BiConsumer<? super T,? super U> a) {
570 //                 return DEFAULT_ASYNC.thenAcceptBoth(f, g, a);
571 //             }
572 //         },
573
574        EXECUTOR {
628              public <T,U> CompletableFuture<Void> runAfterBoth
629                  (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
630                  return f.runAfterBothAsync(g, a, new ThreadExecutor());
# Line 588 | Line 641 | public class CompletableFutureTest exten
641                   BiFunction<? super T,? super U,? extends V> a) {
642                  return f.thenCombineAsync(g, a, new ThreadExecutor());
643              }
591            public <T,U> CompletableFuture<U> applyToEither
592                (CompletableFuture<T> f,
593                 CompletionStage<? extends T> g,
594                 Function<? super T,U> a) {
595                return f.applyToEitherAsync(g, a, new ThreadExecutor());
596            }
597            public <T> CompletableFuture<Void> acceptEither
598                (CompletableFuture<T> f,
599                 CompletionStage<? extends T> g,
600                 Consumer<? super T> a) {
601                return f.acceptEitherAsync(g, a, new ThreadExecutor());
602            }
644              public <T> CompletableFuture<Void> runAfterEither
645                  (CompletableFuture<T> f,
646                   CompletionStage<?> g,
647                   java.lang.Runnable a) {
648                  return f.runAfterEitherAsync(g, a, new ThreadExecutor());
649              }
650 <            public <T,U> CompletableFuture<U> thenCompose
650 >            public <T> CompletableFuture<Void> acceptEither
651                  (CompletableFuture<T> f,
652 <                 Function<? super T,? extends CompletionStage<U>> a) {
653 <                return f.thenComposeAsync(a, new ThreadExecutor());
652 >                 CompletionStage<? extends T> g,
653 >                 Consumer<? super T> a) {
654 >                return f.acceptEitherAsync(g, a, new ThreadExecutor());
655              }
656 <            public <T> CompletableFuture<T> whenComplete
656 >            public <T,U> CompletableFuture<U> applyToEither
657                  (CompletableFuture<T> f,
658 <                 BiConsumer<? super T,? super Throwable> a) {
659 <                return f.whenCompleteAsync(a, new ThreadExecutor());
658 >                 CompletionStage<? extends T> g,
659 >                 Function<? super T,U> a) {
660 >                return f.applyToEitherAsync(g, a, new ThreadExecutor());
661              }
662          };
663  
664 +        public abstract void checkExecutionMode();
665 +        public abstract <T> CompletableFuture<Void> thenRun
666 +            (CompletableFuture<T> f, Runnable a);
667 +        public abstract <T> CompletableFuture<Void> thenAccept
668 +            (CompletableFuture<T> f, Consumer<? super T> a);
669 +        public abstract <T,U> CompletableFuture<U> thenApply
670 +            (CompletableFuture<T> f, Function<? super T,U> a);
671 +        public abstract <T,U> CompletableFuture<U> thenCompose
672 +            (CompletableFuture<T> f,
673 +             Function<? super T,? extends CompletionStage<U>> a);
674 +        public abstract <T,U> CompletableFuture<U> handle
675 +            (CompletableFuture<T> f,
676 +             BiFunction<? super T,Throwable,? extends U> a);
677 +        public abstract <T> CompletableFuture<T> whenComplete
678 +            (CompletableFuture<T> f,
679 +             BiConsumer<? super T,? super Throwable> a);
680          public abstract <T,U> CompletableFuture<Void> runAfterBoth
681              (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a);
682          public abstract <T,U> CompletableFuture<Void> thenAcceptBoth
# Line 628 | Line 687 | public class CompletableFutureTest exten
687              (CompletableFuture<T> f,
688               CompletionStage<? extends U> g,
689               BiFunction<? super T,? super U,? extends V> a);
631        public abstract <T,U> CompletableFuture<U> applyToEither
632            (CompletableFuture<T> f,
633             CompletionStage<? extends T> g,
634             Function<? super T,U> a);
635        public abstract <T> CompletableFuture<Void> acceptEither
636            (CompletableFuture<T> f,
637             CompletionStage<? extends T> g,
638             Consumer<? super T> a);
690          public abstract <T> CompletableFuture<Void> runAfterEither
691              (CompletableFuture<T> f,
692               CompletionStage<?> g,
693               java.lang.Runnable a);
694 <        public abstract <T,U> CompletableFuture<U> thenCompose
694 >        public abstract <T> CompletableFuture<Void> acceptEither
695              (CompletableFuture<T> f,
696 <             Function<? super T,? extends CompletionStage<U>> a);
697 <        public abstract <T> CompletableFuture<T> whenComplete
696 >             CompletionStage<? extends T> g,
697 >             Consumer<? super T> a);
698 >        public abstract <T,U> CompletableFuture<U> applyToEither
699              (CompletableFuture<T> f,
700 <             BiConsumer<? super T,? super Throwable> a);
700 >             CompletionStage<? extends T> g,
701 >             Function<? super T,U> a);
702 >    }
703 >
704 >    /**
705 >     * exceptionally action is not invoked when source completes
706 >     * normally, and source result is propagated
707 >     */
708 >    public void testExceptionally_normalCompletion() {
709 >        for (boolean createIncomplete : new boolean[] { true, false })
710 >        for (Integer v1 : new Integer[] { 1, null })
711 >    {
712 >        final AtomicInteger a = new AtomicInteger(0);
713 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
714 >        if (!createIncomplete) f.complete(v1);
715 >        final CompletableFuture<Integer> g = f.exceptionally
716 >            ((Throwable t) -> {
717 >                // Should not be called
718 >                a.getAndIncrement();
719 >                throw new AssertionError();
720 >            });
721 >        if (createIncomplete) f.complete(v1);
722  
723 +        checkCompletedNormally(g, v1);
724 +        checkCompletedNormally(f, v1);
725 +        assertEquals(0, a.get());
726 +    }}
727  
651    }
728  
729      /**
730       * exceptionally action completes with function value on source
731 <     * exception; otherwise with source value
731 >     * exception
732       */
733 <    public void testExceptionally() {
734 <        CompletableFuture<Integer> f = new CompletableFuture<>();
735 <        ExceptionToInteger r = new ExceptionToInteger();
736 <        CompletableFuture<Integer> g = f.exceptionally(r);
737 <        f.completeExceptionally(new CFException());
738 <        checkCompletedNormally(g, three);
733 >    public void testExceptionally_exceptionalCompletion() {
734 >        for (boolean createIncomplete : new boolean[] { true, false })
735 >        for (Integer v1 : new Integer[] { 1, null })
736 >    {
737 >        final AtomicInteger a = new AtomicInteger(0);
738 >        final CFException ex = new CFException();
739 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
740 >        if (!createIncomplete) f.completeExceptionally(ex);
741 >        final CompletableFuture<Integer> g = f.exceptionally
742 >            ((Throwable t) -> {
743 >                threadAssertSame(t, ex);
744 >                a.getAndIncrement();
745 >                return v1;
746 >            });
747 >        if (createIncomplete) f.completeExceptionally(ex);
748  
749 <        f = new CompletableFuture<>();
750 <        r = new ExceptionToInteger();
751 <        g = f.exceptionally(r);
752 <        f.complete(one);
753 <        checkCompletedNormally(g, one);
754 <    }
749 >        checkCompletedNormally(g, v1);
750 >        assertEquals(1, a.get());
751 >    }}
752 >
753 >    public void testExceptionally_exceptionalCompletionActionFailed() {
754 >        for (boolean createIncomplete : new boolean[] { true, false })
755 >        for (Integer v1 : new Integer[] { 1, null })
756 >    {
757 >        final AtomicInteger a = new AtomicInteger(0);
758 >        final CFException ex1 = new CFException();
759 >        final CFException ex2 = new CFException();
760 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
761 >        if (!createIncomplete) f.completeExceptionally(ex1);
762 >        final CompletableFuture<Integer> g = f.exceptionally
763 >            ((Throwable t) -> {
764 >                threadAssertSame(t, ex1);
765 >                a.getAndIncrement();
766 >                throw ex2;
767 >            });
768 >        if (createIncomplete) f.completeExceptionally(ex1);
769 >
770 >        checkCompletedWithWrappedCFException(g, ex2);
771 >        assertEquals(1, a.get());
772 >    }}
773  
774      /**
775 <     * handle action completes normally with function value on either
776 <     * normal or exceptional completion of source
775 >     * handle action completes normally with function value on normal
776 >     * completion of source
777       */
778 <    public void testHandle() {
779 <        CompletableFuture<Integer> f, g;
780 <        IntegerHandler r;
778 >    public void testHandle_normalCompletion() {
779 >        for (ExecutionMode m : ExecutionMode.values())
780 >        for (boolean createIncomplete : new boolean[] { true, false })
781 >        for (Integer v1 : new Integer[] { 1, null })
782 >    {
783 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
784 >        final AtomicInteger a = new AtomicInteger(0);
785 >        if (!createIncomplete) f.complete(v1);
786 >        final CompletableFuture<Integer> g = m.handle
787 >            (f,
788 >             (Integer x, Throwable t) -> {
789 >                threadAssertSame(x, v1);
790 >                threadAssertNull(t);
791 >                a.getAndIncrement();
792 >                return inc(v1);
793 >            });
794 >        if (createIncomplete) f.complete(v1);
795  
796 <        f = new CompletableFuture<>();
797 <        f.completeExceptionally(new CFException());
798 <        g = f.handle(r = new IntegerHandler());
799 <        assertTrue(r.ran);
683 <        checkCompletedNormally(g, three);
796 >        checkCompletedNormally(g, inc(v1));
797 >        checkCompletedNormally(f, v1);
798 >        assertEquals(1, a.get());
799 >    }}
800  
801 <        f = new CompletableFuture<>();
802 <        g = f.handle(r = new IntegerHandler());
803 <        assertFalse(r.ran);
804 <        f.completeExceptionally(new CFException());
805 <        checkCompletedNormally(g, three);
806 <        assertTrue(r.ran);
801 >    /**
802 >     * handle action completes normally with function value on
803 >     * exceptional completion of source
804 >     */
805 >    public void testHandle_exceptionalCompletion() {
806 >        for (ExecutionMode m : ExecutionMode.values())
807 >        for (boolean createIncomplete : new boolean[] { true, false })
808 >        for (Integer v1 : new Integer[] { 1, null })
809 >    {
810 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
811 >        final AtomicInteger a = new AtomicInteger(0);
812 >        final CFException ex = new CFException();
813 >        if (!createIncomplete) f.completeExceptionally(ex);
814 >        final CompletableFuture<Integer> g = m.handle
815 >            (f,
816 >             (Integer x, Throwable t) -> {
817 >                threadAssertNull(x);
818 >                threadAssertSame(t, ex);
819 >                a.getAndIncrement();
820 >                return v1;
821 >            });
822 >        if (createIncomplete) f.completeExceptionally(ex);
823  
824 <        f = new CompletableFuture<>();
825 <        f.complete(one);
826 <        g = f.handle(r = new IntegerHandler());
827 <        assertTrue(r.ran);
696 <        checkCompletedNormally(g, two);
824 >        checkCompletedNormally(g, v1);
825 >        checkCompletedWithWrappedCFException(f, ex);
826 >        assertEquals(1, a.get());
827 >    }}
828  
829 <        f = new CompletableFuture<>();
830 <        g = f.handle(r = new IntegerHandler());
831 <        assertFalse(r.ran);
832 <        f.complete(one);
833 <        assertTrue(r.ran);
834 <        checkCompletedNormally(g, two);
835 <    }
829 >    /**
830 >     * handle action completes normally with function value on
831 >     * cancelled source
832 >     */
833 >    public void testHandle_sourceCancelled() {
834 >        for (ExecutionMode m : ExecutionMode.values())
835 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
836 >        for (boolean createIncomplete : new boolean[] { true, false })
837 >        for (Integer v1 : new Integer[] { 1, null })
838 >    {
839 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
840 >        final AtomicInteger a = new AtomicInteger(0);
841 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
842 >        final CompletableFuture<Integer> g = m.handle
843 >            (f,
844 >             (Integer x, Throwable t) -> {
845 >                threadAssertNull(x);
846 >                threadAssertTrue(t instanceof CancellationException);
847 >                a.getAndIncrement();
848 >                return v1;
849 >            });
850 >        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
851 >
852 >        checkCompletedNormally(g, v1);
853 >        checkCancelled(f);
854 >        assertEquals(1, a.get());
855 >    }}
856 >
857 >    /**
858 >     * handle result completes exceptionally if action does
859 >     */
860 >    public void testHandle_sourceFailedActionFailed() {
861 >        for (ExecutionMode m : ExecutionMode.values())
862 >        for (boolean createIncomplete : new boolean[] { true, false })
863 >    {
864 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
865 >        final AtomicInteger a = new AtomicInteger(0);
866 >        final CFException ex1 = new CFException();
867 >        final CFException ex2 = new CFException();
868 >        if (!createIncomplete) f.completeExceptionally(ex1);
869 >        final CompletableFuture<Integer> g = m.handle
870 >            (f,
871 >             (Integer x, Throwable t) -> {
872 >                threadAssertNull(x);
873 >                threadAssertSame(ex1, t);
874 >                a.getAndIncrement();
875 >                throw ex2;
876 >            });
877 >        if (createIncomplete) f.completeExceptionally(ex1);
878 >
879 >        checkCompletedWithWrappedCFException(g, ex2);
880 >        checkCompletedWithWrappedCFException(f, ex1);
881 >        assertEquals(1, a.get());
882 >    }}
883 >
884 >    public void testHandle_sourceCompletedNormallyActionFailed() {
885 >        for (ExecutionMode m : ExecutionMode.values())
886 >        for (boolean createIncomplete : new boolean[] { true, false })
887 >        for (Integer v1 : new Integer[] { 1, null })
888 >    {
889 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
890 >        final AtomicInteger a = new AtomicInteger(0);
891 >        final CFException ex = new CFException();
892 >        if (!createIncomplete) f.complete(v1);
893 >        final CompletableFuture<Integer> g = m.handle
894 >            (f,
895 >             (Integer x, Throwable t) -> {
896 >                threadAssertSame(x, v1);
897 >                threadAssertNull(t);
898 >                a.getAndIncrement();
899 >                throw ex;
900 >            });
901 >        if (createIncomplete) f.complete(v1);
902 >
903 >        checkCompletedWithWrappedCFException(g, ex);
904 >        checkCompletedNormally(f, v1);
905 >        assertEquals(1, a.get());
906 >    }}
907  
908      /**
909       * runAsync completes after running Runnable
# Line 710 | Line 912 | public class CompletableFutureTest exten
912          Noop r = new Noop();
913          CompletableFuture<Void> f = CompletableFuture.runAsync(r);
914          assertNull(f.join());
915 <        assertTrue(r.ran);
915 >        assertEquals(1, r.invocationCount);
916          checkCompletedNormally(f, null);
917      }
918  
# Line 722 | Line 924 | public class CompletableFutureTest exten
924          ThreadExecutor exec = new ThreadExecutor();
925          CompletableFuture<Void> f = CompletableFuture.runAsync(r, exec);
926          assertNull(f.join());
927 <        assertTrue(r.ran);
927 >        assertEquals(1, r.invocationCount);
928          checkCompletedNormally(f, null);
929          assertEquals(1, exec.count.get());
930      }
# Line 731 | Line 933 | public class CompletableFutureTest exten
933       * failing runAsync completes exceptionally after running Runnable
934       */
935      public void testRunAsync3() {
936 <        FailingNoop r = new FailingNoop();
936 >        FailingRunnable r = new FailingRunnable();
937          CompletableFuture<Void> f = CompletableFuture.runAsync(r);
938          checkCompletedWithWrappedCFException(f);
939 <        assertTrue(r.ran);
939 >        assertEquals(1, r.invocationCount);
940      }
941  
942      /**
# Line 764 | Line 966 | public class CompletableFutureTest exten
966          FailingSupplier r = new FailingSupplier();
967          CompletableFuture<Integer> f = CompletableFuture.supplyAsync(r);
968          checkCompletedWithWrappedCFException(f);
969 <        assertTrue(r.ran);
969 >        assertEquals(1, r.invocationCount);
970      }
971  
972      // seq completion methods
# Line 772 | Line 974 | public class CompletableFutureTest exten
974      /**
975       * thenRun result completes normally after normal completion of source
976       */
977 <    public void testThenRun() {
978 <        CompletableFuture<Integer> f;
979 <        CompletableFuture<Void> g;
980 <        Noop r;
981 <
982 <        f = new CompletableFuture<>();
983 <        g = f.thenRun(r = new Noop());
984 <        f.complete(null);
985 <        checkCompletedNormally(g, null);
986 <        assertTrue(r.ran);
977 >    public void testThenRun_normalCompletion() {
978 >        for (ExecutionMode m : ExecutionMode.values())
979 >        for (boolean createIncomplete : new boolean[] { true, false })
980 >        for (Integer v1 : new Integer[] { 1, null })
981 >    {
982 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
983 >        final Noop r = new Noop();
984 >        if (!createIncomplete) f.complete(v1);
985 >        final CompletableFuture<Void> g = m.thenRun(f, r);
986 >        if (createIncomplete) 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 FailingRunnable r = new FailingRunnable();
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
1052       */
1053 <    public void testThenApply() {
1054 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1055 <        CompletableFuture<Integer> g = f.thenApply(inc);
1056 <        f.complete(one);
1057 <        checkCompletedNormally(g, two);
1058 <    }
1053 >    public void testThenApply_normalCompletion() {
1054 >        for (ExecutionMode m : ExecutionMode.values())
1055 >        for (boolean createIncomplete : new boolean[] { true, false })
1056 >        for (Integer v1 : new Integer[] { 1, null })
1057 >    {
1058 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1059 >        final IncFunction r = new IncFunction();
1060 >        if (!createIncomplete) f.complete(v1);
1061 >        final CompletableFuture<Integer> g = m.thenApply(f, r);
1062 >        if (createIncomplete) {
1063 >            checkIncomplete(g);
1064 >            f.complete(v1);
1065 >        }
1066 >
1067 >        checkCompletedNormally(g, inc(v1));
1068 >        checkCompletedNormally(f, v1);
1069 >        assertEquals(1, r.invocationCount);
1070 >    }}
1071  
1072      /**
1073       * thenApply result completes exceptionally after exceptional
1074       * completion of source
1075       */
1076 <    public void testThenApply2() {
1077 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1078 <        CompletableFuture<Integer> g = f.thenApply(inc);
1079 <        f.completeExceptionally(new CFException());
1080 <        checkCompletedWithWrappedCFException(g);
1081 <    }
1076 >    public void testThenApply_exceptionalCompletion() {
1077 >        for (ExecutionMode m : ExecutionMode.values())
1078 >        for (boolean createIncomplete : new boolean[] { true, false })
1079 >    {
1080 >        final CFException ex = new CFException();
1081 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1082 >        final IncFunction r = new IncFunction();
1083 >        if (!createIncomplete) f.completeExceptionally(ex);
1084 >        final CompletableFuture<Integer> g = m.thenApply(f, r);
1085 >        if (createIncomplete) f.completeExceptionally(ex);
1086  
1087 <    /**
1088 <     * thenApply result completes exceptionally if action does
1089 <     */
1090 <    public void testThenApply3() {
878 <        CompletableFuture<Integer> f = new CompletableFuture<>();
879 <        CompletableFuture<Integer> g = f.thenApply(new FailingFunction());
880 <        f.complete(one);
881 <        checkCompletedWithWrappedCFException(g);
882 <    }
1087 >        checkCompletedWithWrappedCFException(g, ex);
1088 >        checkCompletedWithWrappedCFException(f, ex);
1089 >        assertEquals(0, r.invocationCount);
1090 >    }}
1091  
1092      /**
1093       * thenApply result completes exceptionally if source cancelled
1094       */
1095 <    public void testThenApply4() {
1096 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1097 <        CompletableFuture<Integer> g = f.thenApply(inc);
1098 <        assertTrue(f.cancel(true));
1095 >    public void testThenApply_sourceCancelled() {
1096 >        for (ExecutionMode m : ExecutionMode.values())
1097 >        for (boolean createIncomplete : new boolean[] { true, false })
1098 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1099 >    {
1100 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1101 >        final IncFunction r = new IncFunction();
1102 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1103 >        final CompletableFuture<Integer> g = f.thenApply(r);
1104 >        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1105 >
1106          checkCompletedWithWrappedCancellationException(g);
1107 <    }
1107 >        checkCancelled(f);
1108 >        assertEquals(0, r.invocationCount);
1109 >    }}
1110  
1111      /**
1112 <     * thenAccept result completes normally after normal completion of source
1112 >     * thenApply result completes exceptionally if action does
1113       */
1114 <    public void testThenAccept() {
1115 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1116 <        IncAction r = new IncAction();
1117 <        CompletableFuture<Void> g = f.thenAccept(r);
1118 <        f.complete(one);
1119 <        checkCompletedNormally(g, null);
1120 <        assertEquals(r.value, (Integer) 2);
1121 <    }
1114 >    public void testThenApply_actionFailed() {
1115 >        for (ExecutionMode m : ExecutionMode.values())
1116 >        for (boolean createIncomplete : new boolean[] { true, false })
1117 >        for (Integer v1 : new Integer[] { 1, null })
1118 >    {
1119 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1120 >        final FailingFunction r = new FailingFunction();
1121 >        if (!createIncomplete) f.complete(v1);
1122 >        final CompletableFuture<Integer> g = f.thenApply(r);
1123 >        if (createIncomplete) f.complete(v1);
1124  
906    /**
907     * thenAccept result completes exceptionally after exceptional
908     * completion of source
909     */
910    public void testThenAccept2() {
911        CompletableFuture<Integer> f = new CompletableFuture<>();
912        IncAction r = new IncAction();
913        CompletableFuture<Void> g = f.thenAccept(r);
914        f.completeExceptionally(new CFException());
1125          checkCompletedWithWrappedCFException(g);
1126 <    }
1126 >        checkCompletedNormally(f, v1);
1127 >    }}
1128  
1129      /**
1130 <     * thenAccept result completes exceptionally if action does
1130 >     * thenAccept result completes normally after normal completion of source
1131       */
1132 <    public void testThenAccept3() {
1133 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1134 <        FailingConsumer r = new FailingConsumer();
1135 <        CompletableFuture<Void> g = f.thenAccept(r);
1136 <        f.complete(one);
1137 <        checkCompletedWithWrappedCFException(g);
1138 <        assertTrue(r.ran);
1139 <    }
1132 >    public void testThenAccept_normalCompletion() {
1133 >        for (ExecutionMode m : ExecutionMode.values())
1134 >        for (boolean createIncomplete : new boolean[] { true, false })
1135 >        for (Integer v1 : new Integer[] { 1, null })
1136 >    {
1137 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1138 >        final IncAction r = new IncAction();
1139 >        if (!createIncomplete) f.complete(v1);
1140 >        final CompletableFuture<Void> g = m.thenAccept(f, r);
1141 >        if (createIncomplete) f.complete(v1);
1142  
1143 <    /**
1144 <     * thenAccept result completes exceptionally if source cancelled
1145 <     */
1146 <    public void testThenAccept4() {
1147 <        CompletableFuture<Integer> f = new CompletableFuture<>();
935 <        IncAction r = new IncAction();
936 <        CompletableFuture<Void> g = f.thenAccept(r);
937 <        assertTrue(f.cancel(true));
938 <        checkCompletedWithWrappedCancellationException(g);
939 <    }
1143 >        checkCompletedNormally(g, null);
1144 >        checkCompletedNormally(f, v1);
1145 >        assertEquals(1, r.invocationCount);
1146 >        assertEquals(inc(v1), r.value);
1147 >    }}
1148  
1149      /**
1150 <     * thenCombine result completes normally after normal completion
1151 <     * of sources
1150 >     * thenAccept result completes exceptionally after exceptional
1151 >     * completion of source
1152       */
1153 <    public void testThenCombine_normalCompletion1() {
1153 >    public void testThenAccept_exceptionalCompletion() {
1154          for (ExecutionMode m : ExecutionMode.values())
1155 <        for (Integer v1 : new Integer[] { 1, null })
1156 <        for (Integer v2 : new Integer[] { 2, null }) {
1157 <
1155 >        for (boolean createIncomplete : new boolean[] { true, false })
1156 >    {
1157 >        final CFException ex = new CFException();
1158          final CompletableFuture<Integer> f = new CompletableFuture<>();
1159 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1160 <        final SubtractFunction r = new SubtractFunction();
1161 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1162 <
955 <        f.complete(v1);
956 <        checkIncomplete(h);
957 <        assertFalse(r.ran());
958 <        g.complete(v2);
1159 >        final IncAction r = new IncAction();
1160 >        if (!createIncomplete) f.completeExceptionally(ex);
1161 >        final CompletableFuture<Void> g = m.thenAccept(f, r);
1162 >        if (createIncomplete) f.completeExceptionally(ex);
1163  
1164 <        checkCompletedNormally(h, subtract(v1, v2));
1165 <        checkCompletedNormally(f, v1);
1166 <        checkCompletedNormally(g, v2);
1167 <        }
964 <    }
1164 >        checkCompletedWithWrappedCFException(g, ex);
1165 >        checkCompletedWithWrappedCFException(f, ex);
1166 >        assertEquals(0, r.invocationCount);
1167 >    }}
1168  
1169 <    public void testThenCombine_normalCompletion2() {
1169 >    /**
1170 >     * thenAccept result completes exceptionally if action does
1171 >     */
1172 >    public void testThenAccept_actionFailed() {
1173          for (ExecutionMode m : ExecutionMode.values())
1174 +        for (boolean createIncomplete : new boolean[] { true, false })
1175          for (Integer v1 : new Integer[] { 1, null })
1176 <        for (Integer v2 : new Integer[] { 2, null }) {
970 <
1176 >    {
1177          final CompletableFuture<Integer> f = new CompletableFuture<>();
1178 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1179 <        final SubtractFunction r = new SubtractFunction();
1180 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1181 <
976 <        g.complete(v2);
977 <        checkIncomplete(h);
978 <        assertFalse(r.ran());
979 <        f.complete(v1);
1178 >        final FailingConsumer r = new FailingConsumer();
1179 >        if (!createIncomplete) f.complete(v1);
1180 >        final CompletableFuture<Void> g = f.thenAccept(r);
1181 >        if (createIncomplete) f.complete(v1);
1182  
1183 <        checkCompletedNormally(h, subtract(v1, v2));
1183 >        checkCompletedWithWrappedCFException(g);
1184          checkCompletedNormally(f, v1);
1185 <        checkCompletedNormally(g, v2);
984 <        }
985 <    }
1185 >    }}
1186  
1187 <    public void testThenCombine_normalCompletion3() {
1187 >    /**
1188 >     * thenAccept result completes exceptionally if source cancelled
1189 >     */
1190 >    public void testThenAccept_sourceCancelled() {
1191          for (ExecutionMode m : ExecutionMode.values())
1192 <        for (Integer v1 : new Integer[] { 1, null })
1193 <        for (Integer v2 : new Integer[] { 2, null }) {
1194 <
1192 >        for (boolean createIncomplete : new boolean[] { true, false })
1193 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1194 >    {
1195          final CompletableFuture<Integer> f = new CompletableFuture<>();
1196 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1197 <        final SubtractFunction r = new SubtractFunction();
1198 <
1199 <        g.complete(v2);
1200 <        f.complete(v1);
1201 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
999 <
1000 <        checkCompletedNormally(h, subtract(v1, v2));
1001 <        checkCompletedNormally(f, v1);
1002 <        checkCompletedNormally(g, v2);
1196 >        final IncAction r = new IncAction();
1197 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1198 >        final CompletableFuture<Void> g = f.thenAccept(r);
1199 >        if (createIncomplete) {
1200 >            checkIncomplete(g);
1201 >            assertTrue(f.cancel(mayInterruptIfRunning));
1202          }
1004    }
1203  
1204 <    public void testThenCombine_normalCompletion4() {
1204 >        checkCompletedWithWrappedCancellationException(g);
1205 >        checkCancelled(f);
1206 >        assertEquals(0, r.invocationCount);
1207 >    }}
1208 >
1209 >    /**
1210 >     * thenCombine result completes normally after normal completion
1211 >     * of sources
1212 >     */
1213 >    public void testThenCombine_normalCompletion1() {
1214 >        for (boolean createIncomplete : new boolean[] { true, false })
1215 >        for (boolean fFirst : new boolean[] { true, false })
1216          for (ExecutionMode m : ExecutionMode.values())
1217          for (Integer v1 : new Integer[] { 1, null })
1218 <        for (Integer v2 : new Integer[] { 2, null }) {
1219 <
1218 >        for (Integer v2 : new Integer[] { 2, null })
1219 >    {
1220          final CompletableFuture<Integer> f = new CompletableFuture<>();
1221          final CompletableFuture<Integer> g = new CompletableFuture<>();
1222          final SubtractFunction r = new SubtractFunction();
1223 +        CompletableFuture<Integer> h = null;
1224 +        if (createIncomplete) h = m.thenCombine(f, g, r);
1225  
1226 <        f.complete(v1);
1227 <        g.complete(v2);
1228 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1226 >        if (fFirst)
1227 >            f.complete(v1);
1228 >        else
1229 >            g.complete(v2);
1230 >        if (createIncomplete) checkIncomplete(h);
1231 >        assertEquals(0, r.invocationCount);
1232 >        if (!fFirst)
1233 >            f.complete(v1);
1234 >        else
1235 >            g.complete(v2);
1236 >        if (!createIncomplete) h = m.thenCombine(f, g, r);
1237  
1238          checkCompletedNormally(h, subtract(v1, v2));
1239          checkCompletedNormally(f, v1);
1240          checkCompletedNormally(g, v2);
1241 <        }
1242 <    }
1241 >        assertEquals(1, r.invocationCount);
1242 >    }}
1243  
1244      /**
1245       * thenCombine result completes exceptionally after exceptional
# Line 1028 | Line 1247 | public class CompletableFutureTest exten
1247       */
1248      public void testThenCombine_exceptionalCompletion1() {
1249          for (ExecutionMode m : ExecutionMode.values())
1250 <        for (Integer v1 : new Integer[] { 1, null }) {
1251 <
1250 >        for (Integer v1 : new Integer[] { 1, null })
1251 >    {
1252          final CompletableFuture<Integer> f = new CompletableFuture<>();
1253          final CompletableFuture<Integer> g = new CompletableFuture<>();
1254          final SubtractFunction r = new SubtractFunction();
# Line 1042 | Line 1261 | public class CompletableFutureTest exten
1261  
1262          checkCompletedWithWrappedCFException(h, ex);
1263          checkCompletedWithWrappedCFException(f, ex);
1264 <        assertFalse(r.ran());
1264 >        assertEquals(0, r.invocationCount);
1265          checkCompletedNormally(g, v1);
1266 <        }
1048 <    }
1266 >    }}
1267  
1268      public void testThenCombine_exceptionalCompletion2() {
1269          for (ExecutionMode m : ExecutionMode.values())
1270 <        for (Integer v1 : new Integer[] { 1, null }) {
1271 <
1270 >        for (Integer v1 : new Integer[] { 1, null })
1271 >    {
1272          final CompletableFuture<Integer> f = new CompletableFuture<>();
1273          final CompletableFuture<Integer> g = new CompletableFuture<>();
1274          final SubtractFunction r = new SubtractFunction();
# Line 1063 | Line 1281 | public class CompletableFutureTest exten
1281  
1282          checkCompletedWithWrappedCFException(h, ex);
1283          checkCompletedWithWrappedCFException(g, ex);
1284 <        assertFalse(r.ran());
1284 >        assertEquals(0, r.invocationCount);
1285          checkCompletedNormally(f, v1);
1286 <        }
1069 <    }
1286 >    }}
1287  
1288      public void testThenCombine_exceptionalCompletion3() {
1289          for (ExecutionMode m : ExecutionMode.values())
1290 <        for (Integer v1 : new Integer[] { 1, null }) {
1291 <
1290 >        for (Integer v1 : new Integer[] { 1, null })
1291 >    {
1292          final CompletableFuture<Integer> f = new CompletableFuture<>();
1293          final CompletableFuture<Integer> g = new CompletableFuture<>();
1294          final SubtractFunction r = new SubtractFunction();
# Line 1083 | Line 1300 | public class CompletableFutureTest exten
1300  
1301          checkCompletedWithWrappedCFException(h, ex);
1302          checkCompletedWithWrappedCFException(g, ex);
1303 <        assertFalse(r.ran());
1303 >        assertEquals(0, r.invocationCount);
1304          checkCompletedNormally(f, v1);
1305 <        }
1089 <    }
1305 >    }}
1306  
1307      public void testThenCombine_exceptionalCompletion4() {
1308          for (ExecutionMode m : ExecutionMode.values())
1309 <        for (Integer v1 : new Integer[] { 1, null }) {
1310 <
1309 >        for (Integer v1 : new Integer[] { 1, null })
1310 >    {
1311          final CompletableFuture<Integer> f = new CompletableFuture<>();
1312          final CompletableFuture<Integer> g = new CompletableFuture<>();
1313          final SubtractFunction r = new SubtractFunction();
# Line 1103 | Line 1319 | public class CompletableFutureTest exten
1319  
1320          checkCompletedWithWrappedCFException(h, ex);
1321          checkCompletedWithWrappedCFException(f, ex);
1322 <        assertFalse(r.ran());
1322 >        assertEquals(0, r.invocationCount);
1323          checkCompletedNormally(g, v1);
1324 <        }
1109 <    }
1324 >    }}
1325  
1326      /**
1327       * thenCombine result completes exceptionally if action does
# Line 1114 | Line 1329 | public class CompletableFutureTest exten
1329      public void testThenCombine_actionFailed1() {
1330          for (ExecutionMode m : ExecutionMode.values())
1331          for (Integer v1 : new Integer[] { 1, null })
1332 <        for (Integer v2 : new Integer[] { 2, null }) {
1333 <
1332 >        for (Integer v2 : new Integer[] { 2, null })
1333 >    {
1334          final CompletableFuture<Integer> f = new CompletableFuture<>();
1335          final CompletableFuture<Integer> g = new CompletableFuture<>();
1336          final FailingBiFunction r = new FailingBiFunction();
# Line 1128 | Line 1343 | public class CompletableFutureTest exten
1343          checkCompletedWithWrappedCFException(h);
1344          checkCompletedNormally(f, v1);
1345          checkCompletedNormally(g, v2);
1346 <        }
1132 <    }
1346 >    }}
1347  
1348      public void testThenCombine_actionFailed2() {
1349          for (ExecutionMode m : ExecutionMode.values())
1350          for (Integer v1 : new Integer[] { 1, null })
1351 <        for (Integer v2 : new Integer[] { 2, null }) {
1352 <
1351 >        for (Integer v2 : new Integer[] { 2, null })
1352 >    {
1353          final CompletableFuture<Integer> f = new CompletableFuture<>();
1354          final CompletableFuture<Integer> g = new CompletableFuture<>();
1355          final FailingBiFunction r = new FailingBiFunction();
# Line 1148 | Line 1362 | public class CompletableFutureTest exten
1362          checkCompletedWithWrappedCFException(h);
1363          checkCompletedNormally(f, v1);
1364          checkCompletedNormally(g, v2);
1365 <        }
1152 <    }
1365 >    }}
1366  
1367      /**
1368       * thenCombine result completes exceptionally if either source cancelled
# Line 1157 | Line 1370 | public class CompletableFutureTest exten
1370      public void testThenCombine_sourceCancelled1() {
1371          for (ExecutionMode m : ExecutionMode.values())
1372          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1373 <        for (Integer v1 : new Integer[] { 1, null }) {
1374 <
1373 >        for (Integer v1 : new Integer[] { 1, null })
1374 >    {
1375          final CompletableFuture<Integer> f = new CompletableFuture<>();
1376          final CompletableFuture<Integer> g = new CompletableFuture<>();
1377          final SubtractFunction r = new SubtractFunction();
# Line 1170 | Line 1383 | public class CompletableFutureTest exten
1383  
1384          checkCompletedWithWrappedCancellationException(h);
1385          checkCancelled(f);
1386 <        assertFalse(r.ran());
1386 >        assertEquals(0, r.invocationCount);
1387          checkCompletedNormally(g, v1);
1388 <        }
1176 <    }
1388 >    }}
1389  
1390      public void testThenCombine_sourceCancelled2() {
1391          for (ExecutionMode m : ExecutionMode.values())
1392          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1393 <        for (Integer v1 : new Integer[] { 1, null }) {
1394 <
1393 >        for (Integer v1 : new Integer[] { 1, null })
1394 >    {
1395          final CompletableFuture<Integer> f = new CompletableFuture<>();
1396          final CompletableFuture<Integer> g = new CompletableFuture<>();
1397          final SubtractFunction r = new SubtractFunction();
# Line 1191 | Line 1403 | public class CompletableFutureTest exten
1403  
1404          checkCompletedWithWrappedCancellationException(h);
1405          checkCancelled(g);
1406 <        assertFalse(r.ran());
1406 >        assertEquals(0, r.invocationCount);
1407          checkCompletedNormally(f, v1);
1408 <        }
1197 <    }
1408 >    }}
1409  
1410      public void testThenCombine_sourceCancelled3() {
1411          for (ExecutionMode m : ExecutionMode.values())
1412          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1413 <        for (Integer v1 : new Integer[] { 1, null }) {
1414 <
1413 >        for (Integer v1 : new Integer[] { 1, null })
1414 >    {
1415          final CompletableFuture<Integer> f = new CompletableFuture<>();
1416          final CompletableFuture<Integer> g = new CompletableFuture<>();
1417          final SubtractFunction r = new SubtractFunction();
# Line 1211 | Line 1422 | public class CompletableFutureTest exten
1422  
1423          checkCompletedWithWrappedCancellationException(h);
1424          checkCancelled(g);
1425 <        assertFalse(r.ran());
1425 >        assertEquals(0, r.invocationCount);
1426          checkCompletedNormally(f, v1);
1427 <        }
1217 <    }
1427 >    }}
1428  
1429      public void testThenCombine_sourceCancelled4() {
1430          for (ExecutionMode m : ExecutionMode.values())
1431          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1432 <        for (Integer v1 : new Integer[] { 1, null }) {
1433 <
1432 >        for (Integer v1 : new Integer[] { 1, null })
1433 >    {
1434          final CompletableFuture<Integer> f = new CompletableFuture<>();
1435          final CompletableFuture<Integer> g = new CompletableFuture<>();
1436          final SubtractFunction r = new SubtractFunction();
# Line 1231 | Line 1441 | public class CompletableFutureTest exten
1441  
1442          checkCompletedWithWrappedCancellationException(h);
1443          checkCancelled(f);
1444 <        assertFalse(r.ran());
1444 >        assertEquals(0, r.invocationCount);
1445          checkCompletedNormally(g, v1);
1446 <        }
1237 <    }
1446 >    }}
1447  
1448      /**
1449       * thenAcceptBoth result completes normally after normal
# Line 1243 | Line 1452 | public class CompletableFutureTest exten
1452      public void testThenAcceptBoth_normalCompletion1() {
1453          for (ExecutionMode m : ExecutionMode.values())
1454          for (Integer v1 : new Integer[] { 1, null })
1455 <        for (Integer v2 : new Integer[] { 2, null }) {
1456 <
1455 >        for (Integer v2 : new Integer[] { 2, null })
1456 >    {
1457          final CompletableFuture<Integer> f = new CompletableFuture<>();
1458          final CompletableFuture<Integer> g = new CompletableFuture<>();
1459          final SubtractAction r = new SubtractAction();
# Line 1252 | Line 1461 | public class CompletableFutureTest exten
1461  
1462          f.complete(v1);
1463          checkIncomplete(h);
1464 <        assertFalse(r.ran());
1464 >        assertEquals(0, r.invocationCount);
1465          g.complete(v2);
1466  
1467          checkCompletedNormally(h, null);
1468 <        assertEquals(r.value, subtract(v1, v2));
1468 >        assertEquals(subtract(v1, v2), r.value);
1469          checkCompletedNormally(f, v1);
1470          checkCompletedNormally(g, v2);
1471 <        }
1263 <    }
1471 >    }}
1472  
1473      public void testThenAcceptBoth_normalCompletion2() {
1474          for (ExecutionMode m : ExecutionMode.values())
1475          for (Integer v1 : new Integer[] { 1, null })
1476 <        for (Integer v2 : new Integer[] { 2, null }) {
1477 <
1476 >        for (Integer v2 : new Integer[] { 2, null })
1477 >    {
1478          final CompletableFuture<Integer> f = new CompletableFuture<>();
1479          final CompletableFuture<Integer> g = new CompletableFuture<>();
1480          final SubtractAction r = new SubtractAction();
# Line 1274 | Line 1482 | public class CompletableFutureTest exten
1482  
1483          g.complete(v2);
1484          checkIncomplete(h);
1485 <        assertFalse(r.ran());
1485 >        assertEquals(0, r.invocationCount);
1486          f.complete(v1);
1487  
1488          checkCompletedNormally(h, null);
1489 <        assertEquals(r.value, subtract(v1, v2));
1489 >        assertEquals(subtract(v1, v2), r.value);
1490          checkCompletedNormally(f, v1);
1491          checkCompletedNormally(g, v2);
1492 <        }
1285 <    }
1492 >    }}
1493  
1494      public void testThenAcceptBoth_normalCompletion3() {
1495          for (ExecutionMode m : ExecutionMode.values())
1496          for (Integer v1 : new Integer[] { 1, null })
1497 <        for (Integer v2 : new Integer[] { 2, null }) {
1498 <
1497 >        for (Integer v2 : new Integer[] { 2, null })
1498 >    {
1499          final CompletableFuture<Integer> f = new CompletableFuture<>();
1500          final CompletableFuture<Integer> g = new CompletableFuture<>();
1501          final SubtractAction r = new SubtractAction();
# Line 1298 | Line 1505 | public class CompletableFutureTest exten
1505          final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1506  
1507          checkCompletedNormally(h, null);
1508 <        assertEquals(r.value, subtract(v1, v2));
1508 >        assertEquals(subtract(v1, v2), r.value);
1509          checkCompletedNormally(f, v1);
1510          checkCompletedNormally(g, v2);
1511 <        }
1305 <    }
1511 >    }}
1512  
1513      public void testThenAcceptBoth_normalCompletion4() {
1514          for (ExecutionMode m : ExecutionMode.values())
1515          for (Integer v1 : new Integer[] { 1, null })
1516 <        for (Integer v2 : new Integer[] { 2, null }) {
1517 <
1516 >        for (Integer v2 : new Integer[] { 2, null })
1517 >    {
1518          final CompletableFuture<Integer> f = new CompletableFuture<>();
1519          final CompletableFuture<Integer> g = new CompletableFuture<>();
1520          final SubtractAction r = new SubtractAction();
# Line 1318 | Line 1524 | public class CompletableFutureTest exten
1524          final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1525  
1526          checkCompletedNormally(h, null);
1527 <        assertEquals(r.value, subtract(v1, v2));
1527 >        assertEquals(subtract(v1, v2), r.value);
1528          checkCompletedNormally(f, v1);
1529          checkCompletedNormally(g, v2);
1530 <        }
1325 <    }
1530 >    }}
1531  
1532      /**
1533       * thenAcceptBoth result completes exceptionally after exceptional
# Line 1330 | Line 1535 | public class CompletableFutureTest exten
1535       */
1536      public void testThenAcceptBoth_exceptionalCompletion1() {
1537          for (ExecutionMode m : ExecutionMode.values())
1538 <        for (Integer v1 : new Integer[] { 1, null }) {
1539 <
1538 >        for (Integer v1 : new Integer[] { 1, null })
1539 >    {
1540          final CompletableFuture<Integer> f = new CompletableFuture<>();
1541          final CompletableFuture<Integer> g = new CompletableFuture<>();
1542          final SubtractAction r = new SubtractAction();
# Line 1344 | Line 1549 | public class CompletableFutureTest exten
1549  
1550          checkCompletedWithWrappedCFException(h, ex);
1551          checkCompletedWithWrappedCFException(f, ex);
1552 <        assertFalse(r.ran());
1552 >        assertEquals(0, r.invocationCount);
1553          checkCompletedNormally(g, v1);
1554 <        }
1350 <    }
1554 >    }}
1555  
1556      public void testThenAcceptBoth_exceptionalCompletion2() {
1557          for (ExecutionMode m : ExecutionMode.values())
1558 <        for (Integer v1 : new Integer[] { 1, null }) {
1559 <
1558 >        for (Integer v1 : new Integer[] { 1, null })
1559 >    {
1560          final CompletableFuture<Integer> f = new CompletableFuture<>();
1561          final CompletableFuture<Integer> g = new CompletableFuture<>();
1562          final SubtractAction r = new SubtractAction();
# Line 1365 | Line 1569 | public class CompletableFutureTest exten
1569  
1570          checkCompletedWithWrappedCFException(h, ex);
1571          checkCompletedWithWrappedCFException(g, ex);
1572 <        assertFalse(r.ran());
1572 >        assertEquals(0, r.invocationCount);
1573          checkCompletedNormally(f, v1);
1574 <        }
1371 <    }
1574 >    }}
1575  
1576      public void testThenAcceptBoth_exceptionalCompletion3() {
1577          for (ExecutionMode m : ExecutionMode.values())
1578 <        for (Integer v1 : new Integer[] { 1, null }) {
1579 <
1578 >        for (Integer v1 : new Integer[] { 1, null })
1579 >    {
1580          final CompletableFuture<Integer> f = new CompletableFuture<>();
1581          final CompletableFuture<Integer> g = new CompletableFuture<>();
1582          final SubtractAction r = new SubtractAction();
# Line 1385 | Line 1588 | public class CompletableFutureTest exten
1588  
1589          checkCompletedWithWrappedCFException(h, ex);
1590          checkCompletedWithWrappedCFException(g, ex);
1591 <        assertFalse(r.ran());
1591 >        assertEquals(0, r.invocationCount);
1592          checkCompletedNormally(f, v1);
1593 <        }
1391 <    }
1593 >    }}
1594  
1595      public void testThenAcceptBoth_exceptionalCompletion4() {
1596          for (ExecutionMode m : ExecutionMode.values())
1597 <        for (Integer v1 : new Integer[] { 1, null }) {
1598 <
1597 >        for (Integer v1 : new Integer[] { 1, null })
1598 >    {
1599          final CompletableFuture<Integer> f = new CompletableFuture<>();
1600          final CompletableFuture<Integer> g = new CompletableFuture<>();
1601          final SubtractAction r = new SubtractAction();
# Line 1405 | Line 1607 | public class CompletableFutureTest exten
1607  
1608          checkCompletedWithWrappedCFException(h, ex);
1609          checkCompletedWithWrappedCFException(f, ex);
1610 <        assertFalse(r.ran());
1610 >        assertEquals(0, r.invocationCount);
1611          checkCompletedNormally(g, v1);
1612 <        }
1411 <    }
1612 >    }}
1613  
1614      /**
1615       * thenAcceptBoth result completes exceptionally if action does
# Line 1416 | Line 1617 | public class CompletableFutureTest exten
1617      public void testThenAcceptBoth_actionFailed1() {
1618          for (ExecutionMode m : ExecutionMode.values())
1619          for (Integer v1 : new Integer[] { 1, null })
1620 <        for (Integer v2 : new Integer[] { 2, null }) {
1621 <
1620 >        for (Integer v2 : new Integer[] { 2, null })
1621 >    {
1622          final CompletableFuture<Integer> f = new CompletableFuture<>();
1623          final CompletableFuture<Integer> g = new CompletableFuture<>();
1624          final FailingBiConsumer r = new FailingBiConsumer();
# Line 1430 | Line 1631 | public class CompletableFutureTest exten
1631          checkCompletedWithWrappedCFException(h);
1632          checkCompletedNormally(f, v1);
1633          checkCompletedNormally(g, v2);
1634 <        }
1434 <    }
1634 >    }}
1635  
1636      public void testThenAcceptBoth_actionFailed2() {
1637          for (ExecutionMode m : ExecutionMode.values())
1638          for (Integer v1 : new Integer[] { 1, null })
1639 <        for (Integer v2 : new Integer[] { 2, null }) {
1640 <
1639 >        for (Integer v2 : new Integer[] { 2, null })
1640 >    {
1641          final CompletableFuture<Integer> f = new CompletableFuture<>();
1642          final CompletableFuture<Integer> g = new CompletableFuture<>();
1643          final FailingBiConsumer r = new FailingBiConsumer();
# Line 1450 | Line 1650 | public class CompletableFutureTest exten
1650          checkCompletedWithWrappedCFException(h);
1651          checkCompletedNormally(f, v1);
1652          checkCompletedNormally(g, v2);
1653 <        }
1454 <    }
1653 >    }}
1654  
1655      /**
1656       * thenAcceptBoth result completes exceptionally if either source cancelled
# Line 1459 | Line 1658 | public class CompletableFutureTest exten
1658      public void testThenAcceptBoth_sourceCancelled1() {
1659          for (ExecutionMode m : ExecutionMode.values())
1660          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1661 <        for (Integer v1 : new Integer[] { 1, null }) {
1662 <
1661 >        for (Integer v1 : new Integer[] { 1, null })
1662 >    {
1663          final CompletableFuture<Integer> f = new CompletableFuture<>();
1664          final CompletableFuture<Integer> g = new CompletableFuture<>();
1665          final SubtractAction r = new SubtractAction();
# Line 1472 | Line 1671 | public class CompletableFutureTest exten
1671  
1672          checkCompletedWithWrappedCancellationException(h);
1673          checkCancelled(f);
1674 <        assertFalse(r.ran());
1674 >        assertEquals(0, r.invocationCount);
1675          checkCompletedNormally(g, v1);
1676 <        }
1478 <    }
1676 >    }}
1677  
1678      public void testThenAcceptBoth_sourceCancelled2() {
1679          for (ExecutionMode m : ExecutionMode.values())
1680          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1681 <        for (Integer v1 : new Integer[] { 1, null }) {
1682 <
1681 >        for (Integer v1 : new Integer[] { 1, null })
1682 >    {
1683          final CompletableFuture<Integer> f = new CompletableFuture<>();
1684          final CompletableFuture<Integer> g = new CompletableFuture<>();
1685          final SubtractAction r = new SubtractAction();
# Line 1493 | Line 1691 | public class CompletableFutureTest exten
1691  
1692          checkCompletedWithWrappedCancellationException(h);
1693          checkCancelled(g);
1694 <        assertFalse(r.ran());
1694 >        assertEquals(0, r.invocationCount);
1695          checkCompletedNormally(f, v1);
1696 <        }
1499 <    }
1696 >    }}
1697  
1698      public void testThenAcceptBoth_sourceCancelled3() {
1699          for (ExecutionMode m : ExecutionMode.values())
1700          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1701 <        for (Integer v1 : new Integer[] { 1, null }) {
1702 <
1701 >        for (Integer v1 : new Integer[] { 1, null })
1702 >    {
1703          final CompletableFuture<Integer> f = new CompletableFuture<>();
1704          final CompletableFuture<Integer> g = new CompletableFuture<>();
1705          final SubtractAction r = new SubtractAction();
# Line 1513 | Line 1710 | public class CompletableFutureTest exten
1710  
1711          checkCompletedWithWrappedCancellationException(h);
1712          checkCancelled(g);
1713 <        assertFalse(r.ran());
1713 >        assertEquals(0, r.invocationCount);
1714          checkCompletedNormally(f, v1);
1715 <        }
1519 <    }
1715 >    }}
1716  
1717      public void testThenAcceptBoth_sourceCancelled4() {
1718          for (ExecutionMode m : ExecutionMode.values())
1719          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1720 <        for (Integer v1 : new Integer[] { 1, null }) {
1721 <
1720 >        for (Integer v1 : new Integer[] { 1, null })
1721 >    {
1722          final CompletableFuture<Integer> f = new CompletableFuture<>();
1723          final CompletableFuture<Integer> g = new CompletableFuture<>();
1724          final SubtractAction r = new SubtractAction();
# Line 1533 | Line 1729 | public class CompletableFutureTest exten
1729  
1730          checkCompletedWithWrappedCancellationException(h);
1731          checkCancelled(f);
1732 <        assertFalse(r.ran());
1732 >        assertEquals(0, r.invocationCount);
1733          checkCompletedNormally(g, v1);
1734 <        }
1539 <    }
1734 >    }}
1735  
1736      /**
1737       * runAfterBoth result completes normally after normal
# Line 1545 | Line 1740 | public class CompletableFutureTest exten
1740      public void testRunAfterBoth_normalCompletion1() {
1741          for (ExecutionMode m : ExecutionMode.values())
1742          for (Integer v1 : new Integer[] { 1, null })
1743 <        for (Integer v2 : new Integer[] { 2, null }) {
1744 <
1743 >        for (Integer v2 : new Integer[] { 2, null })
1744 >    {
1745          final CompletableFuture<Integer> f = new CompletableFuture<>();
1746          final CompletableFuture<Integer> g = new CompletableFuture<>();
1747          final Noop r = new Noop();
# Line 1554 | Line 1749 | public class CompletableFutureTest exten
1749  
1750          f.complete(v1);
1751          checkIncomplete(h);
1752 <        assertFalse(r.ran);
1752 >        assertEquals(0, r.invocationCount);
1753          g.complete(v2);
1754  
1755          checkCompletedNormally(h, null);
1756 <        assertTrue(r.ran);
1756 >        assertEquals(1, r.invocationCount);
1757          checkCompletedNormally(f, v1);
1758          checkCompletedNormally(g, v2);
1759 <        }
1565 <    }
1759 >    }}
1760  
1761      public void testRunAfterBoth_normalCompletion2() {
1762          for (ExecutionMode m : ExecutionMode.values())
1763          for (Integer v1 : new Integer[] { 1, null })
1764 <        for (Integer v2 : new Integer[] { 2, null }) {
1765 <
1764 >        for (Integer v2 : new Integer[] { 2, null })
1765 >    {
1766          final CompletableFuture<Integer> f = new CompletableFuture<>();
1767          final CompletableFuture<Integer> g = new CompletableFuture<>();
1768          final Noop r = new Noop();
# Line 1576 | Line 1770 | public class CompletableFutureTest exten
1770  
1771          g.complete(v2);
1772          checkIncomplete(h);
1773 <        assertFalse(r.ran);
1773 >        assertEquals(0, r.invocationCount);
1774          f.complete(v1);
1775  
1776          checkCompletedNormally(h, null);
1777 <        assertTrue(r.ran);
1777 >        assertEquals(1, r.invocationCount);
1778          checkCompletedNormally(f, v1);
1779          checkCompletedNormally(g, v2);
1780 <        }
1587 <    }
1780 >    }}
1781  
1782      public void testRunAfterBoth_normalCompletion3() {
1783          for (ExecutionMode m : ExecutionMode.values())
1784          for (Integer v1 : new Integer[] { 1, null })
1785 <        for (Integer v2 : new Integer[] { 2, null }) {
1786 <
1785 >        for (Integer v2 : new Integer[] { 2, null })
1786 >    {
1787          final CompletableFuture<Integer> f = new CompletableFuture<>();
1788          final CompletableFuture<Integer> g = new CompletableFuture<>();
1789          final Noop r = new Noop();
# Line 1600 | Line 1793 | public class CompletableFutureTest exten
1793          final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1794  
1795          checkCompletedNormally(h, null);
1796 <        assertTrue(r.ran);
1796 >        assertEquals(1, r.invocationCount);
1797          checkCompletedNormally(f, v1);
1798          checkCompletedNormally(g, v2);
1799 <        }
1607 <    }
1799 >    }}
1800  
1801      public void testRunAfterBoth_normalCompletion4() {
1802          for (ExecutionMode m : ExecutionMode.values())
1803          for (Integer v1 : new Integer[] { 1, null })
1804 <        for (Integer v2 : new Integer[] { 2, null }) {
1805 <
1804 >        for (Integer v2 : new Integer[] { 2, null })
1805 >    {
1806          final CompletableFuture<Integer> f = new CompletableFuture<>();
1807          final CompletableFuture<Integer> g = new CompletableFuture<>();
1808          final Noop r = new Noop();
# Line 1620 | Line 1812 | public class CompletableFutureTest exten
1812          final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1813  
1814          checkCompletedNormally(h, null);
1815 <        assertTrue(r.ran);
1815 >        assertEquals(1, r.invocationCount);
1816          checkCompletedNormally(f, v1);
1817          checkCompletedNormally(g, v2);
1818 <        }
1627 <    }
1818 >    }}
1819  
1820      /**
1821       * runAfterBoth result completes exceptionally after exceptional
# Line 1632 | Line 1823 | public class CompletableFutureTest exten
1823       */
1824      public void testRunAfterBoth_exceptionalCompletion1() {
1825          for (ExecutionMode m : ExecutionMode.values())
1826 <        for (Integer v1 : new Integer[] { 1, null }) {
1827 <
1826 >        for (Integer v1 : new Integer[] { 1, null })
1827 >    {
1828          final CompletableFuture<Integer> f = new CompletableFuture<>();
1829          final CompletableFuture<Integer> g = new CompletableFuture<>();
1830          final Noop r = new Noop();
# Line 1646 | Line 1837 | public class CompletableFutureTest exten
1837  
1838          checkCompletedWithWrappedCFException(h, ex);
1839          checkCompletedWithWrappedCFException(f, ex);
1840 <        assertFalse(r.ran);
1840 >        assertEquals(0, r.invocationCount);
1841          checkCompletedNormally(g, v1);
1842 <        }
1652 <    }
1842 >    }}
1843  
1844      public void testRunAfterBoth_exceptionalCompletion2() {
1845          for (ExecutionMode m : ExecutionMode.values())
1846 <        for (Integer v1 : new Integer[] { 1, null }) {
1847 <
1846 >        for (Integer v1 : new Integer[] { 1, null })
1847 >    {
1848          final CompletableFuture<Integer> f = new CompletableFuture<>();
1849          final CompletableFuture<Integer> g = new CompletableFuture<>();
1850          final Noop r = new Noop();
# Line 1667 | Line 1857 | public class CompletableFutureTest exten
1857  
1858          checkCompletedWithWrappedCFException(h, ex);
1859          checkCompletedWithWrappedCFException(g, ex);
1860 <        assertFalse(r.ran);
1860 >        assertEquals(0, r.invocationCount);
1861          checkCompletedNormally(f, v1);
1862 <        }
1673 <    }
1862 >    }}
1863  
1864      public void testRunAfterBoth_exceptionalCompletion3() {
1865          for (ExecutionMode m : ExecutionMode.values())
1866 <        for (Integer v1 : new Integer[] { 1, null }) {
1867 <
1866 >        for (Integer v1 : new Integer[] { 1, null })
1867 >    {
1868          final CompletableFuture<Integer> f = new CompletableFuture<>();
1869          final CompletableFuture<Integer> g = new CompletableFuture<>();
1870          final Noop r = new Noop();
# Line 1687 | Line 1876 | public class CompletableFutureTest exten
1876  
1877          checkCompletedWithWrappedCFException(h, ex);
1878          checkCompletedWithWrappedCFException(g, ex);
1879 <        assertFalse(r.ran);
1879 >        assertEquals(0, r.invocationCount);
1880          checkCompletedNormally(f, v1);
1881 <        }
1693 <    }
1881 >    }}
1882  
1883      public void testRunAfterBoth_exceptionalCompletion4() {
1884          for (ExecutionMode m : ExecutionMode.values())
1885 <        for (Integer v1 : new Integer[] { 1, null }) {
1886 <
1885 >        for (Integer v1 : new Integer[] { 1, null })
1886 >    {
1887          final CompletableFuture<Integer> f = new CompletableFuture<>();
1888          final CompletableFuture<Integer> g = new CompletableFuture<>();
1889          final Noop r = new Noop();
# Line 1707 | Line 1895 | public class CompletableFutureTest exten
1895  
1896          checkCompletedWithWrappedCFException(h, ex);
1897          checkCompletedWithWrappedCFException(f, ex);
1898 <        assertFalse(r.ran);
1898 >        assertEquals(0, r.invocationCount);
1899          checkCompletedNormally(g, v1);
1900 <        }
1713 <    }
1900 >    }}
1901  
1902      /**
1903       * runAfterBoth result completes exceptionally if action does
# Line 1718 | Line 1905 | public class CompletableFutureTest exten
1905      public void testRunAfterBoth_actionFailed1() {
1906          for (ExecutionMode m : ExecutionMode.values())
1907          for (Integer v1 : new Integer[] { 1, null })
1908 <        for (Integer v2 : new Integer[] { 2, null }) {
1909 <
1908 >        for (Integer v2 : new Integer[] { 2, null })
1909 >    {
1910          final CompletableFuture<Integer> f = new CompletableFuture<>();
1911          final CompletableFuture<Integer> g = new CompletableFuture<>();
1912 <        final FailingNoop r = new FailingNoop();
1912 >        final FailingRunnable r = new FailingRunnable();
1913          final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1914  
1915          f.complete(v1);
# Line 1732 | Line 1919 | public class CompletableFutureTest exten
1919          checkCompletedWithWrappedCFException(h);
1920          checkCompletedNormally(f, v1);
1921          checkCompletedNormally(g, v2);
1922 <        }
1736 <    }
1922 >    }}
1923  
1924      public void testRunAfterBoth_actionFailed2() {
1925          for (ExecutionMode m : ExecutionMode.values())
1926          for (Integer v1 : new Integer[] { 1, null })
1927 <        for (Integer v2 : new Integer[] { 2, null }) {
1928 <
1927 >        for (Integer v2 : new Integer[] { 2, null })
1928 >    {
1929          final CompletableFuture<Integer> f = new CompletableFuture<>();
1930          final CompletableFuture<Integer> g = new CompletableFuture<>();
1931 <        final FailingNoop r = new FailingNoop();
1931 >        final FailingRunnable r = new FailingRunnable();
1932          final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1933  
1934          g.complete(v2);
# Line 1752 | Line 1938 | public class CompletableFutureTest exten
1938          checkCompletedWithWrappedCFException(h);
1939          checkCompletedNormally(f, v1);
1940          checkCompletedNormally(g, v2);
1941 <        }
1756 <    }
1941 >    }}
1942  
1943      /**
1944       * runAfterBoth result completes exceptionally if either source cancelled
# Line 1761 | Line 1946 | public class CompletableFutureTest exten
1946      public void testRunAfterBoth_sourceCancelled1() {
1947          for (ExecutionMode m : ExecutionMode.values())
1948          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1949 <        for (Integer v1 : new Integer[] { 1, null }) {
1950 <
1949 >        for (Integer v1 : new Integer[] { 1, null })
1950 >    {
1951          final CompletableFuture<Integer> f = new CompletableFuture<>();
1952          final CompletableFuture<Integer> g = new CompletableFuture<>();
1953          final Noop r = new Noop();
# Line 1774 | Line 1959 | public class CompletableFutureTest exten
1959  
1960          checkCompletedWithWrappedCancellationException(h);
1961          checkCancelled(f);
1962 <        assertFalse(r.ran);
1962 >        assertEquals(0, r.invocationCount);
1963          checkCompletedNormally(g, v1);
1964 <        }
1780 <    }
1964 >    }}
1965  
1966      public void testRunAfterBoth_sourceCancelled2() {
1967          for (ExecutionMode m : ExecutionMode.values())
1968          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1969 <        for (Integer v1 : new Integer[] { 1, null }) {
1970 <
1969 >        for (Integer v1 : new Integer[] { 1, null })
1970 >    {
1971          final CompletableFuture<Integer> f = new CompletableFuture<>();
1972          final CompletableFuture<Integer> g = new CompletableFuture<>();
1973          final Noop r = new Noop();
# Line 1795 | Line 1979 | public class CompletableFutureTest exten
1979  
1980          checkCompletedWithWrappedCancellationException(h);
1981          checkCancelled(g);
1982 <        assertFalse(r.ran);
1982 >        assertEquals(0, r.invocationCount);
1983          checkCompletedNormally(f, v1);
1984 <        }
1801 <    }
1984 >    }}
1985  
1986      public void testRunAfterBoth_sourceCancelled3() {
1987          for (ExecutionMode m : ExecutionMode.values())
1988          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1989 <        for (Integer v1 : new Integer[] { 1, null }) {
1990 <
1989 >        for (Integer v1 : new Integer[] { 1, null })
1990 >    {
1991          final CompletableFuture<Integer> f = new CompletableFuture<>();
1992          final CompletableFuture<Integer> g = new CompletableFuture<>();
1993          final Noop r = new Noop();
# Line 1815 | Line 1998 | public class CompletableFutureTest exten
1998  
1999          checkCompletedWithWrappedCancellationException(h);
2000          checkCancelled(g);
2001 <        assertFalse(r.ran);
2001 >        assertEquals(0, r.invocationCount);
2002          checkCompletedNormally(f, v1);
2003 <        }
1821 <    }
2003 >    }}
2004  
2005      public void testRunAfterBoth_sourceCancelled4() {
2006          for (ExecutionMode m : ExecutionMode.values())
2007          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2008 <        for (Integer v1 : new Integer[] { 1, null }) {
2009 <
2008 >        for (Integer v1 : new Integer[] { 1, null })
2009 >    {
2010          final CompletableFuture<Integer> f = new CompletableFuture<>();
2011          final CompletableFuture<Integer> g = new CompletableFuture<>();
2012          final Noop r = new Noop();
# Line 1835 | Line 2017 | public class CompletableFutureTest exten
2017  
2018          checkCompletedWithWrappedCancellationException(h);
2019          checkCancelled(f);
2020 <        assertFalse(r.ran);
2020 >        assertEquals(0, r.invocationCount);
2021          checkCompletedNormally(g, v1);
2022 <        }
1841 <    }
2022 >    }}
2023  
2024      /**
2025       * applyToEither result completes normally after normal completion
# Line 1847 | Line 2028 | public class CompletableFutureTest exten
2028      public void testApplyToEither_normalCompletion1() {
2029          for (ExecutionMode m : ExecutionMode.values())
2030          for (Integer v1 : new Integer[] { 1, null })
2031 <        for (Integer v2 : new Integer[] { 2, null }) {
2032 <
2031 >        for (Integer v2 : new Integer[] { 2, null })
2032 >    {
2033          final CompletableFuture<Integer> f = new CompletableFuture<>();
2034          final CompletableFuture<Integer> g = new CompletableFuture<>();
2035          final IncFunction r = new IncFunction();
# Line 1861 | Line 2042 | public class CompletableFutureTest exten
2042          checkCompletedNormally(f, v1);
2043          checkCompletedNormally(g, v2);
2044          checkCompletedNormally(h, inc(v1));
2045 <        }
1865 <    }
2045 >    }}
2046  
2047      public void testApplyToEither_normalCompletion2() {
2048          for (ExecutionMode m : ExecutionMode.values())
2049          for (Integer v1 : new Integer[] { 1, null })
2050 <        for (Integer v2 : new Integer[] { 2, null }) {
2051 <
2050 >        for (Integer v2 : new Integer[] { 2, null })
2051 >    {
2052          final CompletableFuture<Integer> f = new CompletableFuture<>();
2053          final CompletableFuture<Integer> g = new CompletableFuture<>();
2054          final IncFunction r = new IncFunction();
# Line 1881 | Line 2061 | public class CompletableFutureTest exten
2061          checkCompletedNormally(f, v1);
2062          checkCompletedNormally(g, v2);
2063          checkCompletedNormally(h, inc(v2));
2064 <        }
2065 <    }
2064 >        }}
2065 >
2066      public void testApplyToEither_normalCompletion3() {
2067          for (ExecutionMode m : ExecutionMode.values())
2068          for (Integer v1 : new Integer[] { 1, null })
2069 <        for (Integer v2 : new Integer[] { 2, null }) {
2070 <
2069 >        for (Integer v2 : new Integer[] { 2, null })
2070 >    {
2071          final CompletableFuture<Integer> f = new CompletableFuture<>();
2072          final CompletableFuture<Integer> g = new CompletableFuture<>();
2073          final IncFunction r = new IncFunction();
# Line 1902 | Line 2082 | public class CompletableFutureTest exten
2082          // unspecified behavior
2083          assertTrue(Objects.equals(h.join(), inc(v1)) ||
2084                     Objects.equals(h.join(), inc(v2)));
2085 <        }
2086 <    }
2085 >        assertEquals(1, r.invocationCount);
2086 >    }}
2087  
2088      /**
2089       * applyToEither result completes exceptionally after exceptional
# Line 1911 | Line 2091 | public class CompletableFutureTest exten
2091       */
2092      public void testApplyToEither_exceptionalCompletion1() {
2093          for (ExecutionMode m : ExecutionMode.values())
2094 <        for (Integer v1 : new Integer[] { 1, null }) {
2095 <
2094 >        for (Integer v1 : new Integer[] { 1, null })
2095 >    {
2096          final CompletableFuture<Integer> f = new CompletableFuture<>();
2097          final CompletableFuture<Integer> g = new CompletableFuture<>();
2098          final IncFunction r = new IncFunction();
# Line 1923 | Line 2103 | public class CompletableFutureTest exten
2103          checkCompletedWithWrappedCFException(h, ex);
2104          g.complete(v1);
2105  
2106 <        assertFalse(r.ran());
2106 >        assertEquals(0, r.invocationCount);
2107          checkCompletedNormally(g, v1);
2108          checkCompletedWithWrappedCFException(f, ex);
2109          checkCompletedWithWrappedCFException(h, ex);
2110 <        }
1931 <    }
2110 >    }}
2111  
2112      public void testApplyToEither_exceptionalCompletion2() {
2113          for (ExecutionMode m : ExecutionMode.values())
2114 <        for (Integer v1 : new Integer[] { 1, null }) {
2115 <
2114 >        for (Integer v1 : new Integer[] { 1, null })
2115 >    {
2116          final CompletableFuture<Integer> f = new CompletableFuture<>();
2117          final CompletableFuture<Integer> g = new CompletableFuture<>();
2118          final IncFunction r = new IncFunction();
# Line 1944 | Line 2123 | public class CompletableFutureTest exten
2123          checkCompletedWithWrappedCFException(h, ex);
2124          f.complete(v1);
2125  
2126 <        assertFalse(r.ran());
2126 >        assertEquals(0, r.invocationCount);
2127          checkCompletedNormally(f, v1);
2128          checkCompletedWithWrappedCFException(g, ex);
2129          checkCompletedWithWrappedCFException(h, ex);
2130 <        }
1952 <    }
2130 >    }}
2131  
2132      public void testApplyToEither_exceptionalCompletion3() {
2133          for (ExecutionMode m : ExecutionMode.values())
2134 <        for (Integer v1 : new Integer[] { 1, null }) {
2135 <
2134 >        for (Integer v1 : new Integer[] { 1, null })
2135 >    {
2136          final CompletableFuture<Integer> f = new CompletableFuture<>();
2137          final CompletableFuture<Integer> g = new CompletableFuture<>();
2138          final IncFunction r = new IncFunction();
# Line 1967 | Line 2145 | public class CompletableFutureTest exten
2145          // unspecified behavior
2146          Integer v;
2147          try {
2148 <            assertEquals(h.join(), inc(v1));
2149 <            assertTrue(r.ran());
2148 >            assertEquals(inc(v1), h.join());
2149 >            assertEquals(1, r.invocationCount);
2150          } catch (CompletionException ok) {
2151              checkCompletedWithWrappedCFException(h, ex);
2152 <            assertFalse(r.ran());
2152 >            assertEquals(0, r.invocationCount);
2153          }
2154  
2155          checkCompletedWithWrappedCFException(g, ex);
2156          checkCompletedNormally(f, v1);
2157 <        }
1980 <    }
2157 >    }}
2158  
2159      public void testApplyToEither_exceptionalCompletion4() {
2160          for (ExecutionMode m : ExecutionMode.values())
2161 <        for (Integer v1 : new Integer[] { 1, null }) {
2162 <
2161 >        for (Integer v1 : new Integer[] { 1, null })
2162 >    {
2163          final CompletableFuture<Integer> f = new CompletableFuture<>();
2164          final CompletableFuture<Integer> g = new CompletableFuture<>();
2165          final IncFunction r = new IncFunction();
# Line 1995 | Line 2172 | public class CompletableFutureTest exten
2172          // unspecified behavior
2173          Integer v;
2174          try {
2175 <            assertEquals(h.join(), inc(v1));
2176 <            assertTrue(r.ran());
2175 >            assertEquals(inc(v1), h.join());
2176 >            assertEquals(1, r.invocationCount);
2177          } catch (CompletionException ok) {
2178              checkCompletedWithWrappedCFException(h, ex);
2179 <            assertFalse(r.ran());
2179 >            assertEquals(0, r.invocationCount);
2180          }
2181  
2182          checkCompletedWithWrappedCFException(f, ex);
2006        assertFalse(r.ran());
2183          checkCompletedNormally(g, v1);
2184 <        }
2009 <    }
2184 >    }}
2185  
2186      /**
2187       * applyToEither result completes exceptionally if action does
# Line 2014 | Line 2189 | public class CompletableFutureTest exten
2189      public void testApplyToEither_actionFailed1() {
2190          for (ExecutionMode m : ExecutionMode.values())
2191          for (Integer v1 : new Integer[] { 1, null })
2192 <        for (Integer v2 : new Integer[] { 2, null }) {
2193 <
2192 >        for (Integer v2 : new Integer[] { 2, null })
2193 >    {
2194          final CompletableFuture<Integer> f = new CompletableFuture<>();
2195          final CompletableFuture<Integer> g = new CompletableFuture<>();
2196          final FailingFunction r = new FailingFunction();
# Line 2026 | Line 2201 | public class CompletableFutureTest exten
2201          g.complete(v2);
2202          checkCompletedNormally(f, v1);
2203          checkCompletedNormally(g, v2);
2204 <        }
2030 <    }
2204 >    }}
2205  
2206      public void testApplyToEither_actionFailed2() {
2207          for (ExecutionMode m : ExecutionMode.values())
2208          for (Integer v1 : new Integer[] { 1, null })
2209 <        for (Integer v2 : new Integer[] { 2, null }) {
2210 <
2209 >        for (Integer v2 : new Integer[] { 2, null })
2210 >    {
2211          final CompletableFuture<Integer> f = new CompletableFuture<>();
2212          final CompletableFuture<Integer> g = new CompletableFuture<>();
2213          final FailingFunction r = new FailingFunction();
# Line 2044 | Line 2218 | public class CompletableFutureTest exten
2218          f.complete(v1);
2219          checkCompletedNormally(f, v1);
2220          checkCompletedNormally(g, v2);
2221 <        }
2048 <    }
2221 >    }}
2222  
2223      /**
2224       * applyToEither result completes exceptionally if either source cancelled
# Line 2053 | Line 2226 | public class CompletableFutureTest exten
2226      public void testApplyToEither_sourceCancelled1() {
2227          for (ExecutionMode m : ExecutionMode.values())
2228          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2229 <        for (Integer v1 : new Integer[] { 1, null }) {
2230 <
2229 >        for (Integer v1 : new Integer[] { 1, null })
2230 >    {
2231          final CompletableFuture<Integer> f = new CompletableFuture<>();
2232          final CompletableFuture<Integer> g = new CompletableFuture<>();
2233          final IncFunction r = new IncFunction();
# Line 2065 | Line 2238 | public class CompletableFutureTest exten
2238          g.complete(v1);
2239  
2240          checkCancelled(f);
2241 <        assertFalse(r.ran());
2241 >        assertEquals(0, r.invocationCount);
2242          checkCompletedNormally(g, v1);
2243          checkCompletedWithWrappedCancellationException(h);
2244 <        }
2072 <    }
2244 >    }}
2245  
2246      public void testApplyToEither_sourceCancelled2() {
2247          for (ExecutionMode m : ExecutionMode.values())
2248          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2249 <        for (Integer v1 : new Integer[] { 1, null }) {
2250 <
2249 >        for (Integer v1 : new Integer[] { 1, null })
2250 >    {
2251          final CompletableFuture<Integer> f = new CompletableFuture<>();
2252          final CompletableFuture<Integer> g = new CompletableFuture<>();
2253          final IncFunction r = new IncFunction();
# Line 2086 | Line 2258 | public class CompletableFutureTest exten
2258          f.complete(v1);
2259  
2260          checkCancelled(g);
2261 <        assertFalse(r.ran());
2261 >        assertEquals(0, r.invocationCount);
2262          checkCompletedNormally(f, v1);
2263          checkCompletedWithWrappedCancellationException(h);
2264 <        }
2093 <    }
2264 >    }}
2265  
2266      public void testApplyToEither_sourceCancelled3() {
2267          for (ExecutionMode m : ExecutionMode.values())
2268          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2269 <        for (Integer v1 : new Integer[] { 1, null }) {
2270 <
2269 >        for (Integer v1 : new Integer[] { 1, null })
2270 >    {
2271          final CompletableFuture<Integer> f = new CompletableFuture<>();
2272          final CompletableFuture<Integer> g = new CompletableFuture<>();
2273          final IncFunction r = new IncFunction();
# Line 2108 | Line 2279 | public class CompletableFutureTest exten
2279          // unspecified behavior
2280          Integer v;
2281          try {
2282 <            assertEquals(h.join(), inc(v1));
2283 <            assertTrue(r.ran());
2282 >            assertEquals(inc(v1), h.join());
2283 >            assertEquals(1, r.invocationCount);
2284          } catch (CompletionException ok) {
2285              checkCompletedWithWrappedCancellationException(h);
2286 <            assertFalse(r.ran());
2286 >            assertEquals(0, r.invocationCount);
2287          }
2288  
2289          checkCancelled(g);
2290          checkCompletedNormally(f, v1);
2291 <        }
2121 <    }
2291 >    }}
2292  
2293      public void testApplyToEither_sourceCancelled4() {
2294          for (ExecutionMode m : ExecutionMode.values())
2295          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2296 <        for (Integer v1 : new Integer[] { 1, null }) {
2297 <
2296 >        for (Integer v1 : new Integer[] { 1, null })
2297 >    {
2298          final CompletableFuture<Integer> f = new CompletableFuture<>();
2299          final CompletableFuture<Integer> g = new CompletableFuture<>();
2300          final IncFunction r = new IncFunction();
# Line 2136 | Line 2306 | public class CompletableFutureTest exten
2306          // unspecified behavior
2307          Integer v;
2308          try {
2309 <            assertEquals(h.join(), inc(v1));
2310 <            assertTrue(r.ran());
2309 >            assertEquals(inc(v1), h.join());
2310 >            assertEquals(1, r.invocationCount);
2311          } catch (CompletionException ok) {
2312              checkCompletedWithWrappedCancellationException(h);
2313 <            assertFalse(r.ran());
2313 >            assertEquals(0, r.invocationCount);
2314          }
2315  
2316          checkCancelled(f);
2317          checkCompletedNormally(g, v1);
2318 <        }
2149 <    }
2318 >    }}
2319  
2320      /**
2321       * acceptEither result completes normally after normal completion
# Line 2155 | Line 2324 | public class CompletableFutureTest exten
2324      public void testAcceptEither_normalCompletion1() {
2325          for (ExecutionMode m : ExecutionMode.values())
2326          for (Integer v1 : new Integer[] { 1, null })
2327 <        for (Integer v2 : new Integer[] { 2, null }) {
2328 <
2327 >        for (Integer v2 : new Integer[] { 2, null })
2328 >    {
2329          final CompletableFuture<Integer> f = new CompletableFuture<>();
2330          final CompletableFuture<Integer> g = new CompletableFuture<>();
2331          final IncAction r = new IncAction();
# Line 2164 | Line 2333 | public class CompletableFutureTest exten
2333  
2334          f.complete(v1);
2335          checkCompletedNormally(h, null);
2336 <        assertEquals(r.value, inc(v1));
2336 >        assertEquals(inc(v1), r.value);
2337          g.complete(v2);
2338  
2339          checkCompletedNormally(f, v1);
2340          checkCompletedNormally(g, v2);
2341          checkCompletedNormally(h, null);
2342 <        }
2174 <    }
2342 >    }}
2343  
2344      public void testAcceptEither_normalCompletion2() {
2345          for (ExecutionMode m : ExecutionMode.values())
2346          for (Integer v1 : new Integer[] { 1, null })
2347 <        for (Integer v2 : new Integer[] { 2, null }) {
2348 <
2347 >        for (Integer v2 : new Integer[] { 2, null })
2348 >    {
2349          final CompletableFuture<Integer> f = new CompletableFuture<>();
2350          final CompletableFuture<Integer> g = new CompletableFuture<>();
2351          final IncAction r = new IncAction();
# Line 2185 | Line 2353 | public class CompletableFutureTest exten
2353  
2354          g.complete(v2);
2355          checkCompletedNormally(h, null);
2356 <        assertEquals(r.value, inc(v2));
2356 >        assertEquals(inc(v2), r.value);
2357          f.complete(v1);
2358  
2359          checkCompletedNormally(f, v1);
2360          checkCompletedNormally(g, v2);
2361          checkCompletedNormally(h, null);
2362 <        }
2363 <    }
2362 >    }}
2363 >
2364      public void testAcceptEither_normalCompletion3() {
2365          for (ExecutionMode m : ExecutionMode.values())
2366          for (Integer v1 : new Integer[] { 1, null })
2367 <        for (Integer v2 : new Integer[] { 2, null }) {
2368 <
2367 >        for (Integer v2 : new Integer[] { 2, null })
2368 >    {
2369          final CompletableFuture<Integer> f = new CompletableFuture<>();
2370          final CompletableFuture<Integer> g = new CompletableFuture<>();
2371          final IncAction r = new IncAction();
# Line 2213 | Line 2381 | public class CompletableFutureTest exten
2381          // unspecified behavior
2382          assertTrue(Objects.equals(r.value, inc(v1)) ||
2383                     Objects.equals(r.value, inc(v2)));
2384 <        }
2217 <    }
2384 >    }}
2385  
2386      /**
2387       * acceptEither result completes exceptionally after exceptional
# Line 2222 | Line 2389 | public class CompletableFutureTest exten
2389       */
2390      public void testAcceptEither_exceptionalCompletion1() {
2391          for (ExecutionMode m : ExecutionMode.values())
2392 <        for (Integer v1 : new Integer[] { 1, null }) {
2393 <
2392 >        for (Integer v1 : new Integer[] { 1, null })
2393 >    {
2394          final CompletableFuture<Integer> f = new CompletableFuture<>();
2395          final CompletableFuture<Integer> g = new CompletableFuture<>();
2396          final IncAction r = new IncAction();
# Line 2234 | Line 2401 | public class CompletableFutureTest exten
2401          checkCompletedWithWrappedCFException(h, ex);
2402          g.complete(v1);
2403  
2404 <        assertFalse(r.ran());
2404 >        assertEquals(0, r.invocationCount);
2405          checkCompletedNormally(g, v1);
2406          checkCompletedWithWrappedCFException(f, ex);
2407          checkCompletedWithWrappedCFException(h, ex);
2408 <        }
2242 <    }
2408 >    }}
2409  
2410      public void testAcceptEither_exceptionalCompletion2() {
2411          for (ExecutionMode m : ExecutionMode.values())
2412 <        for (Integer v1 : new Integer[] { 1, null }) {
2413 <
2412 >        for (Integer v1 : new Integer[] { 1, null })
2413 >    {
2414          final CompletableFuture<Integer> f = new CompletableFuture<>();
2415          final CompletableFuture<Integer> g = new CompletableFuture<>();
2416          final IncAction r = new IncAction();
# Line 2255 | Line 2421 | public class CompletableFutureTest exten
2421          checkCompletedWithWrappedCFException(h, ex);
2422          f.complete(v1);
2423  
2424 <        assertFalse(r.ran());
2424 >        assertEquals(0, r.invocationCount);
2425          checkCompletedNormally(f, v1);
2426          checkCompletedWithWrappedCFException(g, ex);
2427          checkCompletedWithWrappedCFException(h, ex);
2428 <        }
2263 <    }
2428 >    }}
2429  
2430      public void testAcceptEither_exceptionalCompletion3() {
2431          for (ExecutionMode m : ExecutionMode.values())
2432 <        for (Integer v1 : new Integer[] { 1, null }) {
2433 <
2432 >        for (Integer v1 : new Integer[] { 1, null })
2433 >    {
2434          final CompletableFuture<Integer> f = new CompletableFuture<>();
2435          final CompletableFuture<Integer> g = new CompletableFuture<>();
2436          final IncAction r = new IncAction();
# Line 2278 | Line 2443 | public class CompletableFutureTest exten
2443          // unspecified behavior
2444          Integer v;
2445          try {
2446 <            assertEquals(h.join(), null);
2447 <            assertTrue(r.ran());
2446 >            assertNull(h.join());
2447 >            assertEquals(1, r.invocationCount);
2448              assertEquals(inc(v1), r.value);
2449          } catch (CompletionException ok) {
2450              checkCompletedWithWrappedCFException(h, ex);
2451 <            assertFalse(r.ran());
2451 >            assertEquals(0, r.invocationCount);
2452          }
2453  
2454          checkCompletedWithWrappedCFException(g, ex);
2455          checkCompletedNormally(f, v1);
2456 <        }
2292 <    }
2456 >    }}
2457  
2458      public void testAcceptEither_exceptionalCompletion4() {
2459          for (ExecutionMode m : ExecutionMode.values())
2460 <        for (Integer v1 : new Integer[] { 1, null }) {
2461 <
2460 >        for (Integer v1 : new Integer[] { 1, null })
2461 >    {
2462          final CompletableFuture<Integer> f = new CompletableFuture<>();
2463          final CompletableFuture<Integer> g = new CompletableFuture<>();
2464          final IncAction r = new IncAction();
# Line 2307 | Line 2471 | public class CompletableFutureTest exten
2471          // unspecified behavior
2472          Integer v;
2473          try {
2474 <            assertEquals(h.join(), null);
2475 <            assertTrue(r.ran());
2474 >            assertNull(h.join());
2475 >            assertEquals(1, r.invocationCount);
2476              assertEquals(inc(v1), r.value);
2477          } catch (CompletionException ok) {
2478              checkCompletedWithWrappedCFException(h, ex);
2479 <            assertFalse(r.ran());
2479 >            assertEquals(0, r.invocationCount);
2480          }
2481  
2482          checkCompletedWithWrappedCFException(f, ex);
2319        assertFalse(r.ran());
2483          checkCompletedNormally(g, v1);
2484 <        }
2322 <    }
2484 >    }}
2485  
2486      /**
2487       * acceptEither result completes exceptionally if action does
# Line 2327 | Line 2489 | public class CompletableFutureTest exten
2489      public void testAcceptEither_actionFailed1() {
2490          for (ExecutionMode m : ExecutionMode.values())
2491          for (Integer v1 : new Integer[] { 1, null })
2492 <        for (Integer v2 : new Integer[] { 2, null }) {
2493 <
2492 >        for (Integer v2 : new Integer[] { 2, null })
2493 >    {
2494          final CompletableFuture<Integer> f = new CompletableFuture<>();
2495          final CompletableFuture<Integer> g = new CompletableFuture<>();
2496          final FailingConsumer r = new FailingConsumer();
# Line 2339 | Line 2501 | public class CompletableFutureTest exten
2501          g.complete(v2);
2502          checkCompletedNormally(f, v1);
2503          checkCompletedNormally(g, v2);
2504 <        }
2343 <    }
2504 >    }}
2505  
2506      public void testAcceptEither_actionFailed2() {
2507          for (ExecutionMode m : ExecutionMode.values())
2508          for (Integer v1 : new Integer[] { 1, null })
2509 <        for (Integer v2 : new Integer[] { 2, null }) {
2510 <
2509 >        for (Integer v2 : new Integer[] { 2, null })
2510 >    {
2511          final CompletableFuture<Integer> f = new CompletableFuture<>();
2512          final CompletableFuture<Integer> g = new CompletableFuture<>();
2513          final FailingConsumer r = new FailingConsumer();
# Line 2357 | Line 2518 | public class CompletableFutureTest exten
2518          f.complete(v1);
2519          checkCompletedNormally(f, v1);
2520          checkCompletedNormally(g, v2);
2521 <        }
2361 <    }
2521 >    }}
2522  
2523      /**
2524       * acceptEither result completes exceptionally if either source cancelled
# Line 2366 | Line 2526 | public class CompletableFutureTest exten
2526      public void testAcceptEither_sourceCancelled1() {
2527          for (ExecutionMode m : ExecutionMode.values())
2528          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2529 <        for (Integer v1 : new Integer[] { 1, null }) {
2530 <
2529 >        for (Integer v1 : new Integer[] { 1, null })
2530 >    {
2531          final CompletableFuture<Integer> f = new CompletableFuture<>();
2532          final CompletableFuture<Integer> g = new CompletableFuture<>();
2533          final IncAction r = new IncAction();
# Line 2378 | Line 2538 | public class CompletableFutureTest exten
2538          g.complete(v1);
2539  
2540          checkCancelled(f);
2541 <        assertFalse(r.ran());
2541 >        assertEquals(0, r.invocationCount);
2542          checkCompletedNormally(g, v1);
2543          checkCompletedWithWrappedCancellationException(h);
2544 <        }
2385 <    }
2544 >    }}
2545  
2546      public void testAcceptEither_sourceCancelled2() {
2547          for (ExecutionMode m : ExecutionMode.values())
2548          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2549 <        for (Integer v1 : new Integer[] { 1, null }) {
2550 <
2549 >        for (Integer v1 : new Integer[] { 1, null })
2550 >    {
2551          final CompletableFuture<Integer> f = new CompletableFuture<>();
2552          final CompletableFuture<Integer> g = new CompletableFuture<>();
2553          final IncAction r = new IncAction();
# Line 2399 | Line 2558 | public class CompletableFutureTest exten
2558          f.complete(v1);
2559  
2560          checkCancelled(g);
2561 <        assertFalse(r.ran());
2561 >        assertEquals(0, r.invocationCount);
2562          checkCompletedNormally(f, v1);
2563          checkCompletedWithWrappedCancellationException(h);
2564 <        }
2406 <    }
2564 >    }}
2565  
2566      public void testAcceptEither_sourceCancelled3() {
2567          for (ExecutionMode m : ExecutionMode.values())
2568          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2569 <        for (Integer v1 : new Integer[] { 1, null }) {
2570 <
2569 >        for (Integer v1 : new Integer[] { 1, null })
2570 >    {
2571          final CompletableFuture<Integer> f = new CompletableFuture<>();
2572          final CompletableFuture<Integer> g = new CompletableFuture<>();
2573          final IncAction r = new IncAction();
# Line 2421 | Line 2579 | public class CompletableFutureTest exten
2579          // unspecified behavior
2580          Integer v;
2581          try {
2582 <            assertEquals(h.join(), null);
2583 <            assertTrue(r.ran());
2582 >            assertNull(h.join());
2583 >            assertEquals(1, r.invocationCount);
2584              assertEquals(inc(v1), r.value);
2585          } catch (CompletionException ok) {
2586              checkCompletedWithWrappedCancellationException(h);
2587 <            assertFalse(r.ran());
2587 >            assertEquals(0, r.invocationCount);
2588          }
2589  
2590          checkCancelled(g);
2591          checkCompletedNormally(f, v1);
2592 <        }
2435 <    }
2592 >    }}
2593  
2594      public void testAcceptEither_sourceCancelled4() {
2595          for (ExecutionMode m : ExecutionMode.values())
2596          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2597 <        for (Integer v1 : new Integer[] { 1, null }) {
2598 <
2597 >        for (Integer v1 : new Integer[] { 1, null })
2598 >    {
2599          final CompletableFuture<Integer> f = new CompletableFuture<>();
2600          final CompletableFuture<Integer> g = new CompletableFuture<>();
2601          final IncAction r = new IncAction();
# Line 2450 | Line 2607 | public class CompletableFutureTest exten
2607          // unspecified behavior
2608          Integer v;
2609          try {
2610 <            assertEquals(h.join(), null);
2611 <            assertTrue(r.ran());
2610 >            assertNull(h.join());
2611 >            assertEquals(1, r.invocationCount);
2612              assertEquals(inc(v1), r.value);
2613          } catch (CompletionException ok) {
2614              checkCompletedWithWrappedCancellationException(h);
2615 <            assertFalse(r.ran());
2615 >            assertEquals(0, r.invocationCount);
2616          }
2617  
2618          checkCancelled(f);
2619          checkCompletedNormally(g, v1);
2620 <        }
2464 <    }
2620 >    }}
2621  
2622      /**
2623       * runAfterEither result completes normally after normal completion
2624       * of either source
2625       */
2626 <    public void testRunAfterEither() {
2627 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2628 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2629 <        Noop r = new Noop();
2630 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
2631 <        f.complete(one);
2632 <        checkCompletedNormally(g, null);
2633 <        f2.complete(one);
2634 <        checkCompletedNormally(g, null);
2479 <        assertTrue(r.ran);
2480 <
2481 <        r = new Noop();
2482 <        f = new CompletableFuture<>();
2483 <        f.complete(one);
2484 <        f2 = new CompletableFuture<>();
2485 <        g = f.runAfterEither(f2, r);
2486 <        checkCompletedNormally(g, null);
2487 <        assertTrue(r.ran);
2488 <    }
2489 <
2490 <    /**
2491 <     * runAfterEither result completes exceptionally after exceptional
2492 <     * completion of either source
2493 <     */
2494 <    public void testRunAfterEither2() {
2495 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2496 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2497 <        Noop r = new Noop();
2498 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
2499 <        f.completeExceptionally(new CFException());
2500 <        f2.complete(one);
2501 <        checkCompletedWithWrappedCFException(g);
2502 <
2503 <        r = new Noop();
2504 <        f = new CompletableFuture<>();
2505 <        f2 = new CompletableFuture<>();
2506 <        f2.completeExceptionally(new CFException());
2507 <        g = f.runAfterEither(f2, r);
2508 <        checkCompletedWithWrappedCFException(g);
2509 <    }
2626 >    public void testRunAfterEither_normalCompletion1() {
2627 >        for (ExecutionMode m : ExecutionMode.values())
2628 >        for (Integer v1 : new Integer[] { 1, null })
2629 >        for (Integer v2 : new Integer[] { 2, null })
2630 >    {
2631 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2632 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2633 >        final Noop r = new Noop();
2634 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2635  
2636 <    /**
2637 <     * runAfterEither result completes exceptionally if action does
2638 <     */
2639 <    public void testRunAfterEither3() {
2515 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2516 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2517 <        FailingNoop r = new FailingNoop();
2518 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
2519 <        f2.complete(two);
2520 <        checkCompletedWithWrappedCFException(g);
2521 <    }
2636 >        f.complete(v1);
2637 >        checkCompletedNormally(h, null);
2638 >        assertEquals(1, r.invocationCount);
2639 >        g.complete(v2);
2640  
2641 <    /**
2642 <     * runAfterEither result completes exceptionally if either source cancelled
2643 <     */
2644 <    public void testRunAfterEither4() {
2645 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2528 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2529 <        Noop r = new Noop();
2530 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
2531 <        assertTrue(f.cancel(true));
2532 <        checkCompletedWithWrappedCancellationException(g);
2533 <        f = new CompletableFuture<>();
2534 <        f2 = new CompletableFuture<>();
2535 <        assertTrue(f2.cancel(true));
2536 <        checkCompletedWithWrappedCancellationException(g);
2537 <    }
2641 >        checkCompletedNormally(f, v1);
2642 >        checkCompletedNormally(g, v2);
2643 >        checkCompletedNormally(h, null);
2644 >        assertEquals(1, r.invocationCount);
2645 >    }}
2646  
2647 <    /**
2648 <     * thenCompose result completes normally after normal completion of source
2649 <     */
2650 <    public void testThenCompose() {
2651 <        CompletableFuture<Integer> f, g;
2652 <        CompletableFutureInc r;
2647 >    public void testRunAfterEither_normalCompletion2() {
2648 >        for (ExecutionMode m : ExecutionMode.values())
2649 >        for (Integer v1 : new Integer[] { 1, null })
2650 >        for (Integer v2 : new Integer[] { 2, null })
2651 >    {
2652 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2653 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2654 >        final Noop r = new Noop();
2655 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2656  
2657 <        f = new CompletableFuture<>();
2658 <        g = f.thenCompose(r = new CompletableFutureInc());
2659 <        f.complete(one);
2660 <        checkCompletedNormally(g, two);
2550 <        assertTrue(r.ran);
2657 >        g.complete(v2);
2658 >        checkCompletedNormally(h, null);
2659 >        assertEquals(1, r.invocationCount);
2660 >        f.complete(v1);
2661  
2662 <        f = new CompletableFuture<>();
2663 <        f.complete(one);
2664 <        g = f.thenCompose(r = new CompletableFutureInc());
2665 <        checkCompletedNormally(g, two);
2666 <        assertTrue(r.ran);
2557 <    }
2662 >        checkCompletedNormally(f, v1);
2663 >        checkCompletedNormally(g, v2);
2664 >        checkCompletedNormally(h, null);
2665 >        assertEquals(1, r.invocationCount);
2666 >        }}
2667  
2668 <    /**
2669 <     * thenCompose result completes exceptionally after exceptional
2670 <     * completion of source
2671 <     */
2672 <    public void testThenCompose2() {
2673 <        CompletableFuture<Integer> f, g;
2674 <        CompletableFutureInc r;
2668 >    public void testRunAfterEither_normalCompletion3() {
2669 >        for (ExecutionMode m : ExecutionMode.values())
2670 >        for (Integer v1 : new Integer[] { 1, null })
2671 >        for (Integer v2 : new Integer[] { 2, null })
2672 >    {
2673 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2674 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2675 >        final Noop r = new Noop();
2676  
2677 <        f = new CompletableFuture<>();
2678 <        g = f.thenCompose(r = new CompletableFutureInc());
2679 <        f.completeExceptionally(new CFException());
2570 <        checkCompletedWithWrappedCFException(g);
2677 >        f.complete(v1);
2678 >        g.complete(v2);
2679 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2680  
2681 <        f = new CompletableFuture<>();
2682 <        f.completeExceptionally(new CFException());
2683 <        g = f.thenCompose(r = new CompletableFutureInc());
2684 <        checkCompletedWithWrappedCFException(g);
2685 <    }
2681 >        checkCompletedNormally(h, null);
2682 >        checkCompletedNormally(f, v1);
2683 >        checkCompletedNormally(g, v2);
2684 >        assertEquals(1, r.invocationCount);
2685 >    }}
2686  
2687      /**
2688 <     * thenCompose result completes exceptionally if action does
2688 >     * runAfterEither result completes exceptionally after exceptional
2689 >     * completion of either source
2690       */
2691 <    public void testThenCompose3() {
2692 <        CompletableFuture<Integer> f, g;
2693 <        FailingCompletableFutureFunction r;
2694 <
2695 <        f = new CompletableFuture<>();
2696 <        g = f.thenCompose(r = new FailingCompletableFutureFunction());
2697 <        f.complete(one);
2698 <        checkCompletedWithWrappedCFException(g);
2691 >    public void testRunAfterEither_exceptionalCompletion1() {
2692 >        for (ExecutionMode m : ExecutionMode.values())
2693 >        for (Integer v1 : new Integer[] { 1, null })
2694 >    {
2695 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2696 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2697 >        final Noop r = new Noop();
2698 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2699 >        final CFException ex = new CFException();
2700  
2701 <        f = new CompletableFuture<>();
2702 <        f.complete(one);
2703 <        g = f.thenCompose(r = new FailingCompletableFutureFunction());
2593 <        checkCompletedWithWrappedCFException(g);
2594 <    }
2701 >        f.completeExceptionally(ex);
2702 >        checkCompletedWithWrappedCFException(h, ex);
2703 >        g.complete(v1);
2704  
2705 <    /**
2706 <     * thenCompose result completes exceptionally if source cancelled
2707 <     */
2708 <    public void testThenCompose4() {
2709 <        CompletableFuture<Integer> f, g;
2601 <        CompletableFutureInc r;
2705 >        assertEquals(0, r.invocationCount);
2706 >        checkCompletedNormally(g, v1);
2707 >        checkCompletedWithWrappedCFException(f, ex);
2708 >        checkCompletedWithWrappedCFException(h, ex);
2709 >    }}
2710  
2711 <        f = new CompletableFuture<>();
2712 <        g = f.thenCompose(r = new CompletableFutureInc());
2713 <        assertTrue(f.cancel(true));
2714 <        checkCompletedWithWrappedCancellationException(g);
2711 >    public void testRunAfterEither_exceptionalCompletion2() {
2712 >        for (ExecutionMode m : ExecutionMode.values())
2713 >        for (Integer v1 : new Integer[] { 1, null })
2714 >    {
2715 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2716 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2717 >        final Noop r = new Noop();
2718 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2719 >        final CFException ex = new CFException();
2720  
2721 <        f = new CompletableFuture<>();
2722 <        assertTrue(f.cancel(true));
2723 <        g = f.thenCompose(r = new CompletableFutureInc());
2611 <        checkCompletedWithWrappedCancellationException(g);
2612 <    }
2721 >        g.completeExceptionally(ex);
2722 >        checkCompletedWithWrappedCFException(h, ex);
2723 >        f.complete(v1);
2724  
2725 <    // asyncs
2725 >        assertEquals(0, r.invocationCount);
2726 >        checkCompletedNormally(f, v1);
2727 >        checkCompletedWithWrappedCFException(g, ex);
2728 >        checkCompletedWithWrappedCFException(h, ex);
2729 >    }}
2730  
2731 <    /**
2732 <     * thenRunAsync result completes normally after normal completion of source
2733 <     */
2734 <    public void testThenRunAsync() {
2735 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2736 <        Noop r = new Noop();
2737 <        CompletableFuture<Void> g = f.thenRunAsync(r);
2738 <        f.complete(null);
2624 <        checkCompletedNormally(g, null);
2731 >    public void testRunAfterEither_exceptionalCompletion3() {
2732 >        for (ExecutionMode m : ExecutionMode.values())
2733 >        for (Integer v1 : new Integer[] { 1, null })
2734 >    {
2735 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2736 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2737 >        final Noop r = new Noop();
2738 >        final CFException ex = new CFException();
2739  
2740 <        // reordered version
2741 <        f = new CompletableFuture<>();
2742 <        f.complete(null);
2629 <        r = new Noop();
2630 <        g = f.thenRunAsync(r);
2631 <        checkCompletedNormally(g, null);
2632 <    }
2740 >        g.completeExceptionally(ex);
2741 >        f.complete(v1);
2742 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2743  
2744 <    /**
2745 <     * thenRunAsync result completes exceptionally after exceptional
2636 <     * completion of source
2637 <     */
2638 <    public void testThenRunAsync2() {
2639 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2640 <        Noop r = new Noop();
2641 <        CompletableFuture<Void> g = f.thenRunAsync(r);
2642 <        f.completeExceptionally(new CFException());
2744 >        // unspecified behavior
2745 >        Integer v;
2746          try {
2747 <            g.join();
2748 <            shouldThrow();
2749 <        } catch (CompletionException success) {}
2750 <        checkCompletedWithWrappedCFException(g);
2751 <    }
2752 <
2650 <    /**
2651 <     * thenRunAsync result completes exceptionally if action does
2652 <     */
2653 <    public void testThenRunAsync3() {
2654 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2655 <        FailingNoop r = new FailingNoop();
2656 <        CompletableFuture<Void> g = f.thenRunAsync(r);
2657 <        f.complete(null);
2658 <        checkCompletedWithWrappedCFException(g);
2659 <    }
2660 <
2661 <    /**
2662 <     * thenRunAsync result completes exceptionally if source cancelled
2663 <     */
2664 <    public void testThenRunAsync4() {
2665 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2666 <        Noop r = new Noop();
2667 <        CompletableFuture<Void> g = f.thenRunAsync(r);
2668 <        assertTrue(f.cancel(true));
2669 <        checkCompletedWithWrappedCancellationException(g);
2670 <    }
2671 <
2672 <    /**
2673 <     * thenApplyAsync result completes normally after normal completion of source
2674 <     */
2675 <    public void testThenApplyAsync() {
2676 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2677 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
2678 <        f.complete(one);
2679 <        checkCompletedNormally(g, two);
2680 <    }
2681 <
2682 <    /**
2683 <     * thenApplyAsync result completes exceptionally after exceptional
2684 <     * completion of source
2685 <     */
2686 <    public void testThenApplyAsync2() {
2687 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2688 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
2689 <        f.completeExceptionally(new CFException());
2690 <        checkCompletedWithWrappedCFException(g);
2691 <    }
2692 <
2693 <    /**
2694 <     * thenApplyAsync result completes exceptionally if action does
2695 <     */
2696 <    public void testThenApplyAsync3() {
2697 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2698 <        FailingFunction r = new FailingFunction();
2699 <        CompletableFuture<Integer> g = f.thenApplyAsync(r);
2700 <        f.complete(null);
2701 <        checkCompletedWithWrappedCFException(g);
2702 <    }
2703 <
2704 <    /**
2705 <     * thenApplyAsync result completes exceptionally if source cancelled
2706 <     */
2707 <    public void testThenApplyAsync4() {
2708 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2709 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
2710 <        assertTrue(f.cancel(true));
2711 <        checkCompletedWithWrappedCancellationException(g);
2712 <    }
2713 <
2714 <    /**
2715 <     * thenAcceptAsync result completes normally after normal
2716 <     * completion of source
2717 <     */
2718 <    public void testThenAcceptAsync() {
2719 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2720 <        IncAction r = new IncAction();
2721 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2722 <        f.complete(one);
2723 <        checkCompletedNormally(g, null);
2724 <        assertEquals(r.value, (Integer) 2);
2725 <    }
2726 <
2727 <    /**
2728 <     * thenAcceptAsync result completes exceptionally after exceptional
2729 <     * completion of source
2730 <     */
2731 <    public void testThenAcceptAsync2() {
2732 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2733 <        IncAction r = new IncAction();
2734 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2735 <        f.completeExceptionally(new CFException());
2736 <        checkCompletedWithWrappedCFException(g);
2737 <    }
2738 <
2739 <    /**
2740 <     * thenAcceptAsync result completes exceptionally if action does
2741 <     */
2742 <    public void testThenAcceptAsync3() {
2743 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2744 <        FailingConsumer r = new FailingConsumer();
2745 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2746 <        f.complete(null);
2747 <        checkCompletedWithWrappedCFException(g);
2748 <    }
2749 <
2750 <    /**
2751 <     * thenAcceptAsync result completes exceptionally if source cancelled
2752 <     */
2753 <    public void testThenAcceptAsync4() {
2754 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2755 <        IncAction r = new IncAction();
2756 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2757 <        assertTrue(f.cancel(true));
2758 <        checkCompletedWithWrappedCancellationException(g);
2759 <    }
2760 <
2761 <    /**
2762 <     * runAfterEitherAsync result completes normally after normal
2763 <     * completion of sources
2764 <     */
2765 <    public void testRunAfterEitherAsync() {
2766 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2767 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2768 <        Noop r = new Noop();
2769 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
2770 <        f.complete(one);
2771 <        checkCompletedNormally(g, null);
2772 <        assertTrue(r.ran);
2773 <
2774 <        r = new Noop();
2775 <        f = new CompletableFuture<>();
2776 <        f.complete(one);
2777 <        f2 = new CompletableFuture<>();
2778 <        g = f.runAfterEitherAsync(f2, r);
2779 <        checkCompletedNormally(g, null);
2780 <        assertTrue(r.ran);
2781 <    }
2747 >            assertNull(h.join());
2748 >            assertEquals(1, r.invocationCount);
2749 >        } catch (CompletionException ok) {
2750 >            checkCompletedWithWrappedCFException(h, ex);
2751 >            assertEquals(0, r.invocationCount);
2752 >        }
2753  
2754 <    /**
2755 <     * runAfterEitherAsync result completes exceptionally after exceptional
2756 <     * completion of source
2786 <     */
2787 <    public void testRunAfterEitherAsync2() {
2788 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2789 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2790 <        Noop r = new Noop();
2791 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
2792 <        f.completeExceptionally(new CFException());
2793 <        checkCompletedWithWrappedCFException(g);
2754 >        checkCompletedWithWrappedCFException(g, ex);
2755 >        checkCompletedNormally(f, v1);
2756 >    }}
2757  
2758 <        r = new Noop();
2759 <        f = new CompletableFuture<>();
2760 <        f2 = new CompletableFuture<>();
2761 <        f2.completeExceptionally(new CFException());
2762 <        g = f.runAfterEitherAsync(f2, r);
2763 <        f.complete(one);
2764 <        checkCompletedWithWrappedCFException(g);
2765 <    }
2758 >    public void testRunAfterEither_exceptionalCompletion4() {
2759 >        for (ExecutionMode m : ExecutionMode.values())
2760 >        for (Integer v1 : new Integer[] { 1, null })
2761 >    {
2762 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2763 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2764 >        final Noop r = new Noop();
2765 >        final CFException ex = new CFException();
2766  
2767 <    /**
2768 <     * runAfterEitherAsync result completes exceptionally if action does
2769 <     */
2807 <    public void testRunAfterEitherAsync3() {
2808 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2809 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2810 <        FailingNoop r = new FailingNoop();
2811 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
2812 <        f.complete(one);
2813 <        checkCompletedWithWrappedCFException(g);
2814 <    }
2767 >        f.completeExceptionally(ex);
2768 >        g.complete(v1);
2769 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2770  
2771 <    /**
2772 <     * runAfterEitherAsync result completes exceptionally if either
2773 <     * source cancelled
2774 <     */
2775 <    public void testRunAfterEitherAsync4() {
2776 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2777 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2778 <        Noop r = new Noop();
2779 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
2825 <        assertTrue(f.cancel(true));
2826 <        checkCompletedWithWrappedCancellationException(g);
2771 >        // unspecified behavior
2772 >        Integer v;
2773 >        try {
2774 >            assertNull(h.join());
2775 >            assertEquals(1, r.invocationCount);
2776 >        } catch (CompletionException ok) {
2777 >            checkCompletedWithWrappedCFException(h, ex);
2778 >            assertEquals(0, r.invocationCount);
2779 >        }
2780  
2781 <        r = new Noop();
2782 <        f = new CompletableFuture<>();
2783 <        f2 = new CompletableFuture<>();
2831 <        assertTrue(f2.cancel(true));
2832 <        g = f.runAfterEitherAsync(f2, r);
2833 <        checkCompletedWithWrappedCancellationException(g);
2834 <    }
2781 >        checkCompletedWithWrappedCFException(f, ex);
2782 >        checkCompletedNormally(g, v1);
2783 >    }}
2784  
2785      /**
2786 <     * thenComposeAsync result completes normally after normal
2838 <     * completion of source
2786 >     * runAfterEither result completes exceptionally if action does
2787       */
2788 <    public void testThenComposeAsync() {
2789 <        CompletableFuture<Integer> f, g;
2790 <        CompletableFutureInc r;
2791 <
2792 <        f = new CompletableFuture<>();
2793 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2794 <        f.complete(one);
2795 <        checkCompletedNormally(g, two);
2796 <
2849 <        f = new CompletableFuture<>();
2850 <        f.complete(one);
2851 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2852 <        checkCompletedNormally(g, two);
2853 <    }
2788 >    public void testRunAfterEither_actionFailed1() {
2789 >        for (ExecutionMode m : ExecutionMode.values())
2790 >        for (Integer v1 : new Integer[] { 1, null })
2791 >        for (Integer v2 : new Integer[] { 2, null })
2792 >    {
2793 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2794 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2795 >        final FailingRunnable r = new FailingRunnable();
2796 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2797  
2798 <    /**
2799 <     * thenComposeAsync result completes exceptionally after
2800 <     * exceptional completion of source
2801 <     */
2802 <    public void testThenComposeAsync2() {
2803 <        CompletableFuture<Integer> f, g;
2861 <        CompletableFutureInc r;
2798 >        f.complete(v1);
2799 >        checkCompletedWithWrappedCFException(h);
2800 >        g.complete(v2);
2801 >        checkCompletedNormally(f, v1);
2802 >        checkCompletedNormally(g, v2);
2803 >    }}
2804  
2805 <        f = new CompletableFuture<>();
2806 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2807 <        f.completeExceptionally(new CFException());
2808 <        checkCompletedWithWrappedCFException(g);
2809 <        assertFalse(r.ran);
2805 >    public void testRunAfterEither_actionFailed2() {
2806 >        for (ExecutionMode m : ExecutionMode.values())
2807 >        for (Integer v1 : new Integer[] { 1, null })
2808 >        for (Integer v2 : new Integer[] { 2, null })
2809 >    {
2810 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2811 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2812 >        final FailingRunnable r = new FailingRunnable();
2813 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2814  
2815 <        f = new CompletableFuture<>();
2816 <        f.completeExceptionally(new CFException());
2817 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2818 <        checkCompletedWithWrappedCFException(g);
2819 <        assertFalse(r.ran);
2820 <    }
2815 >        g.complete(v2);
2816 >        checkCompletedWithWrappedCFException(h);
2817 >        f.complete(v1);
2818 >        checkCompletedNormally(f, v1);
2819 >        checkCompletedNormally(g, v2);
2820 >    }}
2821  
2822      /**
2823 <     * thenComposeAsync result completes exceptionally if action does
2823 >     * runAfterEither result completes exceptionally if either source cancelled
2824       */
2825 <    public void testThenComposeAsync3() {
2826 <        CompletableFuture<Integer> f, g;
2827 <        FailingCompletableFutureFunction r;
2828 <
2829 <        f = new CompletableFuture<>();
2830 <        g = f.thenComposeAsync(r = new FailingCompletableFutureFunction());
2831 <        f.complete(one);
2832 <        checkCompletedWithWrappedCFException(g);
2825 >    public void testRunAfterEither_sourceCancelled1() {
2826 >        for (ExecutionMode m : ExecutionMode.values())
2827 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2828 >        for (Integer v1 : new Integer[] { 1, null })
2829 >    {
2830 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2831 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2832 >        final Noop r = new Noop();
2833 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2834  
2835 <        f = new CompletableFuture<>();
2836 <        f.complete(one);
2837 <        g = f.thenComposeAsync(r = new FailingCompletableFutureFunction());
2891 <        checkCompletedWithWrappedCFException(g);
2892 <    }
2835 >        assertTrue(f.cancel(mayInterruptIfRunning));
2836 >        checkCompletedWithWrappedCancellationException(h);
2837 >        g.complete(v1);
2838  
2839 <    /**
2840 <     * thenComposeAsync result completes exceptionally if source cancelled
2841 <     */
2842 <    public void testThenComposeAsync4() {
2843 <        CompletableFuture<Integer> f, g;
2899 <        CompletableFutureInc r;
2839 >        checkCancelled(f);
2840 >        assertEquals(0, r.invocationCount);
2841 >        checkCompletedNormally(g, v1);
2842 >        checkCompletedWithWrappedCancellationException(h);
2843 >    }}
2844  
2845 <        f = new CompletableFuture<>();
2846 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2847 <        assertTrue(f.cancel(true));
2848 <        checkCompletedWithWrappedCancellationException(g);
2845 >    public void testRunAfterEither_sourceCancelled2() {
2846 >        for (ExecutionMode m : ExecutionMode.values())
2847 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2848 >        for (Integer v1 : new Integer[] { 1, null })
2849 >    {
2850 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2851 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2852 >        final Noop r = new Noop();
2853 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2854  
2855 <        f = new CompletableFuture<>();
2856 <        assertTrue(f.cancel(true));
2857 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2909 <        checkCompletedWithWrappedCancellationException(g);
2910 <    }
2855 >        assertTrue(g.cancel(mayInterruptIfRunning));
2856 >        checkCompletedWithWrappedCancellationException(h);
2857 >        f.complete(v1);
2858  
2859 <    // async with explicit executors
2859 >        checkCancelled(g);
2860 >        assertEquals(0, r.invocationCount);
2861 >        checkCompletedNormally(f, v1);
2862 >        checkCompletedWithWrappedCancellationException(h);
2863 >    }}
2864  
2865 <    /**
2866 <     * thenRunAsync result completes normally after normal completion of source
2867 <     */
2868 <    public void testThenRunAsyncE() {
2869 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2870 <        Noop r = new Noop();
2871 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2872 <        f.complete(null);
2922 <        checkCompletedNormally(g, null);
2865 >    public void testRunAfterEither_sourceCancelled3() {
2866 >        for (ExecutionMode m : ExecutionMode.values())
2867 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2868 >        for (Integer v1 : new Integer[] { 1, null })
2869 >    {
2870 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2871 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2872 >        final Noop r = new Noop();
2873  
2874 <        // reordered version
2875 <        f = new CompletableFuture<>();
2876 <        f.complete(null);
2927 <        r = new Noop();
2928 <        g = f.thenRunAsync(r, new ThreadExecutor());
2929 <        checkCompletedNormally(g, null);
2930 <    }
2874 >        assertTrue(g.cancel(mayInterruptIfRunning));
2875 >        f.complete(v1);
2876 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2877  
2878 <    /**
2879 <     * thenRunAsync result completes exceptionally after exceptional
2934 <     * completion of source
2935 <     */
2936 <    public void testThenRunAsync2E() {
2937 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2938 <        Noop r = new Noop();
2939 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2940 <        f.completeExceptionally(new CFException());
2878 >        // unspecified behavior
2879 >        Integer v;
2880          try {
2881 <            g.join();
2882 <            shouldThrow();
2883 <        } catch (CompletionException success) {}
2884 <        checkCompletedWithWrappedCFException(g);
2885 <    }
2886 <
2948 <    /**
2949 <     * thenRunAsync result completes exceptionally if action does
2950 <     */
2951 <    public void testThenRunAsync3E() {
2952 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2953 <        FailingNoop r = new FailingNoop();
2954 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2955 <        f.complete(null);
2956 <        checkCompletedWithWrappedCFException(g);
2957 <    }
2958 <
2959 <    /**
2960 <     * thenRunAsync result completes exceptionally if source cancelled
2961 <     */
2962 <    public void testThenRunAsync4E() {
2963 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2964 <        Noop r = new Noop();
2965 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2966 <        assertTrue(f.cancel(true));
2967 <        checkCompletedWithWrappedCancellationException(g);
2968 <    }
2969 <
2970 <    /**
2971 <     * thenApplyAsync result completes normally after normal completion of source
2972 <     */
2973 <    public void testThenApplyAsyncE() {
2974 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2975 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
2976 <        f.complete(one);
2977 <        checkCompletedNormally(g, two);
2978 <    }
2979 <
2980 <    /**
2981 <     * thenApplyAsync result completes exceptionally after exceptional
2982 <     * completion of source
2983 <     */
2984 <    public void testThenApplyAsync2E() {
2985 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2986 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
2987 <        f.completeExceptionally(new CFException());
2988 <        checkCompletedWithWrappedCFException(g);
2989 <    }
2990 <
2991 <    /**
2992 <     * thenApplyAsync result completes exceptionally if action does
2993 <     */
2994 <    public void testThenApplyAsync3E() {
2995 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2996 <        FailingFunction r = new FailingFunction();
2997 <        CompletableFuture<Integer> g = f.thenApplyAsync(r, new ThreadExecutor());
2998 <        f.complete(null);
2999 <        checkCompletedWithWrappedCFException(g);
3000 <    }
2881 >            assertNull(h.join());
2882 >            assertEquals(1, r.invocationCount);
2883 >        } catch (CompletionException ok) {
2884 >            checkCompletedWithWrappedCancellationException(h);
2885 >            assertEquals(0, r.invocationCount);
2886 >        }
2887  
2888 <    /**
2889 <     * thenApplyAsync result completes exceptionally if source cancelled
2890 <     */
3005 <    public void testThenApplyAsync4E() {
3006 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3007 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
3008 <        assertTrue(f.cancel(true));
3009 <        checkCompletedWithWrappedCancellationException(g);
3010 <    }
2888 >        checkCancelled(g);
2889 >        checkCompletedNormally(f, v1);
2890 >    }}
2891  
2892 <    /**
2893 <     * thenAcceptAsync result completes normally after normal
2894 <     * completion of source
2895 <     */
2896 <    public void testThenAcceptAsyncE() {
2897 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2898 <        IncAction r = new IncAction();
2899 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3020 <        f.complete(one);
3021 <        checkCompletedNormally(g, null);
3022 <        assertEquals(r.value, (Integer) 2);
3023 <    }
2892 >    public void testRunAfterEither_sourceCancelled4() {
2893 >        for (ExecutionMode m : ExecutionMode.values())
2894 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2895 >        for (Integer v1 : new Integer[] { 1, null })
2896 >    {
2897 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2898 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2899 >        final Noop r = new Noop();
2900  
2901 <    /**
2902 <     * thenAcceptAsync result completes exceptionally after exceptional
2903 <     * completion of source
3028 <     */
3029 <    public void testThenAcceptAsync2E() {
3030 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3031 <        IncAction r = new IncAction();
3032 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3033 <        f.completeExceptionally(new CFException());
3034 <        checkCompletedWithWrappedCFException(g);
3035 <    }
2901 >        assertTrue(f.cancel(mayInterruptIfRunning));
2902 >        g.complete(v1);
2903 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2904  
2905 <    /**
2906 <     * thenAcceptAsync result completes exceptionally if action does
2907 <     */
2908 <    public void testThenAcceptAsync3E() {
2909 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2910 <        FailingConsumer r = new FailingConsumer();
2911 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2912 <        f.complete(null);
2913 <        checkCompletedWithWrappedCFException(g);
3046 <    }
2905 >        // unspecified behavior
2906 >        Integer v;
2907 >        try {
2908 >            assertNull(h.join());
2909 >            assertEquals(1, r.invocationCount);
2910 >        } catch (CompletionException ok) {
2911 >            checkCompletedWithWrappedCancellationException(h);
2912 >            assertEquals(0, r.invocationCount);
2913 >        }
2914  
2915 <    /**
2916 <     * thenAcceptAsync result completes exceptionally if source cancelled
2917 <     */
3051 <    public void testThenAcceptAsync4E() {
3052 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3053 <        IncAction r = new IncAction();
3054 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3055 <        assertTrue(f.cancel(true));
3056 <        checkCompletedWithWrappedCancellationException(g);
3057 <    }
2915 >        checkCancelled(f);
2916 >        checkCompletedNormally(g, v1);
2917 >    }}
2918  
2919      /**
2920 <     * runAfterEitherAsync result completes normally after normal
3061 <     * completion of sources
2920 >     * thenCompose result completes normally after normal completion of source
2921       */
2922 <    public void testRunAfterEitherAsyncE() {
2923 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2924 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2925 <        Noop r = new Noop();
2926 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2927 <        f.complete(one);
2928 <        checkCompletedNormally(g, null);
2929 <        assertTrue(r.ran);
2922 >    public void testThenCompose_normalCompletion() {
2923 >        for (ExecutionMode m : ExecutionMode.values())
2924 >        for (boolean createIncomplete : new boolean[] { true, false })
2925 >        for (Integer v1 : new Integer[] { 1, null })
2926 >    {
2927 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2928 >        final CompletableFutureInc r = new CompletableFutureInc();
2929 >        if (!createIncomplete) f.complete(v1);
2930 >        final CompletableFuture<Integer> g = f.thenCompose(r);
2931 >        if (createIncomplete) f.complete(v1);
2932  
2933 <        r = new Noop();
2934 <        f = new CompletableFuture<>();
2935 <        f.complete(one);
2936 <        f2 = new CompletableFuture<>();
3076 <        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
3077 <        checkCompletedNormally(g, null);
3078 <        assertTrue(r.ran);
3079 <    }
2933 >        checkCompletedNormally(g, inc(v1));
2934 >        checkCompletedNormally(f, v1);
2935 >        assertEquals(1, r.invocationCount);
2936 >    }}
2937  
2938      /**
2939 <     * runAfterEitherAsync result completes exceptionally after exceptional
2939 >     * thenCompose result completes exceptionally after exceptional
2940       * completion of source
2941       */
2942 <    public void testRunAfterEitherAsync2E() {
2943 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2944 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2945 <        Noop r = new Noop();
2946 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2947 <        f.completeExceptionally(new CFException());
2948 <        checkCompletedWithWrappedCFException(g);
2949 <
2950 <        r = new Noop();
2951 <        f = new CompletableFuture<>();
3095 <        f2 = new CompletableFuture<>();
3096 <        f2.completeExceptionally(new CFException());
3097 <        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
3098 <        f.complete(one);
3099 <        checkCompletedWithWrappedCFException(g);
3100 <    }
3101 <
3102 <    /**
3103 <     * runAfterEitherAsync result completes exceptionally if action does
3104 <     */
3105 <    public void testRunAfterEitherAsync3E() {
3106 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3107 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
3108 <        FailingNoop r = new FailingNoop();
3109 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
3110 <        f.complete(one);
3111 <        checkCompletedWithWrappedCFException(g);
3112 <    }
3113 <
3114 <    /**
3115 <     * runAfterEitherAsync result completes exceptionally if either
3116 <     * source cancelled
3117 <     */
3118 <    public void testRunAfterEitherAsync4E() {
3119 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3120 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
3121 <        Noop r = new Noop();
3122 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
3123 <        assertTrue(f.cancel(true));
3124 <        checkCompletedWithWrappedCancellationException(g);
2942 >    public void testThenCompose_exceptionalCompletion() {
2943 >        for (ExecutionMode m : ExecutionMode.values())
2944 >        for (boolean createIncomplete : new boolean[] { true, false })
2945 >    {
2946 >        final CFException ex = new CFException();
2947 >        final CompletableFutureInc r = new CompletableFutureInc();
2948 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2949 >        if (!createIncomplete) f.completeExceptionally(ex);
2950 >        final CompletableFuture<Integer> g = f.thenCompose(r);
2951 >        if (createIncomplete) f.completeExceptionally(ex);
2952  
2953 <        r = new Noop();
2954 <        f = new CompletableFuture<>();
2955 <        f2 = new CompletableFuture<>();
2956 <        assertTrue(f2.cancel(true));
3130 <        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
3131 <        checkCompletedWithWrappedCancellationException(g);
3132 <    }
2953 >        checkCompletedWithWrappedCFException(g, ex);
2954 >        checkCompletedWithWrappedCFException(f, ex);
2955 >        assertEquals(0, r.invocationCount);
2956 >    }}
2957  
2958      /**
2959 <     * thenComposeAsync result completes normally after normal
3136 <     * completion of source
2959 >     * thenCompose result completes exceptionally if action does
2960       */
2961 <    public void testThenComposeAsyncE() {
2962 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2963 <        CompletableFutureInc r = new CompletableFutureInc();
2964 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2965 <        f.complete(one);
2966 <        checkCompletedNormally(g, two);
2967 <    }
2961 >    public void testThenCompose_actionFailed() {
2962 >        for (ExecutionMode m : ExecutionMode.values())
2963 >        for (boolean createIncomplete : new boolean[] { true, false })
2964 >        for (Integer v1 : new Integer[] { 1, null })
2965 >    {
2966 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2967 >        final FailingCompletableFutureFunction r
2968 >            = new FailingCompletableFutureFunction();
2969 >        if (!createIncomplete) f.complete(v1);
2970 >        final CompletableFuture<Integer> g = f.thenCompose(r);
2971 >        if (createIncomplete) f.complete(v1);
2972  
3146    /**
3147     * thenComposeAsync result completes exceptionally after
3148     * exceptional completion of source
3149     */
3150    public void testThenComposeAsync2E() {
3151        CompletableFuture<Integer> f = new CompletableFuture<>();
3152        CompletableFutureInc r = new CompletableFutureInc();
3153        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
3154        f.completeExceptionally(new CFException());
2973          checkCompletedWithWrappedCFException(g);
2974 <    }
2974 >        checkCompletedNormally(f, v1);
2975 >    }}
2976  
2977      /**
2978 <     * thenComposeAsync result completes exceptionally if action does
2978 >     * thenCompose result completes exceptionally if source cancelled
2979       */
2980 <    public void testThenComposeAsync3E() {
2981 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2982 <        FailingCompletableFutureFunction r = new FailingCompletableFutureFunction();
2983 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2984 <        f.complete(one);
2985 <        checkCompletedWithWrappedCFException(g);
2986 <    }
2980 >    public void testThenCompose_sourceCancelled() {
2981 >        for (ExecutionMode m : ExecutionMode.values())
2982 >        for (boolean createIncomplete : new boolean[] { true, false })
2983 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2984 >    {
2985 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2986 >        final CompletableFutureInc r = new CompletableFutureInc();
2987 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2988 >        final CompletableFuture<Integer> g = f.thenCompose(r);
2989 >        if (createIncomplete) {
2990 >            checkIncomplete(g);
2991 >            assertTrue(f.cancel(mayInterruptIfRunning));
2992 >        }
2993  
3169    /**
3170     * thenComposeAsync result completes exceptionally if source cancelled
3171     */
3172    public void testThenComposeAsync4E() {
3173        CompletableFuture<Integer> f = new CompletableFuture<>();
3174        CompletableFutureInc r = new CompletableFutureInc();
3175        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
3176        assertTrue(f.cancel(true));
2994          checkCompletedWithWrappedCancellationException(g);
2995 <    }
2995 >        checkCancelled(f);
2996 >    }}
2997  
2998      // other static methods
2999  
# Line 3375 | Line 3193 | public class CompletableFutureTest exten
3193       * whenComplete action executes on normal completion, propagating
3194       * source result.
3195       */
3196 <    public void testWhenComplete1() {
3197 <        final AtomicInteger a = new AtomicInteger();
3198 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3199 <        CompletableFuture<Integer> g =
3200 <            f.whenComplete((Integer x, Throwable t) -> a.getAndIncrement());
3201 <        f.complete(three);
3202 <        checkCompletedNormally(f, three);
3203 <        checkCompletedNormally(g, three);
3204 <        assertEquals(a.get(), 1);
3205 <    }
3206 <
3207 <    /**
3208 <     * whenComplete action executes on exceptional completion, propagating
3209 <     * source result.
3210 <     */
3211 <    public void testWhenComplete2() {
3394 <        final AtomicInteger a = new AtomicInteger();
3395 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3396 <        CompletableFuture<Integer> g =
3397 <            f.whenComplete((Integer x, Throwable t) -> a.getAndIncrement());
3398 <        f.completeExceptionally(new CFException());
3399 <        assertTrue(f.isCompletedExceptionally());
3400 <        assertTrue(g.isCompletedExceptionally());
3401 <        assertEquals(a.get(), 1);
3402 <    }
3403 <
3404 <    /**
3405 <     * If a whenComplete action throws an exception when triggered by
3406 <     * a normal completion, it completes exceptionally
3407 <     */
3408 <    public void testWhenComplete3() {
3409 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3410 <        CompletableFuture<Integer> g =
3411 <            f.whenComplete((Integer x, Throwable t) ->
3412 <                           { throw new CFException(); } );
3413 <        f.complete(three);
3414 <        checkCompletedNormally(f, three);
3415 <        assertTrue(g.isCompletedExceptionally());
3416 <        checkCompletedWithWrappedCFException(g);
3417 <    }
3418 <
3419 <    /**
3420 <     * whenCompleteAsync action executes on normal completion, propagating
3421 <     * source result.
3422 <     */
3423 <    public void testWhenCompleteAsync1() {
3424 <        final AtomicInteger a = new AtomicInteger();
3425 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3426 <        CompletableFuture<Integer> g =
3427 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement());
3428 <        f.complete(three);
3429 <        checkCompletedNormally(f, three);
3430 <        checkCompletedNormally(g, three);
3431 <        assertEquals(a.get(), 1);
3432 <    }
3433 <
3434 <    /**
3435 <     * whenCompleteAsync action executes on exceptional completion, propagating
3436 <     * source result.
3437 <     */
3438 <    public void testWhenCompleteAsync2() {
3439 <        final AtomicInteger a = new AtomicInteger();
3440 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3441 <        CompletableFuture<Integer> g =
3442 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement());
3443 <        f.completeExceptionally(new CFException());
3444 <        checkCompletedWithWrappedCFException(f);
3445 <        checkCompletedWithWrappedCFException(g);
3446 <    }
3196 >    public void testWhenComplete_normalCompletion1() {
3197 >        for (ExecutionMode m : ExecutionMode.values())
3198 >        for (boolean createIncomplete : new boolean[] { true, false })
3199 >        for (Integer v1 : new Integer[] { 1, null })
3200 >    {
3201 >        final AtomicInteger a = new AtomicInteger(0);
3202 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
3203 >        if (!createIncomplete) f.complete(v1);
3204 >        final CompletableFuture<Integer> g = m.whenComplete
3205 >            (f,
3206 >             (Integer x, Throwable t) -> {
3207 >                threadAssertSame(x, v1);
3208 >                threadAssertNull(t);
3209 >                a.getAndIncrement();
3210 >            });
3211 >        if (createIncomplete) f.complete(v1);
3212  
3213 <    /**
3214 <     * If a whenCompleteAsync action throws an exception when
3215 <     * triggered by a normal completion, it completes exceptionally
3216 <     */
3452 <    public void testWhenCompleteAsync3() {
3453 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3454 <        CompletableFuture<Integer> g =
3455 <            f.whenCompleteAsync((Integer x, Throwable t) ->
3456 <                           { throw new CFException(); } );
3457 <        f.complete(three);
3458 <        checkCompletedNormally(f, three);
3459 <        checkCompletedWithWrappedCFException(g);
3460 <    }
3213 >        checkCompletedNormally(g, v1);
3214 >        checkCompletedNormally(f, v1);
3215 >        assertEquals(1, a.get());
3216 >    }}
3217  
3218      /**
3219 <     * whenCompleteAsync action executes on normal completion, propagating
3219 >     * whenComplete action executes on exceptional completion, propagating
3220       * source result.
3221       */
3222 <    public void testWhenCompleteAsync1e() {
3223 <        final AtomicInteger a = new AtomicInteger();
3224 <        ThreadExecutor exec = new ThreadExecutor();
3225 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3226 <        CompletableFuture<Integer> g =
3227 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement(),
3228 <                                exec);
3229 <        f.complete(three);
3230 <        checkCompletedNormally(f, three);
3231 <        checkCompletedNormally(g, three);
3232 <        assertEquals(a.get(), 1);
3233 <    }
3222 >    public void testWhenComplete_exceptionalCompletion() {
3223 >        for (ExecutionMode m : ExecutionMode.values())
3224 >        for (boolean createIncomplete : new boolean[] { true, false })
3225 >        for (Integer v1 : new Integer[] { 1, null })
3226 >    {
3227 >        final AtomicInteger a = new AtomicInteger(0);
3228 >        final CFException ex = new CFException();
3229 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
3230 >        if (!createIncomplete) f.completeExceptionally(ex);
3231 >        final CompletableFuture<Integer> g = m.whenComplete
3232 >            (f,
3233 >             (Integer x, Throwable t) -> {
3234 >                threadAssertNull(x);
3235 >                threadAssertSame(t, ex);
3236 >                a.getAndIncrement();
3237 >            });
3238 >        if (createIncomplete) f.completeExceptionally(ex);
3239 >        checkCompletedWithWrappedCFException(f, ex);
3240 >        checkCompletedWithWrappedCFException(g, ex);
3241 >        assertEquals(1, a.get());
3242 >    }}
3243  
3244      /**
3245 <     * whenCompleteAsync action executes on exceptional completion, propagating
3246 <     * source result.
3245 >     * whenComplete action executes on cancelled source, propagating
3246 >     * CancellationException.
3247       */
3248 <    public void testWhenCompleteAsync2e() {
3249 <        final AtomicInteger a = new AtomicInteger();
3250 <        ThreadExecutor exec = new ThreadExecutor();
3251 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3252 <        CompletableFuture<Integer> g =
3253 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement(),
3254 <                                exec);
3255 <        f.completeExceptionally(new CFException());
3256 <        checkCompletedWithWrappedCFException(f);
3257 <        checkCompletedWithWrappedCFException(g);
3258 <    }
3248 >    public void testWhenComplete_sourceCancelled() {
3249 >        for (ExecutionMode m : ExecutionMode.values())
3250 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3251 >        for (boolean createIncomplete : new boolean[] { true, false })
3252 >    {
3253 >        final AtomicInteger a = new AtomicInteger(0);
3254 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
3255 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
3256 >        final CompletableFuture<Integer> g = m.whenComplete
3257 >            (f,
3258 >             (Integer x, Throwable t) -> {
3259 >                threadAssertNull(x);
3260 >                threadAssertTrue(t instanceof CancellationException);
3261 >                a.getAndIncrement();
3262 >            });
3263 >        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
3264  
3265 <    /**
3266 <     * If a whenCompleteAsync action throws an exception when triggered
3267 <     * by a normal completion, it completes exceptionally
3268 <     */
3269 <    public void testWhenCompleteAsync3e() {
3500 <        ThreadExecutor exec = new ThreadExecutor();
3501 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3502 <        CompletableFuture<Integer> g =
3503 <            f.whenCompleteAsync((Integer x, Throwable t) ->
3504 <                                { throw new CFException(); },
3505 <                                exec);
3506 <        f.complete(three);
3507 <        checkCompletedNormally(f, three);
3508 <        checkCompletedWithWrappedCFException(g);
3509 <    }
3265 >        //try { g.join(); } catch (Throwable t) { throw new Error(t); }
3266 >        checkCompletedWithWrappedCancellationException(g);
3267 >        checkCancelled(f);
3268 >        assertEquals(1, a.get());
3269 >    }}
3270  
3271      /**
3272 <     * handleAsync action completes normally with function value on
3273 <     * either normal or exceptional completion of source
3272 >     * If a whenComplete action throws an exception when triggered by
3273 >     * a normal completion, it completes exceptionally
3274       */
3275 <    public void testHandleAsync() {
3276 <        CompletableFuture<Integer> f, g;
3277 <        IntegerHandler r;
3278 <
3279 <        f = new CompletableFuture<>();
3280 <        g = f.handleAsync(r = new IntegerHandler());
3281 <        assertFalse(r.ran);
3282 <        f.completeExceptionally(new CFException());
3283 <        checkCompletedWithWrappedCFException(f);
3284 <        checkCompletedNormally(g, three);
3285 <        assertTrue(r.ran);
3286 <
3287 <        f = new CompletableFuture<>();
3288 <        g = f.handleAsync(r = new IntegerHandler());
3289 <        assertFalse(r.ran);
3290 <        f.completeExceptionally(new CFException());
3291 <        checkCompletedWithWrappedCFException(f);
3292 <        checkCompletedNormally(g, three);
3293 <        assertTrue(r.ran);
3294 <
3295 <        f = new CompletableFuture<>();
3296 <        g = f.handleAsync(r = new IntegerHandler());
3537 <        assertFalse(r.ran);
3538 <        f.complete(one);
3539 <        checkCompletedNormally(f, one);
3540 <        checkCompletedNormally(g, two);
3541 <        assertTrue(r.ran);
3542 <
3543 <        f = new CompletableFuture<>();
3544 <        g = f.handleAsync(r = new IntegerHandler());
3545 <        assertFalse(r.ran);
3546 <        f.complete(one);
3547 <        checkCompletedNormally(f, one);
3548 <        checkCompletedNormally(g, two);
3549 <        assertTrue(r.ran);
3550 <    }
3275 >    public void testWhenComplete_actionFailed() {
3276 >        for (boolean createIncomplete : new boolean[] { true, false })
3277 >        for (ExecutionMode m : ExecutionMode.values())
3278 >        for (Integer v1 : new Integer[] { 1, null })
3279 >    {
3280 >        final AtomicInteger a = new AtomicInteger(0);
3281 >        final CFException ex = new CFException();
3282 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
3283 >        if (!createIncomplete) f.complete(v1);
3284 >        final CompletableFuture<Integer> g = m.whenComplete
3285 >            (f,
3286 >             (Integer x, Throwable t) -> {
3287 >                threadAssertSame(x, v1);
3288 >                threadAssertNull(t);
3289 >                a.getAndIncrement();
3290 >                throw ex;
3291 >            });
3292 >        if (createIncomplete) f.complete(v1);
3293 >        checkCompletedNormally(f, v1);
3294 >        checkCompletedWithWrappedCFException(g, ex);
3295 >        assertEquals(1, a.get());
3296 >    }}
3297  
3298      /**
3299 <     * handleAsync action with Executor completes normally with
3300 <     * function value on either normal or exceptional completion of
3301 <     * source
3299 >     * If a whenComplete action throws an exception when triggered by
3300 >     * a source completion that also throws an exception, the source
3301 >     * exception takes precedence.
3302       */
3303 <    public void testHandleAsync2() {
3304 <        CompletableFuture<Integer> f, g;
3305 <        ThreadExecutor exec = new ThreadExecutor();
3306 <        IntegerHandler r;
3307 <
3308 <        f = new CompletableFuture<>();
3309 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3310 <        assertFalse(r.ran);
3311 <        f.completeExceptionally(new CFException());
3312 <        checkCompletedWithWrappedCFException(f);
3313 <        checkCompletedNormally(g, three);
3314 <        assertTrue(r.ran);
3315 <
3316 <        f = new CompletableFuture<>();
3317 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3318 <        assertFalse(r.ran);
3319 <        f.completeExceptionally(new CFException());
3320 <        checkCompletedWithWrappedCFException(f);
3321 <        checkCompletedNormally(g, three);
3322 <        assertTrue(r.ran);
3323 <
3324 <        f = new CompletableFuture<>();
3325 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3326 <        assertFalse(r.ran);
3327 <        f.complete(one);
3582 <        checkCompletedNormally(f, one);
3583 <        checkCompletedNormally(g, two);
3584 <        assertTrue(r.ran);
3585 <
3586 <        f = new CompletableFuture<>();
3587 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3588 <        assertFalse(r.ran);
3589 <        f.complete(one);
3590 <        checkCompletedNormally(f, one);
3591 <        checkCompletedNormally(g, two);
3592 <        assertTrue(r.ran);
3593 <    }
3303 >    public void testWhenComplete_actionFailedSourceFailed() {
3304 >        for (boolean createIncomplete : new boolean[] { true, false })
3305 >        for (ExecutionMode m : ExecutionMode.values())
3306 >        for (Integer v1 : new Integer[] { 1, null })
3307 >    {
3308 >        final AtomicInteger a = new AtomicInteger(0);
3309 >        final CFException ex1 = new CFException();
3310 >        final CFException ex2 = new CFException();
3311 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
3312 >
3313 >        if (!createIncomplete) f.completeExceptionally(ex1);
3314 >        final CompletableFuture<Integer> g = m.whenComplete
3315 >            (f,
3316 >             (Integer x, Throwable t) -> {
3317 >                threadAssertSame(t, ex1);
3318 >                threadAssertNull(x);
3319 >                a.getAndIncrement();
3320 >                throw ex2;
3321 >            });
3322 >        if (createIncomplete) f.completeExceptionally(ex1);
3323 >
3324 >        checkCompletedWithWrappedCFException(f, ex1);
3325 >        checkCompletedWithWrappedCFException(g, ex1);
3326 >        assertEquals(1, a.get());
3327 >    }}
3328  
3329   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines