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.42 by jsr166, Mon Jun 2 02:19:23 2014 UTC vs.
Revision 1.51 by jsr166, Mon Jun 2 19:49:28 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);
# Line 376 | Line 376 | public class CompletableFutureTest exten
376      }
377      static final class Noop implements Runnable {
378          int invocationCount = 0;
379        boolean ran;
379          public void run() {
380              invocationCount++;
382            ran = true;
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 437 | Line 454 | public class CompletableFutureTest exten
454          }
455      }
456  
440    static final class ExceptionToInteger implements Function<Throwable, Integer> {
441        public Integer apply(Throwable x) { return Integer.valueOf(3); }
442    }
443
444    static final class IntegerHandler implements BiFunction<Integer, Throwable, Integer> {
445        boolean ran;
446        public Integer apply(Integer x, Throwable t) {
447            ran = true;
448            return (t == null) ? two : three;
449        }
450    }
451
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 471 | 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 483 | 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              }
502        },
503
504 //             /** Experimental way to do more testing */
505 //         REVERSE_DEFAULT {
506 //             public <T,U> CompletableFuture<Void> runAfterBoth
507 //                 (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
508 //                 return g.runAfterBoth(f, a);
509 //             }
510 //             public <T,U> CompletableFuture<Void> thenAcceptBoth
511 //                 (CompletableFuture<T> f,
512 //                  CompletionStage<? extends U> g,
513 //                  BiConsumer<? super T,? super U> a) {
514 //                 return DEFAULT.thenAcceptBoth(f, g, a);
515 //             }
516 //         },
517
518        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 532 | 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 544 | 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              }
563        },
564
565 //         REVERSE_DEFAULT_ASYNC {
566 //             public <T,U> CompletableFuture<Void> runAfterBoth
567 //                 (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
568 //                 return f.runAfterBothAsync(g, a);
569 //             }
570 //             public <T,U> CompletableFuture<Void> thenAcceptBoth
571 //                 (CompletableFuture<T> f,
572 //                  CompletionStage<? extends U> g,
573 //                  BiConsumer<? super T,? super U> a) {
574 //                 return DEFAULT_ASYNC.thenAcceptBoth(f, g, a);
575 //             }
576 //         },
577
578        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 592 | Line 641 | public class CompletableFutureTest exten
641                   BiFunction<? super T,? super U,? extends V> a) {
642                  return f.thenCombineAsync(g, a, new ThreadExecutor());
643              }
595            public <T,U> CompletableFuture<U> applyToEither
596                (CompletableFuture<T> f,
597                 CompletionStage<? extends T> g,
598                 Function<? super T,U> a) {
599                return f.applyToEitherAsync(g, a, new ThreadExecutor());
600            }
601            public <T> CompletableFuture<Void> acceptEither
602                (CompletableFuture<T> f,
603                 CompletionStage<? extends T> g,
604                 Consumer<? super T> a) {
605                return f.acceptEitherAsync(g, a, new ThreadExecutor());
606            }
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 632 | Line 687 | public class CompletableFutureTest exten
687              (CompletableFuture<T> f,
688               CompletionStage<? extends U> g,
689               BiFunction<? super T,? super U,? extends V> a);
635        public abstract <T,U> CompletableFuture<U> applyToEither
636            (CompletableFuture<T> f,
637             CompletionStage<? extends T> g,
638             Function<? super T,U> a);
639        public abstract <T> CompletableFuture<Void> acceptEither
640            (CompletableFuture<T> f,
641             CompletionStage<? extends T> g,
642             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  
655    }
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);
687 <        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);
700 <        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 714 | 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 726 | 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 735 | 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 768 | 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 776 | Line 974 | public class CompletableFutureTest exten
974      /**
975       * thenRun result completes normally after normal completion of source
976       */
977 <    public void testThenRun() {
978 <        CompletableFuture<Integer> f;
979 <        CompletableFuture<Void> g;
980 <        Noop r;
981 <
982 <        f = new CompletableFuture<>();
983 <        g = f.thenRun(r = new Noop());
984 <        f.complete(null);
985 <        checkCompletedNormally(g, null);
986 <        assertTrue(r.ran);
977 >    public void testThenRun_normalCompletion() {
978 >        for (ExecutionMode m : ExecutionMode.values())
979 >        for (boolean createIncomplete : new boolean[] { true, false })
980 >        for (Integer v1 : new Integer[] { 1, null })
981 >    {
982 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
983 >        final Noop r = new Noop();
984 >        if (!createIncomplete) f.complete(v1);
985 >        final CompletableFuture<Void> g = m.thenRun(f, r);
986 >        if (createIncomplete) {
987 >            checkIncomplete(g);
988 >            f.complete(v1);
989 >        }
990  
790        f = new CompletableFuture<>();
791        f.complete(null);
792        g = f.thenRun(r = new Noop());
991          checkCompletedNormally(g, null);
992 <        assertTrue(r.ran);
993 <    }
992 >        checkCompletedNormally(f, v1);
993 >        assertEquals(1, r.invocationCount);
994 >    }}
995  
996      /**
997       * thenRun result completes exceptionally after exceptional
998       * completion of source
999       */
1000 <    public void testThenRun2() {
1001 <        CompletableFuture<Integer> f;
1002 <        CompletableFuture<Void> g;
1003 <        Noop r;
1004 <
1005 <        f = new CompletableFuture<>();
1006 <        g = f.thenRun(r = new Noop());
1007 <        f.completeExceptionally(new CFException());
1008 <        checkCompletedWithWrappedCFException(g);
1009 <        assertFalse(r.ran);
1000 >    public void testThenRun_exceptionalCompletion() {
1001 >        for (ExecutionMode m : ExecutionMode.values())
1002 >        for (boolean createIncomplete : new boolean[] { true, false })
1003 >    {
1004 >        final CFException ex = new CFException();
1005 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1006 >        final Noop r = new Noop();
1007 >        if (!createIncomplete) f.completeExceptionally(ex);
1008 >        final CompletableFuture<Void> g = m.thenRun(f, r);
1009 >        if (createIncomplete) {
1010 >            checkIncomplete(g);
1011 >            f.completeExceptionally(ex);
1012 >        }
1013  
1014 <        f = new CompletableFuture<>();
1015 <        f.completeExceptionally(new CFException());
1016 <        g = f.thenRun(r = new Noop());
1017 <        checkCompletedWithWrappedCFException(g);
816 <        assertFalse(r.ran);
817 <    }
1014 >        checkCompletedWithWrappedCFException(g, ex);
1015 >        checkCompletedWithWrappedCFException(f, ex);
1016 >        assertEquals(0, r.invocationCount);
1017 >    }}
1018  
1019      /**
1020 <     * thenRun result completes exceptionally if action does
1020 >     * thenRun result completes exceptionally if source cancelled
1021       */
1022 <    public void testThenRun3() {
1023 <        CompletableFuture<Integer> f;
1024 <        CompletableFuture<Void> g;
1025 <        FailingNoop r;
1026 <
1027 <        f = new CompletableFuture<>();
1028 <        g = f.thenRun(r = new FailingNoop());
1029 <        f.complete(null);
1030 <        checkCompletedWithWrappedCFException(g);
1022 >    public void testThenRun_sourceCancelled() {
1023 >        for (ExecutionMode m : ExecutionMode.values())
1024 >        for (boolean createIncomplete : new boolean[] { true, false })
1025 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1026 >    {
1027 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1028 >        final Noop r = new Noop();
1029 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1030 >        final CompletableFuture<Void> g = f.thenRun(r);
1031 >        if (createIncomplete) {
1032 >            checkIncomplete(g);
1033 >            assertTrue(f.cancel(mayInterruptIfRunning));
1034 >        }
1035  
1036 <        f = new CompletableFuture<>();
1037 <        f.complete(null);
1038 <        g = f.thenRun(r = new FailingNoop());
1039 <        checkCompletedWithWrappedCFException(g);
836 <    }
1036 >        checkCompletedWithWrappedCancellationException(g);
1037 >        checkCancelled(f);
1038 >        assertEquals(0, r.invocationCount);
1039 >    }}
1040  
1041      /**
1042 <     * thenRun result completes exceptionally if source cancelled
1042 >     * thenRun result completes exceptionally if action does
1043       */
1044 <    public void testThenRun4() {
1045 <        CompletableFuture<Integer> f;
1046 <        CompletableFuture<Void> g;
1047 <        Noop r;
1048 <
1049 <        f = new CompletableFuture<>();
1050 <        g = f.thenRun(r = new Noop());
1051 <        assertTrue(f.cancel(true));
1052 <        checkCompletedWithWrappedCancellationException(g);
1044 >    public void testThenRun_actionFailed() {
1045 >        for (ExecutionMode m : ExecutionMode.values())
1046 >        for (boolean createIncomplete : new boolean[] { true, false })
1047 >        for (Integer v1 : new Integer[] { 1, null })
1048 >    {
1049 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1050 >        final FailingRunnable r = new FailingRunnable();
1051 >        if (!createIncomplete) f.complete(v1);
1052 >        final CompletableFuture<Void> g = f.thenRun(r);
1053 >        if (createIncomplete) {
1054 >            checkIncomplete(g);
1055 >            f.complete(v1);
1056 >        }
1057  
1058 <        f = new CompletableFuture<>();
1059 <        assertTrue(f.cancel(true));
1060 <        g = f.thenRun(r = new Noop());
854 <        checkCompletedWithWrappedCancellationException(g);
855 <    }
1058 >        checkCompletedWithWrappedCFException(g);
1059 >        checkCompletedNormally(f, v1);
1060 >    }}
1061  
1062      /**
1063       * thenApply result completes normally after normal completion of source
1064       */
1065 <    public void testThenApply() {
1066 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1067 <        CompletableFuture<Integer> g = f.thenApply(inc);
1068 <        f.complete(one);
1069 <        checkCompletedNormally(g, two);
1070 <    }
1065 >    public void testThenApply_normalCompletion() {
1066 >        for (ExecutionMode m : ExecutionMode.values())
1067 >        for (boolean createIncomplete : new boolean[] { true, false })
1068 >        for (Integer v1 : new Integer[] { 1, null })
1069 >    {
1070 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1071 >        final IncFunction r = new IncFunction();
1072 >        if (!createIncomplete) f.complete(v1);
1073 >        final CompletableFuture<Integer> g = m.thenApply(f, r);
1074 >        if (createIncomplete) {
1075 >            checkIncomplete(g);
1076 >            f.complete(v1);
1077 >        }
1078 >
1079 >        checkCompletedNormally(g, inc(v1));
1080 >        checkCompletedNormally(f, v1);
1081 >        assertEquals(1, r.invocationCount);
1082 >    }}
1083  
1084      /**
1085       * thenApply result completes exceptionally after exceptional
1086       * completion of source
1087       */
1088 <    public void testThenApply2() {
1089 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1090 <        CompletableFuture<Integer> g = f.thenApply(inc);
1091 <        f.completeExceptionally(new CFException());
1092 <        checkCompletedWithWrappedCFException(g);
1093 <    }
1088 >    public void testThenApply_exceptionalCompletion() {
1089 >        for (ExecutionMode m : ExecutionMode.values())
1090 >        for (boolean createIncomplete : new boolean[] { true, false })
1091 >    {
1092 >        final CFException ex = new CFException();
1093 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1094 >        final IncFunction r = new IncFunction();
1095 >        if (!createIncomplete) f.completeExceptionally(ex);
1096 >        final CompletableFuture<Integer> g = m.thenApply(f, r);
1097 >        if (createIncomplete) {
1098 >            checkIncomplete(g);
1099 >            f.completeExceptionally(ex);
1100 >        }
1101  
1102 <    /**
1103 <     * thenApply result completes exceptionally if action does
1104 <     */
1105 <    public void testThenApply3() {
882 <        CompletableFuture<Integer> f = new CompletableFuture<>();
883 <        CompletableFuture<Integer> g = f.thenApply(new FailingFunction());
884 <        f.complete(one);
885 <        checkCompletedWithWrappedCFException(g);
886 <    }
1102 >        checkCompletedWithWrappedCFException(g, ex);
1103 >        checkCompletedWithWrappedCFException(f, ex);
1104 >        assertEquals(0, r.invocationCount);
1105 >    }}
1106  
1107      /**
1108       * thenApply result completes exceptionally if source cancelled
1109       */
1110 <    public void testThenApply4() {
1111 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1112 <        CompletableFuture<Integer> g = f.thenApply(inc);
1113 <        assertTrue(f.cancel(true));
1110 >    public void testThenApply_sourceCancelled() {
1111 >        for (ExecutionMode m : ExecutionMode.values())
1112 >        for (boolean createIncomplete : new boolean[] { true, false })
1113 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1114 >    {
1115 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1116 >        final IncFunction r = new IncFunction();
1117 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1118 >        final CompletableFuture<Integer> g = f.thenApply(r);
1119 >        if (createIncomplete) {
1120 >            checkIncomplete(g);
1121 >            assertTrue(f.cancel(mayInterruptIfRunning));
1122 >        }
1123 >
1124          checkCompletedWithWrappedCancellationException(g);
1125 <    }
1125 >        checkCancelled(f);
1126 >        assertEquals(0, r.invocationCount);
1127 >    }}
1128  
1129      /**
1130 <     * thenAccept result completes normally after normal completion of source
1130 >     * thenApply result completes exceptionally if action does
1131       */
1132 <    public void testThenAccept() {
1133 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1134 <        IncAction r = new IncAction();
1135 <        CompletableFuture<Void> g = f.thenAccept(r);
1136 <        f.complete(one);
1137 <        checkCompletedNormally(g, null);
1138 <        assertEquals(r.value, (Integer) 2);
1139 <    }
1132 >    public void testThenApply_actionFailed() {
1133 >        for (ExecutionMode m : ExecutionMode.values())
1134 >        for (boolean createIncomplete : new boolean[] { true, false })
1135 >        for (Integer v1 : new Integer[] { 1, null })
1136 >    {
1137 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1138 >        final FailingFunction r = new FailingFunction();
1139 >        if (!createIncomplete) f.complete(v1);
1140 >        final CompletableFuture<Integer> g = f.thenApply(r);
1141 >        if (createIncomplete) {
1142 >            checkIncomplete(g);
1143 >            f.complete(v1);
1144 >        }
1145  
910    /**
911     * thenAccept result completes exceptionally after exceptional
912     * completion of source
913     */
914    public void testThenAccept2() {
915        CompletableFuture<Integer> f = new CompletableFuture<>();
916        IncAction r = new IncAction();
917        CompletableFuture<Void> g = f.thenAccept(r);
918        f.completeExceptionally(new CFException());
1146          checkCompletedWithWrappedCFException(g);
1147 <    }
1147 >        checkCompletedNormally(f, v1);
1148 >    }}
1149  
1150      /**
1151 <     * thenAccept result completes exceptionally if action does
1151 >     * thenAccept result completes normally after normal completion of source
1152       */
1153 <    public void testThenAccept3() {
1154 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1155 <        FailingConsumer r = new FailingConsumer();
1156 <        CompletableFuture<Void> g = f.thenAccept(r);
1157 <        f.complete(one);
1158 <        checkCompletedWithWrappedCFException(g);
1159 <        assertTrue(r.ran);
1160 <    }
1153 >    public void testThenAccept_normalCompletion() {
1154 >        for (ExecutionMode m : ExecutionMode.values())
1155 >        for (boolean createIncomplete : new boolean[] { true, false })
1156 >        for (Integer v1 : new Integer[] { 1, null })
1157 >    {
1158 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1159 >        final IncAction r = new IncAction();
1160 >        if (!createIncomplete) f.complete(v1);
1161 >        final CompletableFuture<Void> g = m.thenAccept(f, r);
1162 >        if (createIncomplete) {
1163 >            checkIncomplete(g);
1164 >            f.complete(v1);
1165 >        }
1166  
1167 <    /**
1168 <     * thenAccept result completes exceptionally if source cancelled
1169 <     */
1170 <    public void testThenAccept4() {
1171 <        CompletableFuture<Integer> f = new CompletableFuture<>();
939 <        IncAction r = new IncAction();
940 <        CompletableFuture<Void> g = f.thenAccept(r);
941 <        assertTrue(f.cancel(true));
942 <        checkCompletedWithWrappedCancellationException(g);
943 <    }
1167 >        checkCompletedNormally(g, null);
1168 >        checkCompletedNormally(f, v1);
1169 >        assertEquals(1, r.invocationCount);
1170 >        assertEquals(inc(v1), r.value);
1171 >    }}
1172  
1173      /**
1174 <     * thenCombine result completes normally after normal completion
1175 <     * of sources
1174 >     * thenAccept result completes exceptionally after exceptional
1175 >     * completion of source
1176       */
1177 <    public void testThenCombine_normalCompletion1() {
1177 >    public void testThenAccept_exceptionalCompletion() {
1178          for (ExecutionMode m : ExecutionMode.values())
1179 <        for (Integer v1 : new Integer[] { 1, null })
1180 <        for (Integer v2 : new Integer[] { 2, null }) {
1181 <
1179 >        for (boolean createIncomplete : new boolean[] { true, false })
1180 >    {
1181 >        final CFException ex = new CFException();
1182          final CompletableFuture<Integer> f = new CompletableFuture<>();
1183 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1184 <        final SubtractFunction r = new SubtractFunction();
1185 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1186 <
1187 <        f.complete(v1);
1188 <        checkIncomplete(h);
961 <        assertEquals(r.invocationCount, 0);
962 <        g.complete(v2);
963 <
964 <        checkCompletedNormally(h, subtract(v1, v2));
965 <        checkCompletedNormally(f, v1);
966 <        checkCompletedNormally(g, v2);
967 <        assertEquals(r.invocationCount, 1);
1183 >        final IncAction r = new IncAction();
1184 >        if (!createIncomplete) f.completeExceptionally(ex);
1185 >        final CompletableFuture<Void> g = m.thenAccept(f, r);
1186 >        if (createIncomplete) {
1187 >            checkIncomplete(g);
1188 >            f.completeExceptionally(ex);
1189          }
969    }
1190  
1191 <    public void testThenCombine_normalCompletion2() {
1191 >        checkCompletedWithWrappedCFException(g, ex);
1192 >        checkCompletedWithWrappedCFException(f, ex);
1193 >        assertEquals(0, r.invocationCount);
1194 >    }}
1195 >
1196 >    /**
1197 >     * thenAccept result completes exceptionally if action does
1198 >     */
1199 >    public void testThenAccept_actionFailed() {
1200          for (ExecutionMode m : ExecutionMode.values())
1201 +        for (boolean createIncomplete : new boolean[] { true, false })
1202          for (Integer v1 : new Integer[] { 1, null })
1203 <        for (Integer v2 : new Integer[] { 2, null }) {
975 <
1203 >    {
1204          final CompletableFuture<Integer> f = new CompletableFuture<>();
1205 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1206 <        final SubtractFunction r = new SubtractFunction();
1207 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1208 <
1209 <        g.complete(v2);
1210 <        checkIncomplete(h);
1211 <        assertEquals(r.invocationCount, 0);
984 <        f.complete(v1);
1205 >        final FailingConsumer r = new FailingConsumer();
1206 >        if (!createIncomplete) f.complete(v1);
1207 >        final CompletableFuture<Void> g = f.thenAccept(r);
1208 >        if (createIncomplete) {
1209 >            checkIncomplete(g);
1210 >            f.complete(v1);
1211 >        }
1212  
1213 <        checkCompletedNormally(h, subtract(v1, v2));
1213 >        checkCompletedWithWrappedCFException(g);
1214          checkCompletedNormally(f, v1);
1215 <        checkCompletedNormally(g, v2);
989 <        assertEquals(r.invocationCount, 1);
990 <        }
991 <    }
1215 >    }}
1216  
1217 <    public void testThenCombine_normalCompletion3() {
1217 >    /**
1218 >     * thenAccept result completes exceptionally if source cancelled
1219 >     */
1220 >    public void testThenAccept_sourceCancelled() {
1221          for (ExecutionMode m : ExecutionMode.values())
1222 <        for (Integer v1 : new Integer[] { 1, null })
1223 <        for (Integer v2 : new Integer[] { 2, null }) {
1224 <
1222 >        for (boolean createIncomplete : new boolean[] { true, false })
1223 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1224 >    {
1225          final CompletableFuture<Integer> f = new CompletableFuture<>();
1226 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1227 <        final SubtractFunction r = new SubtractFunction();
1228 <
1229 <        g.complete(v2);
1230 <        f.complete(v1);
1231 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1005 <
1006 <        checkCompletedNormally(h, subtract(v1, v2));
1007 <        checkCompletedNormally(f, v1);
1008 <        checkCompletedNormally(g, v2);
1009 <        assertEquals(r.invocationCount, 1);
1226 >        final IncAction r = new IncAction();
1227 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1228 >        final CompletableFuture<Void> g = f.thenAccept(r);
1229 >        if (createIncomplete) {
1230 >            checkIncomplete(g);
1231 >            assertTrue(f.cancel(mayInterruptIfRunning));
1232          }
1011    }
1233  
1234 <    public void testThenCombine_normalCompletion4() {
1234 >        checkCompletedWithWrappedCancellationException(g);
1235 >        checkCancelled(f);
1236 >        assertEquals(0, r.invocationCount);
1237 >    }}
1238 >
1239 >    /**
1240 >     * thenCombine result completes normally after normal completion
1241 >     * of sources
1242 >     */
1243 >    public void testThenCombine_normalCompletion() {
1244          for (ExecutionMode m : ExecutionMode.values())
1245 +        for (boolean createIncomplete : new boolean[] { true, false })
1246 +        for (boolean fFirst : new boolean[] { true, false })
1247          for (Integer v1 : new Integer[] { 1, null })
1248 <        for (Integer v2 : new Integer[] { 2, null }) {
1249 <
1248 >        for (Integer v2 : new Integer[] { 2, null })
1249 >    {
1250          final CompletableFuture<Integer> f = new CompletableFuture<>();
1251          final CompletableFuture<Integer> g = new CompletableFuture<>();
1252          final SubtractFunction r = new SubtractFunction();
1253  
1254 <        f.complete(v1);
1255 <        g.complete(v2);
1254 >        if (fFirst) f.complete(v1); else g.complete(v2);
1255 >        if (!createIncomplete)
1256 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1257          final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1258 +        if (createIncomplete) {
1259 +            checkIncomplete(h);
1260 +            assertEquals(0, r.invocationCount);
1261 +            if (!fFirst) f.complete(v1); else g.complete(v2);
1262 +        }
1263  
1264          checkCompletedNormally(h, subtract(v1, v2));
1265          checkCompletedNormally(f, v1);
1266          checkCompletedNormally(g, v2);
1267 <        assertEquals(r.invocationCount, 1);
1268 <        }
1031 <    }
1267 >        assertEquals(1, r.invocationCount);
1268 >    }}
1269  
1270      /**
1271       * thenCombine result completes exceptionally after exceptional
# Line 1036 | Line 1273 | public class CompletableFutureTest exten
1273       */
1274      public void testThenCombine_exceptionalCompletion1() {
1275          for (ExecutionMode m : ExecutionMode.values())
1276 <        for (Integer v1 : new Integer[] { 1, null }) {
1277 <
1276 >        for (Integer v1 : new Integer[] { 1, null })
1277 >    {
1278          final CompletableFuture<Integer> f = new CompletableFuture<>();
1279          final CompletableFuture<Integer> g = new CompletableFuture<>();
1280          final SubtractFunction r = new SubtractFunction();
# Line 1050 | Line 1287 | public class CompletableFutureTest exten
1287  
1288          checkCompletedWithWrappedCFException(h, ex);
1289          checkCompletedWithWrappedCFException(f, ex);
1290 <        assertEquals(r.invocationCount, 0);
1290 >        assertEquals(0, r.invocationCount);
1291          checkCompletedNormally(g, v1);
1292 <        }
1056 <    }
1292 >    }}
1293  
1294      public void testThenCombine_exceptionalCompletion2() {
1295          for (ExecutionMode m : ExecutionMode.values())
1296 <        for (Integer v1 : new Integer[] { 1, null }) {
1297 <
1296 >        for (Integer v1 : new Integer[] { 1, null })
1297 >    {
1298          final CompletableFuture<Integer> f = new CompletableFuture<>();
1299          final CompletableFuture<Integer> g = new CompletableFuture<>();
1300          final SubtractFunction r = new SubtractFunction();
# Line 1071 | Line 1307 | public class CompletableFutureTest exten
1307  
1308          checkCompletedWithWrappedCFException(h, ex);
1309          checkCompletedWithWrappedCFException(g, ex);
1310 <        assertEquals(r.invocationCount, 0);
1310 >        assertEquals(0, r.invocationCount);
1311          checkCompletedNormally(f, v1);
1312 <        }
1077 <    }
1312 >    }}
1313  
1314      public void testThenCombine_exceptionalCompletion3() {
1315          for (ExecutionMode m : ExecutionMode.values())
1316 <        for (Integer v1 : new Integer[] { 1, null }) {
1317 <
1316 >        for (Integer v1 : new Integer[] { 1, null })
1317 >    {
1318          final CompletableFuture<Integer> f = new CompletableFuture<>();
1319          final CompletableFuture<Integer> g = new CompletableFuture<>();
1320          final SubtractFunction r = new SubtractFunction();
# Line 1091 | Line 1326 | public class CompletableFutureTest exten
1326  
1327          checkCompletedWithWrappedCFException(h, ex);
1328          checkCompletedWithWrappedCFException(g, ex);
1329 <        assertEquals(r.invocationCount, 0);
1329 >        assertEquals(0, r.invocationCount);
1330          checkCompletedNormally(f, v1);
1331 <        }
1097 <    }
1331 >    }}
1332  
1333      public void testThenCombine_exceptionalCompletion4() {
1334          for (ExecutionMode m : ExecutionMode.values())
1335 <        for (Integer v1 : new Integer[] { 1, null }) {
1336 <
1335 >        for (Integer v1 : new Integer[] { 1, null })
1336 >    {
1337          final CompletableFuture<Integer> f = new CompletableFuture<>();
1338          final CompletableFuture<Integer> g = new CompletableFuture<>();
1339          final SubtractFunction r = new SubtractFunction();
# Line 1111 | Line 1345 | public class CompletableFutureTest exten
1345  
1346          checkCompletedWithWrappedCFException(h, ex);
1347          checkCompletedWithWrappedCFException(f, ex);
1348 <        assertEquals(r.invocationCount, 0);
1348 >        assertEquals(0, r.invocationCount);
1349          checkCompletedNormally(g, v1);
1350 <        }
1117 <    }
1350 >    }}
1351  
1352      /**
1353       * thenCombine result completes exceptionally if action does
# Line 1122 | Line 1355 | public class CompletableFutureTest exten
1355      public void testThenCombine_actionFailed1() {
1356          for (ExecutionMode m : ExecutionMode.values())
1357          for (Integer v1 : new Integer[] { 1, null })
1358 <        for (Integer v2 : new Integer[] { 2, null }) {
1359 <
1358 >        for (Integer v2 : new Integer[] { 2, null })
1359 >    {
1360          final CompletableFuture<Integer> f = new CompletableFuture<>();
1361          final CompletableFuture<Integer> g = new CompletableFuture<>();
1362          final FailingBiFunction r = new FailingBiFunction();
# Line 1136 | Line 1369 | public class CompletableFutureTest exten
1369          checkCompletedWithWrappedCFException(h);
1370          checkCompletedNormally(f, v1);
1371          checkCompletedNormally(g, v2);
1372 <        }
1140 <    }
1372 >    }}
1373  
1374      public void testThenCombine_actionFailed2() {
1375          for (ExecutionMode m : ExecutionMode.values())
1376          for (Integer v1 : new Integer[] { 1, null })
1377 <        for (Integer v2 : new Integer[] { 2, null }) {
1378 <
1377 >        for (Integer v2 : new Integer[] { 2, null })
1378 >    {
1379          final CompletableFuture<Integer> f = new CompletableFuture<>();
1380          final CompletableFuture<Integer> g = new CompletableFuture<>();
1381          final FailingBiFunction r = new FailingBiFunction();
# Line 1156 | Line 1388 | public class CompletableFutureTest exten
1388          checkCompletedWithWrappedCFException(h);
1389          checkCompletedNormally(f, v1);
1390          checkCompletedNormally(g, v2);
1391 <        }
1160 <    }
1391 >    }}
1392  
1393      /**
1394       * thenCombine result completes exceptionally if either source cancelled
# Line 1165 | Line 1396 | public class CompletableFutureTest exten
1396      public void testThenCombine_sourceCancelled1() {
1397          for (ExecutionMode m : ExecutionMode.values())
1398          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1399 <        for (Integer v1 : new Integer[] { 1, null }) {
1400 <
1399 >        for (Integer v1 : new Integer[] { 1, null })
1400 >    {
1401          final CompletableFuture<Integer> f = new CompletableFuture<>();
1402          final CompletableFuture<Integer> g = new CompletableFuture<>();
1403          final SubtractFunction r = new SubtractFunction();
# Line 1178 | Line 1409 | public class CompletableFutureTest exten
1409  
1410          checkCompletedWithWrappedCancellationException(h);
1411          checkCancelled(f);
1412 <        assertEquals(r.invocationCount, 0);
1412 >        assertEquals(0, r.invocationCount);
1413          checkCompletedNormally(g, v1);
1414 <        }
1184 <    }
1414 >    }}
1415  
1416      public void testThenCombine_sourceCancelled2() {
1417          for (ExecutionMode m : ExecutionMode.values())
1418          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1419 <        for (Integer v1 : new Integer[] { 1, null }) {
1420 <
1419 >        for (Integer v1 : new Integer[] { 1, null })
1420 >    {
1421          final CompletableFuture<Integer> f = new CompletableFuture<>();
1422          final CompletableFuture<Integer> g = new CompletableFuture<>();
1423          final SubtractFunction r = new SubtractFunction();
# Line 1199 | Line 1429 | public class CompletableFutureTest exten
1429  
1430          checkCompletedWithWrappedCancellationException(h);
1431          checkCancelled(g);
1432 <        assertEquals(r.invocationCount, 0);
1432 >        assertEquals(0, r.invocationCount);
1433          checkCompletedNormally(f, v1);
1434 <        }
1205 <    }
1434 >    }}
1435  
1436      public void testThenCombine_sourceCancelled3() {
1437          for (ExecutionMode m : ExecutionMode.values())
1438          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1439 <        for (Integer v1 : new Integer[] { 1, null }) {
1440 <
1439 >        for (Integer v1 : new Integer[] { 1, null })
1440 >    {
1441          final CompletableFuture<Integer> f = new CompletableFuture<>();
1442          final CompletableFuture<Integer> g = new CompletableFuture<>();
1443          final SubtractFunction r = new SubtractFunction();
# Line 1219 | Line 1448 | public class CompletableFutureTest exten
1448  
1449          checkCompletedWithWrappedCancellationException(h);
1450          checkCancelled(g);
1451 <        assertEquals(r.invocationCount, 0);
1451 >        assertEquals(0, r.invocationCount);
1452          checkCompletedNormally(f, v1);
1453 <        }
1225 <    }
1453 >    }}
1454  
1455      public void testThenCombine_sourceCancelled4() {
1456          for (ExecutionMode m : ExecutionMode.values())
1457          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1458 <        for (Integer v1 : new Integer[] { 1, null }) {
1459 <
1458 >        for (Integer v1 : new Integer[] { 1, null })
1459 >    {
1460          final CompletableFuture<Integer> f = new CompletableFuture<>();
1461          final CompletableFuture<Integer> g = new CompletableFuture<>();
1462          final SubtractFunction r = new SubtractFunction();
# Line 1239 | Line 1467 | public class CompletableFutureTest exten
1467  
1468          checkCompletedWithWrappedCancellationException(h);
1469          checkCancelled(f);
1470 <        assertEquals(r.invocationCount, 0);
1470 >        assertEquals(0, r.invocationCount);
1471          checkCompletedNormally(g, v1);
1472 <        }
1245 <    }
1472 >    }}
1473  
1474      /**
1475       * thenAcceptBoth result completes normally after normal
# Line 1251 | Line 1478 | public class CompletableFutureTest exten
1478      public void testThenAcceptBoth_normalCompletion1() {
1479          for (ExecutionMode m : ExecutionMode.values())
1480          for (Integer v1 : new Integer[] { 1, null })
1481 <        for (Integer v2 : new Integer[] { 2, null }) {
1482 <
1481 >        for (Integer v2 : new Integer[] { 2, null })
1482 >    {
1483          final CompletableFuture<Integer> f = new CompletableFuture<>();
1484          final CompletableFuture<Integer> g = new CompletableFuture<>();
1485          final SubtractAction r = new SubtractAction();
# Line 1260 | Line 1487 | public class CompletableFutureTest exten
1487  
1488          f.complete(v1);
1489          checkIncomplete(h);
1490 <        assertFalse(r.ran());
1490 >        assertEquals(0, r.invocationCount);
1491          g.complete(v2);
1492  
1493          checkCompletedNormally(h, null);
1494 <        assertEquals(r.value, subtract(v1, v2));
1494 >        assertEquals(subtract(v1, v2), r.value);
1495          checkCompletedNormally(f, v1);
1496          checkCompletedNormally(g, v2);
1497 <        }
1271 <    }
1497 >    }}
1498  
1499      public void testThenAcceptBoth_normalCompletion2() {
1500          for (ExecutionMode m : ExecutionMode.values())
1501          for (Integer v1 : new Integer[] { 1, null })
1502 <        for (Integer v2 : new Integer[] { 2, null }) {
1503 <
1502 >        for (Integer v2 : new Integer[] { 2, null })
1503 >    {
1504          final CompletableFuture<Integer> f = new CompletableFuture<>();
1505          final CompletableFuture<Integer> g = new CompletableFuture<>();
1506          final SubtractAction r = new SubtractAction();
# Line 1282 | Line 1508 | public class CompletableFutureTest exten
1508  
1509          g.complete(v2);
1510          checkIncomplete(h);
1511 <        assertFalse(r.ran());
1511 >        assertEquals(0, r.invocationCount);
1512          f.complete(v1);
1513  
1514          checkCompletedNormally(h, null);
1515 <        assertEquals(r.value, subtract(v1, v2));
1515 >        assertEquals(subtract(v1, v2), r.value);
1516          checkCompletedNormally(f, v1);
1517          checkCompletedNormally(g, v2);
1518 <        }
1293 <    }
1518 >    }}
1519  
1520      public void testThenAcceptBoth_normalCompletion3() {
1521          for (ExecutionMode m : ExecutionMode.values())
1522          for (Integer v1 : new Integer[] { 1, null })
1523 <        for (Integer v2 : new Integer[] { 2, null }) {
1524 <
1523 >        for (Integer v2 : new Integer[] { 2, null })
1524 >    {
1525          final CompletableFuture<Integer> f = new CompletableFuture<>();
1526          final CompletableFuture<Integer> g = new CompletableFuture<>();
1527          final SubtractAction r = new SubtractAction();
# Line 1306 | Line 1531 | public class CompletableFutureTest exten
1531          final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1532  
1533          checkCompletedNormally(h, null);
1534 <        assertEquals(r.value, subtract(v1, v2));
1534 >        assertEquals(subtract(v1, v2), r.value);
1535          checkCompletedNormally(f, v1);
1536          checkCompletedNormally(g, v2);
1537 <        }
1313 <    }
1537 >    }}
1538  
1539      public void testThenAcceptBoth_normalCompletion4() {
1540          for (ExecutionMode m : ExecutionMode.values())
1541          for (Integer v1 : new Integer[] { 1, null })
1542 <        for (Integer v2 : new Integer[] { 2, null }) {
1543 <
1542 >        for (Integer v2 : new Integer[] { 2, null })
1543 >    {
1544          final CompletableFuture<Integer> f = new CompletableFuture<>();
1545          final CompletableFuture<Integer> g = new CompletableFuture<>();
1546          final SubtractAction r = new SubtractAction();
# Line 1326 | Line 1550 | public class CompletableFutureTest exten
1550          final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1551  
1552          checkCompletedNormally(h, null);
1553 <        assertEquals(r.value, subtract(v1, v2));
1553 >        assertEquals(subtract(v1, v2), r.value);
1554          checkCompletedNormally(f, v1);
1555          checkCompletedNormally(g, v2);
1556 <        }
1333 <    }
1556 >    }}
1557  
1558      /**
1559       * thenAcceptBoth result completes exceptionally after exceptional
# Line 1338 | Line 1561 | public class CompletableFutureTest exten
1561       */
1562      public void testThenAcceptBoth_exceptionalCompletion1() {
1563          for (ExecutionMode m : ExecutionMode.values())
1564 <        for (Integer v1 : new Integer[] { 1, null }) {
1565 <
1564 >        for (Integer v1 : new Integer[] { 1, null })
1565 >    {
1566          final CompletableFuture<Integer> f = new CompletableFuture<>();
1567          final CompletableFuture<Integer> g = new CompletableFuture<>();
1568          final SubtractAction r = new SubtractAction();
# Line 1352 | Line 1575 | public class CompletableFutureTest exten
1575  
1576          checkCompletedWithWrappedCFException(h, ex);
1577          checkCompletedWithWrappedCFException(f, ex);
1578 <        assertEquals(r.invocationCount, 0);
1578 >        assertEquals(0, r.invocationCount);
1579          checkCompletedNormally(g, v1);
1580 <        }
1358 <    }
1580 >    }}
1581  
1582      public void testThenAcceptBoth_exceptionalCompletion2() {
1583          for (ExecutionMode m : ExecutionMode.values())
1584 <        for (Integer v1 : new Integer[] { 1, null }) {
1585 <
1584 >        for (Integer v1 : new Integer[] { 1, null })
1585 >    {
1586          final CompletableFuture<Integer> f = new CompletableFuture<>();
1587          final CompletableFuture<Integer> g = new CompletableFuture<>();
1588          final SubtractAction r = new SubtractAction();
# Line 1373 | Line 1595 | public class CompletableFutureTest exten
1595  
1596          checkCompletedWithWrappedCFException(h, ex);
1597          checkCompletedWithWrappedCFException(g, ex);
1598 <        assertEquals(r.invocationCount, 0);
1598 >        assertEquals(0, r.invocationCount);
1599          checkCompletedNormally(f, v1);
1600 <        }
1379 <    }
1600 >    }}
1601  
1602      public void testThenAcceptBoth_exceptionalCompletion3() {
1603          for (ExecutionMode m : ExecutionMode.values())
1604 <        for (Integer v1 : new Integer[] { 1, null }) {
1605 <
1604 >        for (Integer v1 : new Integer[] { 1, null })
1605 >    {
1606          final CompletableFuture<Integer> f = new CompletableFuture<>();
1607          final CompletableFuture<Integer> g = new CompletableFuture<>();
1608          final SubtractAction r = new SubtractAction();
# Line 1393 | Line 1614 | public class CompletableFutureTest exten
1614  
1615          checkCompletedWithWrappedCFException(h, ex);
1616          checkCompletedWithWrappedCFException(g, ex);
1617 <        assertEquals(r.invocationCount, 0);
1617 >        assertEquals(0, r.invocationCount);
1618          checkCompletedNormally(f, v1);
1619 <        }
1399 <    }
1619 >    }}
1620  
1621      public void testThenAcceptBoth_exceptionalCompletion4() {
1622          for (ExecutionMode m : ExecutionMode.values())
1623 <        for (Integer v1 : new Integer[] { 1, null }) {
1624 <
1623 >        for (Integer v1 : new Integer[] { 1, null })
1624 >    {
1625          final CompletableFuture<Integer> f = new CompletableFuture<>();
1626          final CompletableFuture<Integer> g = new CompletableFuture<>();
1627          final SubtractAction r = new SubtractAction();
# Line 1413 | Line 1633 | public class CompletableFutureTest exten
1633  
1634          checkCompletedWithWrappedCFException(h, ex);
1635          checkCompletedWithWrappedCFException(f, ex);
1636 <        assertFalse(r.ran());
1636 >        assertEquals(0, r.invocationCount);
1637          checkCompletedNormally(g, v1);
1638 <        }
1419 <    }
1638 >    }}
1639  
1640      /**
1641       * thenAcceptBoth result completes exceptionally if action does
# Line 1424 | Line 1643 | public class CompletableFutureTest exten
1643      public void testThenAcceptBoth_actionFailed1() {
1644          for (ExecutionMode m : ExecutionMode.values())
1645          for (Integer v1 : new Integer[] { 1, null })
1646 <        for (Integer v2 : new Integer[] { 2, null }) {
1647 <
1646 >        for (Integer v2 : new Integer[] { 2, null })
1647 >    {
1648          final CompletableFuture<Integer> f = new CompletableFuture<>();
1649          final CompletableFuture<Integer> g = new CompletableFuture<>();
1650          final FailingBiConsumer r = new FailingBiConsumer();
# Line 1438 | Line 1657 | public class CompletableFutureTest exten
1657          checkCompletedWithWrappedCFException(h);
1658          checkCompletedNormally(f, v1);
1659          checkCompletedNormally(g, v2);
1660 <        }
1442 <    }
1660 >    }}
1661  
1662      public void testThenAcceptBoth_actionFailed2() {
1663          for (ExecutionMode m : ExecutionMode.values())
1664          for (Integer v1 : new Integer[] { 1, null })
1665 <        for (Integer v2 : new Integer[] { 2, null }) {
1666 <
1665 >        for (Integer v2 : new Integer[] { 2, null })
1666 >    {
1667          final CompletableFuture<Integer> f = new CompletableFuture<>();
1668          final CompletableFuture<Integer> g = new CompletableFuture<>();
1669          final FailingBiConsumer r = new FailingBiConsumer();
# Line 1458 | Line 1676 | public class CompletableFutureTest exten
1676          checkCompletedWithWrappedCFException(h);
1677          checkCompletedNormally(f, v1);
1678          checkCompletedNormally(g, v2);
1679 <        }
1462 <    }
1679 >    }}
1680  
1681      /**
1682       * thenAcceptBoth result completes exceptionally if either source cancelled
# Line 1467 | Line 1684 | public class CompletableFutureTest exten
1684      public void testThenAcceptBoth_sourceCancelled1() {
1685          for (ExecutionMode m : ExecutionMode.values())
1686          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1687 <        for (Integer v1 : new Integer[] { 1, null }) {
1688 <
1687 >        for (Integer v1 : new Integer[] { 1, null })
1688 >    {
1689          final CompletableFuture<Integer> f = new CompletableFuture<>();
1690          final CompletableFuture<Integer> g = new CompletableFuture<>();
1691          final SubtractAction r = new SubtractAction();
# Line 1480 | Line 1697 | public class CompletableFutureTest exten
1697  
1698          checkCompletedWithWrappedCancellationException(h);
1699          checkCancelled(f);
1700 <        assertEquals(r.invocationCount, 0);
1700 >        assertEquals(0, r.invocationCount);
1701          checkCompletedNormally(g, v1);
1702 <        }
1486 <    }
1702 >    }}
1703  
1704      public void testThenAcceptBoth_sourceCancelled2() {
1705          for (ExecutionMode m : ExecutionMode.values())
1706          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1707 <        for (Integer v1 : new Integer[] { 1, null }) {
1708 <
1707 >        for (Integer v1 : new Integer[] { 1, null })
1708 >    {
1709          final CompletableFuture<Integer> f = new CompletableFuture<>();
1710          final CompletableFuture<Integer> g = new CompletableFuture<>();
1711          final SubtractAction r = new SubtractAction();
# Line 1501 | Line 1717 | public class CompletableFutureTest exten
1717  
1718          checkCompletedWithWrappedCancellationException(h);
1719          checkCancelled(g);
1720 <        assertEquals(r.invocationCount, 0);
1720 >        assertEquals(0, r.invocationCount);
1721          checkCompletedNormally(f, v1);
1722 <        }
1507 <    }
1722 >    }}
1723  
1724      public void testThenAcceptBoth_sourceCancelled3() {
1725          for (ExecutionMode m : ExecutionMode.values())
1726          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1727 <        for (Integer v1 : new Integer[] { 1, null }) {
1728 <
1727 >        for (Integer v1 : new Integer[] { 1, null })
1728 >    {
1729          final CompletableFuture<Integer> f = new CompletableFuture<>();
1730          final CompletableFuture<Integer> g = new CompletableFuture<>();
1731          final SubtractAction r = new SubtractAction();
# Line 1521 | Line 1736 | public class CompletableFutureTest exten
1736  
1737          checkCompletedWithWrappedCancellationException(h);
1738          checkCancelled(g);
1739 <        assertEquals(r.invocationCount, 0);
1739 >        assertEquals(0, r.invocationCount);
1740          checkCompletedNormally(f, v1);
1741 <        }
1527 <    }
1741 >    }}
1742  
1743      public void testThenAcceptBoth_sourceCancelled4() {
1744          for (ExecutionMode m : ExecutionMode.values())
1745          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1746 <        for (Integer v1 : new Integer[] { 1, null }) {
1747 <
1746 >        for (Integer v1 : new Integer[] { 1, null })
1747 >    {
1748          final CompletableFuture<Integer> f = new CompletableFuture<>();
1749          final CompletableFuture<Integer> g = new CompletableFuture<>();
1750          final SubtractAction r = new SubtractAction();
# Line 1541 | Line 1755 | public class CompletableFutureTest exten
1755  
1756          checkCompletedWithWrappedCancellationException(h);
1757          checkCancelled(f);
1758 <        assertEquals(r.invocationCount, 0);
1758 >        assertEquals(0, r.invocationCount);
1759          checkCompletedNormally(g, v1);
1760 <        }
1547 <    }
1760 >    }}
1761  
1762      /**
1763       * runAfterBoth result completes normally after normal
# Line 1553 | Line 1766 | public class CompletableFutureTest exten
1766      public void testRunAfterBoth_normalCompletion1() {
1767          for (ExecutionMode m : ExecutionMode.values())
1768          for (Integer v1 : new Integer[] { 1, null })
1769 <        for (Integer v2 : new Integer[] { 2, null }) {
1770 <
1769 >        for (Integer v2 : new Integer[] { 2, null })
1770 >    {
1771          final CompletableFuture<Integer> f = new CompletableFuture<>();
1772          final CompletableFuture<Integer> g = new CompletableFuture<>();
1773          final Noop r = new Noop();
# Line 1562 | Line 1775 | public class CompletableFutureTest exten
1775  
1776          f.complete(v1);
1777          checkIncomplete(h);
1778 <        assertFalse(r.ran);
1778 >        assertEquals(0, r.invocationCount);
1779          g.complete(v2);
1780  
1781          checkCompletedNormally(h, null);
1782 <        assertEquals(r.invocationCount, 1);
1782 >        assertEquals(1, r.invocationCount);
1783          checkCompletedNormally(f, v1);
1784          checkCompletedNormally(g, v2);
1785 <        }
1573 <    }
1785 >    }}
1786  
1787      public void testRunAfterBoth_normalCompletion2() {
1788          for (ExecutionMode m : ExecutionMode.values())
1789          for (Integer v1 : new Integer[] { 1, null })
1790 <        for (Integer v2 : new Integer[] { 2, null }) {
1791 <
1790 >        for (Integer v2 : new Integer[] { 2, null })
1791 >    {
1792          final CompletableFuture<Integer> f = new CompletableFuture<>();
1793          final CompletableFuture<Integer> g = new CompletableFuture<>();
1794          final Noop r = new Noop();
# Line 1584 | Line 1796 | public class CompletableFutureTest exten
1796  
1797          g.complete(v2);
1798          checkIncomplete(h);
1799 <        assertFalse(r.ran);
1799 >        assertEquals(0, r.invocationCount);
1800          f.complete(v1);
1801  
1802          checkCompletedNormally(h, null);
1803 <        assertEquals(r.invocationCount, 1);
1803 >        assertEquals(1, r.invocationCount);
1804          checkCompletedNormally(f, v1);
1805          checkCompletedNormally(g, v2);
1806 <        }
1595 <    }
1806 >    }}
1807  
1808      public void testRunAfterBoth_normalCompletion3() {
1809          for (ExecutionMode m : ExecutionMode.values())
1810          for (Integer v1 : new Integer[] { 1, null })
1811 <        for (Integer v2 : new Integer[] { 2, null }) {
1812 <
1811 >        for (Integer v2 : new Integer[] { 2, null })
1812 >    {
1813          final CompletableFuture<Integer> f = new CompletableFuture<>();
1814          final CompletableFuture<Integer> g = new CompletableFuture<>();
1815          final Noop r = new Noop();
# Line 1608 | Line 1819 | public class CompletableFutureTest exten
1819          final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1820  
1821          checkCompletedNormally(h, null);
1822 <        assertTrue(r.ran);
1822 >        assertEquals(1, r.invocationCount);
1823          checkCompletedNormally(f, v1);
1824          checkCompletedNormally(g, v2);
1825 <        }
1615 <    }
1825 >    }}
1826  
1827      public void testRunAfterBoth_normalCompletion4() {
1828          for (ExecutionMode m : ExecutionMode.values())
1829          for (Integer v1 : new Integer[] { 1, null })
1830 <        for (Integer v2 : new Integer[] { 2, null }) {
1831 <
1830 >        for (Integer v2 : new Integer[] { 2, null })
1831 >    {
1832          final CompletableFuture<Integer> f = new CompletableFuture<>();
1833          final CompletableFuture<Integer> g = new CompletableFuture<>();
1834          final Noop r = new Noop();
# Line 1628 | Line 1838 | public class CompletableFutureTest exten
1838          final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1839  
1840          checkCompletedNormally(h, null);
1841 <        assertEquals(r.invocationCount, 1);
1841 >        assertEquals(1, r.invocationCount);
1842          checkCompletedNormally(f, v1);
1843          checkCompletedNormally(g, v2);
1844 <        }
1635 <    }
1844 >    }}
1845  
1846      /**
1847       * runAfterBoth result completes exceptionally after exceptional
# Line 1640 | Line 1849 | public class CompletableFutureTest exten
1849       */
1850      public void testRunAfterBoth_exceptionalCompletion1() {
1851          for (ExecutionMode m : ExecutionMode.values())
1852 <        for (Integer v1 : new Integer[] { 1, null }) {
1853 <
1852 >        for (Integer v1 : new Integer[] { 1, null })
1853 >    {
1854          final CompletableFuture<Integer> f = new CompletableFuture<>();
1855          final CompletableFuture<Integer> g = new CompletableFuture<>();
1856          final Noop r = new Noop();
# Line 1654 | Line 1863 | public class CompletableFutureTest exten
1863  
1864          checkCompletedWithWrappedCFException(h, ex);
1865          checkCompletedWithWrappedCFException(f, ex);
1866 <        assertEquals(r.invocationCount, 0);
1866 >        assertEquals(0, r.invocationCount);
1867          checkCompletedNormally(g, v1);
1868 <        }
1660 <    }
1868 >    }}
1869  
1870      public void testRunAfterBoth_exceptionalCompletion2() {
1871          for (ExecutionMode m : ExecutionMode.values())
1872 <        for (Integer v1 : new Integer[] { 1, null }) {
1873 <
1872 >        for (Integer v1 : new Integer[] { 1, null })
1873 >    {
1874          final CompletableFuture<Integer> f = new CompletableFuture<>();
1875          final CompletableFuture<Integer> g = new CompletableFuture<>();
1876          final Noop r = new Noop();
# Line 1675 | Line 1883 | public class CompletableFutureTest exten
1883  
1884          checkCompletedWithWrappedCFException(h, ex);
1885          checkCompletedWithWrappedCFException(g, ex);
1886 <        assertEquals(r.invocationCount, 0);
1886 >        assertEquals(0, r.invocationCount);
1887          checkCompletedNormally(f, v1);
1888 <        }
1681 <    }
1888 >    }}
1889  
1890      public void testRunAfterBoth_exceptionalCompletion3() {
1891          for (ExecutionMode m : ExecutionMode.values())
1892 <        for (Integer v1 : new Integer[] { 1, null }) {
1893 <
1892 >        for (Integer v1 : new Integer[] { 1, null })
1893 >    {
1894          final CompletableFuture<Integer> f = new CompletableFuture<>();
1895          final CompletableFuture<Integer> g = new CompletableFuture<>();
1896          final Noop r = new Noop();
# Line 1695 | Line 1902 | public class CompletableFutureTest exten
1902  
1903          checkCompletedWithWrappedCFException(h, ex);
1904          checkCompletedWithWrappedCFException(g, ex);
1905 <        assertEquals(r.invocationCount, 0);
1905 >        assertEquals(0, r.invocationCount);
1906          checkCompletedNormally(f, v1);
1907 <        }
1701 <    }
1907 >    }}
1908  
1909      public void testRunAfterBoth_exceptionalCompletion4() {
1910          for (ExecutionMode m : ExecutionMode.values())
1911 <        for (Integer v1 : new Integer[] { 1, null }) {
1912 <
1911 >        for (Integer v1 : new Integer[] { 1, null })
1912 >    {
1913          final CompletableFuture<Integer> f = new CompletableFuture<>();
1914          final CompletableFuture<Integer> g = new CompletableFuture<>();
1915          final Noop r = new Noop();
# Line 1715 | Line 1921 | public class CompletableFutureTest exten
1921  
1922          checkCompletedWithWrappedCFException(h, ex);
1923          checkCompletedWithWrappedCFException(f, ex);
1924 <        assertEquals(r.invocationCount, 0);
1924 >        assertEquals(0, r.invocationCount);
1925          checkCompletedNormally(g, v1);
1926 <        }
1721 <    }
1926 >    }}
1927  
1928      /**
1929       * runAfterBoth result completes exceptionally if action does
# Line 1726 | Line 1931 | public class CompletableFutureTest exten
1931      public void testRunAfterBoth_actionFailed1() {
1932          for (ExecutionMode m : ExecutionMode.values())
1933          for (Integer v1 : new Integer[] { 1, null })
1934 <        for (Integer v2 : new Integer[] { 2, null }) {
1935 <
1934 >        for (Integer v2 : new Integer[] { 2, null })
1935 >    {
1936          final CompletableFuture<Integer> f = new CompletableFuture<>();
1937          final CompletableFuture<Integer> g = new CompletableFuture<>();
1938 <        final FailingNoop r = new FailingNoop();
1938 >        final FailingRunnable r = new FailingRunnable();
1939          final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1940  
1941          f.complete(v1);
# Line 1740 | Line 1945 | public class CompletableFutureTest exten
1945          checkCompletedWithWrappedCFException(h);
1946          checkCompletedNormally(f, v1);
1947          checkCompletedNormally(g, v2);
1948 <        }
1744 <    }
1948 >    }}
1949  
1950      public void testRunAfterBoth_actionFailed2() {
1951          for (ExecutionMode m : ExecutionMode.values())
1952          for (Integer v1 : new Integer[] { 1, null })
1953 <        for (Integer v2 : new Integer[] { 2, null }) {
1954 <
1953 >        for (Integer v2 : new Integer[] { 2, null })
1954 >    {
1955          final CompletableFuture<Integer> f = new CompletableFuture<>();
1956          final CompletableFuture<Integer> g = new CompletableFuture<>();
1957 <        final FailingNoop r = new FailingNoop();
1957 >        final FailingRunnable r = new FailingRunnable();
1958          final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1959  
1960          g.complete(v2);
# Line 1760 | Line 1964 | public class CompletableFutureTest exten
1964          checkCompletedWithWrappedCFException(h);
1965          checkCompletedNormally(f, v1);
1966          checkCompletedNormally(g, v2);
1967 <        }
1764 <    }
1967 >    }}
1968  
1969      /**
1970       * runAfterBoth result completes exceptionally if either source cancelled
# Line 1769 | Line 1972 | public class CompletableFutureTest exten
1972      public void testRunAfterBoth_sourceCancelled1() {
1973          for (ExecutionMode m : ExecutionMode.values())
1974          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1975 <        for (Integer v1 : new Integer[] { 1, null }) {
1976 <
1975 >        for (Integer v1 : new Integer[] { 1, null })
1976 >    {
1977          final CompletableFuture<Integer> f = new CompletableFuture<>();
1978          final CompletableFuture<Integer> g = new CompletableFuture<>();
1979          final Noop r = new Noop();
# Line 1782 | Line 1985 | public class CompletableFutureTest exten
1985  
1986          checkCompletedWithWrappedCancellationException(h);
1987          checkCancelled(f);
1988 <        assertEquals(r.invocationCount, 0);
1988 >        assertEquals(0, r.invocationCount);
1989          checkCompletedNormally(g, v1);
1990 <        }
1788 <    }
1990 >    }}
1991  
1992      public void testRunAfterBoth_sourceCancelled2() {
1993          for (ExecutionMode m : ExecutionMode.values())
1994          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1995 <        for (Integer v1 : new Integer[] { 1, null }) {
1996 <
1995 >        for (Integer v1 : new Integer[] { 1, null })
1996 >    {
1997          final CompletableFuture<Integer> f = new CompletableFuture<>();
1998          final CompletableFuture<Integer> g = new CompletableFuture<>();
1999          final Noop r = new Noop();
# Line 1803 | Line 2005 | public class CompletableFutureTest exten
2005  
2006          checkCompletedWithWrappedCancellationException(h);
2007          checkCancelled(g);
2008 <        assertEquals(r.invocationCount, 0);
2008 >        assertEquals(0, r.invocationCount);
2009          checkCompletedNormally(f, v1);
2010 <        }
1809 <    }
2010 >    }}
2011  
2012      public void testRunAfterBoth_sourceCancelled3() {
2013          for (ExecutionMode m : ExecutionMode.values())
2014          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2015 <        for (Integer v1 : new Integer[] { 1, null }) {
2016 <
2015 >        for (Integer v1 : new Integer[] { 1, null })
2016 >    {
2017          final CompletableFuture<Integer> f = new CompletableFuture<>();
2018          final CompletableFuture<Integer> g = new CompletableFuture<>();
2019          final Noop r = new Noop();
# Line 1823 | Line 2024 | public class CompletableFutureTest exten
2024  
2025          checkCompletedWithWrappedCancellationException(h);
2026          checkCancelled(g);
2027 <        assertEquals(r.invocationCount, 0);
2027 >        assertEquals(0, r.invocationCount);
2028          checkCompletedNormally(f, v1);
2029 <        }
1829 <    }
2029 >    }}
2030  
2031      public void testRunAfterBoth_sourceCancelled4() {
2032          for (ExecutionMode m : ExecutionMode.values())
2033          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2034 <        for (Integer v1 : new Integer[] { 1, null }) {
2035 <
2034 >        for (Integer v1 : new Integer[] { 1, null })
2035 >    {
2036          final CompletableFuture<Integer> f = new CompletableFuture<>();
2037          final CompletableFuture<Integer> g = new CompletableFuture<>();
2038          final Noop r = new Noop();
# Line 1843 | Line 2043 | public class CompletableFutureTest exten
2043  
2044          checkCompletedWithWrappedCancellationException(h);
2045          checkCancelled(f);
2046 <        assertEquals(r.invocationCount, 0);
2046 >        assertEquals(0, r.invocationCount);
2047          checkCompletedNormally(g, v1);
2048 <        }
1849 <    }
2048 >    }}
2049  
2050      /**
2051       * applyToEither result completes normally after normal completion
# Line 1855 | Line 2054 | public class CompletableFutureTest exten
2054      public void testApplyToEither_normalCompletion1() {
2055          for (ExecutionMode m : ExecutionMode.values())
2056          for (Integer v1 : new Integer[] { 1, null })
2057 <        for (Integer v2 : new Integer[] { 2, null }) {
2058 <
2057 >        for (Integer v2 : new Integer[] { 2, null })
2058 >    {
2059          final CompletableFuture<Integer> f = new CompletableFuture<>();
2060          final CompletableFuture<Integer> g = new CompletableFuture<>();
2061          final IncFunction r = new IncFunction();
# Line 1869 | Line 2068 | public class CompletableFutureTest exten
2068          checkCompletedNormally(f, v1);
2069          checkCompletedNormally(g, v2);
2070          checkCompletedNormally(h, inc(v1));
2071 <        }
1873 <    }
2071 >    }}
2072  
2073      public void testApplyToEither_normalCompletion2() {
2074          for (ExecutionMode m : ExecutionMode.values())
2075          for (Integer v1 : new Integer[] { 1, null })
2076 <        for (Integer v2 : new Integer[] { 2, null }) {
2077 <
2076 >        for (Integer v2 : new Integer[] { 2, null })
2077 >    {
2078          final CompletableFuture<Integer> f = new CompletableFuture<>();
2079          final CompletableFuture<Integer> g = new CompletableFuture<>();
2080          final IncFunction r = new IncFunction();
# Line 1889 | Line 2087 | public class CompletableFutureTest exten
2087          checkCompletedNormally(f, v1);
2088          checkCompletedNormally(g, v2);
2089          checkCompletedNormally(h, inc(v2));
2090 <        }
2091 <    }
2090 >        }}
2091 >
2092      public void testApplyToEither_normalCompletion3() {
2093          for (ExecutionMode m : ExecutionMode.values())
2094          for (Integer v1 : new Integer[] { 1, null })
2095 <        for (Integer v2 : new Integer[] { 2, null }) {
2096 <
2095 >        for (Integer v2 : new Integer[] { 2, null })
2096 >    {
2097          final CompletableFuture<Integer> f = new CompletableFuture<>();
2098          final CompletableFuture<Integer> g = new CompletableFuture<>();
2099          final IncFunction r = new IncFunction();
# Line 1910 | Line 2108 | public class CompletableFutureTest exten
2108          // unspecified behavior
2109          assertTrue(Objects.equals(h.join(), inc(v1)) ||
2110                     Objects.equals(h.join(), inc(v2)));
2111 <        assertEquals(r.invocationCount, 1);
2112 <        }
1915 <    }
2111 >        assertEquals(1, r.invocationCount);
2112 >    }}
2113  
2114      /**
2115       * applyToEither result completes exceptionally after exceptional
# Line 1920 | Line 2117 | public class CompletableFutureTest exten
2117       */
2118      public void testApplyToEither_exceptionalCompletion1() {
2119          for (ExecutionMode m : ExecutionMode.values())
2120 <        for (Integer v1 : new Integer[] { 1, null }) {
2121 <
2120 >        for (Integer v1 : new Integer[] { 1, null })
2121 >    {
2122          final CompletableFuture<Integer> f = new CompletableFuture<>();
2123          final CompletableFuture<Integer> g = new CompletableFuture<>();
2124          final IncFunction r = new IncFunction();
# Line 1932 | Line 2129 | public class CompletableFutureTest exten
2129          checkCompletedWithWrappedCFException(h, ex);
2130          g.complete(v1);
2131  
2132 <        assertEquals(r.invocationCount, 0);
2132 >        assertEquals(0, r.invocationCount);
2133          checkCompletedNormally(g, v1);
2134          checkCompletedWithWrappedCFException(f, ex);
2135          checkCompletedWithWrappedCFException(h, ex);
2136 <        }
1940 <    }
2136 >    }}
2137  
2138      public void testApplyToEither_exceptionalCompletion2() {
2139          for (ExecutionMode m : ExecutionMode.values())
2140 <        for (Integer v1 : new Integer[] { 1, null }) {
2141 <
2140 >        for (Integer v1 : new Integer[] { 1, null })
2141 >    {
2142          final CompletableFuture<Integer> f = new CompletableFuture<>();
2143          final CompletableFuture<Integer> g = new CompletableFuture<>();
2144          final IncFunction r = new IncFunction();
# Line 1953 | Line 2149 | public class CompletableFutureTest exten
2149          checkCompletedWithWrappedCFException(h, ex);
2150          f.complete(v1);
2151  
2152 <        assertEquals(r.invocationCount, 0);
2152 >        assertEquals(0, r.invocationCount);
2153          checkCompletedNormally(f, v1);
2154          checkCompletedWithWrappedCFException(g, ex);
2155          checkCompletedWithWrappedCFException(h, ex);
2156 <        }
1961 <    }
2156 >    }}
2157  
2158      public void testApplyToEither_exceptionalCompletion3() {
2159          for (ExecutionMode m : ExecutionMode.values())
2160 <        for (Integer v1 : new Integer[] { 1, null }) {
2161 <
2160 >        for (Integer v1 : new Integer[] { 1, null })
2161 >    {
2162          final CompletableFuture<Integer> f = new CompletableFuture<>();
2163          final CompletableFuture<Integer> g = new CompletableFuture<>();
2164          final IncFunction r = new IncFunction();
# Line 1976 | Line 2171 | public class CompletableFutureTest exten
2171          // unspecified behavior
2172          Integer v;
2173          try {
2174 <            assertEquals(h.join(), inc(v1));
2175 <            assertEquals(r.invocationCount, 1);
2174 >            assertEquals(inc(v1), h.join());
2175 >            assertEquals(1, r.invocationCount);
2176          } catch (CompletionException ok) {
2177              checkCompletedWithWrappedCFException(h, ex);
2178 <            assertEquals(r.invocationCount, 0);
2178 >            assertEquals(0, r.invocationCount);
2179          }
2180  
2181          checkCompletedWithWrappedCFException(g, ex);
2182          checkCompletedNormally(f, v1);
2183 <        }
1989 <    }
2183 >    }}
2184  
2185      public void testApplyToEither_exceptionalCompletion4() {
2186          for (ExecutionMode m : ExecutionMode.values())
2187 <        for (Integer v1 : new Integer[] { 1, null }) {
2188 <
2187 >        for (Integer v1 : new Integer[] { 1, null })
2188 >    {
2189          final CompletableFuture<Integer> f = new CompletableFuture<>();
2190          final CompletableFuture<Integer> g = new CompletableFuture<>();
2191          final IncFunction r = new IncFunction();
# Line 2004 | Line 2198 | public class CompletableFutureTest exten
2198          // unspecified behavior
2199          Integer v;
2200          try {
2201 <            assertEquals(h.join(), inc(v1));
2202 <            assertEquals(r.invocationCount, 1);
2201 >            assertEquals(inc(v1), h.join());
2202 >            assertEquals(1, r.invocationCount);
2203          } catch (CompletionException ok) {
2204              checkCompletedWithWrappedCFException(h, ex);
2205 <            assertEquals(r.invocationCount, 0);
2205 >            assertEquals(0, r.invocationCount);
2206          }
2207  
2208          checkCompletedWithWrappedCFException(f, ex);
2209          checkCompletedNormally(g, v1);
2210 <        }
2017 <    }
2210 >    }}
2211  
2212      /**
2213       * applyToEither result completes exceptionally if action does
# Line 2022 | Line 2215 | public class CompletableFutureTest exten
2215      public void testApplyToEither_actionFailed1() {
2216          for (ExecutionMode m : ExecutionMode.values())
2217          for (Integer v1 : new Integer[] { 1, null })
2218 <        for (Integer v2 : new Integer[] { 2, null }) {
2219 <
2218 >        for (Integer v2 : new Integer[] { 2, null })
2219 >    {
2220          final CompletableFuture<Integer> f = new CompletableFuture<>();
2221          final CompletableFuture<Integer> g = new CompletableFuture<>();
2222          final FailingFunction r = new FailingFunction();
# Line 2034 | Line 2227 | public class CompletableFutureTest exten
2227          g.complete(v2);
2228          checkCompletedNormally(f, v1);
2229          checkCompletedNormally(g, v2);
2230 <        }
2038 <    }
2230 >    }}
2231  
2232      public void testApplyToEither_actionFailed2() {
2233          for (ExecutionMode m : ExecutionMode.values())
2234          for (Integer v1 : new Integer[] { 1, null })
2235 <        for (Integer v2 : new Integer[] { 2, null }) {
2236 <
2235 >        for (Integer v2 : new Integer[] { 2, null })
2236 >    {
2237          final CompletableFuture<Integer> f = new CompletableFuture<>();
2238          final CompletableFuture<Integer> g = new CompletableFuture<>();
2239          final FailingFunction r = new FailingFunction();
# Line 2052 | Line 2244 | public class CompletableFutureTest exten
2244          f.complete(v1);
2245          checkCompletedNormally(f, v1);
2246          checkCompletedNormally(g, v2);
2247 <        }
2056 <    }
2247 >    }}
2248  
2249      /**
2250       * applyToEither result completes exceptionally if either source cancelled
# Line 2061 | Line 2252 | public class CompletableFutureTest exten
2252      public void testApplyToEither_sourceCancelled1() {
2253          for (ExecutionMode m : ExecutionMode.values())
2254          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2255 <        for (Integer v1 : new Integer[] { 1, null }) {
2256 <
2255 >        for (Integer v1 : new Integer[] { 1, null })
2256 >    {
2257          final CompletableFuture<Integer> f = new CompletableFuture<>();
2258          final CompletableFuture<Integer> g = new CompletableFuture<>();
2259          final IncFunction r = new IncFunction();
# Line 2073 | Line 2264 | public class CompletableFutureTest exten
2264          g.complete(v1);
2265  
2266          checkCancelled(f);
2267 <        assertEquals(r.invocationCount, 0);
2267 >        assertEquals(0, r.invocationCount);
2268          checkCompletedNormally(g, v1);
2269          checkCompletedWithWrappedCancellationException(h);
2270 <        }
2080 <    }
2270 >    }}
2271  
2272      public void testApplyToEither_sourceCancelled2() {
2273          for (ExecutionMode m : ExecutionMode.values())
2274          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2275 <        for (Integer v1 : new Integer[] { 1, null }) {
2276 <
2275 >        for (Integer v1 : new Integer[] { 1, null })
2276 >    {
2277          final CompletableFuture<Integer> f = new CompletableFuture<>();
2278          final CompletableFuture<Integer> g = new CompletableFuture<>();
2279          final IncFunction r = new IncFunction();
# Line 2094 | Line 2284 | public class CompletableFutureTest exten
2284          f.complete(v1);
2285  
2286          checkCancelled(g);
2287 <        assertEquals(r.invocationCount, 0);
2287 >        assertEquals(0, r.invocationCount);
2288          checkCompletedNormally(f, v1);
2289          checkCompletedWithWrappedCancellationException(h);
2290 <        }
2101 <    }
2290 >    }}
2291  
2292      public void testApplyToEither_sourceCancelled3() {
2293          for (ExecutionMode m : ExecutionMode.values())
2294          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2295 <        for (Integer v1 : new Integer[] { 1, null }) {
2296 <
2295 >        for (Integer v1 : new Integer[] { 1, null })
2296 >    {
2297          final CompletableFuture<Integer> f = new CompletableFuture<>();
2298          final CompletableFuture<Integer> g = new CompletableFuture<>();
2299          final IncFunction r = new IncFunction();
# Line 2116 | Line 2305 | public class CompletableFutureTest exten
2305          // unspecified behavior
2306          Integer v;
2307          try {
2308 <            assertEquals(h.join(), inc(v1));
2309 <            assertEquals(r.invocationCount, 1);
2308 >            assertEquals(inc(v1), h.join());
2309 >            assertEquals(1, r.invocationCount);
2310          } catch (CompletionException ok) {
2311              checkCompletedWithWrappedCancellationException(h);
2312 <            assertEquals(r.invocationCount, 0);
2312 >            assertEquals(0, r.invocationCount);
2313          }
2314  
2315          checkCancelled(g);
2316          checkCompletedNormally(f, v1);
2317 <        }
2129 <    }
2317 >    }}
2318  
2319      public void testApplyToEither_sourceCancelled4() {
2320          for (ExecutionMode m : ExecutionMode.values())
2321          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2322 <        for (Integer v1 : new Integer[] { 1, null }) {
2323 <
2322 >        for (Integer v1 : new Integer[] { 1, null })
2323 >    {
2324          final CompletableFuture<Integer> f = new CompletableFuture<>();
2325          final CompletableFuture<Integer> g = new CompletableFuture<>();
2326          final IncFunction r = new IncFunction();
# Line 2144 | Line 2332 | public class CompletableFutureTest exten
2332          // unspecified behavior
2333          Integer v;
2334          try {
2335 <            assertEquals(h.join(), inc(v1));
2336 <            assertEquals(r.invocationCount, 1);
2335 >            assertEquals(inc(v1), h.join());
2336 >            assertEquals(1, r.invocationCount);
2337          } catch (CompletionException ok) {
2338              checkCompletedWithWrappedCancellationException(h);
2339 <            assertEquals(r.invocationCount, 0);
2339 >            assertEquals(0, r.invocationCount);
2340          }
2341  
2342          checkCancelled(f);
2343          checkCompletedNormally(g, v1);
2344 <        }
2157 <    }
2344 >    }}
2345  
2346      /**
2347       * acceptEither result completes normally after normal completion
# Line 2163 | Line 2350 | public class CompletableFutureTest exten
2350      public void testAcceptEither_normalCompletion1() {
2351          for (ExecutionMode m : ExecutionMode.values())
2352          for (Integer v1 : new Integer[] { 1, null })
2353 <        for (Integer v2 : new Integer[] { 2, null }) {
2354 <
2353 >        for (Integer v2 : new Integer[] { 2, null })
2354 >    {
2355          final CompletableFuture<Integer> f = new CompletableFuture<>();
2356          final CompletableFuture<Integer> g = new CompletableFuture<>();
2357          final IncAction r = new IncAction();
# Line 2172 | Line 2359 | public class CompletableFutureTest exten
2359  
2360          f.complete(v1);
2361          checkCompletedNormally(h, null);
2362 <        assertEquals(r.value, inc(v1));
2362 >        assertEquals(inc(v1), r.value);
2363          g.complete(v2);
2364  
2365          checkCompletedNormally(f, v1);
2366          checkCompletedNormally(g, v2);
2367          checkCompletedNormally(h, null);
2368 <        }
2182 <    }
2368 >    }}
2369  
2370      public void testAcceptEither_normalCompletion2() {
2371          for (ExecutionMode m : ExecutionMode.values())
2372          for (Integer v1 : new Integer[] { 1, null })
2373 <        for (Integer v2 : new Integer[] { 2, null }) {
2374 <
2373 >        for (Integer v2 : new Integer[] { 2, null })
2374 >    {
2375          final CompletableFuture<Integer> f = new CompletableFuture<>();
2376          final CompletableFuture<Integer> g = new CompletableFuture<>();
2377          final IncAction r = new IncAction();
# Line 2193 | Line 2379 | public class CompletableFutureTest exten
2379  
2380          g.complete(v2);
2381          checkCompletedNormally(h, null);
2382 <        assertEquals(r.value, inc(v2));
2382 >        assertEquals(inc(v2), r.value);
2383          f.complete(v1);
2384  
2385          checkCompletedNormally(f, v1);
2386          checkCompletedNormally(g, v2);
2387          checkCompletedNormally(h, null);
2388 <        }
2389 <    }
2388 >    }}
2389 >
2390      public void testAcceptEither_normalCompletion3() {
2391          for (ExecutionMode m : ExecutionMode.values())
2392          for (Integer v1 : new Integer[] { 1, null })
2393 <        for (Integer v2 : new Integer[] { 2, null }) {
2394 <
2393 >        for (Integer v2 : new Integer[] { 2, null })
2394 >    {
2395          final CompletableFuture<Integer> f = new CompletableFuture<>();
2396          final CompletableFuture<Integer> g = new CompletableFuture<>();
2397          final IncAction r = new IncAction();
# Line 2221 | Line 2407 | public class CompletableFutureTest exten
2407          // unspecified behavior
2408          assertTrue(Objects.equals(r.value, inc(v1)) ||
2409                     Objects.equals(r.value, inc(v2)));
2410 <        }
2225 <    }
2410 >    }}
2411  
2412      /**
2413       * acceptEither result completes exceptionally after exceptional
# Line 2230 | Line 2415 | public class CompletableFutureTest exten
2415       */
2416      public void testAcceptEither_exceptionalCompletion1() {
2417          for (ExecutionMode m : ExecutionMode.values())
2418 <        for (Integer v1 : new Integer[] { 1, null }) {
2419 <
2418 >        for (Integer v1 : new Integer[] { 1, null })
2419 >    {
2420          final CompletableFuture<Integer> f = new CompletableFuture<>();
2421          final CompletableFuture<Integer> g = new CompletableFuture<>();
2422          final IncAction r = new IncAction();
# Line 2242 | Line 2427 | public class CompletableFutureTest exten
2427          checkCompletedWithWrappedCFException(h, ex);
2428          g.complete(v1);
2429  
2430 <        assertEquals(r.invocationCount, 0);
2430 >        assertEquals(0, r.invocationCount);
2431          checkCompletedNormally(g, v1);
2432          checkCompletedWithWrappedCFException(f, ex);
2433          checkCompletedWithWrappedCFException(h, ex);
2434 <        }
2250 <    }
2434 >    }}
2435  
2436      public void testAcceptEither_exceptionalCompletion2() {
2437          for (ExecutionMode m : ExecutionMode.values())
2438 <        for (Integer v1 : new Integer[] { 1, null }) {
2439 <
2438 >        for (Integer v1 : new Integer[] { 1, null })
2439 >    {
2440          final CompletableFuture<Integer> f = new CompletableFuture<>();
2441          final CompletableFuture<Integer> g = new CompletableFuture<>();
2442          final IncAction r = new IncAction();
# Line 2263 | Line 2447 | public class CompletableFutureTest exten
2447          checkCompletedWithWrappedCFException(h, ex);
2448          f.complete(v1);
2449  
2450 <        assertEquals(r.invocationCount, 0);
2450 >        assertEquals(0, r.invocationCount);
2451          checkCompletedNormally(f, v1);
2452          checkCompletedWithWrappedCFException(g, ex);
2453          checkCompletedWithWrappedCFException(h, ex);
2454 <        }
2271 <    }
2454 >    }}
2455  
2456      public void testAcceptEither_exceptionalCompletion3() {
2457          for (ExecutionMode m : ExecutionMode.values())
2458 <        for (Integer v1 : new Integer[] { 1, null }) {
2459 <
2458 >        for (Integer v1 : new Integer[] { 1, null })
2459 >    {
2460          final CompletableFuture<Integer> f = new CompletableFuture<>();
2461          final CompletableFuture<Integer> g = new CompletableFuture<>();
2462          final IncAction r = new IncAction();
# Line 2286 | Line 2469 | public class CompletableFutureTest exten
2469          // unspecified behavior
2470          Integer v;
2471          try {
2472 <            assertEquals(h.join(), null);
2473 <            assertEquals(r.invocationCount, 1);
2472 >            assertNull(h.join());
2473 >            assertEquals(1, r.invocationCount);
2474              assertEquals(inc(v1), r.value);
2475          } catch (CompletionException ok) {
2476              checkCompletedWithWrappedCFException(h, ex);
2477 <            assertEquals(r.invocationCount, 0);
2477 >            assertEquals(0, r.invocationCount);
2478          }
2479  
2480          checkCompletedWithWrappedCFException(g, ex);
2481          checkCompletedNormally(f, v1);
2482 <        }
2300 <    }
2482 >    }}
2483  
2484      public void testAcceptEither_exceptionalCompletion4() {
2485          for (ExecutionMode m : ExecutionMode.values())
2486 <        for (Integer v1 : new Integer[] { 1, null }) {
2487 <
2486 >        for (Integer v1 : new Integer[] { 1, null })
2487 >    {
2488          final CompletableFuture<Integer> f = new CompletableFuture<>();
2489          final CompletableFuture<Integer> g = new CompletableFuture<>();
2490          final IncAction r = new IncAction();
# Line 2315 | Line 2497 | public class CompletableFutureTest exten
2497          // unspecified behavior
2498          Integer v;
2499          try {
2500 <            assertEquals(h.join(), null);
2501 <            assertEquals(r.invocationCount, 1);
2500 >            assertNull(h.join());
2501 >            assertEquals(1, r.invocationCount);
2502              assertEquals(inc(v1), r.value);
2503          } catch (CompletionException ok) {
2504              checkCompletedWithWrappedCFException(h, ex);
2505 <            assertEquals(r.invocationCount, 0);
2505 >            assertEquals(0, r.invocationCount);
2506          }
2507  
2508          checkCompletedWithWrappedCFException(f, ex);
2509          checkCompletedNormally(g, v1);
2510 <        }
2329 <    }
2510 >    }}
2511  
2512      /**
2513       * acceptEither result completes exceptionally if action does
# Line 2334 | Line 2515 | public class CompletableFutureTest exten
2515      public void testAcceptEither_actionFailed1() {
2516          for (ExecutionMode m : ExecutionMode.values())
2517          for (Integer v1 : new Integer[] { 1, null })
2518 <        for (Integer v2 : new Integer[] { 2, null }) {
2519 <
2518 >        for (Integer v2 : new Integer[] { 2, null })
2519 >    {
2520          final CompletableFuture<Integer> f = new CompletableFuture<>();
2521          final CompletableFuture<Integer> g = new CompletableFuture<>();
2522          final FailingConsumer r = new FailingConsumer();
# Line 2346 | Line 2527 | public class CompletableFutureTest exten
2527          g.complete(v2);
2528          checkCompletedNormally(f, v1);
2529          checkCompletedNormally(g, v2);
2530 <        }
2350 <    }
2530 >    }}
2531  
2532      public void testAcceptEither_actionFailed2() {
2533          for (ExecutionMode m : ExecutionMode.values())
2534          for (Integer v1 : new Integer[] { 1, null })
2535 <        for (Integer v2 : new Integer[] { 2, null }) {
2536 <
2535 >        for (Integer v2 : new Integer[] { 2, null })
2536 >    {
2537          final CompletableFuture<Integer> f = new CompletableFuture<>();
2538          final CompletableFuture<Integer> g = new CompletableFuture<>();
2539          final FailingConsumer r = new FailingConsumer();
# Line 2364 | Line 2544 | public class CompletableFutureTest exten
2544          f.complete(v1);
2545          checkCompletedNormally(f, v1);
2546          checkCompletedNormally(g, v2);
2547 <        }
2368 <    }
2547 >    }}
2548  
2549      /**
2550       * acceptEither result completes exceptionally if either source cancelled
# Line 2373 | Line 2552 | public class CompletableFutureTest exten
2552      public void testAcceptEither_sourceCancelled1() {
2553          for (ExecutionMode m : ExecutionMode.values())
2554          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2555 <        for (Integer v1 : new Integer[] { 1, null }) {
2556 <
2555 >        for (Integer v1 : new Integer[] { 1, null })
2556 >    {
2557          final CompletableFuture<Integer> f = new CompletableFuture<>();
2558          final CompletableFuture<Integer> g = new CompletableFuture<>();
2559          final IncAction r = new IncAction();
# Line 2385 | Line 2564 | public class CompletableFutureTest exten
2564          g.complete(v1);
2565  
2566          checkCancelled(f);
2567 <        assertEquals(r.invocationCount, 0);
2567 >        assertEquals(0, r.invocationCount);
2568          checkCompletedNormally(g, v1);
2569          checkCompletedWithWrappedCancellationException(h);
2570 <        }
2392 <    }
2570 >    }}
2571  
2572      public void testAcceptEither_sourceCancelled2() {
2573          for (ExecutionMode m : ExecutionMode.values())
2574          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2575 <        for (Integer v1 : new Integer[] { 1, null }) {
2576 <
2575 >        for (Integer v1 : new Integer[] { 1, null })
2576 >    {
2577          final CompletableFuture<Integer> f = new CompletableFuture<>();
2578          final CompletableFuture<Integer> g = new CompletableFuture<>();
2579          final IncAction r = new IncAction();
# Line 2406 | Line 2584 | public class CompletableFutureTest exten
2584          f.complete(v1);
2585  
2586          checkCancelled(g);
2587 <        assertEquals(r.invocationCount, 0);
2587 >        assertEquals(0, r.invocationCount);
2588          checkCompletedNormally(f, v1);
2589          checkCompletedWithWrappedCancellationException(h);
2590 <        }
2413 <    }
2590 >    }}
2591  
2592      public void testAcceptEither_sourceCancelled3() {
2593          for (ExecutionMode m : ExecutionMode.values())
2594          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2595 <        for (Integer v1 : new Integer[] { 1, null }) {
2596 <
2595 >        for (Integer v1 : new Integer[] { 1, null })
2596 >    {
2597          final CompletableFuture<Integer> f = new CompletableFuture<>();
2598          final CompletableFuture<Integer> g = new CompletableFuture<>();
2599          final IncAction r = new IncAction();
# Line 2428 | Line 2605 | public class CompletableFutureTest exten
2605          // unspecified behavior
2606          Integer v;
2607          try {
2608 <            assertEquals(h.join(), null);
2609 <            assertEquals(r.invocationCount, 1);
2608 >            assertNull(h.join());
2609 >            assertEquals(1, r.invocationCount);
2610              assertEquals(inc(v1), r.value);
2611          } catch (CompletionException ok) {
2612              checkCompletedWithWrappedCancellationException(h);
2613 <            assertEquals(r.invocationCount, 0);
2613 >            assertEquals(0, r.invocationCount);
2614          }
2615  
2616          checkCancelled(g);
2617          checkCompletedNormally(f, v1);
2618 <        }
2442 <    }
2618 >    }}
2619  
2620      public void testAcceptEither_sourceCancelled4() {
2621          for (ExecutionMode m : ExecutionMode.values())
2622          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2623 <        for (Integer v1 : new Integer[] { 1, null }) {
2624 <
2623 >        for (Integer v1 : new Integer[] { 1, null })
2624 >    {
2625          final CompletableFuture<Integer> f = new CompletableFuture<>();
2626          final CompletableFuture<Integer> g = new CompletableFuture<>();
2627          final IncAction r = new IncAction();
# Line 2457 | Line 2633 | public class CompletableFutureTest exten
2633          // unspecified behavior
2634          Integer v;
2635          try {
2636 <            assertEquals(h.join(), null);
2637 <            assertEquals(r.invocationCount, 1);
2636 >            assertNull(h.join());
2637 >            assertEquals(1, r.invocationCount);
2638              assertEquals(inc(v1), r.value);
2639          } catch (CompletionException ok) {
2640              checkCompletedWithWrappedCancellationException(h);
2641 <            assertEquals(r.invocationCount, 0);
2641 >            assertEquals(0, r.invocationCount);
2642          }
2643  
2644          checkCancelled(f);
2645          checkCompletedNormally(g, v1);
2646 <        }
2471 <    }
2646 >    }}
2647  
2648      /**
2649       * runAfterEither result completes normally after normal completion
# Line 2477 | Line 2652 | public class CompletableFutureTest exten
2652      public void testRunAfterEither_normalCompletion1() {
2653          for (ExecutionMode m : ExecutionMode.values())
2654          for (Integer v1 : new Integer[] { 1, null })
2655 <        for (Integer v2 : new Integer[] { 2, null }) {
2656 <
2655 >        for (Integer v2 : new Integer[] { 2, null })
2656 >    {
2657          final CompletableFuture<Integer> f = new CompletableFuture<>();
2658          final CompletableFuture<Integer> g = new CompletableFuture<>();
2659          final Noop r = new Noop();
# Line 2486 | Line 2661 | public class CompletableFutureTest exten
2661  
2662          f.complete(v1);
2663          checkCompletedNormally(h, null);
2664 <        assertEquals(r.invocationCount, 1);
2664 >        assertEquals(1, r.invocationCount);
2665          g.complete(v2);
2666  
2667          checkCompletedNormally(f, v1);
2668          checkCompletedNormally(g, v2);
2669          checkCompletedNormally(h, null);
2670 <        assertEquals(r.invocationCount, 1);
2671 <        }
2497 <    }
2670 >        assertEquals(1, r.invocationCount);
2671 >    }}
2672  
2673      public void testRunAfterEither_normalCompletion2() {
2674          for (ExecutionMode m : ExecutionMode.values())
2675          for (Integer v1 : new Integer[] { 1, null })
2676 <        for (Integer v2 : new Integer[] { 2, null }) {
2677 <
2676 >        for (Integer v2 : new Integer[] { 2, null })
2677 >    {
2678          final CompletableFuture<Integer> f = new CompletableFuture<>();
2679          final CompletableFuture<Integer> g = new CompletableFuture<>();
2680          final Noop r = new Noop();
# Line 2508 | Line 2682 | public class CompletableFutureTest exten
2682  
2683          g.complete(v2);
2684          checkCompletedNormally(h, null);
2685 <        assertEquals(r.invocationCount, 1);
2685 >        assertEquals(1, r.invocationCount);
2686          f.complete(v1);
2687  
2688          checkCompletedNormally(f, v1);
2689          checkCompletedNormally(g, v2);
2690          checkCompletedNormally(h, null);
2691 <        assertEquals(r.invocationCount, 1);
2692 <        }
2693 <    }
2691 >        assertEquals(1, r.invocationCount);
2692 >        }}
2693 >
2694      public void testRunAfterEither_normalCompletion3() {
2695          for (ExecutionMode m : ExecutionMode.values())
2696          for (Integer v1 : new Integer[] { 1, null })
2697 <        for (Integer v2 : new Integer[] { 2, null }) {
2698 <
2697 >        for (Integer v2 : new Integer[] { 2, null })
2698 >    {
2699          final CompletableFuture<Integer> f = new CompletableFuture<>();
2700          final CompletableFuture<Integer> g = new CompletableFuture<>();
2701          final Noop r = new Noop();
# Line 2533 | Line 2707 | public class CompletableFutureTest exten
2707          checkCompletedNormally(h, null);
2708          checkCompletedNormally(f, v1);
2709          checkCompletedNormally(g, v2);
2710 <        assertEquals(r.invocationCount, 1);
2711 <        }
2538 <    }
2710 >        assertEquals(1, r.invocationCount);
2711 >    }}
2712  
2713      /**
2714       * runAfterEither result completes exceptionally after exceptional
# Line 2543 | Line 2716 | public class CompletableFutureTest exten
2716       */
2717      public void testRunAfterEither_exceptionalCompletion1() {
2718          for (ExecutionMode m : ExecutionMode.values())
2719 <        for (Integer v1 : new Integer[] { 1, null }) {
2720 <
2719 >        for (Integer v1 : new Integer[] { 1, null })
2720 >    {
2721          final CompletableFuture<Integer> f = new CompletableFuture<>();
2722          final CompletableFuture<Integer> g = new CompletableFuture<>();
2723          final Noop r = new Noop();
# Line 2555 | Line 2728 | public class CompletableFutureTest exten
2728          checkCompletedWithWrappedCFException(h, ex);
2729          g.complete(v1);
2730  
2731 <        assertEquals(r.invocationCount, 0);
2731 >        assertEquals(0, r.invocationCount);
2732          checkCompletedNormally(g, v1);
2733          checkCompletedWithWrappedCFException(f, ex);
2734          checkCompletedWithWrappedCFException(h, ex);
2735 <        }
2563 <    }
2735 >    }}
2736  
2737      public void testRunAfterEither_exceptionalCompletion2() {
2738          for (ExecutionMode m : ExecutionMode.values())
2739 <        for (Integer v1 : new Integer[] { 1, null }) {
2740 <
2739 >        for (Integer v1 : new Integer[] { 1, null })
2740 >    {
2741          final CompletableFuture<Integer> f = new CompletableFuture<>();
2742          final CompletableFuture<Integer> g = new CompletableFuture<>();
2743          final Noop r = new Noop();
# Line 2576 | Line 2748 | public class CompletableFutureTest exten
2748          checkCompletedWithWrappedCFException(h, ex);
2749          f.complete(v1);
2750  
2751 <        assertEquals(r.invocationCount, 0);
2751 >        assertEquals(0, r.invocationCount);
2752          checkCompletedNormally(f, v1);
2753          checkCompletedWithWrappedCFException(g, ex);
2754          checkCompletedWithWrappedCFException(h, ex);
2755 <        }
2584 <    }
2755 >    }}
2756  
2757      public void testRunAfterEither_exceptionalCompletion3() {
2758          for (ExecutionMode m : ExecutionMode.values())
2759 <        for (Integer v1 : new Integer[] { 1, null }) {
2760 <
2759 >        for (Integer v1 : new Integer[] { 1, null })
2760 >    {
2761          final CompletableFuture<Integer> f = new CompletableFuture<>();
2762          final CompletableFuture<Integer> g = new CompletableFuture<>();
2763          final Noop r = new Noop();
# Line 2599 | Line 2770 | public class CompletableFutureTest exten
2770          // unspecified behavior
2771          Integer v;
2772          try {
2773 <            assertEquals(h.join(), null);
2774 <            assertEquals(r.invocationCount, 1);
2773 >            assertNull(h.join());
2774 >            assertEquals(1, r.invocationCount);
2775          } catch (CompletionException ok) {
2776              checkCompletedWithWrappedCFException(h, ex);
2777 <            assertEquals(r.invocationCount, 0);
2777 >            assertEquals(0, r.invocationCount);
2778          }
2779  
2780          checkCompletedWithWrappedCFException(g, ex);
2781          checkCompletedNormally(f, v1);
2782 <        }
2612 <    }
2782 >    }}
2783  
2784      public void testRunAfterEither_exceptionalCompletion4() {
2785          for (ExecutionMode m : ExecutionMode.values())
2786 <        for (Integer v1 : new Integer[] { 1, null }) {
2787 <
2786 >        for (Integer v1 : new Integer[] { 1, null })
2787 >    {
2788          final CompletableFuture<Integer> f = new CompletableFuture<>();
2789          final CompletableFuture<Integer> g = new CompletableFuture<>();
2790          final Noop r = new Noop();
# Line 2627 | Line 2797 | public class CompletableFutureTest exten
2797          // unspecified behavior
2798          Integer v;
2799          try {
2800 <            assertEquals(h.join(), null);
2801 <            assertEquals(r.invocationCount, 1);
2800 >            assertNull(h.join());
2801 >            assertEquals(1, r.invocationCount);
2802          } catch (CompletionException ok) {
2803              checkCompletedWithWrappedCFException(h, ex);
2804 <            assertEquals(r.invocationCount, 0);
2804 >            assertEquals(0, r.invocationCount);
2805          }
2806  
2807          checkCompletedWithWrappedCFException(f, ex);
2808          checkCompletedNormally(g, v1);
2809 <        }
2640 <    }
2809 >    }}
2810  
2811      /**
2812       * runAfterEither result completes exceptionally if action does
# Line 2645 | Line 2814 | public class CompletableFutureTest exten
2814      public void testRunAfterEither_actionFailed1() {
2815          for (ExecutionMode m : ExecutionMode.values())
2816          for (Integer v1 : new Integer[] { 1, null })
2817 <        for (Integer v2 : new Integer[] { 2, null }) {
2818 <
2817 >        for (Integer v2 : new Integer[] { 2, null })
2818 >    {
2819          final CompletableFuture<Integer> f = new CompletableFuture<>();
2820          final CompletableFuture<Integer> g = new CompletableFuture<>();
2821 <        final FailingNoop r = new FailingNoop();
2821 >        final FailingRunnable r = new FailingRunnable();
2822          final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2823  
2824          f.complete(v1);
# Line 2657 | Line 2826 | public class CompletableFutureTest exten
2826          g.complete(v2);
2827          checkCompletedNormally(f, v1);
2828          checkCompletedNormally(g, v2);
2829 <        }
2661 <    }
2829 >    }}
2830  
2831      public void testRunAfterEither_actionFailed2() {
2832          for (ExecutionMode m : ExecutionMode.values())
2833          for (Integer v1 : new Integer[] { 1, null })
2834 <        for (Integer v2 : new Integer[] { 2, null }) {
2835 <
2834 >        for (Integer v2 : new Integer[] { 2, null })
2835 >    {
2836          final CompletableFuture<Integer> f = new CompletableFuture<>();
2837          final CompletableFuture<Integer> g = new CompletableFuture<>();
2838 <        final FailingNoop r = new FailingNoop();
2838 >        final FailingRunnable r = new FailingRunnable();
2839          final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2840  
2841          g.complete(v2);
# Line 2675 | Line 2843 | public class CompletableFutureTest exten
2843          f.complete(v1);
2844          checkCompletedNormally(f, v1);
2845          checkCompletedNormally(g, v2);
2846 <        }
2679 <    }
2846 >    }}
2847  
2848      /**
2849       * runAfterEither result completes exceptionally if either source cancelled
# Line 2684 | Line 2851 | public class CompletableFutureTest exten
2851      public void testRunAfterEither_sourceCancelled1() {
2852          for (ExecutionMode m : ExecutionMode.values())
2853          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2854 <        for (Integer v1 : new Integer[] { 1, null }) {
2855 <
2854 >        for (Integer v1 : new Integer[] { 1, null })
2855 >    {
2856          final CompletableFuture<Integer> f = new CompletableFuture<>();
2857          final CompletableFuture<Integer> g = new CompletableFuture<>();
2858          final Noop r = new Noop();
# Line 2696 | Line 2863 | public class CompletableFutureTest exten
2863          g.complete(v1);
2864  
2865          checkCancelled(f);
2866 <        assertEquals(r.invocationCount, 0);
2866 >        assertEquals(0, r.invocationCount);
2867          checkCompletedNormally(g, v1);
2868          checkCompletedWithWrappedCancellationException(h);
2869 <        }
2703 <    }
2869 >    }}
2870  
2871      public void testRunAfterEither_sourceCancelled2() {
2872          for (ExecutionMode m : ExecutionMode.values())
2873          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2874 <        for (Integer v1 : new Integer[] { 1, null }) {
2875 <
2874 >        for (Integer v1 : new Integer[] { 1, null })
2875 >    {
2876          final CompletableFuture<Integer> f = new CompletableFuture<>();
2877          final CompletableFuture<Integer> g = new CompletableFuture<>();
2878          final Noop r = new Noop();
# Line 2717 | Line 2883 | public class CompletableFutureTest exten
2883          f.complete(v1);
2884  
2885          checkCancelled(g);
2886 <        assertEquals(r.invocationCount, 0);
2886 >        assertEquals(0, r.invocationCount);
2887          checkCompletedNormally(f, v1);
2888          checkCompletedWithWrappedCancellationException(h);
2889 <        }
2724 <    }
2889 >    }}
2890  
2891      public void testRunAfterEither_sourceCancelled3() {
2892          for (ExecutionMode m : ExecutionMode.values())
2893          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2894 <        for (Integer v1 : new Integer[] { 1, null }) {
2895 <
2894 >        for (Integer v1 : new Integer[] { 1, null })
2895 >    {
2896          final CompletableFuture<Integer> f = new CompletableFuture<>();
2897          final CompletableFuture<Integer> g = new CompletableFuture<>();
2898          final Noop r = new Noop();
# Line 2739 | Line 2904 | public class CompletableFutureTest exten
2904          // unspecified behavior
2905          Integer v;
2906          try {
2907 <            assertEquals(h.join(), null);
2908 <            assertEquals(r.invocationCount, 1);
2907 >            assertNull(h.join());
2908 >            assertEquals(1, r.invocationCount);
2909          } catch (CompletionException ok) {
2910              checkCompletedWithWrappedCancellationException(h);
2911 <            assertEquals(r.invocationCount, 0);
2911 >            assertEquals(0, r.invocationCount);
2912          }
2913  
2914          checkCancelled(g);
2915          checkCompletedNormally(f, v1);
2916 <        }
2752 <    }
2916 >    }}
2917  
2918      public void testRunAfterEither_sourceCancelled4() {
2919          for (ExecutionMode m : ExecutionMode.values())
2920          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2921 <        for (Integer v1 : new Integer[] { 1, null }) {
2922 <
2921 >        for (Integer v1 : new Integer[] { 1, null })
2922 >    {
2923          final CompletableFuture<Integer> f = new CompletableFuture<>();
2924          final CompletableFuture<Integer> g = new CompletableFuture<>();
2925          final Noop r = new Noop();
# Line 2767 | Line 2931 | public class CompletableFutureTest exten
2931          // unspecified behavior
2932          Integer v;
2933          try {
2934 <            assertEquals(h.join(), null);
2935 <            assertEquals(r.invocationCount, 1);
2934 >            assertNull(h.join());
2935 >            assertEquals(1, r.invocationCount);
2936          } catch (CompletionException ok) {
2937              checkCompletedWithWrappedCancellationException(h);
2938 <            assertEquals(r.invocationCount, 0);
2938 >            assertEquals(0, r.invocationCount);
2939          }
2940  
2941          checkCancelled(f);
2942          checkCompletedNormally(g, v1);
2943 <        }
2780 <    }
2943 >    }}
2944  
2945      /**
2946       * thenCompose result completes normally after normal completion of source
2947       */
2948 <    public void testThenCompose() {
2949 <        CompletableFuture<Integer> f, g;
2950 <        CompletableFutureInc r;
2951 <
2952 <        f = new CompletableFuture<>();
2953 <        g = f.thenCompose(r = new CompletableFutureInc());
2954 <        f.complete(one);
2955 <        checkCompletedNormally(g, two);
2956 <        assertTrue(r.ran);
2948 >    public void testThenCompose_normalCompletion() {
2949 >        for (ExecutionMode m : ExecutionMode.values())
2950 >        for (boolean createIncomplete : new boolean[] { true, false })
2951 >        for (Integer v1 : new Integer[] { 1, null })
2952 >    {
2953 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2954 >        final CompletableFutureInc r = new CompletableFutureInc();
2955 >        if (!createIncomplete) f.complete(v1);
2956 >        final CompletableFuture<Integer> g = f.thenCompose(r);
2957 >        if (createIncomplete) f.complete(v1);
2958  
2959 <        f = new CompletableFuture<>();
2960 <        f.complete(one);
2961 <        g = f.thenCompose(r = new CompletableFutureInc());
2962 <        checkCompletedNormally(g, two);
2799 <        assertTrue(r.ran);
2800 <    }
2959 >        checkCompletedNormally(g, inc(v1));
2960 >        checkCompletedNormally(f, v1);
2961 >        assertEquals(1, r.invocationCount);
2962 >    }}
2963  
2964      /**
2965       * thenCompose result completes exceptionally after exceptional
2966       * completion of source
2967       */
2968 <    public void testThenCompose2() {
2969 <        CompletableFuture<Integer> f, g;
2970 <        CompletableFutureInc r;
2971 <
2972 <        f = new CompletableFuture<>();
2973 <        g = f.thenCompose(r = new CompletableFutureInc());
2974 <        f.completeExceptionally(new CFException());
2975 <        checkCompletedWithWrappedCFException(g);
2968 >    public void testThenCompose_exceptionalCompletion() {
2969 >        for (ExecutionMode m : ExecutionMode.values())
2970 >        for (boolean createIncomplete : new boolean[] { true, false })
2971 >    {
2972 >        final CFException ex = new CFException();
2973 >        final CompletableFutureInc r = new CompletableFutureInc();
2974 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2975 >        if (!createIncomplete) f.completeExceptionally(ex);
2976 >        final CompletableFuture<Integer> g = f.thenCompose(r);
2977 >        if (createIncomplete) f.completeExceptionally(ex);
2978  
2979 <        f = new CompletableFuture<>();
2980 <        f.completeExceptionally(new CFException());
2981 <        g = f.thenCompose(r = new CompletableFutureInc());
2982 <        checkCompletedWithWrappedCFException(g);
2819 <    }
2979 >        checkCompletedWithWrappedCFException(g, ex);
2980 >        checkCompletedWithWrappedCFException(f, ex);
2981 >        assertEquals(0, r.invocationCount);
2982 >    }}
2983  
2984      /**
2985       * thenCompose result completes exceptionally if action does
2986       */
2987 <    public void testThenCompose3() {
2988 <        CompletableFuture<Integer> f, g;
2989 <        FailingCompletableFutureFunction r;
2990 <
2991 <        f = new CompletableFuture<>();
2992 <        g = f.thenCompose(r = new FailingCompletableFutureFunction());
2993 <        f.complete(one);
2994 <        checkCompletedWithWrappedCFException(g);
2987 >    public void testThenCompose_actionFailed() {
2988 >        for (ExecutionMode m : ExecutionMode.values())
2989 >        for (boolean createIncomplete : new boolean[] { true, false })
2990 >        for (Integer v1 : new Integer[] { 1, null })
2991 >    {
2992 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2993 >        final FailingCompletableFutureFunction r
2994 >            = new FailingCompletableFutureFunction();
2995 >        if (!createIncomplete) f.complete(v1);
2996 >        final CompletableFuture<Integer> g = f.thenCompose(r);
2997 >        if (createIncomplete) f.complete(v1);
2998  
2833        f = new CompletableFuture<>();
2834        f.complete(one);
2835        g = f.thenCompose(r = new FailingCompletableFutureFunction());
2999          checkCompletedWithWrappedCFException(g);
3000 <    }
3000 >        checkCompletedNormally(f, v1);
3001 >    }}
3002  
3003      /**
3004       * thenCompose result completes exceptionally if source cancelled
3005       */
3006 <    public void testThenCompose4() {
3007 <        CompletableFuture<Integer> f, g;
3008 <        CompletableFutureInc r;
3009 <
3010 <        f = new CompletableFuture<>();
3011 <        g = f.thenCompose(r = new CompletableFutureInc());
3012 <        assertTrue(f.cancel(true));
3013 <        checkCompletedWithWrappedCancellationException(g);
3014 <
3015 <        f = new CompletableFuture<>();
3016 <        assertTrue(f.cancel(true));
3017 <        g = f.thenCompose(r = new CompletableFutureInc());
3018 <        checkCompletedWithWrappedCancellationException(g);
2855 <    }
2856 <
2857 <    // asyncs
2858 <
2859 <    /**
2860 <     * thenRunAsync result completes normally after normal completion of source
2861 <     */
2862 <    public void testThenRunAsync() {
2863 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2864 <        Noop r = new Noop();
2865 <        CompletableFuture<Void> g = f.thenRunAsync(r);
2866 <        f.complete(null);
2867 <        checkCompletedNormally(g, null);
2868 <
2869 <        // reordered version
2870 <        f = new CompletableFuture<>();
2871 <        f.complete(null);
2872 <        r = new Noop();
2873 <        g = f.thenRunAsync(r);
2874 <        checkCompletedNormally(g, null);
2875 <    }
2876 <
2877 <    /**
2878 <     * thenRunAsync result completes exceptionally after exceptional
2879 <     * completion of source
2880 <     */
2881 <    public void testThenRunAsync2() {
2882 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2883 <        Noop r = new Noop();
2884 <        CompletableFuture<Void> g = f.thenRunAsync(r);
2885 <        f.completeExceptionally(new CFException());
2886 <        try {
2887 <            g.join();
2888 <            shouldThrow();
2889 <        } catch (CompletionException success) {}
2890 <        checkCompletedWithWrappedCFException(g);
2891 <    }
2892 <
2893 <    /**
2894 <     * thenRunAsync result completes exceptionally if action does
2895 <     */
2896 <    public void testThenRunAsync3() {
2897 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2898 <        FailingNoop r = new FailingNoop();
2899 <        CompletableFuture<Void> g = f.thenRunAsync(r);
2900 <        f.complete(null);
2901 <        checkCompletedWithWrappedCFException(g);
2902 <    }
2903 <
2904 <    /**
2905 <     * thenRunAsync result completes exceptionally if source cancelled
2906 <     */
2907 <    public void testThenRunAsync4() {
2908 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2909 <        Noop r = new Noop();
2910 <        CompletableFuture<Void> g = f.thenRunAsync(r);
2911 <        assertTrue(f.cancel(true));
2912 <        checkCompletedWithWrappedCancellationException(g);
2913 <    }
2914 <
2915 <    /**
2916 <     * thenApplyAsync result completes normally after normal completion of source
2917 <     */
2918 <    public void testThenApplyAsync() {
2919 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2920 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
2921 <        f.complete(one);
2922 <        checkCompletedNormally(g, two);
2923 <    }
2924 <
2925 <    /**
2926 <     * thenApplyAsync result completes exceptionally after exceptional
2927 <     * completion of source
2928 <     */
2929 <    public void testThenApplyAsync2() {
2930 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2931 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
2932 <        f.completeExceptionally(new CFException());
2933 <        checkCompletedWithWrappedCFException(g);
2934 <    }
2935 <
2936 <    /**
2937 <     * thenApplyAsync result completes exceptionally if action does
2938 <     */
2939 <    public void testThenApplyAsync3() {
2940 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2941 <        FailingFunction r = new FailingFunction();
2942 <        CompletableFuture<Integer> g = f.thenApplyAsync(r);
2943 <        f.complete(null);
2944 <        checkCompletedWithWrappedCFException(g);
2945 <    }
2946 <
2947 <    /**
2948 <     * thenApplyAsync result completes exceptionally if source cancelled
2949 <     */
2950 <    public void testThenApplyAsync4() {
2951 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2952 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
2953 <        assertTrue(f.cancel(true));
2954 <        checkCompletedWithWrappedCancellationException(g);
2955 <    }
2956 <
2957 <    /**
2958 <     * thenAcceptAsync result completes normally after normal
2959 <     * completion of source
2960 <     */
2961 <    public void testThenAcceptAsync() {
2962 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2963 <        IncAction r = new IncAction();
2964 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2965 <        f.complete(one);
2966 <        checkCompletedNormally(g, null);
2967 <        assertEquals(r.value, (Integer) 2);
2968 <    }
2969 <
2970 <    /**
2971 <     * thenAcceptAsync result completes exceptionally after exceptional
2972 <     * completion of source
2973 <     */
2974 <    public void testThenAcceptAsync2() {
2975 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2976 <        IncAction r = new IncAction();
2977 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2978 <        f.completeExceptionally(new CFException());
2979 <        checkCompletedWithWrappedCFException(g);
2980 <    }
2981 <
2982 <    /**
2983 <     * thenAcceptAsync result completes exceptionally if action does
2984 <     */
2985 <    public void testThenAcceptAsync3() {
2986 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2987 <        FailingConsumer r = new FailingConsumer();
2988 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2989 <        f.complete(null);
2990 <        checkCompletedWithWrappedCFException(g);
2991 <    }
2992 <
2993 <    /**
2994 <     * thenAcceptAsync result completes exceptionally if source cancelled
2995 <     */
2996 <    public void testThenAcceptAsync4() {
2997 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2998 <        IncAction r = new IncAction();
2999 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
3000 <        assertTrue(f.cancel(true));
3001 <        checkCompletedWithWrappedCancellationException(g);
3002 <    }
3003 <
3004 <    /**
3005 <     * thenComposeAsync result completes normally after normal
3006 <     * completion of source
3007 <     */
3008 <    public void testThenComposeAsync() {
3009 <        CompletableFuture<Integer> f, g;
3010 <        CompletableFutureInc r;
3011 <
3012 <        f = new CompletableFuture<>();
3013 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
3014 <        f.complete(one);
3015 <        checkCompletedNormally(g, two);
3016 <
3017 <        f = new CompletableFuture<>();
3018 <        f.complete(one);
3019 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
3020 <        checkCompletedNormally(g, two);
3021 <    }
3022 <
3023 <    /**
3024 <     * thenComposeAsync result completes exceptionally after
3025 <     * exceptional completion of source
3026 <     */
3027 <    public void testThenComposeAsync2() {
3028 <        CompletableFuture<Integer> f, g;
3029 <        CompletableFutureInc r;
3030 <
3031 <        f = new CompletableFuture<>();
3032 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
3033 <        f.completeExceptionally(new CFException());
3034 <        checkCompletedWithWrappedCFException(g);
3035 <        assertFalse(r.ran);
3036 <
3037 <        f = new CompletableFuture<>();
3038 <        f.completeExceptionally(new CFException());
3039 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
3040 <        checkCompletedWithWrappedCFException(g);
3041 <        assertFalse(r.ran);
3042 <    }
3043 <
3044 <    /**
3045 <     * thenComposeAsync result completes exceptionally if action does
3046 <     */
3047 <    public void testThenComposeAsync3() {
3048 <        CompletableFuture<Integer> f, g;
3049 <        FailingCompletableFutureFunction r;
3050 <
3051 <        f = new CompletableFuture<>();
3052 <        g = f.thenComposeAsync(r = new FailingCompletableFutureFunction());
3053 <        f.complete(one);
3054 <        checkCompletedWithWrappedCFException(g);
3055 <
3056 <        f = new CompletableFuture<>();
3057 <        f.complete(one);
3058 <        g = f.thenComposeAsync(r = new FailingCompletableFutureFunction());
3059 <        checkCompletedWithWrappedCFException(g);
3060 <    }
3061 <
3062 <    /**
3063 <     * thenComposeAsync result completes exceptionally if source cancelled
3064 <     */
3065 <    public void testThenComposeAsync4() {
3066 <        CompletableFuture<Integer> f, g;
3067 <        CompletableFutureInc r;
3068 <
3069 <        f = new CompletableFuture<>();
3070 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
3071 <        assertTrue(f.cancel(true));
3072 <        checkCompletedWithWrappedCancellationException(g);
3073 <
3074 <        f = new CompletableFuture<>();
3075 <        assertTrue(f.cancel(true));
3076 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
3077 <        checkCompletedWithWrappedCancellationException(g);
3078 <    }
3079 <
3080 <    // async with explicit executors
3081 <
3082 <    /**
3083 <     * thenRunAsync result completes normally after normal completion of source
3084 <     */
3085 <    public void testThenRunAsyncE() {
3086 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3087 <        Noop r = new Noop();
3088 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
3089 <        f.complete(null);
3090 <        checkCompletedNormally(g, null);
3091 <
3092 <        // reordered version
3093 <        f = new CompletableFuture<>();
3094 <        f.complete(null);
3095 <        r = new Noop();
3096 <        g = f.thenRunAsync(r, new ThreadExecutor());
3097 <        checkCompletedNormally(g, null);
3098 <    }
3099 <
3100 <    /**
3101 <     * thenRunAsync result completes exceptionally after exceptional
3102 <     * completion of source
3103 <     */
3104 <    public void testThenRunAsync2E() {
3105 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3106 <        Noop r = new Noop();
3107 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
3108 <        f.completeExceptionally(new CFException());
3109 <        try {
3110 <            g.join();
3111 <            shouldThrow();
3112 <        } catch (CompletionException success) {}
3113 <        checkCompletedWithWrappedCFException(g);
3114 <    }
3115 <
3116 <    /**
3117 <     * thenRunAsync result completes exceptionally if action does
3118 <     */
3119 <    public void testThenRunAsync3E() {
3120 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3121 <        FailingNoop r = new FailingNoop();
3122 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
3123 <        f.complete(null);
3124 <        checkCompletedWithWrappedCFException(g);
3125 <    }
3126 <
3127 <    /**
3128 <     * thenRunAsync result completes exceptionally if source cancelled
3129 <     */
3130 <    public void testThenRunAsync4E() {
3131 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3132 <        Noop r = new Noop();
3133 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
3134 <        assertTrue(f.cancel(true));
3135 <        checkCompletedWithWrappedCancellationException(g);
3136 <    }
3137 <
3138 <    /**
3139 <     * thenApplyAsync result completes normally after normal completion of source
3140 <     */
3141 <    public void testThenApplyAsyncE() {
3142 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3143 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
3144 <        f.complete(one);
3145 <        checkCompletedNormally(g, two);
3146 <    }
3147 <
3148 <    /**
3149 <     * thenApplyAsync result completes exceptionally after exceptional
3150 <     * completion of source
3151 <     */
3152 <    public void testThenApplyAsync2E() {
3153 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3154 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
3155 <        f.completeExceptionally(new CFException());
3156 <        checkCompletedWithWrappedCFException(g);
3157 <    }
3158 <
3159 <    /**
3160 <     * thenApplyAsync result completes exceptionally if action does
3161 <     */
3162 <    public void testThenApplyAsync3E() {
3163 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3164 <        FailingFunction r = new FailingFunction();
3165 <        CompletableFuture<Integer> g = f.thenApplyAsync(r, new ThreadExecutor());
3166 <        f.complete(null);
3167 <        checkCompletedWithWrappedCFException(g);
3168 <    }
3169 <
3170 <    /**
3171 <     * thenApplyAsync result completes exceptionally if source cancelled
3172 <     */
3173 <    public void testThenApplyAsync4E() {
3174 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3175 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
3176 <        assertTrue(f.cancel(true));
3177 <        checkCompletedWithWrappedCancellationException(g);
3178 <    }
3179 <
3180 <    /**
3181 <     * thenAcceptAsync result completes normally after normal
3182 <     * completion of source
3183 <     */
3184 <    public void testThenAcceptAsyncE() {
3185 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3186 <        IncAction r = new IncAction();
3187 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3188 <        f.complete(one);
3189 <        checkCompletedNormally(g, null);
3190 <        assertEquals(r.value, (Integer) 2);
3191 <    }
3192 <
3193 <    /**
3194 <     * thenAcceptAsync result completes exceptionally after exceptional
3195 <     * completion of source
3196 <     */
3197 <    public void testThenAcceptAsync2E() {
3198 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3199 <        IncAction r = new IncAction();
3200 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3201 <        f.completeExceptionally(new CFException());
3202 <        checkCompletedWithWrappedCFException(g);
3203 <    }
3204 <
3205 <    /**
3206 <     * thenAcceptAsync result completes exceptionally if action does
3207 <     */
3208 <    public void testThenAcceptAsync3E() {
3209 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3210 <        FailingConsumer r = new FailingConsumer();
3211 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3212 <        f.complete(null);
3213 <        checkCompletedWithWrappedCFException(g);
3214 <    }
3215 <
3216 <    /**
3217 <     * thenAcceptAsync result completes exceptionally if source cancelled
3218 <     */
3219 <    public void testThenAcceptAsync4E() {
3220 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3221 <        IncAction r = new IncAction();
3222 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3223 <        assertTrue(f.cancel(true));
3224 <        checkCompletedWithWrappedCancellationException(g);
3225 <    }
3226 <
3227 <    /**
3228 <     * thenComposeAsync result completes normally after normal
3229 <     * completion of source
3230 <     */
3231 <    public void testThenComposeAsyncE() {
3232 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3233 <        CompletableFutureInc r = new CompletableFutureInc();
3234 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
3235 <        f.complete(one);
3236 <        checkCompletedNormally(g, two);
3237 <    }
3238 <
3239 <    /**
3240 <     * thenComposeAsync result completes exceptionally after
3241 <     * exceptional completion of source
3242 <     */
3243 <    public void testThenComposeAsync2E() {
3244 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3245 <        CompletableFutureInc r = new CompletableFutureInc();
3246 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
3247 <        f.completeExceptionally(new CFException());
3248 <        checkCompletedWithWrappedCFException(g);
3249 <    }
3250 <
3251 <    /**
3252 <     * thenComposeAsync result completes exceptionally if action does
3253 <     */
3254 <    public void testThenComposeAsync3E() {
3255 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3256 <        FailingCompletableFutureFunction r = new FailingCompletableFutureFunction();
3257 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
3258 <        f.complete(one);
3259 <        checkCompletedWithWrappedCFException(g);
3260 <    }
3006 >    public void testThenCompose_sourceCancelled() {
3007 >        for (ExecutionMode m : ExecutionMode.values())
3008 >        for (boolean createIncomplete : new boolean[] { true, false })
3009 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3010 >    {
3011 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
3012 >        final CompletableFutureInc r = new CompletableFutureInc();
3013 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
3014 >        final CompletableFuture<Integer> g = f.thenCompose(r);
3015 >        if (createIncomplete) {
3016 >            checkIncomplete(g);
3017 >            assertTrue(f.cancel(mayInterruptIfRunning));
3018 >        }
3019  
3262    /**
3263     * thenComposeAsync result completes exceptionally if source cancelled
3264     */
3265    public void testThenComposeAsync4E() {
3266        CompletableFuture<Integer> f = new CompletableFuture<>();
3267        CompletableFutureInc r = new CompletableFutureInc();
3268        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
3269        assertTrue(f.cancel(true));
3020          checkCompletedWithWrappedCancellationException(g);
3021 <    }
3021 >        checkCancelled(f);
3022 >    }}
3023  
3024      // other static methods
3025  
# Line 3470 | Line 3221 | public class CompletableFutureTest exten
3221       */
3222      public void testWhenComplete_normalCompletion1() {
3223          for (ExecutionMode m : ExecutionMode.values())
3224 <        for (Integer v1 : new Integer[] { 1, null }) {
3225 <
3226 <        final AtomicInteger a = new AtomicInteger();
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 CompletableFuture<Integer> f = new CompletableFuture<>();
3229 <        final CompletableFuture<Integer> g =
3230 <            m.whenComplete(f,
3231 <                           (Integer x, Throwable t) -> {
3232 <                               threadAssertSame(x, v1);
3233 <                               threadAssertNull(t);
3234 <                               a.getAndIncrement();
3235 <                           });
3236 <        f.complete(v1);
3237 <        checkCompletedNormally(f, v1);
3229 >        if (!createIncomplete) f.complete(v1);
3230 >        final CompletableFuture<Integer> g = m.whenComplete
3231 >            (f,
3232 >             (Integer x, Throwable t) -> {
3233 >                threadAssertSame(x, v1);
3234 >                threadAssertNull(t);
3235 >                a.getAndIncrement();
3236 >            });
3237 >        if (createIncomplete) f.complete(v1);
3238 >
3239          checkCompletedNormally(g, v1);
3240 <        assertEquals(a.get(), 1);
3241 <        }
3242 <    }
3240 >        checkCompletedNormally(f, v1);
3241 >        assertEquals(1, a.get());
3242 >    }}
3243  
3244      /**
3245       * whenComplete action executes on exceptional completion, propagating
# Line 3494 | Line 3247 | public class CompletableFutureTest exten
3247       */
3248      public void testWhenComplete_exceptionalCompletion() {
3249          for (ExecutionMode m : ExecutionMode.values())
3250 <        for (Integer v1 : new Integer[] { 1, null }) {
3251 <
3252 <        final AtomicInteger a = new AtomicInteger();
3250 >        for (boolean createIncomplete : new boolean[] { true, false })
3251 >        for (Integer v1 : new Integer[] { 1, null })
3252 >    {
3253 >        final AtomicInteger a = new AtomicInteger(0);
3254          final CFException ex = new CFException();
3255          final CompletableFuture<Integer> f = new CompletableFuture<>();
3256 +        if (!createIncomplete) f.completeExceptionally(ex);
3257          final CompletableFuture<Integer> g = m.whenComplete
3258              (f,
3259               (Integer x, Throwable t) -> {
# Line 3506 | Line 3261 | public class CompletableFutureTest exten
3261                  threadAssertSame(t, ex);
3262                  a.getAndIncrement();
3263              });
3264 <        f.completeExceptionally(ex);
3264 >        if (createIncomplete) f.completeExceptionally(ex);
3265          checkCompletedWithWrappedCFException(f, ex);
3266          checkCompletedWithWrappedCFException(g, ex);
3267 <        assertEquals(a.get(), 1);
3268 <        }
3269 <    }
3267 >        assertEquals(1, a.get());
3268 >    }}
3269 >
3270 >    /**
3271 >     * whenComplete action executes on cancelled source, propagating
3272 >     * CancellationException.
3273 >     */
3274 >    public void testWhenComplete_sourceCancelled() {
3275 >        for (ExecutionMode m : ExecutionMode.values())
3276 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3277 >        for (boolean createIncomplete : new boolean[] { true, false })
3278 >    {
3279 >        final AtomicInteger a = new AtomicInteger(0);
3280 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
3281 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
3282 >        final CompletableFuture<Integer> g = m.whenComplete
3283 >            (f,
3284 >             (Integer x, Throwable t) -> {
3285 >                threadAssertNull(x);
3286 >                threadAssertTrue(t instanceof CancellationException);
3287 >                a.getAndIncrement();
3288 >            });
3289 >        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
3290 >
3291 >        //try { g.join(); } catch (Throwable t) { throw new Error(t); }
3292 >        checkCompletedWithWrappedCancellationException(g);
3293 >        checkCancelled(f);
3294 >        assertEquals(1, a.get());
3295 >    }}
3296  
3297      /**
3298       * If a whenComplete action throws an exception when triggered by
3299       * a normal completion, it completes exceptionally
3300       */
3301      public void testWhenComplete_actionFailed() {
3302 +        for (boolean createIncomplete : new boolean[] { true, false })
3303          for (ExecutionMode m : ExecutionMode.values())
3304 <        for (Integer v1 : new Integer[] { 1, null }) {
3305 <
3304 >        for (Integer v1 : new Integer[] { 1, null })
3305 >    {
3306 >        final AtomicInteger a = new AtomicInteger(0);
3307          final CFException ex = new CFException();
3308          final CompletableFuture<Integer> f = new CompletableFuture<>();
3309 +        if (!createIncomplete) f.complete(v1);
3310          final CompletableFuture<Integer> g = m.whenComplete
3311              (f,
3312               (Integer x, Throwable t) -> {
3313                  threadAssertSame(x, v1);
3314                  threadAssertNull(t);
3315 +                a.getAndIncrement();
3316                  throw ex;
3317              });
3318 <        f.complete(v1);
3318 >        if (createIncomplete) f.complete(v1);
3319          checkCompletedNormally(f, v1);
3320          checkCompletedWithWrappedCFException(g, ex);
3321 <        }
3322 <    }
3321 >        assertEquals(1, a.get());
3322 >    }}
3323  
3324      /**
3325       * If a whenComplete action throws an exception when triggered by
# Line 3542 | Line 3327 | public class CompletableFutureTest exten
3327       * exception takes precedence.
3328       */
3329      public void testWhenComplete_actionFailedSourceFailed() {
3330 +        for (boolean createIncomplete : new boolean[] { true, false })
3331          for (ExecutionMode m : ExecutionMode.values())
3332 <        for (Integer v1 : new Integer[] { 1, null }) {
3333 <
3332 >        for (Integer v1 : new Integer[] { 1, null })
3333 >    {
3334 >        final AtomicInteger a = new AtomicInteger(0);
3335          final CFException ex1 = new CFException();
3336          final CFException ex2 = new CFException();
3337          final CompletableFuture<Integer> f = new CompletableFuture<>();
3338 +
3339 +        if (!createIncomplete) f.completeExceptionally(ex1);
3340          final CompletableFuture<Integer> g = m.whenComplete
3341              (f,
3342               (Integer x, Throwable t) -> {
3343                  threadAssertSame(t, ex1);
3344                  threadAssertNull(x);
3345 +                a.getAndIncrement();
3346                  throw ex2;
3347              });
3348 <        f.completeExceptionally(ex1);
3348 >        if (createIncomplete) f.completeExceptionally(ex1);
3349 >
3350          checkCompletedWithWrappedCFException(f, ex1);
3351          checkCompletedWithWrappedCFException(g, ex1);
3352 <        }
3353 <    }
3563 <
3564 <    /**
3565 <     * handleAsync action completes normally with function value on
3566 <     * either normal or exceptional completion of source
3567 <     */
3568 <    public void testHandleAsync() {
3569 <        CompletableFuture<Integer> f, g;
3570 <        IntegerHandler r;
3571 <
3572 <        f = new CompletableFuture<>();
3573 <        g = f.handleAsync(r = new IntegerHandler());
3574 <        assertFalse(r.ran);
3575 <        f.completeExceptionally(new CFException());
3576 <        checkCompletedWithWrappedCFException(f);
3577 <        checkCompletedNormally(g, three);
3578 <        assertTrue(r.ran);
3579 <
3580 <        f = new CompletableFuture<>();
3581 <        g = f.handleAsync(r = new IntegerHandler());
3582 <        assertFalse(r.ran);
3583 <        f.completeExceptionally(new CFException());
3584 <        checkCompletedWithWrappedCFException(f);
3585 <        checkCompletedNormally(g, three);
3586 <        assertTrue(r.ran);
3587 <
3588 <        f = new CompletableFuture<>();
3589 <        g = f.handleAsync(r = new IntegerHandler());
3590 <        assertFalse(r.ran);
3591 <        f.complete(one);
3592 <        checkCompletedNormally(f, one);
3593 <        checkCompletedNormally(g, two);
3594 <        assertTrue(r.ran);
3595 <
3596 <        f = new CompletableFuture<>();
3597 <        g = f.handleAsync(r = new IntegerHandler());
3598 <        assertFalse(r.ran);
3599 <        f.complete(one);
3600 <        checkCompletedNormally(f, one);
3601 <        checkCompletedNormally(g, two);
3602 <        assertTrue(r.ran);
3603 <    }
3604 <
3605 <    /**
3606 <     * handleAsync action with Executor completes normally with
3607 <     * function value on either normal or exceptional completion of
3608 <     * source
3609 <     */
3610 <    public void testHandleAsync2() {
3611 <        CompletableFuture<Integer> f, g;
3612 <        ThreadExecutor exec = new ThreadExecutor();
3613 <        IntegerHandler r;
3614 <
3615 <        f = new CompletableFuture<>();
3616 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3617 <        assertFalse(r.ran);
3618 <        f.completeExceptionally(new CFException());
3619 <        checkCompletedWithWrappedCFException(f);
3620 <        checkCompletedNormally(g, three);
3621 <        assertTrue(r.ran);
3622 <
3623 <        f = new CompletableFuture<>();
3624 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3625 <        assertFalse(r.ran);
3626 <        f.completeExceptionally(new CFException());
3627 <        checkCompletedWithWrappedCFException(f);
3628 <        checkCompletedNormally(g, three);
3629 <        assertTrue(r.ran);
3630 <
3631 <        f = new CompletableFuture<>();
3632 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3633 <        assertFalse(r.ran);
3634 <        f.complete(one);
3635 <        checkCompletedNormally(f, one);
3636 <        checkCompletedNormally(g, two);
3637 <        assertTrue(r.ran);
3638 <
3639 <        f = new CompletableFuture<>();
3640 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3641 <        assertFalse(r.ran);
3642 <        f.complete(one);
3643 <        checkCompletedNormally(f, one);
3644 <        checkCompletedNormally(g, two);
3645 <        assertTrue(r.ran);
3646 <    }
3352 >        assertEquals(1, a.get());
3353 >    }}
3354  
3355   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines