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.48 by jsr166, Mon Jun 2 19:07:14 2014 UTC

# Line 17 | Line 17 | import java.util.concurrent.Future;
17   import java.util.concurrent.CompletableFuture;
18   import java.util.concurrent.CompletionException;
19   import java.util.concurrent.CompletionStage;
20 + import java.util.concurrent.ForkJoinPool;
21 + import java.util.concurrent.ForkJoinTask;
22   import java.util.concurrent.TimeoutException;
23   import java.util.concurrent.atomic.AtomicInteger;
24   import static java.util.concurrent.TimeUnit.MILLISECONDS;
# Line 247 | Line 249 | public class CompletableFutureTest exten
249          f = new CompletableFuture<>();
250          f.obtrudeValue(three);
251          checkCompletedNormally(f, three);
252 +        f.obtrudeValue(null);
253 +        checkCompletedNormally(f, null);
254          f = new CompletableFuture<>();
255          f.completeExceptionally(new CFException());
256          f.obtrudeValue(four);
# Line 279 | Line 283 | public class CompletableFutureTest exten
283       */
284      public void testGetNumberOfDependents() {
285          CompletableFuture<Integer> f = new CompletableFuture<>();
286 <        assertEquals(f.getNumberOfDependents(), 0);
286 >        assertEquals(0, f.getNumberOfDependents());
287          CompletableFuture g = f.thenRun(new Noop());
288 <        assertEquals(f.getNumberOfDependents(), 1);
289 <        assertEquals(g.getNumberOfDependents(), 0);
288 >        assertEquals(1, f.getNumberOfDependents());
289 >        assertEquals(0, g.getNumberOfDependents());
290          CompletableFuture h = f.thenRun(new Noop());
291 <        assertEquals(f.getNumberOfDependents(), 2);
291 >        assertEquals(2, f.getNumberOfDependents());
292          f.complete(1);
293          checkCompletedNormally(g, null);
294 <        assertEquals(f.getNumberOfDependents(), 0);
295 <        assertEquals(g.getNumberOfDependents(), 0);
294 >        assertEquals(0, f.getNumberOfDependents());
295 >        assertEquals(0, g.getNumberOfDependents());
296      }
297  
298      /**
# Line 339 | Line 343 | public class CompletableFutureTest exten
343      static final class IncAction implements Consumer<Integer> {
344          int invocationCount = 0;
345          Integer value;
342        public boolean ran() { return invocationCount == 1; }
346          public void accept(Integer x) {
347              invocationCount++;
348              value = inc(x);
# Line 348 | Line 351 | public class CompletableFutureTest exten
351      static final class IncFunction implements Function<Integer,Integer> {
352          int invocationCount = 0;
353          Integer value;
351        public boolean ran() { return invocationCount == 1; }
354          public Integer apply(Integer x) {
355              invocationCount++;
356              return value = inc(x);
# Line 358 | Line 360 | public class CompletableFutureTest exten
360          int invocationCount = 0;
361          Integer value;
362          // Check this action was invoked exactly once when result is computed.
361        public boolean ran() { return invocationCount == 1; }
363          public void accept(Integer x, Integer y) {
364              invocationCount++;
365              value = subtract(x, y);
# Line 368 | Line 369 | public class CompletableFutureTest exten
369          int invocationCount = 0;
370          Integer value;
371          // Check this action was invoked exactly once when result is computed.
371        public boolean ran() { return invocationCount == 1; }
372          public Integer apply(Integer x, Integer y) {
373              invocationCount++;
374              return value = subtract(x, y);
# 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(); }
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 738 | Line 936 | public class CompletableFutureTest exten
936          FailingNoop r = new FailingNoop();
937          CompletableFuture<Void> f = CompletableFuture.runAsync(r);
938          checkCompletedWithWrappedCFException(f);
939 <        assertTrue(r.ran);
939 >        assertEquals(1, r.invocationCount);
940      }
941  
942      /**
# Line 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) f.complete(v1);
987  
790        f = new CompletableFuture<>();
791        f.complete(null);
792        g = f.thenRun(r = new Noop());
988          checkCompletedNormally(g, null);
989 <        assertTrue(r.ran);
990 <    }
989 >        checkCompletedNormally(f, v1);
990 >        assertEquals(1, r.invocationCount);
991 >    }}
992  
993      /**
994       * thenRun result completes exceptionally after exceptional
995       * completion of source
996       */
997 <    public void testThenRun2() {
998 <        CompletableFuture<Integer> f;
999 <        CompletableFuture<Void> g;
1000 <        Noop r;
1001 <
1002 <        f = new CompletableFuture<>();
1003 <        g = f.thenRun(r = new Noop());
1004 <        f.completeExceptionally(new CFException());
1005 <        checkCompletedWithWrappedCFException(g);
1006 <        assertFalse(r.ran);
997 >    public void testThenRun_exceptionalCompletion() {
998 >        for (ExecutionMode m : ExecutionMode.values())
999 >        for (boolean createIncomplete : new boolean[] { true, false })
1000 >    {
1001 >        final CFException ex = new CFException();
1002 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1003 >        final Noop r = new Noop();
1004 >        if (!createIncomplete) f.completeExceptionally(ex);
1005 >        final CompletableFuture<Void> g = m.thenRun(f, r);
1006 >        if (createIncomplete) f.completeExceptionally(ex);
1007  
1008 <        f = new CompletableFuture<>();
1009 <        f.completeExceptionally(new CFException());
1010 <        g = f.thenRun(r = new Noop());
1011 <        checkCompletedWithWrappedCFException(g);
816 <        assertFalse(r.ran);
817 <    }
1008 >        checkCompletedWithWrappedCFException(g, ex);
1009 >        checkCompletedWithWrappedCFException(f, ex);
1010 >        assertEquals(0, r.invocationCount);
1011 >    }}
1012  
1013      /**
1014 <     * thenRun result completes exceptionally if action does
1014 >     * thenRun result completes exceptionally if source cancelled
1015       */
1016 <    public void testThenRun3() {
1017 <        CompletableFuture<Integer> f;
1018 <        CompletableFuture<Void> g;
1019 <        FailingNoop r;
1020 <
1021 <        f = new CompletableFuture<>();
1022 <        g = f.thenRun(r = new FailingNoop());
1023 <        f.complete(null);
1024 <        checkCompletedWithWrappedCFException(g);
1016 >    public void testThenRun_sourceCancelled() {
1017 >        for (ExecutionMode m : ExecutionMode.values())
1018 >        for (boolean createIncomplete : new boolean[] { true, false })
1019 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1020 >    {
1021 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1022 >        final Noop r = new Noop();
1023 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1024 >        final CompletableFuture<Void> g = f.thenRun(r);
1025 >        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1026  
1027 <        f = new CompletableFuture<>();
1028 <        f.complete(null);
1029 <        g = f.thenRun(r = new FailingNoop());
1030 <        checkCompletedWithWrappedCFException(g);
836 <    }
1027 >        checkCompletedWithWrappedCancellationException(g);
1028 >        checkCancelled(f);
1029 >        assertEquals(0, r.invocationCount);
1030 >    }}
1031  
1032      /**
1033 <     * thenRun result completes exceptionally if source cancelled
1033 >     * thenRun result completes exceptionally if action does
1034       */
1035 <    public void testThenRun4() {
1036 <        CompletableFuture<Integer> f;
1037 <        CompletableFuture<Void> g;
1038 <        Noop r;
1039 <
1040 <        f = new CompletableFuture<>();
1041 <        g = f.thenRun(r = new Noop());
1042 <        assertTrue(f.cancel(true));
1043 <        checkCompletedWithWrappedCancellationException(g);
1035 >    public void testThenRun_actionFailed() {
1036 >        for (ExecutionMode m : ExecutionMode.values())
1037 >        for (boolean createIncomplete : new boolean[] { true, false })
1038 >        for (Integer v1 : new Integer[] { 1, null })
1039 >    {
1040 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1041 >        final FailingNoop r = new FailingNoop();
1042 >        if (!createIncomplete) f.complete(v1);
1043 >        final CompletableFuture<Void> g = f.thenRun(r);
1044 >        if (createIncomplete) f.complete(v1);
1045  
1046 <        f = new CompletableFuture<>();
1047 <        assertTrue(f.cancel(true));
1048 <        g = f.thenRun(r = new Noop());
854 <        checkCompletedWithWrappedCancellationException(g);
855 <    }
1046 >        checkCompletedWithWrappedCFException(g);
1047 >        checkCompletedNormally(f, v1);
1048 >    }}
1049  
1050      /**
1051       * thenApply result completes normally after normal completion of source
# Line 928 | Line 1121 | public class CompletableFutureTest exten
1121          CompletableFuture<Void> g = f.thenAccept(r);
1122          f.complete(one);
1123          checkCompletedWithWrappedCFException(g);
1124 <        assertTrue(r.ran);
1124 >        assertEquals(1, r.invocationCount);
1125      }
1126  
1127      /**
# Line 947 | Line 1140 | public class CompletableFutureTest exten
1140       * of sources
1141       */
1142      public void testThenCombine_normalCompletion1() {
1143 +        for (boolean createIncomplete : new boolean[] { true, false })
1144 +        for (boolean fFirst : new boolean[] { true, false })
1145          for (ExecutionMode m : ExecutionMode.values())
1146          for (Integer v1 : new Integer[] { 1, null })
1147 <        for (Integer v2 : new Integer[] { 2, null }) {
1148 <
1147 >        for (Integer v2 : new Integer[] { 2, null })
1148 >    {
1149          final CompletableFuture<Integer> f = new CompletableFuture<>();
1150          final CompletableFuture<Integer> g = new CompletableFuture<>();
1151          final SubtractFunction r = new SubtractFunction();
1152 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1152 >        CompletableFuture<Integer> h = null;
1153 >        if (createIncomplete) h = m.thenCombine(f, g, r);
1154  
1155 <        f.complete(v1);
1156 <        checkIncomplete(h);
1157 <        assertEquals(r.invocationCount, 0);
1158 <        g.complete(v2);
1159 <
1160 <        checkCompletedNormally(h, subtract(v1, v2));
1161 <        checkCompletedNormally(f, v1);
1162 <        checkCompletedNormally(g, v2);
1163 <        assertEquals(r.invocationCount, 1);
1164 <        }
1165 <    }
970 <
971 <    public void testThenCombine_normalCompletion2() {
972 <        for (ExecutionMode m : ExecutionMode.values())
973 <        for (Integer v1 : new Integer[] { 1, null })
974 <        for (Integer v2 : new Integer[] { 2, null }) {
975 <
976 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
977 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
978 <        final SubtractFunction r = new SubtractFunction();
979 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
980 <
981 <        g.complete(v2);
982 <        checkIncomplete(h);
983 <        assertEquals(r.invocationCount, 0);
984 <        f.complete(v1);
1155 >        if (fFirst)
1156 >            f.complete(v1);
1157 >        else
1158 >            g.complete(v2);
1159 >        if (createIncomplete) checkIncomplete(h);
1160 >        assertEquals(0, r.invocationCount);
1161 >        if (!fFirst)
1162 >            f.complete(v1);
1163 >        else
1164 >            g.complete(v2);
1165 >        if (!createIncomplete) h = m.thenCombine(f, g, r);
1166  
1167          checkCompletedNormally(h, subtract(v1, v2));
1168          checkCompletedNormally(f, v1);
1169          checkCompletedNormally(g, v2);
1170 <        assertEquals(r.invocationCount, 1);
1171 <        }
991 <    }
992 <
993 <    public void testThenCombine_normalCompletion3() {
994 <        for (ExecutionMode m : ExecutionMode.values())
995 <        for (Integer v1 : new Integer[] { 1, null })
996 <        for (Integer v2 : new Integer[] { 2, null }) {
997 <
998 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
999 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1000 <        final SubtractFunction r = new SubtractFunction();
1001 <
1002 <        g.complete(v2);
1003 <        f.complete(v1);
1004 <        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);
1010 <        }
1011 <    }
1012 <
1013 <    public void testThenCombine_normalCompletion4() {
1014 <        for (ExecutionMode m : ExecutionMode.values())
1015 <        for (Integer v1 : new Integer[] { 1, null })
1016 <        for (Integer v2 : new Integer[] { 2, null }) {
1017 <
1018 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1019 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1020 <        final SubtractFunction r = new SubtractFunction();
1021 <
1022 <        f.complete(v1);
1023 <        g.complete(v2);
1024 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1025 <
1026 <        checkCompletedNormally(h, subtract(v1, v2));
1027 <        checkCompletedNormally(f, v1);
1028 <        checkCompletedNormally(g, v2);
1029 <        assertEquals(r.invocationCount, 1);
1030 <        }
1031 <    }
1170 >        assertEquals(1, r.invocationCount);
1171 >    }}
1172  
1173      /**
1174       * thenCombine result completes exceptionally after exceptional
# Line 1036 | Line 1176 | public class CompletableFutureTest exten
1176       */
1177      public void testThenCombine_exceptionalCompletion1() {
1178          for (ExecutionMode m : ExecutionMode.values())
1179 <        for (Integer v1 : new Integer[] { 1, null }) {
1180 <
1179 >        for (Integer v1 : new Integer[] { 1, null })
1180 >    {
1181          final CompletableFuture<Integer> f = new CompletableFuture<>();
1182          final CompletableFuture<Integer> g = new CompletableFuture<>();
1183          final SubtractFunction r = new SubtractFunction();
# Line 1050 | Line 1190 | public class CompletableFutureTest exten
1190  
1191          checkCompletedWithWrappedCFException(h, ex);
1192          checkCompletedWithWrappedCFException(f, ex);
1193 <        assertEquals(r.invocationCount, 0);
1193 >        assertEquals(0, r.invocationCount);
1194          checkCompletedNormally(g, v1);
1195 <        }
1056 <    }
1195 >    }}
1196  
1197      public void testThenCombine_exceptionalCompletion2() {
1198          for (ExecutionMode m : ExecutionMode.values())
1199 <        for (Integer v1 : new Integer[] { 1, null }) {
1200 <
1199 >        for (Integer v1 : new Integer[] { 1, null })
1200 >    {
1201          final CompletableFuture<Integer> f = new CompletableFuture<>();
1202          final CompletableFuture<Integer> g = new CompletableFuture<>();
1203          final SubtractFunction r = new SubtractFunction();
# Line 1071 | Line 1210 | public class CompletableFutureTest exten
1210  
1211          checkCompletedWithWrappedCFException(h, ex);
1212          checkCompletedWithWrappedCFException(g, ex);
1213 <        assertEquals(r.invocationCount, 0);
1213 >        assertEquals(0, r.invocationCount);
1214          checkCompletedNormally(f, v1);
1215 <        }
1077 <    }
1215 >    }}
1216  
1217      public void testThenCombine_exceptionalCompletion3() {
1218          for (ExecutionMode m : ExecutionMode.values())
1219 <        for (Integer v1 : new Integer[] { 1, null }) {
1220 <
1219 >        for (Integer v1 : new Integer[] { 1, null })
1220 >    {
1221          final CompletableFuture<Integer> f = new CompletableFuture<>();
1222          final CompletableFuture<Integer> g = new CompletableFuture<>();
1223          final SubtractFunction r = new SubtractFunction();
# Line 1091 | Line 1229 | public class CompletableFutureTest exten
1229  
1230          checkCompletedWithWrappedCFException(h, ex);
1231          checkCompletedWithWrappedCFException(g, ex);
1232 <        assertEquals(r.invocationCount, 0);
1232 >        assertEquals(0, r.invocationCount);
1233          checkCompletedNormally(f, v1);
1234 <        }
1097 <    }
1234 >    }}
1235  
1236      public void testThenCombine_exceptionalCompletion4() {
1237          for (ExecutionMode m : ExecutionMode.values())
1238 <        for (Integer v1 : new Integer[] { 1, null }) {
1239 <
1238 >        for (Integer v1 : new Integer[] { 1, null })
1239 >    {
1240          final CompletableFuture<Integer> f = new CompletableFuture<>();
1241          final CompletableFuture<Integer> g = new CompletableFuture<>();
1242          final SubtractFunction r = new SubtractFunction();
# Line 1111 | Line 1248 | public class CompletableFutureTest exten
1248  
1249          checkCompletedWithWrappedCFException(h, ex);
1250          checkCompletedWithWrappedCFException(f, ex);
1251 <        assertEquals(r.invocationCount, 0);
1251 >        assertEquals(0, r.invocationCount);
1252          checkCompletedNormally(g, v1);
1253 <        }
1117 <    }
1253 >    }}
1254  
1255      /**
1256       * thenCombine result completes exceptionally if action does
# Line 1122 | Line 1258 | public class CompletableFutureTest exten
1258      public void testThenCombine_actionFailed1() {
1259          for (ExecutionMode m : ExecutionMode.values())
1260          for (Integer v1 : new Integer[] { 1, null })
1261 <        for (Integer v2 : new Integer[] { 2, null }) {
1262 <
1261 >        for (Integer v2 : new Integer[] { 2, null })
1262 >    {
1263          final CompletableFuture<Integer> f = new CompletableFuture<>();
1264          final CompletableFuture<Integer> g = new CompletableFuture<>();
1265          final FailingBiFunction r = new FailingBiFunction();
# Line 1136 | Line 1272 | public class CompletableFutureTest exten
1272          checkCompletedWithWrappedCFException(h);
1273          checkCompletedNormally(f, v1);
1274          checkCompletedNormally(g, v2);
1275 <        }
1140 <    }
1275 >    }}
1276  
1277      public void testThenCombine_actionFailed2() {
1278          for (ExecutionMode m : ExecutionMode.values())
1279          for (Integer v1 : new Integer[] { 1, null })
1280 <        for (Integer v2 : new Integer[] { 2, null }) {
1281 <
1280 >        for (Integer v2 : new Integer[] { 2, null })
1281 >    {
1282          final CompletableFuture<Integer> f = new CompletableFuture<>();
1283          final CompletableFuture<Integer> g = new CompletableFuture<>();
1284          final FailingBiFunction r = new FailingBiFunction();
# Line 1156 | Line 1291 | public class CompletableFutureTest exten
1291          checkCompletedWithWrappedCFException(h);
1292          checkCompletedNormally(f, v1);
1293          checkCompletedNormally(g, v2);
1294 <        }
1160 <    }
1294 >    }}
1295  
1296      /**
1297       * thenCombine result completes exceptionally if either source cancelled
# Line 1165 | Line 1299 | public class CompletableFutureTest exten
1299      public void testThenCombine_sourceCancelled1() {
1300          for (ExecutionMode m : ExecutionMode.values())
1301          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1302 <        for (Integer v1 : new Integer[] { 1, null }) {
1303 <
1302 >        for (Integer v1 : new Integer[] { 1, null })
1303 >    {
1304          final CompletableFuture<Integer> f = new CompletableFuture<>();
1305          final CompletableFuture<Integer> g = new CompletableFuture<>();
1306          final SubtractFunction r = new SubtractFunction();
# Line 1178 | Line 1312 | public class CompletableFutureTest exten
1312  
1313          checkCompletedWithWrappedCancellationException(h);
1314          checkCancelled(f);
1315 <        assertEquals(r.invocationCount, 0);
1315 >        assertEquals(0, r.invocationCount);
1316          checkCompletedNormally(g, v1);
1317 <        }
1184 <    }
1317 >    }}
1318  
1319      public void testThenCombine_sourceCancelled2() {
1320          for (ExecutionMode m : ExecutionMode.values())
1321          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1322 <        for (Integer v1 : new Integer[] { 1, null }) {
1323 <
1322 >        for (Integer v1 : new Integer[] { 1, null })
1323 >    {
1324          final CompletableFuture<Integer> f = new CompletableFuture<>();
1325          final CompletableFuture<Integer> g = new CompletableFuture<>();
1326          final SubtractFunction r = new SubtractFunction();
# Line 1199 | Line 1332 | public class CompletableFutureTest exten
1332  
1333          checkCompletedWithWrappedCancellationException(h);
1334          checkCancelled(g);
1335 <        assertEquals(r.invocationCount, 0);
1335 >        assertEquals(0, r.invocationCount);
1336          checkCompletedNormally(f, v1);
1337 <        }
1205 <    }
1337 >    }}
1338  
1339      public void testThenCombine_sourceCancelled3() {
1340          for (ExecutionMode m : ExecutionMode.values())
1341          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1342 <        for (Integer v1 : new Integer[] { 1, null }) {
1343 <
1342 >        for (Integer v1 : new Integer[] { 1, null })
1343 >    {
1344          final CompletableFuture<Integer> f = new CompletableFuture<>();
1345          final CompletableFuture<Integer> g = new CompletableFuture<>();
1346          final SubtractFunction r = new SubtractFunction();
# Line 1219 | Line 1351 | public class CompletableFutureTest exten
1351  
1352          checkCompletedWithWrappedCancellationException(h);
1353          checkCancelled(g);
1354 <        assertEquals(r.invocationCount, 0);
1354 >        assertEquals(0, r.invocationCount);
1355          checkCompletedNormally(f, v1);
1356 <        }
1225 <    }
1356 >    }}
1357  
1358      public void testThenCombine_sourceCancelled4() {
1359          for (ExecutionMode m : ExecutionMode.values())
1360          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1361 <        for (Integer v1 : new Integer[] { 1, null }) {
1362 <
1361 >        for (Integer v1 : new Integer[] { 1, null })
1362 >    {
1363          final CompletableFuture<Integer> f = new CompletableFuture<>();
1364          final CompletableFuture<Integer> g = new CompletableFuture<>();
1365          final SubtractFunction r = new SubtractFunction();
# Line 1239 | Line 1370 | public class CompletableFutureTest exten
1370  
1371          checkCompletedWithWrappedCancellationException(h);
1372          checkCancelled(f);
1373 <        assertEquals(r.invocationCount, 0);
1373 >        assertEquals(0, r.invocationCount);
1374          checkCompletedNormally(g, v1);
1375 <        }
1245 <    }
1375 >    }}
1376  
1377      /**
1378       * thenAcceptBoth result completes normally after normal
# Line 1251 | Line 1381 | public class CompletableFutureTest exten
1381      public void testThenAcceptBoth_normalCompletion1() {
1382          for (ExecutionMode m : ExecutionMode.values())
1383          for (Integer v1 : new Integer[] { 1, null })
1384 <        for (Integer v2 : new Integer[] { 2, null }) {
1385 <
1384 >        for (Integer v2 : new Integer[] { 2, null })
1385 >    {
1386          final CompletableFuture<Integer> f = new CompletableFuture<>();
1387          final CompletableFuture<Integer> g = new CompletableFuture<>();
1388          final SubtractAction r = new SubtractAction();
# Line 1260 | Line 1390 | public class CompletableFutureTest exten
1390  
1391          f.complete(v1);
1392          checkIncomplete(h);
1393 <        assertFalse(r.ran());
1393 >        assertEquals(0, r.invocationCount);
1394          g.complete(v2);
1395  
1396          checkCompletedNormally(h, null);
1397 <        assertEquals(r.value, subtract(v1, v2));
1397 >        assertEquals(subtract(v1, v2), r.value);
1398          checkCompletedNormally(f, v1);
1399          checkCompletedNormally(g, v2);
1400 <        }
1271 <    }
1400 >    }}
1401  
1402      public void testThenAcceptBoth_normalCompletion2() {
1403          for (ExecutionMode m : ExecutionMode.values())
1404          for (Integer v1 : new Integer[] { 1, null })
1405 <        for (Integer v2 : new Integer[] { 2, null }) {
1406 <
1405 >        for (Integer v2 : new Integer[] { 2, null })
1406 >    {
1407          final CompletableFuture<Integer> f = new CompletableFuture<>();
1408          final CompletableFuture<Integer> g = new CompletableFuture<>();
1409          final SubtractAction r = new SubtractAction();
# Line 1282 | Line 1411 | public class CompletableFutureTest exten
1411  
1412          g.complete(v2);
1413          checkIncomplete(h);
1414 <        assertFalse(r.ran());
1414 >        assertEquals(0, r.invocationCount);
1415          f.complete(v1);
1416  
1417          checkCompletedNormally(h, null);
1418 <        assertEquals(r.value, subtract(v1, v2));
1418 >        assertEquals(subtract(v1, v2), r.value);
1419          checkCompletedNormally(f, v1);
1420          checkCompletedNormally(g, v2);
1421 <        }
1293 <    }
1421 >    }}
1422  
1423      public void testThenAcceptBoth_normalCompletion3() {
1424          for (ExecutionMode m : ExecutionMode.values())
1425          for (Integer v1 : new Integer[] { 1, null })
1426 <        for (Integer v2 : new Integer[] { 2, null }) {
1427 <
1426 >        for (Integer v2 : new Integer[] { 2, null })
1427 >    {
1428          final CompletableFuture<Integer> f = new CompletableFuture<>();
1429          final CompletableFuture<Integer> g = new CompletableFuture<>();
1430          final SubtractAction r = new SubtractAction();
# Line 1306 | Line 1434 | public class CompletableFutureTest exten
1434          final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1435  
1436          checkCompletedNormally(h, null);
1437 <        assertEquals(r.value, subtract(v1, v2));
1437 >        assertEquals(subtract(v1, v2), r.value);
1438          checkCompletedNormally(f, v1);
1439          checkCompletedNormally(g, v2);
1440 <        }
1313 <    }
1440 >    }}
1441  
1442      public void testThenAcceptBoth_normalCompletion4() {
1443          for (ExecutionMode m : ExecutionMode.values())
1444          for (Integer v1 : new Integer[] { 1, null })
1445 <        for (Integer v2 : new Integer[] { 2, null }) {
1446 <
1445 >        for (Integer v2 : new Integer[] { 2, null })
1446 >    {
1447          final CompletableFuture<Integer> f = new CompletableFuture<>();
1448          final CompletableFuture<Integer> g = new CompletableFuture<>();
1449          final SubtractAction r = new SubtractAction();
# Line 1326 | Line 1453 | public class CompletableFutureTest exten
1453          final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1454  
1455          checkCompletedNormally(h, null);
1456 <        assertEquals(r.value, subtract(v1, v2));
1456 >        assertEquals(subtract(v1, v2), r.value);
1457          checkCompletedNormally(f, v1);
1458          checkCompletedNormally(g, v2);
1459 <        }
1333 <    }
1459 >    }}
1460  
1461      /**
1462       * thenAcceptBoth result completes exceptionally after exceptional
# Line 1338 | Line 1464 | public class CompletableFutureTest exten
1464       */
1465      public void testThenAcceptBoth_exceptionalCompletion1() {
1466          for (ExecutionMode m : ExecutionMode.values())
1467 <        for (Integer v1 : new Integer[] { 1, null }) {
1468 <
1467 >        for (Integer v1 : new Integer[] { 1, null })
1468 >    {
1469          final CompletableFuture<Integer> f = new CompletableFuture<>();
1470          final CompletableFuture<Integer> g = new CompletableFuture<>();
1471          final SubtractAction r = new SubtractAction();
# Line 1352 | Line 1478 | public class CompletableFutureTest exten
1478  
1479          checkCompletedWithWrappedCFException(h, ex);
1480          checkCompletedWithWrappedCFException(f, ex);
1481 <        assertEquals(r.invocationCount, 0);
1481 >        assertEquals(0, r.invocationCount);
1482          checkCompletedNormally(g, v1);
1483 <        }
1358 <    }
1483 >    }}
1484  
1485      public void testThenAcceptBoth_exceptionalCompletion2() {
1486          for (ExecutionMode m : ExecutionMode.values())
1487 <        for (Integer v1 : new Integer[] { 1, null }) {
1488 <
1487 >        for (Integer v1 : new Integer[] { 1, null })
1488 >    {
1489          final CompletableFuture<Integer> f = new CompletableFuture<>();
1490          final CompletableFuture<Integer> g = new CompletableFuture<>();
1491          final SubtractAction r = new SubtractAction();
# Line 1373 | Line 1498 | public class CompletableFutureTest exten
1498  
1499          checkCompletedWithWrappedCFException(h, ex);
1500          checkCompletedWithWrappedCFException(g, ex);
1501 <        assertEquals(r.invocationCount, 0);
1501 >        assertEquals(0, r.invocationCount);
1502          checkCompletedNormally(f, v1);
1503 <        }
1379 <    }
1503 >    }}
1504  
1505      public void testThenAcceptBoth_exceptionalCompletion3() {
1506          for (ExecutionMode m : ExecutionMode.values())
1507 <        for (Integer v1 : new Integer[] { 1, null }) {
1508 <
1507 >        for (Integer v1 : new Integer[] { 1, null })
1508 >    {
1509          final CompletableFuture<Integer> f = new CompletableFuture<>();
1510          final CompletableFuture<Integer> g = new CompletableFuture<>();
1511          final SubtractAction r = new SubtractAction();
# Line 1393 | Line 1517 | public class CompletableFutureTest exten
1517  
1518          checkCompletedWithWrappedCFException(h, ex);
1519          checkCompletedWithWrappedCFException(g, ex);
1520 <        assertEquals(r.invocationCount, 0);
1520 >        assertEquals(0, r.invocationCount);
1521          checkCompletedNormally(f, v1);
1522 <        }
1399 <    }
1522 >    }}
1523  
1524      public void testThenAcceptBoth_exceptionalCompletion4() {
1525          for (ExecutionMode m : ExecutionMode.values())
1526 <        for (Integer v1 : new Integer[] { 1, null }) {
1527 <
1526 >        for (Integer v1 : new Integer[] { 1, null })
1527 >    {
1528          final CompletableFuture<Integer> f = new CompletableFuture<>();
1529          final CompletableFuture<Integer> g = new CompletableFuture<>();
1530          final SubtractAction r = new SubtractAction();
# Line 1413 | Line 1536 | public class CompletableFutureTest exten
1536  
1537          checkCompletedWithWrappedCFException(h, ex);
1538          checkCompletedWithWrappedCFException(f, ex);
1539 <        assertFalse(r.ran());
1539 >        assertEquals(0, r.invocationCount);
1540          checkCompletedNormally(g, v1);
1541 <        }
1419 <    }
1541 >    }}
1542  
1543      /**
1544       * thenAcceptBoth result completes exceptionally if action does
# Line 1424 | Line 1546 | public class CompletableFutureTest exten
1546      public void testThenAcceptBoth_actionFailed1() {
1547          for (ExecutionMode m : ExecutionMode.values())
1548          for (Integer v1 : new Integer[] { 1, null })
1549 <        for (Integer v2 : new Integer[] { 2, null }) {
1550 <
1549 >        for (Integer v2 : new Integer[] { 2, null })
1550 >    {
1551          final CompletableFuture<Integer> f = new CompletableFuture<>();
1552          final CompletableFuture<Integer> g = new CompletableFuture<>();
1553          final FailingBiConsumer r = new FailingBiConsumer();
# Line 1438 | Line 1560 | public class CompletableFutureTest exten
1560          checkCompletedWithWrappedCFException(h);
1561          checkCompletedNormally(f, v1);
1562          checkCompletedNormally(g, v2);
1563 <        }
1442 <    }
1563 >    }}
1564  
1565      public void testThenAcceptBoth_actionFailed2() {
1566          for (ExecutionMode m : ExecutionMode.values())
1567          for (Integer v1 : new Integer[] { 1, null })
1568 <        for (Integer v2 : new Integer[] { 2, null }) {
1569 <
1568 >        for (Integer v2 : new Integer[] { 2, null })
1569 >    {
1570          final CompletableFuture<Integer> f = new CompletableFuture<>();
1571          final CompletableFuture<Integer> g = new CompletableFuture<>();
1572          final FailingBiConsumer r = new FailingBiConsumer();
# Line 1458 | Line 1579 | public class CompletableFutureTest exten
1579          checkCompletedWithWrappedCFException(h);
1580          checkCompletedNormally(f, v1);
1581          checkCompletedNormally(g, v2);
1582 <        }
1462 <    }
1582 >    }}
1583  
1584      /**
1585       * thenAcceptBoth result completes exceptionally if either source cancelled
# Line 1467 | Line 1587 | public class CompletableFutureTest exten
1587      public void testThenAcceptBoth_sourceCancelled1() {
1588          for (ExecutionMode m : ExecutionMode.values())
1589          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1590 <        for (Integer v1 : new Integer[] { 1, null }) {
1591 <
1590 >        for (Integer v1 : new Integer[] { 1, null })
1591 >    {
1592          final CompletableFuture<Integer> f = new CompletableFuture<>();
1593          final CompletableFuture<Integer> g = new CompletableFuture<>();
1594          final SubtractAction r = new SubtractAction();
# Line 1480 | Line 1600 | public class CompletableFutureTest exten
1600  
1601          checkCompletedWithWrappedCancellationException(h);
1602          checkCancelled(f);
1603 <        assertEquals(r.invocationCount, 0);
1603 >        assertEquals(0, r.invocationCount);
1604          checkCompletedNormally(g, v1);
1605 <        }
1486 <    }
1605 >    }}
1606  
1607      public void testThenAcceptBoth_sourceCancelled2() {
1608          for (ExecutionMode m : ExecutionMode.values())
1609          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1610 <        for (Integer v1 : new Integer[] { 1, null }) {
1611 <
1610 >        for (Integer v1 : new Integer[] { 1, null })
1611 >    {
1612          final CompletableFuture<Integer> f = new CompletableFuture<>();
1613          final CompletableFuture<Integer> g = new CompletableFuture<>();
1614          final SubtractAction r = new SubtractAction();
# Line 1501 | Line 1620 | public class CompletableFutureTest exten
1620  
1621          checkCompletedWithWrappedCancellationException(h);
1622          checkCancelled(g);
1623 <        assertEquals(r.invocationCount, 0);
1623 >        assertEquals(0, r.invocationCount);
1624          checkCompletedNormally(f, v1);
1625 <        }
1507 <    }
1625 >    }}
1626  
1627      public void testThenAcceptBoth_sourceCancelled3() {
1628          for (ExecutionMode m : ExecutionMode.values())
1629          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1630 <        for (Integer v1 : new Integer[] { 1, null }) {
1631 <
1630 >        for (Integer v1 : new Integer[] { 1, null })
1631 >    {
1632          final CompletableFuture<Integer> f = new CompletableFuture<>();
1633          final CompletableFuture<Integer> g = new CompletableFuture<>();
1634          final SubtractAction r = new SubtractAction();
# Line 1521 | Line 1639 | public class CompletableFutureTest exten
1639  
1640          checkCompletedWithWrappedCancellationException(h);
1641          checkCancelled(g);
1642 <        assertEquals(r.invocationCount, 0);
1642 >        assertEquals(0, r.invocationCount);
1643          checkCompletedNormally(f, v1);
1644 <        }
1527 <    }
1644 >    }}
1645  
1646      public void testThenAcceptBoth_sourceCancelled4() {
1647          for (ExecutionMode m : ExecutionMode.values())
1648          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1649 <        for (Integer v1 : new Integer[] { 1, null }) {
1650 <
1649 >        for (Integer v1 : new Integer[] { 1, null })
1650 >    {
1651          final CompletableFuture<Integer> f = new CompletableFuture<>();
1652          final CompletableFuture<Integer> g = new CompletableFuture<>();
1653          final SubtractAction r = new SubtractAction();
# Line 1541 | Line 1658 | public class CompletableFutureTest exten
1658  
1659          checkCompletedWithWrappedCancellationException(h);
1660          checkCancelled(f);
1661 <        assertEquals(r.invocationCount, 0);
1661 >        assertEquals(0, r.invocationCount);
1662          checkCompletedNormally(g, v1);
1663 <        }
1547 <    }
1663 >    }}
1664  
1665      /**
1666       * runAfterBoth result completes normally after normal
# Line 1553 | Line 1669 | public class CompletableFutureTest exten
1669      public void testRunAfterBoth_normalCompletion1() {
1670          for (ExecutionMode m : ExecutionMode.values())
1671          for (Integer v1 : new Integer[] { 1, null })
1672 <        for (Integer v2 : new Integer[] { 2, null }) {
1673 <
1672 >        for (Integer v2 : new Integer[] { 2, null })
1673 >    {
1674          final CompletableFuture<Integer> f = new CompletableFuture<>();
1675          final CompletableFuture<Integer> g = new CompletableFuture<>();
1676          final Noop r = new Noop();
# Line 1562 | Line 1678 | public class CompletableFutureTest exten
1678  
1679          f.complete(v1);
1680          checkIncomplete(h);
1681 <        assertFalse(r.ran);
1681 >        assertEquals(0, r.invocationCount);
1682          g.complete(v2);
1683  
1684          checkCompletedNormally(h, null);
1685 <        assertEquals(r.invocationCount, 1);
1685 >        assertEquals(1, r.invocationCount);
1686          checkCompletedNormally(f, v1);
1687          checkCompletedNormally(g, v2);
1688 <        }
1573 <    }
1688 >    }}
1689  
1690      public void testRunAfterBoth_normalCompletion2() {
1691          for (ExecutionMode m : ExecutionMode.values())
1692          for (Integer v1 : new Integer[] { 1, null })
1693 <        for (Integer v2 : new Integer[] { 2, null }) {
1694 <
1693 >        for (Integer v2 : new Integer[] { 2, null })
1694 >    {
1695          final CompletableFuture<Integer> f = new CompletableFuture<>();
1696          final CompletableFuture<Integer> g = new CompletableFuture<>();
1697          final Noop r = new Noop();
# Line 1584 | Line 1699 | public class CompletableFutureTest exten
1699  
1700          g.complete(v2);
1701          checkIncomplete(h);
1702 <        assertFalse(r.ran);
1702 >        assertEquals(0, r.invocationCount);
1703          f.complete(v1);
1704  
1705          checkCompletedNormally(h, null);
1706 <        assertEquals(r.invocationCount, 1);
1706 >        assertEquals(1, r.invocationCount);
1707          checkCompletedNormally(f, v1);
1708          checkCompletedNormally(g, v2);
1709 <        }
1595 <    }
1709 >    }}
1710  
1711      public void testRunAfterBoth_normalCompletion3() {
1712          for (ExecutionMode m : ExecutionMode.values())
1713          for (Integer v1 : new Integer[] { 1, null })
1714 <        for (Integer v2 : new Integer[] { 2, null }) {
1715 <
1714 >        for (Integer v2 : new Integer[] { 2, null })
1715 >    {
1716          final CompletableFuture<Integer> f = new CompletableFuture<>();
1717          final CompletableFuture<Integer> g = new CompletableFuture<>();
1718          final Noop r = new Noop();
# Line 1608 | Line 1722 | public class CompletableFutureTest exten
1722          final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1723  
1724          checkCompletedNormally(h, null);
1725 <        assertTrue(r.ran);
1725 >        assertEquals(1, r.invocationCount);
1726          checkCompletedNormally(f, v1);
1727          checkCompletedNormally(g, v2);
1728 <        }
1615 <    }
1728 >    }}
1729  
1730      public void testRunAfterBoth_normalCompletion4() {
1731          for (ExecutionMode m : ExecutionMode.values())
1732          for (Integer v1 : new Integer[] { 1, null })
1733 <        for (Integer v2 : new Integer[] { 2, null }) {
1734 <
1733 >        for (Integer v2 : new Integer[] { 2, null })
1734 >    {
1735          final CompletableFuture<Integer> f = new CompletableFuture<>();
1736          final CompletableFuture<Integer> g = new CompletableFuture<>();
1737          final Noop r = new Noop();
# Line 1628 | Line 1741 | public class CompletableFutureTest exten
1741          final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1742  
1743          checkCompletedNormally(h, null);
1744 <        assertEquals(r.invocationCount, 1);
1744 >        assertEquals(1, r.invocationCount);
1745          checkCompletedNormally(f, v1);
1746          checkCompletedNormally(g, v2);
1747 <        }
1635 <    }
1747 >    }}
1748  
1749      /**
1750       * runAfterBoth result completes exceptionally after exceptional
# Line 1640 | Line 1752 | public class CompletableFutureTest exten
1752       */
1753      public void testRunAfterBoth_exceptionalCompletion1() {
1754          for (ExecutionMode m : ExecutionMode.values())
1755 <        for (Integer v1 : new Integer[] { 1, null }) {
1756 <
1755 >        for (Integer v1 : new Integer[] { 1, null })
1756 >    {
1757          final CompletableFuture<Integer> f = new CompletableFuture<>();
1758          final CompletableFuture<Integer> g = new CompletableFuture<>();
1759          final Noop r = new Noop();
# Line 1654 | Line 1766 | public class CompletableFutureTest exten
1766  
1767          checkCompletedWithWrappedCFException(h, ex);
1768          checkCompletedWithWrappedCFException(f, ex);
1769 <        assertEquals(r.invocationCount, 0);
1769 >        assertEquals(0, r.invocationCount);
1770          checkCompletedNormally(g, v1);
1771 <        }
1660 <    }
1771 >    }}
1772  
1773      public void testRunAfterBoth_exceptionalCompletion2() {
1774          for (ExecutionMode m : ExecutionMode.values())
1775 <        for (Integer v1 : new Integer[] { 1, null }) {
1776 <
1775 >        for (Integer v1 : new Integer[] { 1, null })
1776 >    {
1777          final CompletableFuture<Integer> f = new CompletableFuture<>();
1778          final CompletableFuture<Integer> g = new CompletableFuture<>();
1779          final Noop r = new Noop();
# Line 1675 | Line 1786 | public class CompletableFutureTest exten
1786  
1787          checkCompletedWithWrappedCFException(h, ex);
1788          checkCompletedWithWrappedCFException(g, ex);
1789 <        assertEquals(r.invocationCount, 0);
1789 >        assertEquals(0, r.invocationCount);
1790          checkCompletedNormally(f, v1);
1791 <        }
1681 <    }
1791 >    }}
1792  
1793      public void testRunAfterBoth_exceptionalCompletion3() {
1794          for (ExecutionMode m : ExecutionMode.values())
1795 <        for (Integer v1 : new Integer[] { 1, null }) {
1796 <
1795 >        for (Integer v1 : new Integer[] { 1, null })
1796 >    {
1797          final CompletableFuture<Integer> f = new CompletableFuture<>();
1798          final CompletableFuture<Integer> g = new CompletableFuture<>();
1799          final Noop r = new Noop();
# Line 1695 | Line 1805 | public class CompletableFutureTest exten
1805  
1806          checkCompletedWithWrappedCFException(h, ex);
1807          checkCompletedWithWrappedCFException(g, ex);
1808 <        assertEquals(r.invocationCount, 0);
1808 >        assertEquals(0, r.invocationCount);
1809          checkCompletedNormally(f, v1);
1810 <        }
1701 <    }
1810 >    }}
1811  
1812      public void testRunAfterBoth_exceptionalCompletion4() {
1813          for (ExecutionMode m : ExecutionMode.values())
1814 <        for (Integer v1 : new Integer[] { 1, null }) {
1815 <
1814 >        for (Integer v1 : new Integer[] { 1, null })
1815 >    {
1816          final CompletableFuture<Integer> f = new CompletableFuture<>();
1817          final CompletableFuture<Integer> g = new CompletableFuture<>();
1818          final Noop r = new Noop();
# Line 1715 | Line 1824 | public class CompletableFutureTest exten
1824  
1825          checkCompletedWithWrappedCFException(h, ex);
1826          checkCompletedWithWrappedCFException(f, ex);
1827 <        assertEquals(r.invocationCount, 0);
1827 >        assertEquals(0, r.invocationCount);
1828          checkCompletedNormally(g, v1);
1829 <        }
1721 <    }
1829 >    }}
1830  
1831      /**
1832       * runAfterBoth result completes exceptionally if action does
# Line 1726 | Line 1834 | public class CompletableFutureTest exten
1834      public void testRunAfterBoth_actionFailed1() {
1835          for (ExecutionMode m : ExecutionMode.values())
1836          for (Integer v1 : new Integer[] { 1, null })
1837 <        for (Integer v2 : new Integer[] { 2, null }) {
1838 <
1837 >        for (Integer v2 : new Integer[] { 2, null })
1838 >    {
1839          final CompletableFuture<Integer> f = new CompletableFuture<>();
1840          final CompletableFuture<Integer> g = new CompletableFuture<>();
1841          final FailingNoop r = new FailingNoop();
# Line 1740 | Line 1848 | public class CompletableFutureTest exten
1848          checkCompletedWithWrappedCFException(h);
1849          checkCompletedNormally(f, v1);
1850          checkCompletedNormally(g, v2);
1851 <        }
1744 <    }
1851 >    }}
1852  
1853      public void testRunAfterBoth_actionFailed2() {
1854          for (ExecutionMode m : ExecutionMode.values())
1855          for (Integer v1 : new Integer[] { 1, null })
1856 <        for (Integer v2 : new Integer[] { 2, null }) {
1857 <
1856 >        for (Integer v2 : new Integer[] { 2, null })
1857 >    {
1858          final CompletableFuture<Integer> f = new CompletableFuture<>();
1859          final CompletableFuture<Integer> g = new CompletableFuture<>();
1860          final FailingNoop r = new FailingNoop();
# Line 1760 | Line 1867 | public class CompletableFutureTest exten
1867          checkCompletedWithWrappedCFException(h);
1868          checkCompletedNormally(f, v1);
1869          checkCompletedNormally(g, v2);
1870 <        }
1764 <    }
1870 >    }}
1871  
1872      /**
1873       * runAfterBoth result completes exceptionally if either source cancelled
# Line 1769 | Line 1875 | public class CompletableFutureTest exten
1875      public void testRunAfterBoth_sourceCancelled1() {
1876          for (ExecutionMode m : ExecutionMode.values())
1877          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1878 <        for (Integer v1 : new Integer[] { 1, null }) {
1879 <
1878 >        for (Integer v1 : new Integer[] { 1, null })
1879 >    {
1880          final CompletableFuture<Integer> f = new CompletableFuture<>();
1881          final CompletableFuture<Integer> g = new CompletableFuture<>();
1882          final Noop r = new Noop();
# Line 1782 | Line 1888 | public class CompletableFutureTest exten
1888  
1889          checkCompletedWithWrappedCancellationException(h);
1890          checkCancelled(f);
1891 <        assertEquals(r.invocationCount, 0);
1891 >        assertEquals(0, r.invocationCount);
1892          checkCompletedNormally(g, v1);
1893 <        }
1788 <    }
1893 >    }}
1894  
1895      public void testRunAfterBoth_sourceCancelled2() {
1896          for (ExecutionMode m : ExecutionMode.values())
1897          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1898 <        for (Integer v1 : new Integer[] { 1, null }) {
1899 <
1898 >        for (Integer v1 : new Integer[] { 1, null })
1899 >    {
1900          final CompletableFuture<Integer> f = new CompletableFuture<>();
1901          final CompletableFuture<Integer> g = new CompletableFuture<>();
1902          final Noop r = new Noop();
# Line 1803 | Line 1908 | public class CompletableFutureTest exten
1908  
1909          checkCompletedWithWrappedCancellationException(h);
1910          checkCancelled(g);
1911 <        assertEquals(r.invocationCount, 0);
1911 >        assertEquals(0, r.invocationCount);
1912          checkCompletedNormally(f, v1);
1913 <        }
1809 <    }
1913 >    }}
1914  
1915      public void testRunAfterBoth_sourceCancelled3() {
1916          for (ExecutionMode m : ExecutionMode.values())
1917          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1918 <        for (Integer v1 : new Integer[] { 1, null }) {
1919 <
1918 >        for (Integer v1 : new Integer[] { 1, null })
1919 >    {
1920          final CompletableFuture<Integer> f = new CompletableFuture<>();
1921          final CompletableFuture<Integer> g = new CompletableFuture<>();
1922          final Noop r = new Noop();
# Line 1823 | Line 1927 | public class CompletableFutureTest exten
1927  
1928          checkCompletedWithWrappedCancellationException(h);
1929          checkCancelled(g);
1930 <        assertEquals(r.invocationCount, 0);
1930 >        assertEquals(0, r.invocationCount);
1931          checkCompletedNormally(f, v1);
1932 <        }
1829 <    }
1932 >    }}
1933  
1934      public void testRunAfterBoth_sourceCancelled4() {
1935          for (ExecutionMode m : ExecutionMode.values())
1936          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1937 <        for (Integer v1 : new Integer[] { 1, null }) {
1938 <
1937 >        for (Integer v1 : new Integer[] { 1, null })
1938 >    {
1939          final CompletableFuture<Integer> f = new CompletableFuture<>();
1940          final CompletableFuture<Integer> g = new CompletableFuture<>();
1941          final Noop r = new Noop();
# Line 1843 | Line 1946 | public class CompletableFutureTest exten
1946  
1947          checkCompletedWithWrappedCancellationException(h);
1948          checkCancelled(f);
1949 <        assertEquals(r.invocationCount, 0);
1949 >        assertEquals(0, r.invocationCount);
1950          checkCompletedNormally(g, v1);
1951 <        }
1849 <    }
1951 >    }}
1952  
1953      /**
1954       * applyToEither result completes normally after normal completion
# Line 1855 | Line 1957 | public class CompletableFutureTest exten
1957      public void testApplyToEither_normalCompletion1() {
1958          for (ExecutionMode m : ExecutionMode.values())
1959          for (Integer v1 : new Integer[] { 1, null })
1960 <        for (Integer v2 : new Integer[] { 2, null }) {
1961 <
1960 >        for (Integer v2 : new Integer[] { 2, null })
1961 >    {
1962          final CompletableFuture<Integer> f = new CompletableFuture<>();
1963          final CompletableFuture<Integer> g = new CompletableFuture<>();
1964          final IncFunction r = new IncFunction();
# Line 1869 | Line 1971 | public class CompletableFutureTest exten
1971          checkCompletedNormally(f, v1);
1972          checkCompletedNormally(g, v2);
1973          checkCompletedNormally(h, inc(v1));
1974 <        }
1873 <    }
1974 >    }}
1975  
1976      public void testApplyToEither_normalCompletion2() {
1977          for (ExecutionMode m : ExecutionMode.values())
1978          for (Integer v1 : new Integer[] { 1, null })
1979 <        for (Integer v2 : new Integer[] { 2, null }) {
1980 <
1979 >        for (Integer v2 : new Integer[] { 2, null })
1980 >    {
1981          final CompletableFuture<Integer> f = new CompletableFuture<>();
1982          final CompletableFuture<Integer> g = new CompletableFuture<>();
1983          final IncFunction r = new IncFunction();
# Line 1889 | Line 1990 | public class CompletableFutureTest exten
1990          checkCompletedNormally(f, v1);
1991          checkCompletedNormally(g, v2);
1992          checkCompletedNormally(h, inc(v2));
1993 <        }
1994 <    }
1993 >        }}
1994 >
1995      public void testApplyToEither_normalCompletion3() {
1996          for (ExecutionMode m : ExecutionMode.values())
1997          for (Integer v1 : new Integer[] { 1, null })
1998 <        for (Integer v2 : new Integer[] { 2, null }) {
1999 <
1998 >        for (Integer v2 : new Integer[] { 2, null })
1999 >    {
2000          final CompletableFuture<Integer> f = new CompletableFuture<>();
2001          final CompletableFuture<Integer> g = new CompletableFuture<>();
2002          final IncFunction r = new IncFunction();
# Line 1910 | Line 2011 | public class CompletableFutureTest exten
2011          // unspecified behavior
2012          assertTrue(Objects.equals(h.join(), inc(v1)) ||
2013                     Objects.equals(h.join(), inc(v2)));
2014 <        assertEquals(r.invocationCount, 1);
2015 <        }
1915 <    }
2014 >        assertEquals(1, r.invocationCount);
2015 >    }}
2016  
2017      /**
2018       * applyToEither result completes exceptionally after exceptional
# Line 1920 | Line 2020 | public class CompletableFutureTest exten
2020       */
2021      public void testApplyToEither_exceptionalCompletion1() {
2022          for (ExecutionMode m : ExecutionMode.values())
2023 <        for (Integer v1 : new Integer[] { 1, null }) {
2024 <
2023 >        for (Integer v1 : new Integer[] { 1, null })
2024 >    {
2025          final CompletableFuture<Integer> f = new CompletableFuture<>();
2026          final CompletableFuture<Integer> g = new CompletableFuture<>();
2027          final IncFunction r = new IncFunction();
# Line 1932 | Line 2032 | public class CompletableFutureTest exten
2032          checkCompletedWithWrappedCFException(h, ex);
2033          g.complete(v1);
2034  
2035 <        assertEquals(r.invocationCount, 0);
2035 >        assertEquals(0, r.invocationCount);
2036          checkCompletedNormally(g, v1);
2037          checkCompletedWithWrappedCFException(f, ex);
2038          checkCompletedWithWrappedCFException(h, ex);
2039 <        }
1940 <    }
2039 >    }}
2040  
2041      public void testApplyToEither_exceptionalCompletion2() {
2042          for (ExecutionMode m : ExecutionMode.values())
2043 <        for (Integer v1 : new Integer[] { 1, null }) {
2044 <
2043 >        for (Integer v1 : new Integer[] { 1, null })
2044 >    {
2045          final CompletableFuture<Integer> f = new CompletableFuture<>();
2046          final CompletableFuture<Integer> g = new CompletableFuture<>();
2047          final IncFunction r = new IncFunction();
# Line 1953 | Line 2052 | public class CompletableFutureTest exten
2052          checkCompletedWithWrappedCFException(h, ex);
2053          f.complete(v1);
2054  
2055 <        assertEquals(r.invocationCount, 0);
2055 >        assertEquals(0, r.invocationCount);
2056          checkCompletedNormally(f, v1);
2057          checkCompletedWithWrappedCFException(g, ex);
2058          checkCompletedWithWrappedCFException(h, ex);
2059 <        }
1961 <    }
2059 >    }}
2060  
2061      public void testApplyToEither_exceptionalCompletion3() {
2062          for (ExecutionMode m : ExecutionMode.values())
2063 <        for (Integer v1 : new Integer[] { 1, null }) {
2064 <
2063 >        for (Integer v1 : new Integer[] { 1, null })
2064 >    {
2065          final CompletableFuture<Integer> f = new CompletableFuture<>();
2066          final CompletableFuture<Integer> g = new CompletableFuture<>();
2067          final IncFunction r = new IncFunction();
# Line 1976 | Line 2074 | public class CompletableFutureTest exten
2074          // unspecified behavior
2075          Integer v;
2076          try {
2077 <            assertEquals(h.join(), inc(v1));
2078 <            assertEquals(r.invocationCount, 1);
2077 >            assertEquals(inc(v1), h.join());
2078 >            assertEquals(1, r.invocationCount);
2079          } catch (CompletionException ok) {
2080              checkCompletedWithWrappedCFException(h, ex);
2081 <            assertEquals(r.invocationCount, 0);
2081 >            assertEquals(0, r.invocationCount);
2082          }
2083  
2084          checkCompletedWithWrappedCFException(g, ex);
2085          checkCompletedNormally(f, v1);
2086 <        }
1989 <    }
2086 >    }}
2087  
2088      public void testApplyToEither_exceptionalCompletion4() {
2089          for (ExecutionMode m : ExecutionMode.values())
2090 <        for (Integer v1 : new Integer[] { 1, null }) {
2091 <
2090 >        for (Integer v1 : new Integer[] { 1, null })
2091 >    {
2092          final CompletableFuture<Integer> f = new CompletableFuture<>();
2093          final CompletableFuture<Integer> g = new CompletableFuture<>();
2094          final IncFunction r = new IncFunction();
# Line 2004 | Line 2101 | public class CompletableFutureTest exten
2101          // unspecified behavior
2102          Integer v;
2103          try {
2104 <            assertEquals(h.join(), inc(v1));
2105 <            assertEquals(r.invocationCount, 1);
2104 >            assertEquals(inc(v1), h.join());
2105 >            assertEquals(1, r.invocationCount);
2106          } catch (CompletionException ok) {
2107              checkCompletedWithWrappedCFException(h, ex);
2108 <            assertEquals(r.invocationCount, 0);
2108 >            assertEquals(0, r.invocationCount);
2109          }
2110  
2111          checkCompletedWithWrappedCFException(f, ex);
2112          checkCompletedNormally(g, v1);
2113 <        }
2017 <    }
2113 >    }}
2114  
2115      /**
2116       * applyToEither result completes exceptionally if action does
# Line 2022 | Line 2118 | public class CompletableFutureTest exten
2118      public void testApplyToEither_actionFailed1() {
2119          for (ExecutionMode m : ExecutionMode.values())
2120          for (Integer v1 : new Integer[] { 1, null })
2121 <        for (Integer v2 : new Integer[] { 2, null }) {
2122 <
2121 >        for (Integer v2 : new Integer[] { 2, null })
2122 >    {
2123          final CompletableFuture<Integer> f = new CompletableFuture<>();
2124          final CompletableFuture<Integer> g = new CompletableFuture<>();
2125          final FailingFunction r = new FailingFunction();
# Line 2034 | Line 2130 | public class CompletableFutureTest exten
2130          g.complete(v2);
2131          checkCompletedNormally(f, v1);
2132          checkCompletedNormally(g, v2);
2133 <        }
2038 <    }
2133 >    }}
2134  
2135      public void testApplyToEither_actionFailed2() {
2136          for (ExecutionMode m : ExecutionMode.values())
2137          for (Integer v1 : new Integer[] { 1, null })
2138 <        for (Integer v2 : new Integer[] { 2, null }) {
2139 <
2138 >        for (Integer v2 : new Integer[] { 2, null })
2139 >    {
2140          final CompletableFuture<Integer> f = new CompletableFuture<>();
2141          final CompletableFuture<Integer> g = new CompletableFuture<>();
2142          final FailingFunction r = new FailingFunction();
# Line 2052 | Line 2147 | public class CompletableFutureTest exten
2147          f.complete(v1);
2148          checkCompletedNormally(f, v1);
2149          checkCompletedNormally(g, v2);
2150 <        }
2056 <    }
2150 >    }}
2151  
2152      /**
2153       * applyToEither result completes exceptionally if either source cancelled
# Line 2061 | Line 2155 | public class CompletableFutureTest exten
2155      public void testApplyToEither_sourceCancelled1() {
2156          for (ExecutionMode m : ExecutionMode.values())
2157          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2158 <        for (Integer v1 : new Integer[] { 1, null }) {
2159 <
2158 >        for (Integer v1 : new Integer[] { 1, null })
2159 >    {
2160          final CompletableFuture<Integer> f = new CompletableFuture<>();
2161          final CompletableFuture<Integer> g = new CompletableFuture<>();
2162          final IncFunction r = new IncFunction();
# Line 2073 | Line 2167 | public class CompletableFutureTest exten
2167          g.complete(v1);
2168  
2169          checkCancelled(f);
2170 <        assertEquals(r.invocationCount, 0);
2170 >        assertEquals(0, r.invocationCount);
2171          checkCompletedNormally(g, v1);
2172          checkCompletedWithWrappedCancellationException(h);
2173 <        }
2080 <    }
2173 >    }}
2174  
2175      public void testApplyToEither_sourceCancelled2() {
2176          for (ExecutionMode m : ExecutionMode.values())
2177          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2178 <        for (Integer v1 : new Integer[] { 1, null }) {
2179 <
2178 >        for (Integer v1 : new Integer[] { 1, null })
2179 >    {
2180          final CompletableFuture<Integer> f = new CompletableFuture<>();
2181          final CompletableFuture<Integer> g = new CompletableFuture<>();
2182          final IncFunction r = new IncFunction();
# Line 2094 | Line 2187 | public class CompletableFutureTest exten
2187          f.complete(v1);
2188  
2189          checkCancelled(g);
2190 <        assertEquals(r.invocationCount, 0);
2190 >        assertEquals(0, r.invocationCount);
2191          checkCompletedNormally(f, v1);
2192          checkCompletedWithWrappedCancellationException(h);
2193 <        }
2101 <    }
2193 >    }}
2194  
2195      public void testApplyToEither_sourceCancelled3() {
2196          for (ExecutionMode m : ExecutionMode.values())
2197          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2198 <        for (Integer v1 : new Integer[] { 1, null }) {
2199 <
2198 >        for (Integer v1 : new Integer[] { 1, null })
2199 >    {
2200          final CompletableFuture<Integer> f = new CompletableFuture<>();
2201          final CompletableFuture<Integer> g = new CompletableFuture<>();
2202          final IncFunction r = new IncFunction();
# Line 2116 | Line 2208 | public class CompletableFutureTest exten
2208          // unspecified behavior
2209          Integer v;
2210          try {
2211 <            assertEquals(h.join(), inc(v1));
2212 <            assertEquals(r.invocationCount, 1);
2211 >            assertEquals(inc(v1), h.join());
2212 >            assertEquals(1, r.invocationCount);
2213          } catch (CompletionException ok) {
2214              checkCompletedWithWrappedCancellationException(h);
2215 <            assertEquals(r.invocationCount, 0);
2215 >            assertEquals(0, r.invocationCount);
2216          }
2217  
2218          checkCancelled(g);
2219          checkCompletedNormally(f, v1);
2220 <        }
2129 <    }
2220 >    }}
2221  
2222      public void testApplyToEither_sourceCancelled4() {
2223          for (ExecutionMode m : ExecutionMode.values())
2224          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2225 <        for (Integer v1 : new Integer[] { 1, null }) {
2226 <
2225 >        for (Integer v1 : new Integer[] { 1, null })
2226 >    {
2227          final CompletableFuture<Integer> f = new CompletableFuture<>();
2228          final CompletableFuture<Integer> g = new CompletableFuture<>();
2229          final IncFunction r = new IncFunction();
# Line 2144 | Line 2235 | public class CompletableFutureTest exten
2235          // unspecified behavior
2236          Integer v;
2237          try {
2238 <            assertEquals(h.join(), inc(v1));
2239 <            assertEquals(r.invocationCount, 1);
2238 >            assertEquals(inc(v1), h.join());
2239 >            assertEquals(1, r.invocationCount);
2240          } catch (CompletionException ok) {
2241              checkCompletedWithWrappedCancellationException(h);
2242 <            assertEquals(r.invocationCount, 0);
2242 >            assertEquals(0, r.invocationCount);
2243          }
2244  
2245          checkCancelled(f);
2246          checkCompletedNormally(g, v1);
2247 <        }
2157 <    }
2247 >    }}
2248  
2249      /**
2250       * acceptEither result completes normally after normal completion
# Line 2163 | Line 2253 | public class CompletableFutureTest exten
2253      public void testAcceptEither_normalCompletion1() {
2254          for (ExecutionMode m : ExecutionMode.values())
2255          for (Integer v1 : new Integer[] { 1, null })
2256 <        for (Integer v2 : new Integer[] { 2, null }) {
2257 <
2256 >        for (Integer v2 : new Integer[] { 2, null })
2257 >    {
2258          final CompletableFuture<Integer> f = new CompletableFuture<>();
2259          final CompletableFuture<Integer> g = new CompletableFuture<>();
2260          final IncAction r = new IncAction();
# Line 2172 | Line 2262 | public class CompletableFutureTest exten
2262  
2263          f.complete(v1);
2264          checkCompletedNormally(h, null);
2265 <        assertEquals(r.value, inc(v1));
2265 >        assertEquals(inc(v1), r.value);
2266          g.complete(v2);
2267  
2268          checkCompletedNormally(f, v1);
2269          checkCompletedNormally(g, v2);
2270          checkCompletedNormally(h, null);
2271 <        }
2182 <    }
2271 >    }}
2272  
2273      public void testAcceptEither_normalCompletion2() {
2274          for (ExecutionMode m : ExecutionMode.values())
2275          for (Integer v1 : new Integer[] { 1, null })
2276 <        for (Integer v2 : new Integer[] { 2, null }) {
2277 <
2276 >        for (Integer v2 : new Integer[] { 2, null })
2277 >    {
2278          final CompletableFuture<Integer> f = new CompletableFuture<>();
2279          final CompletableFuture<Integer> g = new CompletableFuture<>();
2280          final IncAction r = new IncAction();
# Line 2193 | Line 2282 | public class CompletableFutureTest exten
2282  
2283          g.complete(v2);
2284          checkCompletedNormally(h, null);
2285 <        assertEquals(r.value, inc(v2));
2285 >        assertEquals(inc(v2), r.value);
2286          f.complete(v1);
2287  
2288          checkCompletedNormally(f, v1);
2289          checkCompletedNormally(g, v2);
2290          checkCompletedNormally(h, null);
2291 <        }
2292 <    }
2291 >    }}
2292 >
2293      public void testAcceptEither_normalCompletion3() {
2294          for (ExecutionMode m : ExecutionMode.values())
2295          for (Integer v1 : new Integer[] { 1, null })
2296 <        for (Integer v2 : new Integer[] { 2, null }) {
2297 <
2296 >        for (Integer v2 : new Integer[] { 2, null })
2297 >    {
2298          final CompletableFuture<Integer> f = new CompletableFuture<>();
2299          final CompletableFuture<Integer> g = new CompletableFuture<>();
2300          final IncAction r = new IncAction();
# Line 2221 | Line 2310 | public class CompletableFutureTest exten
2310          // unspecified behavior
2311          assertTrue(Objects.equals(r.value, inc(v1)) ||
2312                     Objects.equals(r.value, inc(v2)));
2313 <        }
2225 <    }
2313 >    }}
2314  
2315      /**
2316       * acceptEither result completes exceptionally after exceptional
# Line 2230 | Line 2318 | public class CompletableFutureTest exten
2318       */
2319      public void testAcceptEither_exceptionalCompletion1() {
2320          for (ExecutionMode m : ExecutionMode.values())
2321 <        for (Integer v1 : new Integer[] { 1, null }) {
2322 <
2321 >        for (Integer v1 : new Integer[] { 1, null })
2322 >    {
2323          final CompletableFuture<Integer> f = new CompletableFuture<>();
2324          final CompletableFuture<Integer> g = new CompletableFuture<>();
2325          final IncAction r = new IncAction();
# Line 2242 | Line 2330 | public class CompletableFutureTest exten
2330          checkCompletedWithWrappedCFException(h, ex);
2331          g.complete(v1);
2332  
2333 <        assertEquals(r.invocationCount, 0);
2333 >        assertEquals(0, r.invocationCount);
2334          checkCompletedNormally(g, v1);
2335          checkCompletedWithWrappedCFException(f, ex);
2336          checkCompletedWithWrappedCFException(h, ex);
2337 <        }
2250 <    }
2337 >    }}
2338  
2339      public void testAcceptEither_exceptionalCompletion2() {
2340          for (ExecutionMode m : ExecutionMode.values())
2341 <        for (Integer v1 : new Integer[] { 1, null }) {
2342 <
2341 >        for (Integer v1 : new Integer[] { 1, null })
2342 >    {
2343          final CompletableFuture<Integer> f = new CompletableFuture<>();
2344          final CompletableFuture<Integer> g = new CompletableFuture<>();
2345          final IncAction r = new IncAction();
# Line 2263 | Line 2350 | public class CompletableFutureTest exten
2350          checkCompletedWithWrappedCFException(h, ex);
2351          f.complete(v1);
2352  
2353 <        assertEquals(r.invocationCount, 0);
2353 >        assertEquals(0, r.invocationCount);
2354          checkCompletedNormally(f, v1);
2355          checkCompletedWithWrappedCFException(g, ex);
2356          checkCompletedWithWrappedCFException(h, ex);
2357 <        }
2271 <    }
2357 >    }}
2358  
2359      public void testAcceptEither_exceptionalCompletion3() {
2360          for (ExecutionMode m : ExecutionMode.values())
2361 <        for (Integer v1 : new Integer[] { 1, null }) {
2362 <
2361 >        for (Integer v1 : new Integer[] { 1, null })
2362 >    {
2363          final CompletableFuture<Integer> f = new CompletableFuture<>();
2364          final CompletableFuture<Integer> g = new CompletableFuture<>();
2365          final IncAction r = new IncAction();
# Line 2286 | Line 2372 | public class CompletableFutureTest exten
2372          // unspecified behavior
2373          Integer v;
2374          try {
2375 <            assertEquals(h.join(), null);
2376 <            assertEquals(r.invocationCount, 1);
2375 >            assertNull(h.join());
2376 >            assertEquals(1, r.invocationCount);
2377              assertEquals(inc(v1), r.value);
2378          } catch (CompletionException ok) {
2379              checkCompletedWithWrappedCFException(h, ex);
2380 <            assertEquals(r.invocationCount, 0);
2380 >            assertEquals(0, r.invocationCount);
2381          }
2382  
2383          checkCompletedWithWrappedCFException(g, ex);
2384          checkCompletedNormally(f, v1);
2385 <        }
2300 <    }
2385 >    }}
2386  
2387      public void testAcceptEither_exceptionalCompletion4() {
2388          for (ExecutionMode m : ExecutionMode.values())
2389 <        for (Integer v1 : new Integer[] { 1, null }) {
2390 <
2389 >        for (Integer v1 : new Integer[] { 1, null })
2390 >    {
2391          final CompletableFuture<Integer> f = new CompletableFuture<>();
2392          final CompletableFuture<Integer> g = new CompletableFuture<>();
2393          final IncAction r = new IncAction();
# Line 2315 | Line 2400 | public class CompletableFutureTest exten
2400          // unspecified behavior
2401          Integer v;
2402          try {
2403 <            assertEquals(h.join(), null);
2404 <            assertEquals(r.invocationCount, 1);
2403 >            assertNull(h.join());
2404 >            assertEquals(1, r.invocationCount);
2405              assertEquals(inc(v1), r.value);
2406          } catch (CompletionException ok) {
2407              checkCompletedWithWrappedCFException(h, ex);
2408 <            assertEquals(r.invocationCount, 0);
2408 >            assertEquals(0, r.invocationCount);
2409          }
2410  
2411          checkCompletedWithWrappedCFException(f, ex);
2412          checkCompletedNormally(g, v1);
2413 <        }
2329 <    }
2413 >    }}
2414  
2415      /**
2416       * acceptEither result completes exceptionally if action does
# Line 2334 | Line 2418 | public class CompletableFutureTest exten
2418      public void testAcceptEither_actionFailed1() {
2419          for (ExecutionMode m : ExecutionMode.values())
2420          for (Integer v1 : new Integer[] { 1, null })
2421 <        for (Integer v2 : new Integer[] { 2, null }) {
2422 <
2421 >        for (Integer v2 : new Integer[] { 2, null })
2422 >    {
2423          final CompletableFuture<Integer> f = new CompletableFuture<>();
2424          final CompletableFuture<Integer> g = new CompletableFuture<>();
2425          final FailingConsumer r = new FailingConsumer();
# Line 2346 | Line 2430 | public class CompletableFutureTest exten
2430          g.complete(v2);
2431          checkCompletedNormally(f, v1);
2432          checkCompletedNormally(g, v2);
2433 <        }
2350 <    }
2433 >    }}
2434  
2435      public void testAcceptEither_actionFailed2() {
2436          for (ExecutionMode m : ExecutionMode.values())
2437          for (Integer v1 : new Integer[] { 1, null })
2438 <        for (Integer v2 : new Integer[] { 2, null }) {
2439 <
2438 >        for (Integer v2 : new Integer[] { 2, null })
2439 >    {
2440          final CompletableFuture<Integer> f = new CompletableFuture<>();
2441          final CompletableFuture<Integer> g = new CompletableFuture<>();
2442          final FailingConsumer r = new FailingConsumer();
# Line 2364 | Line 2447 | public class CompletableFutureTest exten
2447          f.complete(v1);
2448          checkCompletedNormally(f, v1);
2449          checkCompletedNormally(g, v2);
2450 <        }
2368 <    }
2450 >    }}
2451  
2452      /**
2453       * acceptEither result completes exceptionally if either source cancelled
# Line 2373 | Line 2455 | public class CompletableFutureTest exten
2455      public void testAcceptEither_sourceCancelled1() {
2456          for (ExecutionMode m : ExecutionMode.values())
2457          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2458 <        for (Integer v1 : new Integer[] { 1, null }) {
2459 <
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 2385 | Line 2467 | public class CompletableFutureTest exten
2467          g.complete(v1);
2468  
2469          checkCancelled(f);
2470 <        assertEquals(r.invocationCount, 0);
2470 >        assertEquals(0, r.invocationCount);
2471          checkCompletedNormally(g, v1);
2472          checkCompletedWithWrappedCancellationException(h);
2473 <        }
2392 <    }
2473 >    }}
2474  
2475      public void testAcceptEither_sourceCancelled2() {
2476          for (ExecutionMode m : ExecutionMode.values())
2477          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2478 <        for (Integer v1 : new Integer[] { 1, null }) {
2479 <
2478 >        for (Integer v1 : new Integer[] { 1, null })
2479 >    {
2480          final CompletableFuture<Integer> f = new CompletableFuture<>();
2481          final CompletableFuture<Integer> g = new CompletableFuture<>();
2482          final IncAction r = new IncAction();
# Line 2406 | Line 2487 | public class CompletableFutureTest exten
2487          f.complete(v1);
2488  
2489          checkCancelled(g);
2490 <        assertEquals(r.invocationCount, 0);
2490 >        assertEquals(0, r.invocationCount);
2491          checkCompletedNormally(f, v1);
2492          checkCompletedWithWrappedCancellationException(h);
2493 <        }
2413 <    }
2493 >    }}
2494  
2495      public void testAcceptEither_sourceCancelled3() {
2496          for (ExecutionMode m : ExecutionMode.values())
2497          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2498 <        for (Integer v1 : new Integer[] { 1, null }) {
2499 <
2498 >        for (Integer v1 : new Integer[] { 1, null })
2499 >    {
2500          final CompletableFuture<Integer> f = new CompletableFuture<>();
2501          final CompletableFuture<Integer> g = new CompletableFuture<>();
2502          final IncAction r = new IncAction();
# Line 2428 | Line 2508 | public class CompletableFutureTest exten
2508          // unspecified behavior
2509          Integer v;
2510          try {
2511 <            assertEquals(h.join(), null);
2512 <            assertEquals(r.invocationCount, 1);
2511 >            assertNull(h.join());
2512 >            assertEquals(1, r.invocationCount);
2513              assertEquals(inc(v1), r.value);
2514          } catch (CompletionException ok) {
2515              checkCompletedWithWrappedCancellationException(h);
2516 <            assertEquals(r.invocationCount, 0);
2516 >            assertEquals(0, r.invocationCount);
2517          }
2518  
2519          checkCancelled(g);
2520          checkCompletedNormally(f, v1);
2521 <        }
2442 <    }
2521 >    }}
2522  
2523      public void testAcceptEither_sourceCancelled4() {
2524          for (ExecutionMode m : ExecutionMode.values())
2525          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2526 <        for (Integer v1 : new Integer[] { 1, null }) {
2527 <
2526 >        for (Integer v1 : new Integer[] { 1, null })
2527 >    {
2528          final CompletableFuture<Integer> f = new CompletableFuture<>();
2529          final CompletableFuture<Integer> g = new CompletableFuture<>();
2530          final IncAction r = new IncAction();
# Line 2457 | Line 2536 | public class CompletableFutureTest exten
2536          // unspecified behavior
2537          Integer v;
2538          try {
2539 <            assertEquals(h.join(), null);
2540 <            assertEquals(r.invocationCount, 1);
2539 >            assertNull(h.join());
2540 >            assertEquals(1, r.invocationCount);
2541              assertEquals(inc(v1), r.value);
2542          } catch (CompletionException ok) {
2543              checkCompletedWithWrappedCancellationException(h);
2544 <            assertEquals(r.invocationCount, 0);
2544 >            assertEquals(0, r.invocationCount);
2545          }
2546  
2547          checkCancelled(f);
2548          checkCompletedNormally(g, v1);
2549 <        }
2471 <    }
2549 >    }}
2550  
2551      /**
2552       * runAfterEither result completes normally after normal completion
# Line 2477 | Line 2555 | public class CompletableFutureTest exten
2555      public void testRunAfterEither_normalCompletion1() {
2556          for (ExecutionMode m : ExecutionMode.values())
2557          for (Integer v1 : new Integer[] { 1, null })
2558 <        for (Integer v2 : new Integer[] { 2, null }) {
2559 <
2558 >        for (Integer v2 : new Integer[] { 2, null })
2559 >    {
2560          final CompletableFuture<Integer> f = new CompletableFuture<>();
2561          final CompletableFuture<Integer> g = new CompletableFuture<>();
2562          final Noop r = new Noop();
# Line 2486 | Line 2564 | public class CompletableFutureTest exten
2564  
2565          f.complete(v1);
2566          checkCompletedNormally(h, null);
2567 <        assertEquals(r.invocationCount, 1);
2567 >        assertEquals(1, r.invocationCount);
2568          g.complete(v2);
2569  
2570          checkCompletedNormally(f, v1);
2571          checkCompletedNormally(g, v2);
2572          checkCompletedNormally(h, null);
2573 <        assertEquals(r.invocationCount, 1);
2574 <        }
2497 <    }
2573 >        assertEquals(1, r.invocationCount);
2574 >    }}
2575  
2576      public void testRunAfterEither_normalCompletion2() {
2577          for (ExecutionMode m : ExecutionMode.values())
2578          for (Integer v1 : new Integer[] { 1, null })
2579 <        for (Integer v2 : new Integer[] { 2, null }) {
2580 <
2579 >        for (Integer v2 : new Integer[] { 2, null })
2580 >    {
2581          final CompletableFuture<Integer> f = new CompletableFuture<>();
2582          final CompletableFuture<Integer> g = new CompletableFuture<>();
2583          final Noop r = new Noop();
# Line 2508 | Line 2585 | public class CompletableFutureTest exten
2585  
2586          g.complete(v2);
2587          checkCompletedNormally(h, null);
2588 <        assertEquals(r.invocationCount, 1);
2588 >        assertEquals(1, r.invocationCount);
2589          f.complete(v1);
2590  
2591          checkCompletedNormally(f, v1);
2592          checkCompletedNormally(g, v2);
2593          checkCompletedNormally(h, null);
2594 <        assertEquals(r.invocationCount, 1);
2595 <        }
2596 <    }
2594 >        assertEquals(1, r.invocationCount);
2595 >        }}
2596 >
2597      public void testRunAfterEither_normalCompletion3() {
2598          for (ExecutionMode m : ExecutionMode.values())
2599          for (Integer v1 : new Integer[] { 1, null })
2600 <        for (Integer v2 : new Integer[] { 2, null }) {
2601 <
2600 >        for (Integer v2 : new Integer[] { 2, null })
2601 >    {
2602          final CompletableFuture<Integer> f = new CompletableFuture<>();
2603          final CompletableFuture<Integer> g = new CompletableFuture<>();
2604          final Noop r = new Noop();
# Line 2533 | Line 2610 | public class CompletableFutureTest exten
2610          checkCompletedNormally(h, null);
2611          checkCompletedNormally(f, v1);
2612          checkCompletedNormally(g, v2);
2613 <        assertEquals(r.invocationCount, 1);
2614 <        }
2538 <    }
2613 >        assertEquals(1, r.invocationCount);
2614 >    }}
2615  
2616      /**
2617       * runAfterEither result completes exceptionally after exceptional
# Line 2543 | Line 2619 | public class CompletableFutureTest exten
2619       */
2620      public void testRunAfterEither_exceptionalCompletion1() {
2621          for (ExecutionMode m : ExecutionMode.values())
2622 <        for (Integer v1 : new Integer[] { 1, null }) {
2623 <
2622 >        for (Integer v1 : new Integer[] { 1, null })
2623 >    {
2624          final CompletableFuture<Integer> f = new CompletableFuture<>();
2625          final CompletableFuture<Integer> g = new CompletableFuture<>();
2626          final Noop r = new Noop();
# Line 2555 | Line 2631 | public class CompletableFutureTest exten
2631          checkCompletedWithWrappedCFException(h, ex);
2632          g.complete(v1);
2633  
2634 <        assertEquals(r.invocationCount, 0);
2634 >        assertEquals(0, r.invocationCount);
2635          checkCompletedNormally(g, v1);
2636          checkCompletedWithWrappedCFException(f, ex);
2637          checkCompletedWithWrappedCFException(h, ex);
2638 <        }
2563 <    }
2638 >    }}
2639  
2640      public void testRunAfterEither_exceptionalCompletion2() {
2641          for (ExecutionMode m : ExecutionMode.values())
2642 <        for (Integer v1 : new Integer[] { 1, null }) {
2643 <
2642 >        for (Integer v1 : new Integer[] { 1, null })
2643 >    {
2644          final CompletableFuture<Integer> f = new CompletableFuture<>();
2645          final CompletableFuture<Integer> g = new CompletableFuture<>();
2646          final Noop r = new Noop();
# Line 2576 | Line 2651 | public class CompletableFutureTest exten
2651          checkCompletedWithWrappedCFException(h, ex);
2652          f.complete(v1);
2653  
2654 <        assertEquals(r.invocationCount, 0);
2654 >        assertEquals(0, r.invocationCount);
2655          checkCompletedNormally(f, v1);
2656          checkCompletedWithWrappedCFException(g, ex);
2657          checkCompletedWithWrappedCFException(h, ex);
2658 <        }
2584 <    }
2658 >    }}
2659  
2660      public void testRunAfterEither_exceptionalCompletion3() {
2661          for (ExecutionMode m : ExecutionMode.values())
2662 <        for (Integer v1 : new Integer[] { 1, null }) {
2663 <
2662 >        for (Integer v1 : new Integer[] { 1, null })
2663 >    {
2664          final CompletableFuture<Integer> f = new CompletableFuture<>();
2665          final CompletableFuture<Integer> g = new CompletableFuture<>();
2666          final Noop r = new Noop();
# Line 2599 | Line 2673 | public class CompletableFutureTest exten
2673          // unspecified behavior
2674          Integer v;
2675          try {
2676 <            assertEquals(h.join(), null);
2677 <            assertEquals(r.invocationCount, 1);
2676 >            assertNull(h.join());
2677 >            assertEquals(1, r.invocationCount);
2678          } catch (CompletionException ok) {
2679              checkCompletedWithWrappedCFException(h, ex);
2680 <            assertEquals(r.invocationCount, 0);
2680 >            assertEquals(0, r.invocationCount);
2681          }
2682  
2683          checkCompletedWithWrappedCFException(g, ex);
2684          checkCompletedNormally(f, v1);
2685 <        }
2612 <    }
2685 >    }}
2686  
2687      public void testRunAfterEither_exceptionalCompletion4() {
2688          for (ExecutionMode m : ExecutionMode.values())
2689 <        for (Integer v1 : new Integer[] { 1, null }) {
2690 <
2689 >        for (Integer v1 : new Integer[] { 1, null })
2690 >    {
2691          final CompletableFuture<Integer> f = new CompletableFuture<>();
2692          final CompletableFuture<Integer> g = new CompletableFuture<>();
2693          final Noop r = new Noop();
# Line 2627 | Line 2700 | public class CompletableFutureTest exten
2700          // unspecified behavior
2701          Integer v;
2702          try {
2703 <            assertEquals(h.join(), null);
2704 <            assertEquals(r.invocationCount, 1);
2703 >            assertNull(h.join());
2704 >            assertEquals(1, r.invocationCount);
2705          } catch (CompletionException ok) {
2706              checkCompletedWithWrappedCFException(h, ex);
2707 <            assertEquals(r.invocationCount, 0);
2707 >            assertEquals(0, r.invocationCount);
2708          }
2709  
2710          checkCompletedWithWrappedCFException(f, ex);
2711          checkCompletedNormally(g, v1);
2712 <        }
2640 <    }
2712 >    }}
2713  
2714      /**
2715       * runAfterEither result completes exceptionally if action does
# Line 2645 | Line 2717 | public class CompletableFutureTest exten
2717      public void testRunAfterEither_actionFailed1() {
2718          for (ExecutionMode m : ExecutionMode.values())
2719          for (Integer v1 : new Integer[] { 1, null })
2720 <        for (Integer v2 : new Integer[] { 2, null }) {
2721 <
2720 >        for (Integer v2 : new Integer[] { 2, null })
2721 >    {
2722          final CompletableFuture<Integer> f = new CompletableFuture<>();
2723          final CompletableFuture<Integer> g = new CompletableFuture<>();
2724          final FailingNoop r = new FailingNoop();
# Line 2657 | Line 2729 | public class CompletableFutureTest exten
2729          g.complete(v2);
2730          checkCompletedNormally(f, v1);
2731          checkCompletedNormally(g, v2);
2732 <        }
2661 <    }
2732 >    }}
2733  
2734      public void testRunAfterEither_actionFailed2() {
2735          for (ExecutionMode m : ExecutionMode.values())
2736          for (Integer v1 : new Integer[] { 1, null })
2737 <        for (Integer v2 : new Integer[] { 2, null }) {
2738 <
2737 >        for (Integer v2 : new Integer[] { 2, null })
2738 >    {
2739          final CompletableFuture<Integer> f = new CompletableFuture<>();
2740          final CompletableFuture<Integer> g = new CompletableFuture<>();
2741          final FailingNoop r = new FailingNoop();
# Line 2675 | Line 2746 | public class CompletableFutureTest exten
2746          f.complete(v1);
2747          checkCompletedNormally(f, v1);
2748          checkCompletedNormally(g, v2);
2749 <        }
2679 <    }
2749 >    }}
2750  
2751      /**
2752       * runAfterEither result completes exceptionally if either source cancelled
# Line 2684 | Line 2754 | public class CompletableFutureTest exten
2754      public void testRunAfterEither_sourceCancelled1() {
2755          for (ExecutionMode m : ExecutionMode.values())
2756          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2757 <        for (Integer v1 : new Integer[] { 1, null }) {
2758 <
2757 >        for (Integer v1 : new Integer[] { 1, null })
2758 >    {
2759          final CompletableFuture<Integer> f = new CompletableFuture<>();
2760          final CompletableFuture<Integer> g = new CompletableFuture<>();
2761          final Noop r = new Noop();
# Line 2696 | Line 2766 | public class CompletableFutureTest exten
2766          g.complete(v1);
2767  
2768          checkCancelled(f);
2769 <        assertEquals(r.invocationCount, 0);
2769 >        assertEquals(0, r.invocationCount);
2770          checkCompletedNormally(g, v1);
2771          checkCompletedWithWrappedCancellationException(h);
2772 <        }
2703 <    }
2772 >    }}
2773  
2774      public void testRunAfterEither_sourceCancelled2() {
2775          for (ExecutionMode m : ExecutionMode.values())
2776          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2777 <        for (Integer v1 : new Integer[] { 1, null }) {
2778 <
2777 >        for (Integer v1 : new Integer[] { 1, null })
2778 >    {
2779          final CompletableFuture<Integer> f = new CompletableFuture<>();
2780          final CompletableFuture<Integer> g = new CompletableFuture<>();
2781          final Noop r = new Noop();
# Line 2717 | Line 2786 | public class CompletableFutureTest exten
2786          f.complete(v1);
2787  
2788          checkCancelled(g);
2789 <        assertEquals(r.invocationCount, 0);
2789 >        assertEquals(0, r.invocationCount);
2790          checkCompletedNormally(f, v1);
2791          checkCompletedWithWrappedCancellationException(h);
2792 <        }
2724 <    }
2792 >    }}
2793  
2794      public void testRunAfterEither_sourceCancelled3() {
2795          for (ExecutionMode m : ExecutionMode.values())
2796          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2797 <        for (Integer v1 : new Integer[] { 1, null }) {
2798 <
2797 >        for (Integer v1 : new Integer[] { 1, null })
2798 >    {
2799          final CompletableFuture<Integer> f = new CompletableFuture<>();
2800          final CompletableFuture<Integer> g = new CompletableFuture<>();
2801          final Noop r = new Noop();
# Line 2739 | Line 2807 | public class CompletableFutureTest exten
2807          // unspecified behavior
2808          Integer v;
2809          try {
2810 <            assertEquals(h.join(), null);
2811 <            assertEquals(r.invocationCount, 1);
2810 >            assertNull(h.join());
2811 >            assertEquals(1, r.invocationCount);
2812          } catch (CompletionException ok) {
2813              checkCompletedWithWrappedCancellationException(h);
2814 <            assertEquals(r.invocationCount, 0);
2814 >            assertEquals(0, r.invocationCount);
2815          }
2816  
2817          checkCancelled(g);
2818          checkCompletedNormally(f, v1);
2819 <        }
2752 <    }
2819 >    }}
2820  
2821      public void testRunAfterEither_sourceCancelled4() {
2822          for (ExecutionMode m : ExecutionMode.values())
2823          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2824 <        for (Integer v1 : new Integer[] { 1, null }) {
2825 <
2824 >        for (Integer v1 : new Integer[] { 1, null })
2825 >    {
2826          final CompletableFuture<Integer> f = new CompletableFuture<>();
2827          final CompletableFuture<Integer> g = new CompletableFuture<>();
2828          final Noop r = new Noop();
# Line 2767 | Line 2834 | public class CompletableFutureTest exten
2834          // unspecified behavior
2835          Integer v;
2836          try {
2837 <            assertEquals(h.join(), null);
2838 <            assertEquals(r.invocationCount, 1);
2837 >            assertNull(h.join());
2838 >            assertEquals(1, r.invocationCount);
2839          } catch (CompletionException ok) {
2840              checkCompletedWithWrappedCancellationException(h);
2841 <            assertEquals(r.invocationCount, 0);
2841 >            assertEquals(0, r.invocationCount);
2842          }
2843  
2844          checkCancelled(f);
2845          checkCompletedNormally(g, v1);
2846 <        }
2780 <    }
2846 >    }}
2847  
2848      /**
2849       * thenCompose result completes normally after normal completion of source
2850       */
2851 <    public void testThenCompose() {
2852 <        CompletableFuture<Integer> f, g;
2853 <        CompletableFutureInc r;
2854 <
2855 <        f = new CompletableFuture<>();
2856 <        g = f.thenCompose(r = new CompletableFutureInc());
2857 <        f.complete(one);
2858 <        checkCompletedNormally(g, two);
2859 <        assertTrue(r.ran);
2851 >    public void testThenCompose_normalCompletion() {
2852 >        for (ExecutionMode m : ExecutionMode.values())
2853 >        for (boolean createIncomplete : new boolean[] { true, false })
2854 >        for (Integer v1 : new Integer[] { 1, null })
2855 >    {
2856 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2857 >        final CompletableFutureInc r = new CompletableFutureInc();
2858 >        if (!createIncomplete) f.complete(v1);
2859 >        final CompletableFuture<Integer> g = f.thenCompose(r);
2860 >        if (createIncomplete) f.complete(v1);
2861  
2862 <        f = new CompletableFuture<>();
2863 <        f.complete(one);
2864 <        g = f.thenCompose(r = new CompletableFutureInc());
2865 <        checkCompletedNormally(g, two);
2799 <        assertTrue(r.ran);
2800 <    }
2862 >        checkCompletedNormally(g, inc(v1));
2863 >        checkCompletedNormally(f, v1);
2864 >        assertEquals(1, r.invocationCount);
2865 >    }}
2866  
2867      /**
2868       * thenCompose result completes exceptionally after exceptional
2869       * completion of source
2870       */
2871 <    public void testThenCompose2() {
2872 <        CompletableFuture<Integer> f, g;
2873 <        CompletableFutureInc r;
2874 <
2875 <        f = new CompletableFuture<>();
2876 <        g = f.thenCompose(r = new CompletableFutureInc());
2877 <        f.completeExceptionally(new CFException());
2878 <        checkCompletedWithWrappedCFException(g);
2871 >    public void testThenCompose_exceptionalCompletion() {
2872 >        for (ExecutionMode m : ExecutionMode.values())
2873 >        for (boolean createIncomplete : new boolean[] { true, false })
2874 >    {
2875 >        final CFException ex = new CFException();
2876 >        final CompletableFutureInc r = new CompletableFutureInc();
2877 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2878 >        if (!createIncomplete) f.completeExceptionally(ex);
2879 >        final CompletableFuture<Integer> g = f.thenCompose(r);
2880 >        if (createIncomplete) f.completeExceptionally(ex);
2881  
2882 <        f = new CompletableFuture<>();
2883 <        f.completeExceptionally(new CFException());
2884 <        g = f.thenCompose(r = new CompletableFutureInc());
2885 <        checkCompletedWithWrappedCFException(g);
2819 <    }
2882 >        checkCompletedWithWrappedCFException(g, ex);
2883 >        checkCompletedWithWrappedCFException(f, ex);
2884 >        assertEquals(0, r.invocationCount);
2885 >    }}
2886  
2887      /**
2888       * thenCompose result completes exceptionally if action does
2889       */
2890 <    public void testThenCompose3() {
2891 <        CompletableFuture<Integer> f, g;
2892 <        FailingCompletableFutureFunction r;
2890 >    public void testThenCompose_actionFailed() {
2891 >        for (ExecutionMode m : ExecutionMode.values())
2892 >        for (boolean createIncomplete : new boolean[] { true, false })
2893 >        for (Integer v1 : new Integer[] { 1, null })
2894 >    {
2895 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2896 >        final FailingCompletableFutureFunction r
2897 >            = new FailingCompletableFutureFunction();
2898 >        if (!createIncomplete) f.complete(v1);
2899 >        final CompletableFuture<Integer> g = f.thenCompose(r);
2900 >        if (createIncomplete) f.complete(v1);
2901  
2828        f = new CompletableFuture<>();
2829        g = f.thenCompose(r = new FailingCompletableFutureFunction());
2830        f.complete(one);
2902          checkCompletedWithWrappedCFException(g);
2903 <
2904 <        f = new CompletableFuture<>();
2834 <        f.complete(one);
2835 <        g = f.thenCompose(r = new FailingCompletableFutureFunction());
2836 <        checkCompletedWithWrappedCFException(g);
2837 <    }
2903 >        checkCompletedNormally(f, v1);
2904 >    }}
2905  
2906      /**
2907       * thenCompose result completes exceptionally if source cancelled
2908       */
2909 <    public void testThenCompose4() {
2910 <        CompletableFuture<Integer> f, g;
2911 <        CompletableFutureInc r;
2912 <
2913 <        f = new CompletableFuture<>();
2914 <        g = f.thenCompose(r = new CompletableFutureInc());
2915 <        assertTrue(f.cancel(true));
2916 <        checkCompletedWithWrappedCancellationException(g);
2909 >    public void testThenCompose_sourceCancelled() {
2910 >        for (ExecutionMode m : ExecutionMode.values())
2911 >        for (boolean createIncomplete : new boolean[] { true, false })
2912 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2913 >    {
2914 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2915 >        final CompletableFutureInc r = new CompletableFutureInc();
2916 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2917 >        final CompletableFuture<Integer> g = f.thenCompose(r);
2918 >        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2919  
2851        f = new CompletableFuture<>();
2852        assertTrue(f.cancel(true));
2853        g = f.thenCompose(r = new CompletableFutureInc());
2920          checkCompletedWithWrappedCancellationException(g);
2921 <    }
2921 >        checkCancelled(f);
2922 >    }}
2923  
2924      // asyncs
2925  
2926      /**
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    /**
2927       * thenApplyAsync result completes normally after normal completion of source
2928       */
2929      public void testThenApplyAsync() {
# Line 3001 | Line 3012 | public class CompletableFutureTest exten
3012          checkCompletedWithWrappedCancellationException(g);
3013      }
3014  
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
3015      // async with explicit executors
3016  
3017      /**
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    /**
3018       * thenApplyAsync result completes normally after normal completion of source
3019       */
3020      public void testThenApplyAsyncE() {
# Line 3224 | Line 3103 | public class CompletableFutureTest exten
3103          checkCompletedWithWrappedCancellationException(g);
3104      }
3105  
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    }
3261
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));
3270        checkCompletedWithWrappedCancellationException(g);
3271    }
3272
3106      // other static methods
3107  
3108      /**
# Line 3470 | Line 3303 | public class CompletableFutureTest exten
3303       */
3304      public void testWhenComplete_normalCompletion1() {
3305          for (ExecutionMode m : ExecutionMode.values())
3306 <        for (Integer v1 : new Integer[] { 1, null }) {
3307 <
3308 <        final AtomicInteger a = new AtomicInteger();
3306 >        for (boolean createIncomplete : new boolean[] { true, false })
3307 >        for (Integer v1 : new Integer[] { 1, null })
3308 >    {
3309 >        final AtomicInteger a = new AtomicInteger(0);
3310          final CompletableFuture<Integer> f = new CompletableFuture<>();
3311 <        final CompletableFuture<Integer> g =
3312 <            m.whenComplete(f,
3313 <                           (Integer x, Throwable t) -> {
3314 <                               threadAssertSame(x, v1);
3315 <                               threadAssertNull(t);
3316 <                               a.getAndIncrement();
3317 <                           });
3318 <        f.complete(v1);
3319 <        checkCompletedNormally(f, v1);
3311 >        if (!createIncomplete) f.complete(v1);
3312 >        final CompletableFuture<Integer> g = m.whenComplete
3313 >            (f,
3314 >             (Integer x, Throwable t) -> {
3315 >                threadAssertSame(x, v1);
3316 >                threadAssertNull(t);
3317 >                a.getAndIncrement();
3318 >            });
3319 >        if (createIncomplete) f.complete(v1);
3320 >
3321          checkCompletedNormally(g, v1);
3322 <        assertEquals(a.get(), 1);
3323 <        }
3324 <    }
3322 >        checkCompletedNormally(f, v1);
3323 >        assertEquals(1, a.get());
3324 >    }}
3325  
3326      /**
3327       * whenComplete action executes on exceptional completion, propagating
# Line 3494 | Line 3329 | public class CompletableFutureTest exten
3329       */
3330      public void testWhenComplete_exceptionalCompletion() {
3331          for (ExecutionMode m : ExecutionMode.values())
3332 <        for (Integer v1 : new Integer[] { 1, null }) {
3333 <
3334 <        final AtomicInteger a = new AtomicInteger();
3332 >        for (boolean createIncomplete : new boolean[] { true, false })
3333 >        for (Integer v1 : new Integer[] { 1, null })
3334 >    {
3335 >        final AtomicInteger a = new AtomicInteger(0);
3336          final CFException ex = new CFException();
3337          final CompletableFuture<Integer> f = new CompletableFuture<>();
3338 +        if (!createIncomplete) f.completeExceptionally(ex);
3339          final CompletableFuture<Integer> g = m.whenComplete
3340              (f,
3341               (Integer x, Throwable t) -> {
# Line 3506 | Line 3343 | public class CompletableFutureTest exten
3343                  threadAssertSame(t, ex);
3344                  a.getAndIncrement();
3345              });
3346 <        f.completeExceptionally(ex);
3346 >        if (createIncomplete) f.completeExceptionally(ex);
3347          checkCompletedWithWrappedCFException(f, ex);
3348          checkCompletedWithWrappedCFException(g, ex);
3349 <        assertEquals(a.get(), 1);
3350 <        }
3351 <    }
3349 >        assertEquals(1, a.get());
3350 >    }}
3351 >
3352 >    /**
3353 >     * whenComplete action executes on cancelled source, propagating
3354 >     * CancellationException.
3355 >     */
3356 >    public void testWhenComplete_sourceCancelled() {
3357 >        for (ExecutionMode m : ExecutionMode.values())
3358 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3359 >        for (boolean createIncomplete : new boolean[] { true, false })
3360 >    {
3361 >        final AtomicInteger a = new AtomicInteger(0);
3362 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
3363 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
3364 >        final CompletableFuture<Integer> g = m.whenComplete
3365 >            (f,
3366 >             (Integer x, Throwable t) -> {
3367 >                threadAssertNull(x);
3368 >                threadAssertTrue(t instanceof CancellationException);
3369 >                a.getAndIncrement();
3370 >            });
3371 >        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
3372 >
3373 >        //try { g.join(); } catch (Throwable t) { throw new Error(t); }
3374 >        checkCompletedWithWrappedCancellationException(g);
3375 >        checkCancelled(f);
3376 >        assertEquals(1, a.get());
3377 >    }}
3378  
3379      /**
3380       * If a whenComplete action throws an exception when triggered by
3381       * a normal completion, it completes exceptionally
3382       */
3383      public void testWhenComplete_actionFailed() {
3384 +        for (boolean createIncomplete : new boolean[] { true, false })
3385          for (ExecutionMode m : ExecutionMode.values())
3386 <        for (Integer v1 : new Integer[] { 1, null }) {
3387 <
3386 >        for (Integer v1 : new Integer[] { 1, null })
3387 >    {
3388 >        final AtomicInteger a = new AtomicInteger(0);
3389          final CFException ex = new CFException();
3390          final CompletableFuture<Integer> f = new CompletableFuture<>();
3391 +        if (!createIncomplete) f.complete(v1);
3392          final CompletableFuture<Integer> g = m.whenComplete
3393              (f,
3394               (Integer x, Throwable t) -> {
3395                  threadAssertSame(x, v1);
3396                  threadAssertNull(t);
3397 +                a.getAndIncrement();
3398                  throw ex;
3399              });
3400 <        f.complete(v1);
3400 >        if (createIncomplete) f.complete(v1);
3401          checkCompletedNormally(f, v1);
3402          checkCompletedWithWrappedCFException(g, ex);
3403 <        }
3404 <    }
3403 >        assertEquals(1, a.get());
3404 >    }}
3405  
3406      /**
3407       * If a whenComplete action throws an exception when triggered by
# Line 3542 | Line 3409 | public class CompletableFutureTest exten
3409       * exception takes precedence.
3410       */
3411      public void testWhenComplete_actionFailedSourceFailed() {
3412 +        for (boolean createIncomplete : new boolean[] { true, false })
3413          for (ExecutionMode m : ExecutionMode.values())
3414 <        for (Integer v1 : new Integer[] { 1, null }) {
3415 <
3414 >        for (Integer v1 : new Integer[] { 1, null })
3415 >    {
3416 >        final AtomicInteger a = new AtomicInteger(0);
3417          final CFException ex1 = new CFException();
3418          final CFException ex2 = new CFException();
3419          final CompletableFuture<Integer> f = new CompletableFuture<>();
3420 +
3421 +        if (!createIncomplete) f.completeExceptionally(ex1);
3422          final CompletableFuture<Integer> g = m.whenComplete
3423              (f,
3424               (Integer x, Throwable t) -> {
3425                  threadAssertSame(t, ex1);
3426                  threadAssertNull(x);
3427 +                a.getAndIncrement();
3428                  throw ex2;
3429              });
3430 <        f.completeExceptionally(ex1);
3430 >        if (createIncomplete) f.completeExceptionally(ex1);
3431 >
3432          checkCompletedWithWrappedCFException(f, ex1);
3433          checkCompletedWithWrappedCFException(g, ex1);
3434 <        }
3435 <    }
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 <    }
3434 >        assertEquals(1, a.get());
3435 >    }}
3436  
3437   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines