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.36 by jsr166, Sun Jun 1 23:12:45 2014 UTC vs.
Revision 1.52 by jsr166, Mon Jun 2 20:10:04 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 318 | Line 322 | public class CompletableFutureTest exten
322  
323      // Choose non-commutative actions for better coverage
324  
325 <    // A non-commutative function that handles null values as well
326 <    public static int subtract(Integer x, Integer y) {
327 <        return ((x == null) ? 42 : x.intValue())
325 >    // A non-commutative function that handles and produces null values as well.
326 >    static Integer subtract(Integer x, Integer y) {
327 >        return (x == null && y == null) ? null :
328 >            ((x == null) ? 42 : x.intValue())
329              - ((y == null) ? 99 : y.intValue());
330      }
331  
332 +    // A function that handles and produces null values as well.
333 +    static Integer inc(Integer x) {
334 +        return (x == null) ? null : x + 1;
335 +    }
336 +
337      static final Supplier<Integer> supplyOne =
338          () -> Integer.valueOf(1);
339      static final Function<Integer, Integer> inc =
# Line 331 | Line 341 | public class CompletableFutureTest exten
341      static final BiFunction<Integer, Integer, Integer> subtract =
342          (Integer x, Integer y) -> subtract(x, y);
343      static final class IncAction implements Consumer<Integer> {
344 <        int value;
345 <        public void accept(Integer x) { value = x.intValue() + 1; }
344 >        int invocationCount = 0;
345 >        Integer value;
346 >        public void accept(Integer x) {
347 >            invocationCount++;
348 >            value = inc(x);
349 >        }
350 >    }
351 >    static final class IncFunction implements Function<Integer,Integer> {
352 >        int invocationCount = 0;
353 >        Integer value;
354 >        public Integer apply(Integer x) {
355 >            invocationCount++;
356 >            return value = inc(x);
357 >        }
358      }
359      static final class SubtractAction implements BiConsumer<Integer, Integer> {
360 <        volatile int invocationCount = 0;
361 <        int value;
360 >        int invocationCount = 0;
361 >        Integer value;
362          // Check this action was invoked exactly once when result is computed.
341        public boolean ran() { return invocationCount == 1; }
363          public void accept(Integer x, Integer y) {
364              invocationCount++;
365              value = subtract(x, y);
366          }
367      }
368      static final class SubtractFunction implements BiFunction<Integer, Integer, Integer> {
369 <        volatile int invocationCount = 0;
370 <        int value;
369 >        int invocationCount = 0;
370 >        Integer value;
371          // Check this action was invoked exactly once when result is computed.
351        public boolean ran() { return invocationCount == 1; }
372          public Integer apply(Integer x, Integer y) {
373              invocationCount++;
374 <            return subtract(x, y);
374 >            return value = subtract(x, y);
375          }
376      }
377      static final class Noop implements Runnable {
378 <        boolean ran;
379 <        public void run() { ran = true; }
378 >        int invocationCount = 0;
379 >        public void run() {
380 >            invocationCount++;
381 >        }
382      }
383  
384      static final class FailingSupplier implements Supplier<Integer> {
385 <        boolean ran;
386 <        public Integer get() { ran = true; throw new CFException(); }
385 >        int invocationCount = 0;
386 >        public Integer get() {
387 >            invocationCount++;
388 >            throw new CFException();
389 >        }
390      }
391      static final class FailingConsumer implements Consumer<Integer> {
392 <        boolean ran;
393 <        public void accept(Integer x) { ran = true; throw new CFException(); }
392 >        int invocationCount = 0;
393 >        public void accept(Integer x) {
394 >            invocationCount++;
395 >            throw new CFException();
396 >        }
397      }
398      static final class FailingBiConsumer implements BiConsumer<Integer, Integer> {
399 <        boolean ran;
400 <        public void accept(Integer x, Integer y) { ran = true; throw new CFException(); }
399 >        int invocationCount = 0;
400 >        public void accept(Integer x, Integer y) {
401 >            invocationCount++;
402 >            throw new CFException();
403 >        }
404      }
405      static final class FailingFunction implements Function<Integer, Integer> {
406 <        boolean ran;
407 <        public Integer apply(Integer x) { ran = true; throw new CFException(); }
406 >        int invocationCount = 0;
407 >        public Integer apply(Integer x) {
408 >            invocationCount++;
409 >            throw new CFException();
410 >        }
411      }
412      static final class FailingBiFunction implements BiFunction<Integer, Integer, Integer> {
413 <        boolean ran;
414 <        public Integer apply(Integer x, Integer y) { ran = true; throw new CFException(); }
413 >        int invocationCount = 0;
414 >        public Integer apply(Integer x, Integer y) {
415 >            invocationCount++;
416 >            throw new CFException();
417 >        }
418      }
419 <    static final class FailingNoop implements Runnable {
420 <        boolean ran;
421 <        public void run() { ran = true; throw new CFException(); }
419 >    static final class FailingRunnable implements Runnable {
420 >        int invocationCount = 0;
421 >        public void run() {
422 >            invocationCount++;
423 >            throw new CFException();
424 >        }
425      }
426  
427      static final class CompletableFutureInc
428          implements Function<Integer, CompletableFuture<Integer>> {
429 <        boolean ran;
429 >        int invocationCount = 0;
430          public CompletableFuture<Integer> apply(Integer x) {
431 <            ran = true;
431 >            invocationCount++;
432              CompletableFuture<Integer> f = new CompletableFuture<>();
433 <            f.complete(Integer.valueOf(x.intValue() + 1));
433 >            f.complete(inc(x));
434              return f;
435          }
436      }
437  
438      static final class FailingCompletableFutureFunction
439          implements Function<Integer, CompletableFuture<Integer>> {
440 <        boolean ran;
440 >        int invocationCount = 0;
441          public CompletableFuture<Integer> apply(Integer x) {
442 <            ran = true; throw new CFException();
442 >            invocationCount++;
443 >            throw new CFException();
444          }
445      }
446  
# Line 413 | Line 454 | public class CompletableFutureTest exten
454          }
455      }
456  
416    static final class ExceptionToInteger implements Function<Throwable, Integer> {
417        public Integer apply(Throwable x) { return Integer.valueOf(3); }
418    }
419
420    static final class IntegerHandler implements BiFunction<Integer, Throwable, Integer> {
421        boolean ran;
422        public Integer apply(Integer x, Throwable t) {
423            ran = true;
424            return (t == null) ? two : three;
425        }
426    }
427
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 447 | 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> CompletableFuture<Void> runAfterEither
510 +                (CompletableFuture<T> f,
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,
517 +                 CompletionStage<? extends T> g,
518 +                 Consumer<? super T> a) {
519 +                return f.acceptEither(g, a);
520 +            }
521 +            public <T,U> CompletableFuture<U> applyToEither
522 +                (CompletableFuture<T> f,
523 +                 CompletionStage<? extends T> g,
524 +                 Function<? super T,U> a) {
525 +                return f.applyToEither(g, a);
526 +            }
527          },
528  
529 < //             /** Experimental way to do more testing */
530 < //         REVERSE_DEFAULT {
531 < //             public <T,U> CompletableFuture<Void> runAfterBoth
532 < //                 (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
533 < //                 return g.runAfterBoth(f, a);
534 < //             }
535 < //             public <T,U> CompletableFuture<Void> thenAcceptBoth
536 < //                 (CompletableFuture<T> f,
537 < //                  CompletionStage<? extends U> g,
538 < //                  BiConsumer<? super T,? super U> a) {
539 < //                 return DEFAULT.thenAcceptBoth(f, g, a);
540 < //             }
541 < //         },
542 <
543 <        DEFAULT_ASYNC {
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.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.whenCompleteAsync(a);
560 >            }
561              public <T,U> CompletableFuture<Void> runAfterBoth
562                  (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
563                  return f.runAfterBothAsync(g, a);
# Line 480 | 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> CompletableFuture<Void> runAfterEither
578 +                (CompletableFuture<T> f,
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,
585 +                 CompletionStage<? extends T> g,
586 +                 Consumer<? super T> a) {
587 +                return f.acceptEitherAsync(g, a);
588 +            }
589 +            public <T,U> CompletableFuture<U> applyToEither
590 +                (CompletableFuture<T> f,
591 +                 CompletionStage<? extends T> g,
592 +                 Function<? super T,U> a) {
593 +                return f.applyToEitherAsync(g, a);
594 +            }
595          },
596  
485 //         REVERSE_DEFAULT_ASYNC {
486 //             public <T,U> CompletableFuture<Void> runAfterBoth
487 //                 (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
488 //                 return f.runAfterBothAsync(g, a);
489 //             }
490 //             public <T,U> CompletableFuture<Void> thenAcceptBoth
491 //                 (CompletableFuture<T> f,
492 //                  CompletionStage<? extends U> g,
493 //                  BiConsumer<? super T,? super U> a) {
494 //                 return DEFAULT_ASYNC.thenAcceptBoth(f, g, a);
495 //             }
496 //         },
497
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, 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, new ThreadExecutor());
627 +            }
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 512 | Line 641 | public class CompletableFutureTest exten
641                   BiFunction<? super T,? super U,? extends V> a) {
642                  return f.thenCombineAsync(g, a, new ThreadExecutor());
643              }
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> CompletableFuture<Void> acceptEither
651 +                (CompletableFuture<T> f,
652 +                 CompletionStage<? extends T> g,
653 +                 Consumer<? super T> a) {
654 +                return f.acceptEitherAsync(g, a, new ThreadExecutor());
655 +            }
656 +            public <T,U> CompletableFuture<U> applyToEither
657 +                (CompletableFuture<T> f,
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 524 | Line 687 | public class CompletableFutureTest exten
687              (CompletableFuture<T> f,
688               CompletionStage<? extends U> g,
689               BiFunction<? super T,? super U,? extends V> a);
690 +        public abstract <T> CompletableFuture<Void> runAfterEither
691 +            (CompletableFuture<T> f,
692 +             CompletionStage<?> g,
693 +             java.lang.Runnable a);
694 +        public abstract <T> CompletableFuture<Void> acceptEither
695 +            (CompletableFuture<T> f,
696 +             CompletionStage<? extends T> g,
697 +             Consumer<? super T> a);
698 +        public abstract <T,U> CompletableFuture<U> applyToEither
699 +            (CompletableFuture<T> f,
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 +
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);
559 <        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);
572 <        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 586 | 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 598 | 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 607 | Line 933 | public class CompletableFutureTest exten
933       * failing runAsync completes exceptionally after running Runnable
934       */
935      public void testRunAsync3() {
936 <        FailingNoop r = new FailingNoop();
936 >        FailingRunnable r = new FailingRunnable();
937          CompletableFuture<Void> f = CompletableFuture.runAsync(r);
938          checkCompletedWithWrappedCFException(f);
939 <        assertTrue(r.ran);
939 >        assertEquals(1, r.invocationCount);
940      }
941  
942      /**
# Line 640 | 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 648 | Line 974 | public class CompletableFutureTest exten
974      /**
975       * thenRun result completes normally after normal completion of source
976       */
977 <    public void testThenRun() {
978 <        CompletableFuture<Integer> f;
979 <        CompletableFuture<Void> g;
980 <        Noop r;
981 <
982 <        f = new CompletableFuture<>();
983 <        g = f.thenRun(r = new Noop());
984 <        f.complete(null);
985 <        checkCompletedNormally(g, null);
986 <        assertTrue(r.ran);
977 >    public void testThenRun_normalCompletion() {
978 >        for (ExecutionMode m : ExecutionMode.values())
979 >        for (boolean createIncomplete : new boolean[] { true, false })
980 >        for (Integer v1 : new Integer[] { 1, null })
981 >    {
982 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
983 >        final Noop r = new Noop();
984 >        if (!createIncomplete) f.complete(v1);
985 >        final CompletableFuture<Void> g = m.thenRun(f, r);
986 >        if (createIncomplete) {
987 >            checkIncomplete(g);
988 >            f.complete(v1);
989 >        }
990  
662        f = new CompletableFuture<>();
663        f.complete(null);
664        g = f.thenRun(r = new Noop());
991          checkCompletedNormally(g, null);
992 <        assertTrue(r.ran);
993 <    }
992 >        checkCompletedNormally(f, v1);
993 >        assertEquals(1, r.invocationCount);
994 >    }}
995  
996      /**
997       * thenRun result completes exceptionally after exceptional
998       * completion of source
999       */
1000 <    public void testThenRun2() {
1001 <        CompletableFuture<Integer> f;
1002 <        CompletableFuture<Void> g;
1003 <        Noop r;
1004 <
1005 <        f = new CompletableFuture<>();
1006 <        g = f.thenRun(r = new Noop());
1007 <        f.completeExceptionally(new CFException());
1008 <        checkCompletedWithWrappedCFException(g);
1009 <        assertFalse(r.ran);
1000 >    public void testThenRun_exceptionalCompletion() {
1001 >        for (ExecutionMode m : ExecutionMode.values())
1002 >        for (boolean createIncomplete : new boolean[] { true, false })
1003 >    {
1004 >        final CFException ex = new CFException();
1005 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1006 >        final Noop r = new Noop();
1007 >        if (!createIncomplete) f.completeExceptionally(ex);
1008 >        final CompletableFuture<Void> g = m.thenRun(f, r);
1009 >        if (createIncomplete) {
1010 >            checkIncomplete(g);
1011 >            f.completeExceptionally(ex);
1012 >        }
1013  
1014 <        f = new CompletableFuture<>();
1015 <        f.completeExceptionally(new CFException());
1016 <        g = f.thenRun(r = new Noop());
1017 <        checkCompletedWithWrappedCFException(g);
688 <        assertFalse(r.ran);
689 <    }
1014 >        checkCompletedWithWrappedCFException(g, ex);
1015 >        checkCompletedWithWrappedCFException(f, ex);
1016 >        assertEquals(0, r.invocationCount);
1017 >    }}
1018  
1019      /**
1020 <     * thenRun result completes exceptionally if action does
1020 >     * thenRun result completes exceptionally if source cancelled
1021       */
1022 <    public void testThenRun3() {
1023 <        CompletableFuture<Integer> f;
1024 <        CompletableFuture<Void> g;
1025 <        FailingNoop r;
1026 <
1027 <        f = new CompletableFuture<>();
1028 <        g = f.thenRun(r = new FailingNoop());
1029 <        f.complete(null);
1030 <        checkCompletedWithWrappedCFException(g);
1022 >    public void testThenRun_sourceCancelled() {
1023 >        for (ExecutionMode m : ExecutionMode.values())
1024 >        for (boolean createIncomplete : new boolean[] { true, false })
1025 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1026 >    {
1027 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1028 >        final Noop r = new Noop();
1029 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1030 >        final CompletableFuture<Void> g = f.thenRun(r);
1031 >        if (createIncomplete) {
1032 >            checkIncomplete(g);
1033 >            assertTrue(f.cancel(mayInterruptIfRunning));
1034 >        }
1035  
1036 <        f = new CompletableFuture<>();
1037 <        f.complete(null);
1038 <        g = f.thenRun(r = new FailingNoop());
1039 <        checkCompletedWithWrappedCFException(g);
708 <    }
1036 >        checkCompletedWithWrappedCancellationException(g);
1037 >        checkCancelled(f);
1038 >        assertEquals(0, r.invocationCount);
1039 >    }}
1040  
1041      /**
1042 <     * thenRun result completes exceptionally if source cancelled
1042 >     * thenRun result completes exceptionally if action does
1043       */
1044 <    public void testThenRun4() {
1045 <        CompletableFuture<Integer> f;
1046 <        CompletableFuture<Void> g;
1047 <        Noop r;
1048 <
1049 <        f = new CompletableFuture<>();
1050 <        g = f.thenRun(r = new Noop());
1051 <        assertTrue(f.cancel(true));
1052 <        checkCompletedWithWrappedCancellationException(g);
1044 >    public void testThenRun_actionFailed() {
1045 >        for (ExecutionMode m : ExecutionMode.values())
1046 >        for (boolean createIncomplete : new boolean[] { true, false })
1047 >        for (Integer v1 : new Integer[] { 1, null })
1048 >    {
1049 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1050 >        final FailingRunnable r = new FailingRunnable();
1051 >        if (!createIncomplete) f.complete(v1);
1052 >        final CompletableFuture<Void> g = f.thenRun(r);
1053 >        if (createIncomplete) {
1054 >            checkIncomplete(g);
1055 >            f.complete(v1);
1056 >        }
1057  
1058 <        f = new CompletableFuture<>();
1059 <        assertTrue(f.cancel(true));
1060 <        g = f.thenRun(r = new Noop());
726 <        checkCompletedWithWrappedCancellationException(g);
727 <    }
1058 >        checkCompletedWithWrappedCFException(g);
1059 >        checkCompletedNormally(f, v1);
1060 >    }}
1061  
1062      /**
1063       * thenApply result completes normally after normal completion of source
1064       */
1065 <    public void testThenApply() {
1066 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1067 <        CompletableFuture<Integer> g = f.thenApply(inc);
1068 <        f.complete(one);
1069 <        checkCompletedNormally(g, two);
1070 <    }
1065 >    public void testThenApply_normalCompletion() {
1066 >        for (ExecutionMode m : ExecutionMode.values())
1067 >        for (boolean createIncomplete : new boolean[] { true, false })
1068 >        for (Integer v1 : new Integer[] { 1, null })
1069 >    {
1070 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1071 >        final IncFunction r = new IncFunction();
1072 >        if (!createIncomplete) f.complete(v1);
1073 >        final CompletableFuture<Integer> g = m.thenApply(f, r);
1074 >        if (createIncomplete) {
1075 >            checkIncomplete(g);
1076 >            f.complete(v1);
1077 >        }
1078 >
1079 >        checkCompletedNormally(g, inc(v1));
1080 >        checkCompletedNormally(f, v1);
1081 >        assertEquals(1, r.invocationCount);
1082 >    }}
1083  
1084      /**
1085       * thenApply result completes exceptionally after exceptional
1086       * completion of source
1087       */
1088 <    public void testThenApply2() {
1089 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1090 <        CompletableFuture<Integer> g = f.thenApply(inc);
1091 <        f.completeExceptionally(new CFException());
1092 <        checkCompletedWithWrappedCFException(g);
1093 <    }
1088 >    public void testThenApply_exceptionalCompletion() {
1089 >        for (ExecutionMode m : ExecutionMode.values())
1090 >        for (boolean createIncomplete : new boolean[] { true, false })
1091 >    {
1092 >        final CFException ex = new CFException();
1093 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1094 >        final IncFunction r = new IncFunction();
1095 >        if (!createIncomplete) f.completeExceptionally(ex);
1096 >        final CompletableFuture<Integer> g = m.thenApply(f, r);
1097 >        if (createIncomplete) {
1098 >            checkIncomplete(g);
1099 >            f.completeExceptionally(ex);
1100 >        }
1101  
1102 <    /**
1103 <     * thenApply result completes exceptionally if action does
1104 <     */
1105 <    public void testThenApply3() {
754 <        CompletableFuture<Integer> f = new CompletableFuture<>();
755 <        CompletableFuture<Integer> g = f.thenApply(new FailingFunction());
756 <        f.complete(one);
757 <        checkCompletedWithWrappedCFException(g);
758 <    }
1102 >        checkCompletedWithWrappedCFException(g, ex);
1103 >        checkCompletedWithWrappedCFException(f, ex);
1104 >        assertEquals(0, r.invocationCount);
1105 >    }}
1106  
1107      /**
1108       * thenApply result completes exceptionally if source cancelled
1109       */
1110 <    public void testThenApply4() {
1111 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1112 <        CompletableFuture<Integer> g = f.thenApply(inc);
1113 <        assertTrue(f.cancel(true));
1110 >    public void testThenApply_sourceCancelled() {
1111 >        for (ExecutionMode m : ExecutionMode.values())
1112 >        for (boolean createIncomplete : new boolean[] { true, false })
1113 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1114 >    {
1115 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1116 >        final IncFunction r = new IncFunction();
1117 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1118 >        final CompletableFuture<Integer> g = f.thenApply(r);
1119 >        if (createIncomplete) {
1120 >            checkIncomplete(g);
1121 >            assertTrue(f.cancel(mayInterruptIfRunning));
1122 >        }
1123 >
1124          checkCompletedWithWrappedCancellationException(g);
1125 <    }
1125 >        checkCancelled(f);
1126 >        assertEquals(0, r.invocationCount);
1127 >    }}
1128  
1129      /**
1130 <     * thenAccept result completes normally after normal completion of source
1130 >     * thenApply result completes exceptionally if action does
1131       */
1132 <    public void testThenAccept() {
1133 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1134 <        IncAction r = new IncAction();
1135 <        CompletableFuture<Void> g = f.thenAccept(r);
1136 <        f.complete(one);
1137 <        checkCompletedNormally(g, null);
1138 <        assertEquals(r.value, 2);
1139 <    }
1132 >    public void testThenApply_actionFailed() {
1133 >        for (ExecutionMode m : ExecutionMode.values())
1134 >        for (boolean createIncomplete : new boolean[] { true, false })
1135 >        for (Integer v1 : new Integer[] { 1, null })
1136 >    {
1137 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1138 >        final FailingFunction r = new FailingFunction();
1139 >        if (!createIncomplete) f.complete(v1);
1140 >        final CompletableFuture<Integer> g = f.thenApply(r);
1141 >        if (createIncomplete) {
1142 >            checkIncomplete(g);
1143 >            f.complete(v1);
1144 >        }
1145  
782    /**
783     * thenAccept result completes exceptionally after exceptional
784     * completion of source
785     */
786    public void testThenAccept2() {
787        CompletableFuture<Integer> f = new CompletableFuture<>();
788        IncAction r = new IncAction();
789        CompletableFuture<Void> g = f.thenAccept(r);
790        f.completeExceptionally(new CFException());
1146          checkCompletedWithWrappedCFException(g);
1147 <    }
1147 >        checkCompletedNormally(f, v1);
1148 >    }}
1149  
1150      /**
1151 <     * thenAccept result completes exceptionally if action does
1151 >     * thenAccept result completes normally after normal completion of source
1152       */
1153 <    public void testThenAccept3() {
1154 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1155 <        FailingConsumer r = new FailingConsumer();
1156 <        CompletableFuture<Void> g = f.thenAccept(r);
1157 <        f.complete(one);
1158 <        checkCompletedWithWrappedCFException(g);
1159 <        assertTrue(r.ran);
1160 <    }
1153 >    public void testThenAccept_normalCompletion() {
1154 >        for (ExecutionMode m : ExecutionMode.values())
1155 >        for (boolean createIncomplete : new boolean[] { true, false })
1156 >        for (Integer v1 : new Integer[] { 1, null })
1157 >    {
1158 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1159 >        final IncAction r = new IncAction();
1160 >        if (!createIncomplete) f.complete(v1);
1161 >        final CompletableFuture<Void> g = m.thenAccept(f, r);
1162 >        if (createIncomplete) {
1163 >            checkIncomplete(g);
1164 >            f.complete(v1);
1165 >        }
1166  
1167 <    /**
1168 <     * thenAccept result completes exceptionally if source cancelled
1169 <     */
1170 <    public void testThenAccept4() {
1171 <        CompletableFuture<Integer> f = new CompletableFuture<>();
811 <        IncAction r = new IncAction();
812 <        CompletableFuture<Void> g = f.thenAccept(r);
813 <        assertTrue(f.cancel(true));
814 <        checkCompletedWithWrappedCancellationException(g);
815 <    }
1167 >        checkCompletedNormally(g, null);
1168 >        checkCompletedNormally(f, v1);
1169 >        assertEquals(1, r.invocationCount);
1170 >        assertEquals(inc(v1), r.value);
1171 >    }}
1172  
1173      /**
1174 <     * thenCombine result completes normally after normal completion
1175 <     * of sources
1174 >     * thenAccept result completes exceptionally after exceptional
1175 >     * completion of source
1176       */
1177 <    public void testThenCombine_normalCompletion1() {
1177 >    public void testThenAccept_exceptionalCompletion() {
1178          for (ExecutionMode m : ExecutionMode.values())
1179 <        for (Integer v1 : new Integer[] { 1, null })
1180 <        for (Integer v2 : new Integer[] { 2, null }) {
1181 <
1179 >        for (boolean createIncomplete : new boolean[] { true, false })
1180 >    {
1181 >        final CFException ex = new CFException();
1182          final CompletableFuture<Integer> f = new CompletableFuture<>();
1183 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1184 <        final SubtractFunction r = new SubtractFunction();
1185 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1186 <
1187 <        f.complete(v1);
1188 <        checkIncomplete(h);
833 <        assertFalse(r.ran());
834 <        g.complete(v2);
835 <
836 <        checkCompletedNormally(h, subtract(v1, v2));
837 <        checkCompletedNormally(f, v1);
838 <        checkCompletedNormally(g, v2);
1183 >        final IncAction r = new IncAction();
1184 >        if (!createIncomplete) f.completeExceptionally(ex);
1185 >        final CompletableFuture<Void> g = m.thenAccept(f, r);
1186 >        if (createIncomplete) {
1187 >            checkIncomplete(g);
1188 >            f.completeExceptionally(ex);
1189          }
840    }
1190  
1191 <    public void testThenCombine_normalCompletion2() {
1191 >        checkCompletedWithWrappedCFException(g, ex);
1192 >        checkCompletedWithWrappedCFException(f, ex);
1193 >        assertEquals(0, r.invocationCount);
1194 >    }}
1195 >
1196 >    /**
1197 >     * thenAccept result completes exceptionally if action does
1198 >     */
1199 >    public void testThenAccept_actionFailed() {
1200          for (ExecutionMode m : ExecutionMode.values())
1201 +        for (boolean createIncomplete : new boolean[] { true, false })
1202          for (Integer v1 : new Integer[] { 1, null })
1203 <        for (Integer v2 : new Integer[] { 2, null }) {
846 <
1203 >    {
1204          final CompletableFuture<Integer> f = new CompletableFuture<>();
1205 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1206 <        final SubtractFunction r = new SubtractFunction();
1207 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1208 <
1209 <        g.complete(v2);
1210 <        checkIncomplete(h);
1211 <        assertFalse(r.ran());
855 <        f.complete(v1);
1205 >        final FailingConsumer r = new FailingConsumer();
1206 >        if (!createIncomplete) f.complete(v1);
1207 >        final CompletableFuture<Void> g = f.thenAccept(r);
1208 >        if (createIncomplete) {
1209 >            checkIncomplete(g);
1210 >            f.complete(v1);
1211 >        }
1212  
1213 <        checkCompletedNormally(h, subtract(v1, v2));
1213 >        checkCompletedWithWrappedCFException(g);
1214          checkCompletedNormally(f, v1);
1215 <        checkCompletedNormally(g, v2);
860 <        }
861 <    }
1215 >    }}
1216  
1217 <    public void testThenCombine_normalCompletion3() {
1217 >    /**
1218 >     * thenAccept result completes exceptionally if source cancelled
1219 >     */
1220 >    public void testThenAccept_sourceCancelled() {
1221          for (ExecutionMode m : ExecutionMode.values())
1222 <        for (Integer v1 : new Integer[] { 1, null })
1223 <        for (Integer v2 : new Integer[] { 2, null }) {
1224 <
1222 >        for (boolean createIncomplete : new boolean[] { true, false })
1223 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1224 >    {
1225          final CompletableFuture<Integer> f = new CompletableFuture<>();
1226 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1227 <        final SubtractFunction r = new SubtractFunction();
1228 <
1229 <        g.complete(v2);
1230 <        f.complete(v1);
1231 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
875 <
876 <        checkCompletedNormally(h, subtract(v1, v2));
877 <        checkCompletedNormally(f, v1);
878 <        checkCompletedNormally(g, v2);
1226 >        final IncAction r = new IncAction();
1227 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1228 >        final CompletableFuture<Void> g = f.thenAccept(r);
1229 >        if (createIncomplete) {
1230 >            checkIncomplete(g);
1231 >            assertTrue(f.cancel(mayInterruptIfRunning));
1232          }
880    }
1233  
1234 <    public void testThenCombine_normalCompletion4() {
1234 >        checkCompletedWithWrappedCancellationException(g);
1235 >        checkCancelled(f);
1236 >        assertEquals(0, r.invocationCount);
1237 >    }}
1238 >
1239 >    /**
1240 >     * thenCombine result completes normally after normal completion
1241 >     * of sources
1242 >     */
1243 >    public void testThenCombine_normalCompletion() {
1244          for (ExecutionMode m : ExecutionMode.values())
1245 +        for (boolean createIncomplete : new boolean[] { true, false })
1246 +        for (boolean fFirst : new boolean[] { true, false })
1247          for (Integer v1 : new Integer[] { 1, null })
1248 <        for (Integer v2 : new Integer[] { 2, null }) {
1249 <
1248 >        for (Integer v2 : new Integer[] { 2, null })
1249 >    {
1250          final CompletableFuture<Integer> f = new CompletableFuture<>();
1251          final CompletableFuture<Integer> g = new CompletableFuture<>();
1252          final SubtractFunction r = new SubtractFunction();
1253  
1254 <        f.complete(v1);
1255 <        g.complete(v2);
1254 >        if (fFirst) f.complete(v1); else g.complete(v2);
1255 >        if (!createIncomplete)
1256 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1257          final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1258 +        if (createIncomplete) {
1259 +            checkIncomplete(h);
1260 +            assertEquals(0, r.invocationCount);
1261 +            if (!fFirst) f.complete(v1); else g.complete(v2);
1262 +        }
1263  
1264          checkCompletedNormally(h, subtract(v1, v2));
1265          checkCompletedNormally(f, v1);
1266          checkCompletedNormally(g, v2);
1267 <        }
1268 <    }
1267 >        assertEquals(1, r.invocationCount);
1268 >    }}
1269  
1270      /**
1271       * thenCombine result completes exceptionally after exceptional
1272       * completion of either source
1273       */
1274 <    public void testThenCombine_exceptionalCompletion1() {
1274 >    public void testThenCombine_exceptionalCompletion() {
1275          for (ExecutionMode m : ExecutionMode.values())
1276 <        for (Integer v1 : new Integer[] { 1, null }) {
1277 <
1276 >        for (boolean createIncomplete : new boolean[] { true, false })
1277 >        for (boolean fFirst : new boolean[] { true, false })
1278 >        for (Integer v1 : new Integer[] { 1, null })
1279 >    {
1280          final CompletableFuture<Integer> f = new CompletableFuture<>();
1281          final CompletableFuture<Integer> g = new CompletableFuture<>();
911        final SubtractFunction r = new SubtractFunction();
912        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1282          final CFException ex = new CFException();
914
915        f.completeExceptionally(ex);
916        checkIncomplete(h);
917        g.complete(v1);
918
919        checkCompletedWithWrappedCFException(h, ex);
920        checkCompletedWithWrappedCFException(f, ex);
921        assertFalse(r.ran());
922        checkCompletedNormally(g, v1);
923        }
924    }
925
926    public void testThenCombine_exceptionalCompletion2() {
927        for (ExecutionMode m : ExecutionMode.values())
928        for (Integer v1 : new Integer[] { 1, null }) {
929
930        final CompletableFuture<Integer> f = new CompletableFuture<>();
931        final CompletableFuture<Integer> g = new CompletableFuture<>();
1283          final SubtractFunction r = new SubtractFunction();
933        final CompletableFuture<Integer> h = m.thenCombine(f, g, subtract);
934        final CFException ex = new CFException();
1284  
1285 <        g.completeExceptionally(ex);
1286 <        checkIncomplete(h);
1287 <        f.complete(v1);
939 <
940 <        checkCompletedWithWrappedCFException(h, ex);
941 <        checkCompletedWithWrappedCFException(g, ex);
942 <        assertFalse(r.ran());
943 <        checkCompletedNormally(f, v1);
944 <        }
945 <    }
946 <
947 <    public void testThenCombine_exceptionalCompletion3() {
948 <        for (ExecutionMode m : ExecutionMode.values())
949 <        for (Integer v1 : new Integer[] { 1, null }) {
950 <
951 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
952 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
953 <        final SubtractFunction r = new SubtractFunction();
954 <        final CFException ex = new CFException();
955 <
956 <        g.completeExceptionally(ex);
957 <        f.complete(v1);
1285 >        (fFirst ? f : g).complete(v1);
1286 >        if (!createIncomplete)
1287 >            (!fFirst ? f : g).completeExceptionally(ex);
1288          final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1289 <
1290 <        checkCompletedWithWrappedCFException(h, ex);
1291 <        checkCompletedWithWrappedCFException(g, ex);
962 <        assertFalse(r.ran());
963 <        checkCompletedNormally(f, v1);
1289 >        if (createIncomplete) {
1290 >            checkIncomplete(h);
1291 >            (!fFirst ? f : g).completeExceptionally(ex);
1292          }
965    }
966
967    public void testThenCombine_exceptionalCompletion4() {
968        for (ExecutionMode m : ExecutionMode.values())
969        for (Integer v1 : new Integer[] { 1, null }) {
970
971        final CompletableFuture<Integer> f = new CompletableFuture<>();
972        final CompletableFuture<Integer> g = new CompletableFuture<>();
973        final SubtractFunction r = new SubtractFunction();
974        final CFException ex = new CFException();
975
976        f.completeExceptionally(ex);
977        g.complete(v1);
978        final CompletableFuture<Integer> h = m.thenCombine(f, g, subtract);
1293  
1294          checkCompletedWithWrappedCFException(h, ex);
1295 <        checkCompletedWithWrappedCFException(f, ex);
1296 <        assertFalse(r.ran());
1297 <        checkCompletedNormally(g, v1);
1298 <        }
985 <    }
1295 >        assertEquals(0, r.invocationCount);
1296 >        checkCompletedNormally(fFirst ? f : g, v1);
1297 >        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1298 >    }}
1299  
1300      /**
1301       * thenCombine result completes exceptionally if action does
1302       */
1303 <    public void testThenCombine_actionFailed1() {
1303 >    public void testThenCombine_actionFailed() {
1304          for (ExecutionMode m : ExecutionMode.values())
1305 +        for (boolean fFirst : new boolean[] { true, false })
1306          for (Integer v1 : new Integer[] { 1, null })
1307 <        for (Integer v2 : new Integer[] { 2, null }) {
1308 <
1307 >        for (Integer v2 : new Integer[] { 2, null })
1308 >    {
1309          final CompletableFuture<Integer> f = new CompletableFuture<>();
1310          final CompletableFuture<Integer> g = new CompletableFuture<>();
1311          final FailingBiFunction r = new FailingBiFunction();
1312          final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1313  
1314 <        f.complete(v1);
1315 <        checkIncomplete(h);
1316 <        g.complete(v2);
1317 <
1318 <        checkCompletedWithWrappedCFException(h);
1319 <        checkCompletedNormally(f, v1);
1006 <        checkCompletedNormally(g, v2);
1314 >        if (fFirst) {
1315 >            f.complete(v1);
1316 >            g.complete(v2);
1317 >        } else {
1318 >            g.complete(v2);
1319 >            f.complete(v1);
1320          }
1008    }
1009
1010    public void testThenCombine_actionFailed2() {
1011        for (ExecutionMode m : ExecutionMode.values())
1012        for (Integer v1 : new Integer[] { 1, null })
1013        for (Integer v2 : new Integer[] { 2, null }) {
1014
1015        final CompletableFuture<Integer> f = new CompletableFuture<>();
1016        final CompletableFuture<Integer> g = new CompletableFuture<>();
1017        final FailingBiFunction r = new FailingBiFunction();
1018        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1019
1020        g.complete(v2);
1021        checkIncomplete(h);
1022        f.complete(v1);
1321  
1322          checkCompletedWithWrappedCFException(h);
1323          checkCompletedNormally(f, v1);
1324          checkCompletedNormally(g, v2);
1325 <        }
1028 <    }
1325 >    }}
1326  
1327      /**
1328       * thenCombine result completes exceptionally if either source cancelled
1329       */
1330 <    public void testThenCombine_sourceCancelled1() {
1034 <        for (ExecutionMode m : ExecutionMode.values())
1035 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1036 <        for (Integer v1 : new Integer[] { 1, null }) {
1037 <
1038 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1039 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1040 <        final SubtractFunction r = new SubtractFunction();
1041 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1042 <
1043 <        assertTrue(f.cancel(mayInterruptIfRunning));
1044 <        checkIncomplete(h);
1045 <        g.complete(v1);
1046 <
1047 <        checkCompletedWithWrappedCancellationException(h);
1048 <        checkCancelled(f);
1049 <        assertFalse(r.ran());
1050 <        checkCompletedNormally(g, v1);
1051 <        }
1052 <    }
1053 <
1054 <    public void testThenCombine_sourceCancelled2() {
1055 <        for (ExecutionMode m : ExecutionMode.values())
1056 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1057 <        for (Integer v1 : new Integer[] { 1, null }) {
1058 <
1059 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1060 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1061 <        final SubtractFunction r = new SubtractFunction();
1062 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1063 <
1064 <        assertTrue(g.cancel(mayInterruptIfRunning));
1065 <        checkIncomplete(h);
1066 <        f.complete(v1);
1067 <
1068 <        checkCompletedWithWrappedCancellationException(h);
1069 <        checkCancelled(g);
1070 <        assertFalse(r.ran());
1071 <        checkCompletedNormally(f, v1);
1072 <        }
1073 <    }
1074 <
1075 <    public void testThenCombine_sourceCancelled3() {
1330 >    public void testThenCombine_sourceCancelled() {
1331          for (ExecutionMode m : ExecutionMode.values())
1332          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1333 <        for (Integer v1 : new Integer[] { 1, null }) {
1334 <
1333 >        for (boolean createIncomplete : new boolean[] { true, false })
1334 >        for (boolean fFirst : new boolean[] { true, false })
1335 >        for (Integer v1 : new Integer[] { 1, null })
1336 >    {
1337          final CompletableFuture<Integer> f = new CompletableFuture<>();
1338          final CompletableFuture<Integer> g = new CompletableFuture<>();
1339          final SubtractFunction r = new SubtractFunction();
1340  
1341 <        assertTrue(g.cancel(mayInterruptIfRunning));
1342 <        f.complete(v1);
1341 >        (fFirst ? f : g).complete(v1);
1342 >        if (!createIncomplete)
1343 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1344          final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1345 <
1346 <        checkCompletedWithWrappedCancellationException(h);
1347 <        checkCancelled(g);
1090 <        assertFalse(r.ran());
1091 <        checkCompletedNormally(f, v1);
1345 >        if (createIncomplete) {
1346 >            checkIncomplete(h);
1347 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1348          }
1093    }
1094
1095    public void testThenCombine_sourceCancelled4() {
1096        for (ExecutionMode m : ExecutionMode.values())
1097        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1098        for (Integer v1 : new Integer[] { 1, null }) {
1099
1100        final CompletableFuture<Integer> f = new CompletableFuture<>();
1101        final CompletableFuture<Integer> g = new CompletableFuture<>();
1102        final SubtractFunction r = new SubtractFunction();
1103
1104        assertTrue(f.cancel(mayInterruptIfRunning));
1105        g.complete(v1);
1106        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1349  
1350          checkCompletedWithWrappedCancellationException(h);
1351 <        checkCancelled(f);
1352 <        assertFalse(r.ran());
1353 <        checkCompletedNormally(g, v1);
1354 <        }
1113 <    }
1351 >        checkCancelled(!fFirst ? f : g);
1352 >        assertEquals(0, r.invocationCount);
1353 >        checkCompletedNormally(fFirst ? f : g, v1);
1354 >    }}
1355  
1356      /**
1357       * thenAcceptBoth result completes normally after normal
# Line 1119 | Line 1360 | public class CompletableFutureTest exten
1360      public void testThenAcceptBoth_normalCompletion1() {
1361          for (ExecutionMode m : ExecutionMode.values())
1362          for (Integer v1 : new Integer[] { 1, null })
1363 <        for (Integer v2 : new Integer[] { 2, null }) {
1364 <
1363 >        for (Integer v2 : new Integer[] { 2, null })
1364 >    {
1365          final CompletableFuture<Integer> f = new CompletableFuture<>();
1366          final CompletableFuture<Integer> g = new CompletableFuture<>();
1367          final SubtractAction r = new SubtractAction();
# Line 1128 | Line 1369 | public class CompletableFutureTest exten
1369  
1370          f.complete(v1);
1371          checkIncomplete(h);
1372 <        assertEquals(r.value, 0);
1372 >        assertEquals(0, r.invocationCount);
1373          g.complete(v2);
1374  
1375          checkCompletedNormally(h, null);
1376 <        assertEquals(r.value, subtract(v1, v2));
1376 >        assertEquals(subtract(v1, v2), r.value);
1377          checkCompletedNormally(f, v1);
1378          checkCompletedNormally(g, v2);
1379 <        }
1139 <    }
1379 >    }}
1380  
1381      public void testThenAcceptBoth_normalCompletion2() {
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 1150 | Line 1390 | public class CompletableFutureTest exten
1390  
1391          g.complete(v2);
1392          checkIncomplete(h);
1393 <        assertEquals(r.value, 0);
1393 >        assertEquals(0, r.invocationCount);
1394          f.complete(v1);
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 <        }
1161 <    }
1400 >    }}
1401  
1402      public void testThenAcceptBoth_normalCompletion3() {
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 1174 | Line 1413 | public class CompletableFutureTest exten
1413          final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1414  
1415          checkCompletedNormally(h, null);
1416 <        assertEquals(r.value, subtract(v1, v2));
1416 >        assertEquals(subtract(v1, v2), r.value);
1417          checkCompletedNormally(f, v1);
1418          checkCompletedNormally(g, v2);
1419 <        }
1181 <    }
1419 >    }}
1420  
1421      public void testThenAcceptBoth_normalCompletion4() {
1422          for (ExecutionMode m : ExecutionMode.values())
1423          for (Integer v1 : new Integer[] { 1, null })
1424 <        for (Integer v2 : new Integer[] { 2, null }) {
1425 <
1424 >        for (Integer v2 : new Integer[] { 2, null })
1425 >    {
1426          final CompletableFuture<Integer> f = new CompletableFuture<>();
1427          final CompletableFuture<Integer> g = new CompletableFuture<>();
1428          final SubtractAction r = new SubtractAction();
# Line 1194 | Line 1432 | public class CompletableFutureTest exten
1432          final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1433  
1434          checkCompletedNormally(h, null);
1435 <        assertEquals(r.value, subtract(v1, v2));
1435 >        assertEquals(subtract(v1, v2), r.value);
1436          checkCompletedNormally(f, v1);
1437          checkCompletedNormally(g, v2);
1438 <        }
1201 <    }
1438 >    }}
1439  
1440      /**
1441       * thenAcceptBoth result completes exceptionally after exceptional
# Line 1206 | Line 1443 | public class CompletableFutureTest exten
1443       */
1444      public void testThenAcceptBoth_exceptionalCompletion1() {
1445          for (ExecutionMode m : ExecutionMode.values())
1446 <        for (Integer v1 : new Integer[] { 1, null }) {
1447 <
1446 >        for (Integer v1 : new Integer[] { 1, null })
1447 >    {
1448          final CompletableFuture<Integer> f = new CompletableFuture<>();
1449          final CompletableFuture<Integer> g = new CompletableFuture<>();
1450          final SubtractAction r = new SubtractAction();
# Line 1220 | Line 1457 | public class CompletableFutureTest exten
1457  
1458          checkCompletedWithWrappedCFException(h, ex);
1459          checkCompletedWithWrappedCFException(f, ex);
1460 <        assertFalse(r.ran());
1460 >        assertEquals(0, r.invocationCount);
1461          checkCompletedNormally(g, v1);
1462 <        }
1226 <    }
1462 >    }}
1463  
1464      public void testThenAcceptBoth_exceptionalCompletion2() {
1465          for (ExecutionMode m : ExecutionMode.values())
1466 <        for (Integer v1 : new Integer[] { 1, null }) {
1467 <
1466 >        for (Integer v1 : new Integer[] { 1, null })
1467 >    {
1468          final CompletableFuture<Integer> f = new CompletableFuture<>();
1469          final CompletableFuture<Integer> g = new CompletableFuture<>();
1470          final SubtractAction r = new SubtractAction();
# Line 1241 | Line 1477 | public class CompletableFutureTest exten
1477  
1478          checkCompletedWithWrappedCFException(h, ex);
1479          checkCompletedWithWrappedCFException(g, ex);
1480 <        assertFalse(r.ran());
1480 >        assertEquals(0, r.invocationCount);
1481          checkCompletedNormally(f, v1);
1482 <        }
1247 <    }
1482 >    }}
1483  
1484      public void testThenAcceptBoth_exceptionalCompletion3() {
1485          for (ExecutionMode m : ExecutionMode.values())
1486 <        for (Integer v1 : new Integer[] { 1, null }) {
1487 <
1486 >        for (Integer v1 : new Integer[] { 1, null })
1487 >    {
1488          final CompletableFuture<Integer> f = new CompletableFuture<>();
1489          final CompletableFuture<Integer> g = new CompletableFuture<>();
1490          final SubtractAction r = new SubtractAction();
# Line 1261 | Line 1496 | public class CompletableFutureTest exten
1496  
1497          checkCompletedWithWrappedCFException(h, ex);
1498          checkCompletedWithWrappedCFException(g, ex);
1499 <        assertFalse(r.ran());
1499 >        assertEquals(0, r.invocationCount);
1500          checkCompletedNormally(f, v1);
1501 <        }
1267 <    }
1501 >    }}
1502  
1503      public void testThenAcceptBoth_exceptionalCompletion4() {
1504          for (ExecutionMode m : ExecutionMode.values())
1505 <        for (Integer v1 : new Integer[] { 1, null }) {
1506 <
1505 >        for (Integer v1 : new Integer[] { 1, null })
1506 >    {
1507          final CompletableFuture<Integer> f = new CompletableFuture<>();
1508          final CompletableFuture<Integer> g = new CompletableFuture<>();
1509          final SubtractAction r = new SubtractAction();
# Line 1281 | Line 1515 | public class CompletableFutureTest exten
1515  
1516          checkCompletedWithWrappedCFException(h, ex);
1517          checkCompletedWithWrappedCFException(f, ex);
1518 <        assertFalse(r.ran());
1518 >        assertEquals(0, r.invocationCount);
1519          checkCompletedNormally(g, v1);
1520 <        }
1287 <    }
1520 >    }}
1521  
1522      /**
1523       * thenAcceptBoth result completes exceptionally if action does
# Line 1292 | Line 1525 | public class CompletableFutureTest exten
1525      public void testThenAcceptBoth_actionFailed1() {
1526          for (ExecutionMode m : ExecutionMode.values())
1527          for (Integer v1 : new Integer[] { 1, null })
1528 <        for (Integer v2 : new Integer[] { 2, null }) {
1529 <
1528 >        for (Integer v2 : new Integer[] { 2, null })
1529 >    {
1530          final CompletableFuture<Integer> f = new CompletableFuture<>();
1531          final CompletableFuture<Integer> g = new CompletableFuture<>();
1532          final FailingBiConsumer r = new FailingBiConsumer();
# Line 1306 | Line 1539 | public class CompletableFutureTest exten
1539          checkCompletedWithWrappedCFException(h);
1540          checkCompletedNormally(f, v1);
1541          checkCompletedNormally(g, v2);
1542 <        }
1310 <    }
1542 >    }}
1543  
1544      public void testThenAcceptBoth_actionFailed2() {
1545          for (ExecutionMode m : ExecutionMode.values())
1546          for (Integer v1 : new Integer[] { 1, null })
1547 <        for (Integer v2 : new Integer[] { 2, null }) {
1548 <
1547 >        for (Integer v2 : new Integer[] { 2, null })
1548 >    {
1549          final CompletableFuture<Integer> f = new CompletableFuture<>();
1550          final CompletableFuture<Integer> g = new CompletableFuture<>();
1551          final FailingBiConsumer r = new FailingBiConsumer();
# Line 1326 | Line 1558 | public class CompletableFutureTest exten
1558          checkCompletedWithWrappedCFException(h);
1559          checkCompletedNormally(f, v1);
1560          checkCompletedNormally(g, v2);
1561 <        }
1330 <    }
1561 >    }}
1562  
1563      /**
1564       * thenAcceptBoth result completes exceptionally if either source cancelled
# Line 1335 | Line 1566 | public class CompletableFutureTest exten
1566      public void testThenAcceptBoth_sourceCancelled1() {
1567          for (ExecutionMode m : ExecutionMode.values())
1568          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1569 <        for (Integer v1 : new Integer[] { 1, null }) {
1570 <
1569 >        for (Integer v1 : new Integer[] { 1, null })
1570 >    {
1571          final CompletableFuture<Integer> f = new CompletableFuture<>();
1572          final CompletableFuture<Integer> g = new CompletableFuture<>();
1573          final SubtractAction r = new SubtractAction();
# Line 1348 | Line 1579 | public class CompletableFutureTest exten
1579  
1580          checkCompletedWithWrappedCancellationException(h);
1581          checkCancelled(f);
1582 <        assertFalse(r.ran());
1582 >        assertEquals(0, r.invocationCount);
1583          checkCompletedNormally(g, v1);
1584 <        }
1354 <    }
1584 >    }}
1585  
1586      public void testThenAcceptBoth_sourceCancelled2() {
1587          for (ExecutionMode m : ExecutionMode.values())
1588          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1589 <        for (Integer v1 : new Integer[] { 1, null }) {
1590 <
1589 >        for (Integer v1 : new Integer[] { 1, null })
1590 >    {
1591          final CompletableFuture<Integer> f = new CompletableFuture<>();
1592          final CompletableFuture<Integer> g = new CompletableFuture<>();
1593          final SubtractAction r = new SubtractAction();
# Line 1369 | Line 1599 | public class CompletableFutureTest exten
1599  
1600          checkCompletedWithWrappedCancellationException(h);
1601          checkCancelled(g);
1602 <        assertFalse(r.ran());
1602 >        assertEquals(0, r.invocationCount);
1603          checkCompletedNormally(f, v1);
1604 <        }
1375 <    }
1604 >    }}
1605  
1606      public void testThenAcceptBoth_sourceCancelled3() {
1607          for (ExecutionMode m : ExecutionMode.values())
1608          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1609 <        for (Integer v1 : new Integer[] { 1, null }) {
1610 <
1609 >        for (Integer v1 : new Integer[] { 1, null })
1610 >    {
1611          final CompletableFuture<Integer> f = new CompletableFuture<>();
1612          final CompletableFuture<Integer> g = new CompletableFuture<>();
1613          final SubtractAction r = new SubtractAction();
# Line 1389 | Line 1618 | public class CompletableFutureTest exten
1618  
1619          checkCompletedWithWrappedCancellationException(h);
1620          checkCancelled(g);
1621 <        assertFalse(r.ran());
1621 >        assertEquals(0, r.invocationCount);
1622          checkCompletedNormally(f, v1);
1623 <        }
1395 <    }
1623 >    }}
1624  
1625      public void testThenAcceptBoth_sourceCancelled4() {
1626          for (ExecutionMode m : ExecutionMode.values())
1627          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1628 <        for (Integer v1 : new Integer[] { 1, null }) {
1629 <
1628 >        for (Integer v1 : new Integer[] { 1, null })
1629 >    {
1630          final CompletableFuture<Integer> f = new CompletableFuture<>();
1631          final CompletableFuture<Integer> g = new CompletableFuture<>();
1632          final SubtractAction r = new SubtractAction();
# Line 1409 | Line 1637 | public class CompletableFutureTest exten
1637  
1638          checkCompletedWithWrappedCancellationException(h);
1639          checkCancelled(f);
1640 <        assertFalse(r.ran());
1640 >        assertEquals(0, r.invocationCount);
1641          checkCompletedNormally(g, v1);
1642 <        }
1415 <    }
1642 >    }}
1643  
1644      /**
1645       * runAfterBoth result completes normally after normal
# Line 1421 | Line 1648 | public class CompletableFutureTest exten
1648      public void testRunAfterBoth_normalCompletion1() {
1649          for (ExecutionMode m : ExecutionMode.values())
1650          for (Integer v1 : new Integer[] { 1, null })
1651 <        for (Integer v2 : new Integer[] { 2, null }) {
1652 <
1651 >        for (Integer v2 : new Integer[] { 2, null })
1652 >    {
1653          final CompletableFuture<Integer> f = new CompletableFuture<>();
1654          final CompletableFuture<Integer> g = new CompletableFuture<>();
1655          final Noop r = new Noop();
# Line 1430 | Line 1657 | public class CompletableFutureTest exten
1657  
1658          f.complete(v1);
1659          checkIncomplete(h);
1660 <        assertFalse(r.ran);
1660 >        assertEquals(0, r.invocationCount);
1661          g.complete(v2);
1662  
1663          checkCompletedNormally(h, null);
1664 <        assertTrue(r.ran);
1664 >        assertEquals(1, r.invocationCount);
1665          checkCompletedNormally(f, v1);
1666          checkCompletedNormally(g, v2);
1667 <        }
1441 <    }
1667 >    }}
1668  
1669      public void testRunAfterBoth_normalCompletion2() {
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 1452 | Line 1678 | public class CompletableFutureTest exten
1678  
1679          g.complete(v2);
1680          checkIncomplete(h);
1681 <        assertFalse(r.ran);
1681 >        assertEquals(0, r.invocationCount);
1682          f.complete(v1);
1683  
1684          checkCompletedNormally(h, null);
1685 <        assertTrue(r.ran);
1685 >        assertEquals(1, r.invocationCount);
1686          checkCompletedNormally(f, v1);
1687          checkCompletedNormally(g, v2);
1688 <        }
1463 <    }
1688 >    }}
1689  
1690      public void testRunAfterBoth_normalCompletion3() {
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 1476 | Line 1701 | public class CompletableFutureTest exten
1701          final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1702  
1703          checkCompletedNormally(h, null);
1704 <        assertTrue(r.ran);
1704 >        assertEquals(1, r.invocationCount);
1705          checkCompletedNormally(f, v1);
1706          checkCompletedNormally(g, v2);
1707 <        }
1483 <    }
1707 >    }}
1708  
1709      public void testRunAfterBoth_normalCompletion4() {
1710          for (ExecutionMode m : ExecutionMode.values())
1711          for (Integer v1 : new Integer[] { 1, null })
1712 <        for (Integer v2 : new Integer[] { 2, null }) {
1713 <
1712 >        for (Integer v2 : new Integer[] { 2, null })
1713 >    {
1714          final CompletableFuture<Integer> f = new CompletableFuture<>();
1715          final CompletableFuture<Integer> g = new CompletableFuture<>();
1716          final Noop r = new Noop();
# Line 1496 | Line 1720 | public class CompletableFutureTest exten
1720          final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1721  
1722          checkCompletedNormally(h, null);
1723 <        assertTrue(r.ran);
1723 >        assertEquals(1, r.invocationCount);
1724          checkCompletedNormally(f, v1);
1725          checkCompletedNormally(g, v2);
1726 <        }
1503 <    }
1726 >    }}
1727  
1728      /**
1729       * runAfterBoth result completes exceptionally after exceptional
# Line 1508 | Line 1731 | public class CompletableFutureTest exten
1731       */
1732      public void testRunAfterBoth_exceptionalCompletion1() {
1733          for (ExecutionMode m : ExecutionMode.values())
1734 <        for (Integer v1 : new Integer[] { 1, null }) {
1735 <
1734 >        for (Integer v1 : new Integer[] { 1, null })
1735 >    {
1736          final CompletableFuture<Integer> f = new CompletableFuture<>();
1737          final CompletableFuture<Integer> g = new CompletableFuture<>();
1738          final Noop r = new Noop();
# Line 1522 | Line 1745 | public class CompletableFutureTest exten
1745  
1746          checkCompletedWithWrappedCFException(h, ex);
1747          checkCompletedWithWrappedCFException(f, ex);
1748 <        assertFalse(r.ran);
1748 >        assertEquals(0, r.invocationCount);
1749          checkCompletedNormally(g, v1);
1750 <        }
1528 <    }
1750 >    }}
1751  
1752      public void testRunAfterBoth_exceptionalCompletion2() {
1753          for (ExecutionMode m : ExecutionMode.values())
1754 <        for (Integer v1 : new Integer[] { 1, null }) {
1755 <
1754 >        for (Integer v1 : new Integer[] { 1, null })
1755 >    {
1756          final CompletableFuture<Integer> f = new CompletableFuture<>();
1757          final CompletableFuture<Integer> g = new CompletableFuture<>();
1758          final Noop r = new Noop();
# Line 1543 | Line 1765 | public class CompletableFutureTest exten
1765  
1766          checkCompletedWithWrappedCFException(h, ex);
1767          checkCompletedWithWrappedCFException(g, ex);
1768 <        assertFalse(r.ran);
1768 >        assertEquals(0, r.invocationCount);
1769          checkCompletedNormally(f, v1);
1770 <        }
1549 <    }
1770 >    }}
1771  
1772      public void testRunAfterBoth_exceptionalCompletion3() {
1773          for (ExecutionMode m : ExecutionMode.values())
1774 <        for (Integer v1 : new Integer[] { 1, null }) {
1775 <
1774 >        for (Integer v1 : new Integer[] { 1, null })
1775 >    {
1776          final CompletableFuture<Integer> f = new CompletableFuture<>();
1777          final CompletableFuture<Integer> g = new CompletableFuture<>();
1778          final Noop r = new Noop();
# Line 1563 | Line 1784 | public class CompletableFutureTest exten
1784  
1785          checkCompletedWithWrappedCFException(h, ex);
1786          checkCompletedWithWrappedCFException(g, ex);
1787 <        assertFalse(r.ran);
1787 >        assertEquals(0, r.invocationCount);
1788          checkCompletedNormally(f, v1);
1789 <        }
1569 <    }
1789 >    }}
1790  
1791      public void testRunAfterBoth_exceptionalCompletion4() {
1792          for (ExecutionMode m : ExecutionMode.values())
1793 <        for (Integer v1 : new Integer[] { 1, null }) {
1794 <
1793 >        for (Integer v1 : new Integer[] { 1, null })
1794 >    {
1795          final CompletableFuture<Integer> f = new CompletableFuture<>();
1796          final CompletableFuture<Integer> g = new CompletableFuture<>();
1797          final Noop r = new Noop();
# Line 1583 | Line 1803 | public class CompletableFutureTest exten
1803  
1804          checkCompletedWithWrappedCFException(h, ex);
1805          checkCompletedWithWrappedCFException(f, ex);
1806 <        assertFalse(r.ran);
1806 >        assertEquals(0, r.invocationCount);
1807          checkCompletedNormally(g, v1);
1808 <        }
1589 <    }
1808 >    }}
1809  
1810      /**
1811       * runAfterBoth result completes exceptionally if action does
# Line 1594 | Line 1813 | public class CompletableFutureTest exten
1813      public void testRunAfterBoth_actionFailed1() {
1814          for (ExecutionMode m : ExecutionMode.values())
1815          for (Integer v1 : new Integer[] { 1, null })
1816 <        for (Integer v2 : new Integer[] { 2, null }) {
1817 <
1816 >        for (Integer v2 : new Integer[] { 2, null })
1817 >    {
1818          final CompletableFuture<Integer> f = new CompletableFuture<>();
1819          final CompletableFuture<Integer> g = new CompletableFuture<>();
1820 <        final FailingNoop r = new FailingNoop();
1820 >        final FailingRunnable r = new FailingRunnable();
1821          final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1822  
1823          f.complete(v1);
# Line 1608 | Line 1827 | public class CompletableFutureTest exten
1827          checkCompletedWithWrappedCFException(h);
1828          checkCompletedNormally(f, v1);
1829          checkCompletedNormally(g, v2);
1830 <        }
1612 <    }
1830 >    }}
1831  
1832      public void testRunAfterBoth_actionFailed2() {
1833          for (ExecutionMode m : ExecutionMode.values())
1834          for (Integer v1 : new Integer[] { 1, null })
1835 <        for (Integer v2 : new Integer[] { 2, null }) {
1836 <
1835 >        for (Integer v2 : new Integer[] { 2, null })
1836 >    {
1837          final CompletableFuture<Integer> f = new CompletableFuture<>();
1838          final CompletableFuture<Integer> g = new CompletableFuture<>();
1839 <        final FailingNoop r = new FailingNoop();
1839 >        final FailingRunnable r = new FailingRunnable();
1840          final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1841  
1842          g.complete(v2);
# Line 1628 | Line 1846 | public class CompletableFutureTest exten
1846          checkCompletedWithWrappedCFException(h);
1847          checkCompletedNormally(f, v1);
1848          checkCompletedNormally(g, v2);
1849 <        }
1632 <    }
1849 >    }}
1850  
1851      /**
1852       * runAfterBoth result completes exceptionally if either source cancelled
# Line 1637 | Line 1854 | public class CompletableFutureTest exten
1854      public void testRunAfterBoth_sourceCancelled1() {
1855          for (ExecutionMode m : ExecutionMode.values())
1856          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1857 <        for (Integer v1 : new Integer[] { 1, null }) {
1858 <
1857 >        for (Integer v1 : new Integer[] { 1, null })
1858 >    {
1859          final CompletableFuture<Integer> f = new CompletableFuture<>();
1860          final CompletableFuture<Integer> g = new CompletableFuture<>();
1861          final Noop r = new Noop();
# Line 1650 | Line 1867 | public class CompletableFutureTest exten
1867  
1868          checkCompletedWithWrappedCancellationException(h);
1869          checkCancelled(f);
1870 <        assertFalse(r.ran);
1870 >        assertEquals(0, r.invocationCount);
1871          checkCompletedNormally(g, v1);
1872 <        }
1656 <    }
1872 >    }}
1873  
1874      public void testRunAfterBoth_sourceCancelled2() {
1875          for (ExecutionMode m : ExecutionMode.values())
1876          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1877 <        for (Integer v1 : new Integer[] { 1, null }) {
1878 <
1877 >        for (Integer v1 : new Integer[] { 1, null })
1878 >    {
1879          final CompletableFuture<Integer> f = new CompletableFuture<>();
1880          final CompletableFuture<Integer> g = new CompletableFuture<>();
1881          final Noop r = new Noop();
# Line 1671 | Line 1887 | public class CompletableFutureTest exten
1887  
1888          checkCompletedWithWrappedCancellationException(h);
1889          checkCancelled(g);
1890 <        assertFalse(r.ran);
1890 >        assertEquals(0, r.invocationCount);
1891          checkCompletedNormally(f, v1);
1892 <        }
1677 <    }
1892 >    }}
1893  
1894      public void testRunAfterBoth_sourceCancelled3() {
1895          for (ExecutionMode m : ExecutionMode.values())
1896          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1897 <        for (Integer v1 : new Integer[] { 1, null }) {
1898 <
1897 >        for (Integer v1 : new Integer[] { 1, null })
1898 >    {
1899          final CompletableFuture<Integer> f = new CompletableFuture<>();
1900          final CompletableFuture<Integer> g = new CompletableFuture<>();
1901          final Noop r = new Noop();
# Line 1691 | Line 1906 | public class CompletableFutureTest exten
1906  
1907          checkCompletedWithWrappedCancellationException(h);
1908          checkCancelled(g);
1909 <        assertFalse(r.ran);
1909 >        assertEquals(0, r.invocationCount);
1910          checkCompletedNormally(f, v1);
1911 <        }
1697 <    }
1911 >    }}
1912  
1913      public void testRunAfterBoth_sourceCancelled4() {
1914          for (ExecutionMode m : ExecutionMode.values())
1915          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1916 <        for (Integer v1 : new Integer[] { 1, null }) {
1917 <
1916 >        for (Integer v1 : new Integer[] { 1, null })
1917 >    {
1918          final CompletableFuture<Integer> f = new CompletableFuture<>();
1919          final CompletableFuture<Integer> g = new CompletableFuture<>();
1920          final Noop r = new Noop();
# Line 1711 | Line 1925 | public class CompletableFutureTest exten
1925  
1926          checkCompletedWithWrappedCancellationException(h);
1927          checkCancelled(f);
1928 <        assertFalse(r.ran);
1928 >        assertEquals(0, r.invocationCount);
1929          checkCompletedNormally(g, v1);
1930 <        }
1717 <    }
1930 >    }}
1931  
1932      /**
1933       * applyToEither result completes normally after normal completion
1934       * of either source
1935       */
1936 <    public void testApplyToEither() {
1937 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1938 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1939 <        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
1940 <        f.complete(one);
1941 <        checkCompletedNormally(g, two);
1942 <        f2.complete(one);
1943 <        checkCompletedNormally(g, two);
1936 >    public void testApplyToEither_normalCompletion1() {
1937 >        for (ExecutionMode m : ExecutionMode.values())
1938 >        for (Integer v1 : new Integer[] { 1, null })
1939 >        for (Integer v2 : new Integer[] { 2, null })
1940 >    {
1941 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1942 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1943 >        final IncFunction r = new IncFunction();
1944 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1945  
1946 <        f = new CompletableFuture<>();
1947 <        f.complete(one);
1948 <        f2 = new CompletableFuture<>();
1735 <        g = f.applyToEither(f2, inc);
1736 <        checkCompletedNormally(g, two);
1737 <    }
1946 >        f.complete(v1);
1947 >        checkCompletedNormally(h, inc(v1));
1948 >        g.complete(v2);
1949  
1950 <    /**
1951 <     * applyToEither result completes exceptionally after exceptional
1952 <     * completion of either source
1953 <     */
1743 <    public void testApplyToEither2() {
1744 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1745 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1746 <        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
1747 <        f.completeExceptionally(new CFException());
1748 <        f2.complete(one);
1749 <        checkCompletedWithWrappedCFException(g);
1950 >        checkCompletedNormally(f, v1);
1951 >        checkCompletedNormally(g, v2);
1952 >        checkCompletedNormally(h, inc(v1));
1953 >    }}
1954  
1955 <        f = new CompletableFuture<>();
1956 <        f2 = new CompletableFuture<>();
1957 <        f2.completeExceptionally(new CFException());
1958 <        g = f.applyToEither(f2, inc);
1959 <        checkCompletedWithWrappedCFException(g);
1960 <    }
1955 >    public void testApplyToEither_normalCompletion2() {
1956 >        for (ExecutionMode m : ExecutionMode.values())
1957 >        for (Integer v1 : new Integer[] { 1, null })
1958 >        for (Integer v2 : new Integer[] { 2, null })
1959 >    {
1960 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1961 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1962 >        final IncFunction r = new IncFunction();
1963 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1964  
1965 <    /**
1966 <     * applyToEither result completes exceptionally if action does
1967 <     */
1761 <    public void testApplyToEither3() {
1762 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1763 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1764 <        FailingFunction r = new FailingFunction();
1765 <        CompletableFuture<Integer> g = f.applyToEither(f2, r);
1766 <        f2.complete(two);
1767 <        checkCompletedWithWrappedCFException(g);
1768 <    }
1965 >        g.complete(v2);
1966 >        checkCompletedNormally(h, inc(v2));
1967 >        f.complete(v1);
1968  
1969 <    /**
1970 <     * applyToEither result completes exceptionally if either source cancelled
1971 <     */
1972 <    public void testApplyToEither4() {
1774 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1775 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1776 <        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
1777 <        assertTrue(f.cancel(true));
1778 <        checkCompletedWithWrappedCancellationException(g);
1779 <        f = new CompletableFuture<>();
1780 <        f2 = new CompletableFuture<>();
1781 <        assertTrue(f2.cancel(true));
1782 <        checkCompletedWithWrappedCancellationException(g);
1783 <    }
1969 >        checkCompletedNormally(f, v1);
1970 >        checkCompletedNormally(g, v2);
1971 >        checkCompletedNormally(h, inc(v2));
1972 >        }}
1973  
1974 <    /**
1975 <     * acceptEither result completes normally after normal completion
1976 <     * of either source
1977 <     */
1978 <    public void testAcceptEither() {
1979 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1980 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1981 <        IncAction r = new IncAction();
1793 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
1794 <        f.complete(one);
1795 <        checkCompletedNormally(g, null);
1796 <        f2.complete(one);
1797 <        checkCompletedNormally(g, null);
1798 <        assertEquals(r.value, 2);
1974 >    public void testApplyToEither_normalCompletion3() {
1975 >        for (ExecutionMode m : ExecutionMode.values())
1976 >        for (Integer v1 : new Integer[] { 1, null })
1977 >        for (Integer v2 : new Integer[] { 2, null })
1978 >    {
1979 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1980 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1981 >        final IncFunction r = new IncFunction();
1982  
1983 <        r = new IncAction();
1984 <        f = new CompletableFuture<>();
1985 <        f.complete(one);
1986 <        f2 = new CompletableFuture<>();
1987 <        g = f.acceptEither(f2, r);
1988 <        checkCompletedNormally(g, null);
1989 <        assertEquals(r.value, 2);
1990 <    }
1983 >        f.complete(v1);
1984 >        g.complete(v2);
1985 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1986 >
1987 >        checkCompletedNormally(f, v1);
1988 >        checkCompletedNormally(g, v2);
1989 >
1990 >        // unspecified behavior
1991 >        assertTrue(Objects.equals(h.join(), inc(v1)) ||
1992 >                   Objects.equals(h.join(), inc(v2)));
1993 >        assertEquals(1, r.invocationCount);
1994 >    }}
1995  
1996      /**
1997 <     * acceptEither result completes exceptionally after exceptional
1997 >     * applyToEither result completes exceptionally after exceptional
1998       * completion of either source
1999       */
2000 <    public void testAcceptEither2() {
2001 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2002 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2003 <        IncAction r = new IncAction();
2004 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
2005 <        f.completeExceptionally(new CFException());
2006 <        f2.complete(one);
2007 <        checkCompletedWithWrappedCFException(g);
2000 >    public void testApplyToEither_exceptionalCompletion1() {
2001 >        for (ExecutionMode m : ExecutionMode.values())
2002 >        for (Integer v1 : new Integer[] { 1, null })
2003 >    {
2004 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2005 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2006 >        final IncFunction r = new IncFunction();
2007 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2008 >        final CFException ex = new CFException();
2009  
2010 <        r = new IncAction();
2011 <        f = new CompletableFuture<>();
2012 <        f2 = new CompletableFuture<>();
1825 <        f2.completeExceptionally(new CFException());
1826 <        g = f.acceptEither(f2, r);
1827 <        checkCompletedWithWrappedCFException(g);
1828 <    }
2010 >        f.completeExceptionally(ex);
2011 >        checkCompletedWithWrappedCFException(h, ex);
2012 >        g.complete(v1);
2013  
2014 <    /**
2015 <     * acceptEither result completes exceptionally if action does
2016 <     */
2017 <    public void testAcceptEither3() {
2018 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1835 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1836 <        FailingConsumer r = new FailingConsumer();
1837 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
1838 <        f2.complete(two);
1839 <        checkCompletedWithWrappedCFException(g);
1840 <    }
2014 >        assertEquals(0, r.invocationCount);
2015 >        checkCompletedNormally(g, v1);
2016 >        checkCompletedWithWrappedCFException(f, ex);
2017 >        checkCompletedWithWrappedCFException(h, ex);
2018 >    }}
2019  
2020 <    /**
2021 <     * acceptEither result completes exceptionally if either source cancelled
2022 <     */
2023 <    public void testAcceptEither4() {
2024 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2025 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2026 <        IncAction r = new IncAction();
2027 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
2028 <        assertTrue(f.cancel(true));
1851 <        checkCompletedWithWrappedCancellationException(g);
1852 <        f = new CompletableFuture<>();
1853 <        f2 = new CompletableFuture<>();
1854 <        assertTrue(f2.cancel(true));
1855 <        checkCompletedWithWrappedCancellationException(g);
1856 <    }
2020 >    public void testApplyToEither_exceptionalCompletion2() {
2021 >        for (ExecutionMode m : ExecutionMode.values())
2022 >        for (Integer v1 : new Integer[] { 1, null })
2023 >    {
2024 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2025 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2026 >        final IncFunction r = new IncFunction();
2027 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2028 >        final CFException ex = new CFException();
2029  
2030 <    /**
2031 <     * runAfterEither result completes normally after normal completion
2032 <     * of either source
1861 <     */
1862 <    public void testRunAfterEither() {
1863 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1864 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1865 <        Noop r = new Noop();
1866 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
1867 <        f.complete(one);
1868 <        checkCompletedNormally(g, null);
1869 <        f2.complete(one);
1870 <        checkCompletedNormally(g, null);
1871 <        assertTrue(r.ran);
2030 >        g.completeExceptionally(ex);
2031 >        checkCompletedWithWrappedCFException(h, ex);
2032 >        f.complete(v1);
2033  
2034 <        r = new Noop();
2035 <        f = new CompletableFuture<>();
2036 <        f.complete(one);
2037 <        f2 = new CompletableFuture<>();
2038 <        g = f.runAfterEither(f2, r);
1878 <        checkCompletedNormally(g, null);
1879 <        assertTrue(r.ran);
1880 <    }
2034 >        assertEquals(0, r.invocationCount);
2035 >        checkCompletedNormally(f, v1);
2036 >        checkCompletedWithWrappedCFException(g, ex);
2037 >        checkCompletedWithWrappedCFException(h, ex);
2038 >    }}
2039  
2040 <    /**
2041 <     * runAfterEither result completes exceptionally after exceptional
2042 <     * completion of either source
2043 <     */
2044 <    public void testRunAfterEither2() {
2045 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2046 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2047 <        Noop r = new Noop();
1890 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
1891 <        f.completeExceptionally(new CFException());
1892 <        f2.complete(one);
1893 <        checkCompletedWithWrappedCFException(g);
2040 >    public void testApplyToEither_exceptionalCompletion3() {
2041 >        for (ExecutionMode m : ExecutionMode.values())
2042 >        for (Integer v1 : new Integer[] { 1, null })
2043 >    {
2044 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2045 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2046 >        final IncFunction r = new IncFunction();
2047 >        final CFException ex = new CFException();
2048  
2049 <        r = new Noop();
2050 <        f = new CompletableFuture<>();
2051 <        f2 = new CompletableFuture<>();
1898 <        f2.completeExceptionally(new CFException());
1899 <        g = f.runAfterEither(f2, r);
1900 <        checkCompletedWithWrappedCFException(g);
1901 <    }
2049 >        g.completeExceptionally(ex);
2050 >        f.complete(v1);
2051 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2052  
2053 <    /**
2054 <     * runAfterEither result completes exceptionally if action does
2055 <     */
2056 <    public void testRunAfterEither3() {
2057 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2058 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2059 <        FailingNoop r = new FailingNoop();
2060 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
2061 <        f2.complete(two);
1912 <        checkCompletedWithWrappedCFException(g);
1913 <    }
2053 >        // unspecified behavior
2054 >        Integer v;
2055 >        try {
2056 >            assertEquals(inc(v1), h.join());
2057 >            assertEquals(1, r.invocationCount);
2058 >        } catch (CompletionException ok) {
2059 >            checkCompletedWithWrappedCFException(h, ex);
2060 >            assertEquals(0, r.invocationCount);
2061 >        }
2062  
2063 <    /**
2064 <     * runAfterEither result completes exceptionally if either source cancelled
2065 <     */
1918 <    public void testRunAfterEither4() {
1919 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1920 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1921 <        Noop r = new Noop();
1922 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
1923 <        assertTrue(f.cancel(true));
1924 <        checkCompletedWithWrappedCancellationException(g);
1925 <        f = new CompletableFuture<>();
1926 <        f2 = new CompletableFuture<>();
1927 <        assertTrue(f2.cancel(true));
1928 <        checkCompletedWithWrappedCancellationException(g);
1929 <    }
2063 >        checkCompletedWithWrappedCFException(g, ex);
2064 >        checkCompletedNormally(f, v1);
2065 >    }}
2066  
2067 <    /**
2068 <     * thenCompose result completes normally after normal completion of source
2069 <     */
2070 <    public void testThenCompose() {
2071 <        CompletableFuture<Integer> f, g;
2072 <        CompletableFutureInc r;
2067 >    public void testApplyToEither_exceptionalCompletion4() {
2068 >        for (ExecutionMode m : ExecutionMode.values())
2069 >        for (Integer v1 : new Integer[] { 1, null })
2070 >    {
2071 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2072 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2073 >        final IncFunction r = new IncFunction();
2074 >        final CFException ex = new CFException();
2075  
2076 <        f = new CompletableFuture<>();
2077 <        g = f.thenCompose(r = new CompletableFutureInc());
2078 <        f.complete(one);
1941 <        checkCompletedNormally(g, two);
1942 <        assertTrue(r.ran);
2076 >        f.completeExceptionally(ex);
2077 >        g.complete(v1);
2078 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2079  
2080 <        f = new CompletableFuture<>();
2081 <        f.complete(one);
2082 <        g = f.thenCompose(r = new CompletableFutureInc());
2083 <        checkCompletedNormally(g, two);
2084 <        assertTrue(r.ran);
2085 <    }
2080 >        // unspecified behavior
2081 >        Integer v;
2082 >        try {
2083 >            assertEquals(inc(v1), h.join());
2084 >            assertEquals(1, r.invocationCount);
2085 >        } catch (CompletionException ok) {
2086 >            checkCompletedWithWrappedCFException(h, ex);
2087 >            assertEquals(0, r.invocationCount);
2088 >        }
2089 >
2090 >        checkCompletedWithWrappedCFException(f, ex);
2091 >        checkCompletedNormally(g, v1);
2092 >    }}
2093  
2094      /**
2095 <     * thenCompose result completes exceptionally after exceptional
1953 <     * completion of source
2095 >     * applyToEither result completes exceptionally if action does
2096       */
2097 <    public void testThenCompose2() {
2098 <        CompletableFuture<Integer> f, g;
2099 <        CompletableFutureInc r;
2097 >    public void testApplyToEither_actionFailed1() {
2098 >        for (ExecutionMode m : ExecutionMode.values())
2099 >        for (Integer v1 : new Integer[] { 1, null })
2100 >        for (Integer v2 : new Integer[] { 2, null })
2101 >    {
2102 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2103 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2104 >        final FailingFunction r = new FailingFunction();
2105 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2106  
2107 <        f = new CompletableFuture<>();
2108 <        g = f.thenCompose(r = new CompletableFutureInc());
2109 <        f.completeExceptionally(new CFException());
2110 <        checkCompletedWithWrappedCFException(g);
2107 >        f.complete(v1);
2108 >        checkCompletedWithWrappedCFException(h);
2109 >        g.complete(v2);
2110 >        checkCompletedNormally(f, v1);
2111 >        checkCompletedNormally(g, v2);
2112 >    }}
2113  
2114 <        f = new CompletableFuture<>();
2115 <        f.completeExceptionally(new CFException());
2116 <        g = f.thenCompose(r = new CompletableFutureInc());
2117 <        checkCompletedWithWrappedCFException(g);
2118 <    }
2114 >    public void testApplyToEither_actionFailed2() {
2115 >        for (ExecutionMode m : ExecutionMode.values())
2116 >        for (Integer v1 : new Integer[] { 1, null })
2117 >        for (Integer v2 : new Integer[] { 2, null })
2118 >    {
2119 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2120 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2121 >        final FailingFunction r = new FailingFunction();
2122 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2123 >
2124 >        g.complete(v2);
2125 >        checkCompletedWithWrappedCFException(h);
2126 >        f.complete(v1);
2127 >        checkCompletedNormally(f, v1);
2128 >        checkCompletedNormally(g, v2);
2129 >    }}
2130  
2131      /**
2132 <     * thenCompose result completes exceptionally if action does
2132 >     * applyToEither result completes exceptionally if either source cancelled
2133       */
2134 <    public void testThenCompose3() {
2135 <        CompletableFuture<Integer> f, g;
2136 <        FailingCompletableFutureFunction r;
2134 >    public void testApplyToEither_sourceCancelled1() {
2135 >        for (ExecutionMode m : ExecutionMode.values())
2136 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2137 >        for (Integer v1 : new Integer[] { 1, null })
2138 >    {
2139 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2140 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2141 >        final IncFunction r = new IncFunction();
2142 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2143  
2144 <        f = new CompletableFuture<>();
2145 <        g = f.thenCompose(r = new FailingCompletableFutureFunction());
2146 <        f.complete(one);
1980 <        checkCompletedWithWrappedCFException(g);
2144 >        assertTrue(f.cancel(mayInterruptIfRunning));
2145 >        checkCompletedWithWrappedCancellationException(h);
2146 >        g.complete(v1);
2147  
2148 <        f = new CompletableFuture<>();
2149 <        f.complete(one);
2150 <        g = f.thenCompose(r = new FailingCompletableFutureFunction());
2151 <        checkCompletedWithWrappedCFException(g);
2152 <    }
2148 >        checkCancelled(f);
2149 >        assertEquals(0, r.invocationCount);
2150 >        checkCompletedNormally(g, v1);
2151 >        checkCompletedWithWrappedCancellationException(h);
2152 >    }}
2153  
2154 <    /**
2155 <     * thenCompose result completes exceptionally if source cancelled
2156 <     */
2157 <    public void testThenCompose4() {
2158 <        CompletableFuture<Integer> f, g;
2159 <        CompletableFutureInc r;
2154 >    public void testApplyToEither_sourceCancelled2() {
2155 >        for (ExecutionMode m : ExecutionMode.values())
2156 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2157 >        for (Integer v1 : new Integer[] { 1, null })
2158 >    {
2159 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2160 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2161 >        final IncFunction r = new IncFunction();
2162 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2163  
2164 <        f = new CompletableFuture<>();
2165 <        g = f.thenCompose(r = new CompletableFutureInc());
2166 <        assertTrue(f.cancel(true));
1998 <        checkCompletedWithWrappedCancellationException(g);
2164 >        assertTrue(g.cancel(mayInterruptIfRunning));
2165 >        checkCompletedWithWrappedCancellationException(h);
2166 >        f.complete(v1);
2167  
2168 <        f = new CompletableFuture<>();
2169 <        assertTrue(f.cancel(true));
2170 <        g = f.thenCompose(r = new CompletableFutureInc());
2171 <        checkCompletedWithWrappedCancellationException(g);
2172 <    }
2168 >        checkCancelled(g);
2169 >        assertEquals(0, r.invocationCount);
2170 >        checkCompletedNormally(f, v1);
2171 >        checkCompletedWithWrappedCancellationException(h);
2172 >    }}
2173  
2174 <    // asyncs
2174 >    public void testApplyToEither_sourceCancelled3() {
2175 >        for (ExecutionMode m : ExecutionMode.values())
2176 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2177 >        for (Integer v1 : new Integer[] { 1, null })
2178 >    {
2179 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2180 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2181 >        final IncFunction r = new IncFunction();
2182  
2183 <    /**
2184 <     * thenRunAsync result completes normally after normal completion of source
2185 <     */
2011 <    public void testThenRunAsync() {
2012 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2013 <        Noop r = new Noop();
2014 <        CompletableFuture<Void> g = f.thenRunAsync(r);
2015 <        f.complete(null);
2016 <        checkCompletedNormally(g, null);
2183 >        assertTrue(g.cancel(mayInterruptIfRunning));
2184 >        f.complete(v1);
2185 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2186  
2187 <        // reordered version
2188 <        f = new CompletableFuture<>();
2189 <        f.complete(null);
2190 <        r = new Noop();
2191 <        g = f.thenRunAsync(r);
2192 <        checkCompletedNormally(g, null);
2193 <    }
2187 >        // unspecified behavior
2188 >        Integer v;
2189 >        try {
2190 >            assertEquals(inc(v1), h.join());
2191 >            assertEquals(1, r.invocationCount);
2192 >        } catch (CompletionException ok) {
2193 >            checkCompletedWithWrappedCancellationException(h);
2194 >            assertEquals(0, r.invocationCount);
2195 >        }
2196  
2197 <    /**
2198 <     * thenRunAsync result completes exceptionally after exceptional
2199 <     * completion of source
2200 <     */
2201 <    public void testThenRunAsync2() {
2202 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2203 <        Noop r = new Noop();
2204 <        CompletableFuture<Void> g = f.thenRunAsync(r);
2205 <        f.completeExceptionally(new CFException());
2197 >        checkCancelled(g);
2198 >        checkCompletedNormally(f, v1);
2199 >    }}
2200 >
2201 >    public void testApplyToEither_sourceCancelled4() {
2202 >        for (ExecutionMode m : ExecutionMode.values())
2203 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2204 >        for (Integer v1 : new Integer[] { 1, null })
2205 >    {
2206 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2207 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2208 >        final IncFunction r = new IncFunction();
2209 >
2210 >        assertTrue(f.cancel(mayInterruptIfRunning));
2211 >        g.complete(v1);
2212 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2213 >
2214 >        // unspecified behavior
2215 >        Integer v;
2216          try {
2217 <            g.join();
2218 <            shouldThrow();
2219 <        } catch (CompletionException success) {}
2220 <        checkCompletedWithWrappedCFException(g);
2221 <    }
2217 >            assertEquals(inc(v1), h.join());
2218 >            assertEquals(1, r.invocationCount);
2219 >        } catch (CompletionException ok) {
2220 >            checkCompletedWithWrappedCancellationException(h);
2221 >            assertEquals(0, r.invocationCount);
2222 >        }
2223  
2224 <    /**
2225 <     * thenRunAsync result completes exceptionally if action does
2226 <     */
2045 <    public void testThenRunAsync3() {
2046 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2047 <        FailingNoop r = new FailingNoop();
2048 <        CompletableFuture<Void> g = f.thenRunAsync(r);
2049 <        f.complete(null);
2050 <        checkCompletedWithWrappedCFException(g);
2051 <    }
2224 >        checkCancelled(f);
2225 >        checkCompletedNormally(g, v1);
2226 >    }}
2227  
2228      /**
2229 <     * thenRunAsync result completes exceptionally if source cancelled
2229 >     * acceptEither result completes normally after normal completion
2230 >     * of either source
2231       */
2232 <    public void testThenRunAsync4() {
2233 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2234 <        Noop r = new Noop();
2235 <        CompletableFuture<Void> g = f.thenRunAsync(r);
2236 <        assertTrue(f.cancel(true));
2237 <        checkCompletedWithWrappedCancellationException(g);
2238 <    }
2232 >    public void testAcceptEither_normalCompletion1() {
2233 >        for (ExecutionMode m : ExecutionMode.values())
2234 >        for (Integer v1 : new Integer[] { 1, null })
2235 >        for (Integer v2 : new Integer[] { 2, null })
2236 >    {
2237 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2238 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2239 >        final IncAction r = new IncAction();
2240 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2241  
2242 <    /**
2243 <     * thenApplyAsync result completes normally after normal completion of source
2244 <     */
2245 <    public void testThenApplyAsync() {
2068 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2069 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
2070 <        f.complete(one);
2071 <        checkCompletedNormally(g, two);
2072 <    }
2242 >        f.complete(v1);
2243 >        checkCompletedNormally(h, null);
2244 >        assertEquals(inc(v1), r.value);
2245 >        g.complete(v2);
2246  
2247 <    /**
2248 <     * thenApplyAsync result completes exceptionally after exceptional
2249 <     * completion of source
2250 <     */
2078 <    public void testThenApplyAsync2() {
2079 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2080 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
2081 <        f.completeExceptionally(new CFException());
2082 <        checkCompletedWithWrappedCFException(g);
2083 <    }
2247 >        checkCompletedNormally(f, v1);
2248 >        checkCompletedNormally(g, v2);
2249 >        checkCompletedNormally(h, null);
2250 >    }}
2251  
2252 <    /**
2253 <     * thenApplyAsync result completes exceptionally if action does
2254 <     */
2255 <    public void testThenApplyAsync3() {
2256 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2257 <        FailingFunction r = new FailingFunction();
2258 <        CompletableFuture<Integer> g = f.thenApplyAsync(r);
2259 <        f.complete(null);
2260 <        checkCompletedWithWrappedCFException(g);
2094 <    }
2252 >    public void testAcceptEither_normalCompletion2() {
2253 >        for (ExecutionMode m : ExecutionMode.values())
2254 >        for (Integer v1 : new Integer[] { 1, null })
2255 >        for (Integer v2 : new Integer[] { 2, null })
2256 >    {
2257 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2258 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2259 >        final IncAction r = new IncAction();
2260 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2261  
2262 <    /**
2263 <     * thenApplyAsync result completes exceptionally if source cancelled
2264 <     */
2265 <    public void testThenApplyAsync4() {
2100 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2101 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
2102 <        assertTrue(f.cancel(true));
2103 <        checkCompletedWithWrappedCancellationException(g);
2104 <    }
2262 >        g.complete(v2);
2263 >        checkCompletedNormally(h, null);
2264 >        assertEquals(inc(v2), r.value);
2265 >        f.complete(v1);
2266  
2267 <    /**
2268 <     * thenAcceptAsync result completes normally after normal
2269 <     * completion of source
2270 <     */
2110 <    public void testThenAcceptAsync() {
2111 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2112 <        IncAction r = new IncAction();
2113 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2114 <        f.complete(one);
2115 <        checkCompletedNormally(g, null);
2116 <        assertEquals(r.value, 2);
2117 <    }
2267 >        checkCompletedNormally(f, v1);
2268 >        checkCompletedNormally(g, v2);
2269 >        checkCompletedNormally(h, null);
2270 >    }}
2271  
2272 <    /**
2273 <     * thenAcceptAsync result completes exceptionally after exceptional
2274 <     * completion of source
2275 <     */
2276 <    public void testThenAcceptAsync2() {
2277 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2278 <        IncAction r = new IncAction();
2279 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2127 <        f.completeExceptionally(new CFException());
2128 <        checkCompletedWithWrappedCFException(g);
2129 <    }
2272 >    public void testAcceptEither_normalCompletion3() {
2273 >        for (ExecutionMode m : ExecutionMode.values())
2274 >        for (Integer v1 : new Integer[] { 1, null })
2275 >        for (Integer v2 : new Integer[] { 2, null })
2276 >    {
2277 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2278 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2279 >        final IncAction r = new IncAction();
2280  
2281 <    /**
2282 <     * thenAcceptAsync result completes exceptionally if action does
2283 <     */
2134 <    public void testThenAcceptAsync3() {
2135 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2136 <        FailingConsumer r = new FailingConsumer();
2137 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2138 <        f.complete(null);
2139 <        checkCompletedWithWrappedCFException(g);
2140 <    }
2281 >        f.complete(v1);
2282 >        g.complete(v2);
2283 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2284  
2285 <    /**
2286 <     * thenAcceptAsync result completes exceptionally if source cancelled
2287 <     */
2288 <    public void testThenAcceptAsync4() {
2289 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2290 <        IncAction r = new IncAction();
2291 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2292 <        assertTrue(f.cancel(true));
2150 <        checkCompletedWithWrappedCancellationException(g);
2151 <    }
2285 >        checkCompletedNormally(h, null);
2286 >        checkCompletedNormally(f, v1);
2287 >        checkCompletedNormally(g, v2);
2288 >
2289 >        // unspecified behavior
2290 >        assertTrue(Objects.equals(r.value, inc(v1)) ||
2291 >                   Objects.equals(r.value, inc(v2)));
2292 >    }}
2293  
2294      /**
2295 <     * applyToEitherAsync result completes normally after normal
2296 <     * completion of sources
2295 >     * acceptEither result completes exceptionally after exceptional
2296 >     * completion of either source
2297       */
2298 <    public void testApplyToEitherAsync() {
2299 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2300 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2301 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
2302 <        f.complete(one);
2303 <        checkCompletedNormally(g, two);
2298 >    public void testAcceptEither_exceptionalCompletion1() {
2299 >        for (ExecutionMode m : ExecutionMode.values())
2300 >        for (Integer v1 : new Integer[] { 1, null })
2301 >    {
2302 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2303 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2304 >        final IncAction r = new IncAction();
2305 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2306 >        final CFException ex = new CFException();
2307  
2308 <        f = new CompletableFuture<>();
2309 <        f.complete(one);
2310 <        f2 = new CompletableFuture<>();
2167 <        g = f.applyToEitherAsync(f2, inc);
2168 <        checkCompletedNormally(g, two);
2169 <    }
2308 >        f.completeExceptionally(ex);
2309 >        checkCompletedWithWrappedCFException(h, ex);
2310 >        g.complete(v1);
2311  
2312 <    /**
2313 <     * applyToEitherAsync result completes exceptionally after exceptional
2314 <     * completion of source
2315 <     */
2316 <    public void testApplyToEitherAsync2() {
2176 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2177 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2178 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
2179 <        f.completeExceptionally(new CFException());
2180 <        checkCompletedWithWrappedCFException(g);
2312 >        assertEquals(0, r.invocationCount);
2313 >        checkCompletedNormally(g, v1);
2314 >        checkCompletedWithWrappedCFException(f, ex);
2315 >        checkCompletedWithWrappedCFException(h, ex);
2316 >    }}
2317  
2318 <        f = new CompletableFuture<>();
2319 <        f2 = new CompletableFuture<>();
2320 <        f2.completeExceptionally(new CFException());
2321 <        g = f.applyToEitherAsync(f2, inc);
2322 <        f.complete(one);
2323 <        checkCompletedWithWrappedCFException(g);
2324 <    }
2318 >    public void testAcceptEither_exceptionalCompletion2() {
2319 >        for (ExecutionMode m : ExecutionMode.values())
2320 >        for (Integer v1 : new Integer[] { 1, null })
2321 >    {
2322 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2323 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2324 >        final IncAction r = new IncAction();
2325 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2326 >        final CFException ex = new CFException();
2327  
2328 <    /**
2329 <     * applyToEitherAsync result completes exceptionally if action does
2330 <     */
2193 <    public void testApplyToEitherAsync3() {
2194 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2195 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2196 <        FailingFunction r = new FailingFunction();
2197 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, r);
2198 <        f.complete(one);
2199 <        checkCompletedWithWrappedCFException(g);
2200 <    }
2328 >        g.completeExceptionally(ex);
2329 >        checkCompletedWithWrappedCFException(h, ex);
2330 >        f.complete(v1);
2331  
2332 <    /**
2333 <     * applyToEitherAsync result completes exceptionally if either source cancelled
2334 <     */
2335 <    public void testApplyToEitherAsync4() {
2336 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2207 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2208 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
2209 <        assertTrue(f.cancel(true));
2210 <        checkCompletedWithWrappedCancellationException(g);
2332 >        assertEquals(0, r.invocationCount);
2333 >        checkCompletedNormally(f, v1);
2334 >        checkCompletedWithWrappedCFException(g, ex);
2335 >        checkCompletedWithWrappedCFException(h, ex);
2336 >    }}
2337  
2338 <        f = new CompletableFuture<>();
2339 <        f2 = new CompletableFuture<>();
2340 <        assertTrue(f2.cancel(true));
2341 <        g = f.applyToEitherAsync(f2, inc);
2342 <        checkCompletedWithWrappedCancellationException(g);
2343 <    }
2338 >    public void testAcceptEither_exceptionalCompletion3() {
2339 >        for (ExecutionMode m : ExecutionMode.values())
2340 >        for (Integer v1 : new Integer[] { 1, null })
2341 >    {
2342 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2343 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2344 >        final IncAction r = new IncAction();
2345 >        final CFException ex = new CFException();
2346  
2347 <    /**
2348 <     * acceptEitherAsync result completes normally after normal
2349 <     * completion of sources
2222 <     */
2223 <    public void testAcceptEitherAsync() {
2224 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2225 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2226 <        IncAction r = new IncAction();
2227 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
2228 <        f.complete(one);
2229 <        checkCompletedNormally(g, null);
2230 <        assertEquals(r.value, 2);
2347 >        g.completeExceptionally(ex);
2348 >        f.complete(v1);
2349 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2350  
2351 <        r = new IncAction();
2352 <        f = new CompletableFuture<>();
2353 <        f.complete(one);
2354 <        f2 = new CompletableFuture<>();
2355 <        g = f.acceptEitherAsync(f2, r);
2356 <        checkCompletedNormally(g, null);
2357 <        assertEquals(r.value, 2);
2358 <    }
2351 >        // unspecified behavior
2352 >        Integer v;
2353 >        try {
2354 >            assertNull(h.join());
2355 >            assertEquals(1, r.invocationCount);
2356 >            assertEquals(inc(v1), r.value);
2357 >        } catch (CompletionException ok) {
2358 >            checkCompletedWithWrappedCFException(h, ex);
2359 >            assertEquals(0, r.invocationCount);
2360 >        }
2361  
2362 <    /**
2363 <     * acceptEitherAsync result completes exceptionally after exceptional
2364 <     * completion of source
2244 <     */
2245 <    public void testAcceptEitherAsync2() {
2246 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2247 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2248 <        IncAction r = new IncAction();
2249 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
2250 <        f.completeExceptionally(new CFException());
2251 <        checkCompletedWithWrappedCFException(g);
2362 >        checkCompletedWithWrappedCFException(g, ex);
2363 >        checkCompletedNormally(f, v1);
2364 >    }}
2365  
2366 <        r = new IncAction();
2367 <        f = new CompletableFuture<>();
2368 <        f2 = new CompletableFuture<>();
2369 <        f2.completeExceptionally(new CFException());
2370 <        g = f.acceptEitherAsync(f2, r);
2371 <        f.complete(one);
2372 <        checkCompletedWithWrappedCFException(g);
2373 <    }
2366 >    public void testAcceptEither_exceptionalCompletion4() {
2367 >        for (ExecutionMode m : ExecutionMode.values())
2368 >        for (Integer v1 : new Integer[] { 1, null })
2369 >    {
2370 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2371 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2372 >        final IncAction r = new IncAction();
2373 >        final CFException ex = new CFException();
2374  
2375 <    /**
2376 <     * acceptEitherAsync result completes exceptionally if action does
2377 <     */
2265 <    public void testAcceptEitherAsync3() {
2266 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2267 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2268 <        FailingConsumer r = new FailingConsumer();
2269 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
2270 <        f.complete(one);
2271 <        checkCompletedWithWrappedCFException(g);
2272 <    }
2375 >        f.completeExceptionally(ex);
2376 >        g.complete(v1);
2377 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2378  
2379 <    /**
2380 <     * acceptEitherAsync result completes exceptionally if either
2381 <     * source cancelled
2382 <     */
2383 <    public void testAcceptEitherAsync4() {
2384 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2385 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2386 <        IncAction r = new IncAction();
2387 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
2388 <        assertTrue(f.cancel(true));
2284 <        checkCompletedWithWrappedCancellationException(g);
2379 >        // unspecified behavior
2380 >        Integer v;
2381 >        try {
2382 >            assertNull(h.join());
2383 >            assertEquals(1, r.invocationCount);
2384 >            assertEquals(inc(v1), r.value);
2385 >        } catch (CompletionException ok) {
2386 >            checkCompletedWithWrappedCFException(h, ex);
2387 >            assertEquals(0, r.invocationCount);
2388 >        }
2389  
2390 <        r = new IncAction();
2391 <        f = new CompletableFuture<>();
2392 <        f2 = new CompletableFuture<>();
2289 <        assertTrue(f2.cancel(true));
2290 <        g = f.acceptEitherAsync(f2, r);
2291 <        checkCompletedWithWrappedCancellationException(g);
2292 <    }
2390 >        checkCompletedWithWrappedCFException(f, ex);
2391 >        checkCompletedNormally(g, v1);
2392 >    }}
2393  
2394      /**
2395 <     * runAfterEitherAsync result completes normally after normal
2296 <     * completion of sources
2395 >     * acceptEither result completes exceptionally if action does
2396       */
2397 <    public void testRunAfterEitherAsync() {
2398 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2399 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2400 <        Noop r = new Noop();
2401 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
2402 <        f.complete(one);
2403 <        checkCompletedNormally(g, null);
2404 <        assertTrue(r.ran);
2397 >    public void testAcceptEither_actionFailed1() {
2398 >        for (ExecutionMode m : ExecutionMode.values())
2399 >        for (Integer v1 : new Integer[] { 1, null })
2400 >        for (Integer v2 : new Integer[] { 2, null })
2401 >    {
2402 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2403 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2404 >        final FailingConsumer r = new FailingConsumer();
2405 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2406  
2407 <        r = new Noop();
2408 <        f = new CompletableFuture<>();
2409 <        f.complete(one);
2410 <        f2 = new CompletableFuture<>();
2411 <        g = f.runAfterEitherAsync(f2, r);
2412 <        checkCompletedNormally(g, null);
2313 <        assertTrue(r.ran);
2314 <    }
2407 >        f.complete(v1);
2408 >        checkCompletedWithWrappedCFException(h);
2409 >        g.complete(v2);
2410 >        checkCompletedNormally(f, v1);
2411 >        checkCompletedNormally(g, v2);
2412 >    }}
2413  
2414 <    /**
2415 <     * runAfterEitherAsync result completes exceptionally after exceptional
2416 <     * completion of source
2417 <     */
2418 <    public void testRunAfterEitherAsync2() {
2419 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2420 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2421 <        Noop r = new Noop();
2422 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
2325 <        f.completeExceptionally(new CFException());
2326 <        checkCompletedWithWrappedCFException(g);
2414 >    public void testAcceptEither_actionFailed2() {
2415 >        for (ExecutionMode m : ExecutionMode.values())
2416 >        for (Integer v1 : new Integer[] { 1, null })
2417 >        for (Integer v2 : new Integer[] { 2, null })
2418 >    {
2419 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2420 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2421 >        final FailingConsumer r = new FailingConsumer();
2422 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2423  
2424 <        r = new Noop();
2425 <        f = new CompletableFuture<>();
2426 <        f2 = new CompletableFuture<>();
2427 <        f2.completeExceptionally(new CFException());
2428 <        g = f.runAfterEitherAsync(f2, r);
2429 <        f.complete(one);
2334 <        checkCompletedWithWrappedCFException(g);
2335 <    }
2424 >        g.complete(v2);
2425 >        checkCompletedWithWrappedCFException(h);
2426 >        f.complete(v1);
2427 >        checkCompletedNormally(f, v1);
2428 >        checkCompletedNormally(g, v2);
2429 >    }}
2430  
2431      /**
2432 <     * runAfterEitherAsync result completes exceptionally if action does
2432 >     * acceptEither result completes exceptionally if either source cancelled
2433       */
2434 <    public void testRunAfterEitherAsync3() {
2435 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2436 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2437 <        FailingNoop r = new FailingNoop();
2438 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
2439 <        f.complete(one);
2440 <        checkCompletedWithWrappedCFException(g);
2441 <    }
2434 >    public void testAcceptEither_sourceCancelled1() {
2435 >        for (ExecutionMode m : ExecutionMode.values())
2436 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2437 >        for (Integer v1 : new Integer[] { 1, null })
2438 >    {
2439 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2440 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2441 >        final IncAction r = new IncAction();
2442 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2443  
2444 <    /**
2445 <     * runAfterEitherAsync result completes exceptionally if either
2446 <     * source cancelled
2352 <     */
2353 <    public void testRunAfterEitherAsync4() {
2354 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2355 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2356 <        Noop r = new Noop();
2357 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
2358 <        assertTrue(f.cancel(true));
2359 <        checkCompletedWithWrappedCancellationException(g);
2444 >        assertTrue(f.cancel(mayInterruptIfRunning));
2445 >        checkCompletedWithWrappedCancellationException(h);
2446 >        g.complete(v1);
2447  
2448 <        r = new Noop();
2449 <        f = new CompletableFuture<>();
2450 <        f2 = new CompletableFuture<>();
2451 <        assertTrue(f2.cancel(true));
2452 <        g = f.runAfterEitherAsync(f2, r);
2366 <        checkCompletedWithWrappedCancellationException(g);
2367 <    }
2448 >        checkCancelled(f);
2449 >        assertEquals(0, r.invocationCount);
2450 >        checkCompletedNormally(g, v1);
2451 >        checkCompletedWithWrappedCancellationException(h);
2452 >    }}
2453  
2454 <    /**
2455 <     * thenComposeAsync result completes normally after normal
2456 <     * completion of source
2457 <     */
2458 <    public void testThenComposeAsync() {
2459 <        CompletableFuture<Integer> f, g;
2460 <        CompletableFutureInc r;
2454 >    public void testAcceptEither_sourceCancelled2() {
2455 >        for (ExecutionMode m : ExecutionMode.values())
2456 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2457 >        for (Integer v1 : new Integer[] { 1, null })
2458 >    {
2459 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2460 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2461 >        final IncAction r = new IncAction();
2462 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2463  
2464 <        f = new CompletableFuture<>();
2465 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2466 <        f.complete(one);
2380 <        checkCompletedNormally(g, two);
2464 >        assertTrue(g.cancel(mayInterruptIfRunning));
2465 >        checkCompletedWithWrappedCancellationException(h);
2466 >        f.complete(v1);
2467  
2468 <        f = new CompletableFuture<>();
2469 <        f.complete(one);
2470 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2471 <        checkCompletedNormally(g, two);
2472 <    }
2468 >        checkCancelled(g);
2469 >        assertEquals(0, r.invocationCount);
2470 >        checkCompletedNormally(f, v1);
2471 >        checkCompletedWithWrappedCancellationException(h);
2472 >    }}
2473  
2474 <    /**
2475 <     * thenComposeAsync result completes exceptionally after
2476 <     * exceptional completion of source
2477 <     */
2478 <    public void testThenComposeAsync2() {
2479 <        CompletableFuture<Integer> f, g;
2480 <        CompletableFutureInc r;
2474 >    public void testAcceptEither_sourceCancelled3() {
2475 >        for (ExecutionMode m : ExecutionMode.values())
2476 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2477 >        for (Integer v1 : new Integer[] { 1, null })
2478 >    {
2479 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2480 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2481 >        final IncAction r = new IncAction();
2482  
2483 <        f = new CompletableFuture<>();
2484 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2485 <        f.completeExceptionally(new CFException());
2399 <        checkCompletedWithWrappedCFException(g);
2400 <        assertFalse(r.ran);
2483 >        assertTrue(g.cancel(mayInterruptIfRunning));
2484 >        f.complete(v1);
2485 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2486  
2487 <        f = new CompletableFuture<>();
2488 <        f.completeExceptionally(new CFException());
2489 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2490 <        checkCompletedWithWrappedCFException(g);
2491 <        assertFalse(r.ran);
2492 <    }
2487 >        // unspecified behavior
2488 >        Integer v;
2489 >        try {
2490 >            assertNull(h.join());
2491 >            assertEquals(1, r.invocationCount);
2492 >            assertEquals(inc(v1), r.value);
2493 >        } catch (CompletionException ok) {
2494 >            checkCompletedWithWrappedCancellationException(h);
2495 >            assertEquals(0, r.invocationCount);
2496 >        }
2497  
2498 <    /**
2499 <     * thenComposeAsync result completes exceptionally if action does
2500 <     */
2412 <    public void testThenComposeAsync3() {
2413 <        CompletableFuture<Integer> f, g;
2414 <        FailingCompletableFutureFunction r;
2498 >        checkCancelled(g);
2499 >        checkCompletedNormally(f, v1);
2500 >    }}
2501  
2502 <        f = new CompletableFuture<>();
2503 <        g = f.thenComposeAsync(r = new FailingCompletableFutureFunction());
2504 <        f.complete(one);
2505 <        checkCompletedWithWrappedCFException(g);
2502 >    public void testAcceptEither_sourceCancelled4() {
2503 >        for (ExecutionMode m : ExecutionMode.values())
2504 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2505 >        for (Integer v1 : new Integer[] { 1, null })
2506 >    {
2507 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2508 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2509 >        final IncAction r = new IncAction();
2510  
2511 <        f = new CompletableFuture<>();
2512 <        f.complete(one);
2513 <        g = f.thenComposeAsync(r = new FailingCompletableFutureFunction());
2514 <        checkCompletedWithWrappedCFException(g);
2515 <    }
2511 >        assertTrue(f.cancel(mayInterruptIfRunning));
2512 >        g.complete(v1);
2513 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2514 >
2515 >        // unspecified behavior
2516 >        Integer v;
2517 >        try {
2518 >            assertNull(h.join());
2519 >            assertEquals(1, r.invocationCount);
2520 >            assertEquals(inc(v1), r.value);
2521 >        } catch (CompletionException ok) {
2522 >            checkCompletedWithWrappedCancellationException(h);
2523 >            assertEquals(0, r.invocationCount);
2524 >        }
2525 >
2526 >        checkCancelled(f);
2527 >        checkCompletedNormally(g, v1);
2528 >    }}
2529  
2530      /**
2531 <     * thenComposeAsync result completes exceptionally if source cancelled
2531 >     * runAfterEither result completes normally after normal completion
2532 >     * of either source
2533       */
2534 <    public void testThenComposeAsync4() {
2535 <        CompletableFuture<Integer> f, g;
2536 <        CompletableFutureInc r;
2534 >    public void testRunAfterEither_normalCompletion1() {
2535 >        for (ExecutionMode m : ExecutionMode.values())
2536 >        for (Integer v1 : new Integer[] { 1, null })
2537 >        for (Integer v2 : new Integer[] { 2, null })
2538 >    {
2539 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2540 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2541 >        final Noop r = new Noop();
2542 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2543  
2544 <        f = new CompletableFuture<>();
2545 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2546 <        assertTrue(f.cancel(true));
2547 <        checkCompletedWithWrappedCancellationException(g);
2544 >        f.complete(v1);
2545 >        checkCompletedNormally(h, null);
2546 >        assertEquals(1, r.invocationCount);
2547 >        g.complete(v2);
2548  
2549 <        f = new CompletableFuture<>();
2550 <        assertTrue(f.cancel(true));
2551 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2552 <        checkCompletedWithWrappedCancellationException(g);
2553 <    }
2549 >        checkCompletedNormally(f, v1);
2550 >        checkCompletedNormally(g, v2);
2551 >        checkCompletedNormally(h, null);
2552 >        assertEquals(1, r.invocationCount);
2553 >    }}
2554  
2555 <    // async with explicit executors
2555 >    public void testRunAfterEither_normalCompletion2() {
2556 >        for (ExecutionMode m : ExecutionMode.values())
2557 >        for (Integer v1 : new Integer[] { 1, null })
2558 >        for (Integer v2 : new Integer[] { 2, null })
2559 >    {
2560 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2561 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2562 >        final Noop r = new Noop();
2563 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2564  
2565 <    /**
2566 <     * thenRunAsync result completes normally after normal completion of source
2567 <     */
2568 <    public void testThenRunAsyncE() {
2451 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2452 <        Noop r = new Noop();
2453 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2454 <        f.complete(null);
2455 <        checkCompletedNormally(g, null);
2565 >        g.complete(v2);
2566 >        checkCompletedNormally(h, null);
2567 >        assertEquals(1, r.invocationCount);
2568 >        f.complete(v1);
2569  
2570 <        // reordered version
2571 <        f = new CompletableFuture<>();
2572 <        f.complete(null);
2573 <        r = new Noop();
2574 <        g = f.thenRunAsync(r, new ThreadExecutor());
2462 <        checkCompletedNormally(g, null);
2463 <    }
2570 >        checkCompletedNormally(f, v1);
2571 >        checkCompletedNormally(g, v2);
2572 >        checkCompletedNormally(h, null);
2573 >        assertEquals(1, r.invocationCount);
2574 >        }}
2575  
2576 <    /**
2577 <     * thenRunAsync result completes exceptionally after exceptional
2578 <     * completion of source
2579 <     */
2580 <    public void testThenRunAsync2E() {
2581 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2582 <        Noop r = new Noop();
2583 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2473 <        f.completeExceptionally(new CFException());
2474 <        try {
2475 <            g.join();
2476 <            shouldThrow();
2477 <        } catch (CompletionException success) {}
2478 <        checkCompletedWithWrappedCFException(g);
2479 <    }
2576 >    public void testRunAfterEither_normalCompletion3() {
2577 >        for (ExecutionMode m : ExecutionMode.values())
2578 >        for (Integer v1 : new Integer[] { 1, null })
2579 >        for (Integer v2 : new Integer[] { 2, null })
2580 >    {
2581 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2582 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2583 >        final Noop r = new Noop();
2584  
2585 <    /**
2586 <     * thenRunAsync result completes exceptionally if action does
2587 <     */
2484 <    public void testThenRunAsync3E() {
2485 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2486 <        FailingNoop r = new FailingNoop();
2487 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2488 <        f.complete(null);
2489 <        checkCompletedWithWrappedCFException(g);
2490 <    }
2585 >        f.complete(v1);
2586 >        g.complete(v2);
2587 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2588  
2589 <    /**
2590 <     * thenRunAsync result completes exceptionally if source cancelled
2591 <     */
2592 <    public void testThenRunAsync4E() {
2593 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2497 <        Noop r = new Noop();
2498 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2499 <        assertTrue(f.cancel(true));
2500 <        checkCompletedWithWrappedCancellationException(g);
2501 <    }
2589 >        checkCompletedNormally(h, null);
2590 >        checkCompletedNormally(f, v1);
2591 >        checkCompletedNormally(g, v2);
2592 >        assertEquals(1, r.invocationCount);
2593 >    }}
2594  
2595      /**
2596 <     * thenApplyAsync result completes normally after normal completion of source
2596 >     * runAfterEither result completes exceptionally after exceptional
2597 >     * completion of either source
2598       */
2599 <    public void testThenApplyAsyncE() {
2600 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2601 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
2602 <        f.complete(one);
2603 <        checkCompletedNormally(g, two);
2604 <    }
2599 >    public void testRunAfterEither_exceptionalCompletion1() {
2600 >        for (ExecutionMode m : ExecutionMode.values())
2601 >        for (Integer v1 : new Integer[] { 1, null })
2602 >    {
2603 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2604 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2605 >        final Noop r = new Noop();
2606 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2607 >        final CFException ex = new CFException();
2608  
2609 <    /**
2610 <     * thenApplyAsync result completes exceptionally after exceptional
2611 <     * completion of source
2516 <     */
2517 <    public void testThenApplyAsync2E() {
2518 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2519 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
2520 <        f.completeExceptionally(new CFException());
2521 <        checkCompletedWithWrappedCFException(g);
2522 <    }
2609 >        f.completeExceptionally(ex);
2610 >        checkCompletedWithWrappedCFException(h, ex);
2611 >        g.complete(v1);
2612  
2613 <    /**
2614 <     * thenApplyAsync result completes exceptionally if action does
2615 <     */
2616 <    public void testThenApplyAsync3E() {
2617 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2529 <        FailingFunction r = new FailingFunction();
2530 <        CompletableFuture<Integer> g = f.thenApplyAsync(r, new ThreadExecutor());
2531 <        f.complete(null);
2532 <        checkCompletedWithWrappedCFException(g);
2533 <    }
2613 >        assertEquals(0, r.invocationCount);
2614 >        checkCompletedNormally(g, v1);
2615 >        checkCompletedWithWrappedCFException(f, ex);
2616 >        checkCompletedWithWrappedCFException(h, ex);
2617 >    }}
2618  
2619 <    /**
2620 <     * thenApplyAsync result completes exceptionally if source cancelled
2621 <     */
2622 <    public void testThenApplyAsync4E() {
2623 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2624 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
2625 <        assertTrue(f.cancel(true));
2626 <        checkCompletedWithWrappedCancellationException(g);
2627 <    }
2619 >    public void testRunAfterEither_exceptionalCompletion2() {
2620 >        for (ExecutionMode m : ExecutionMode.values())
2621 >        for (Integer v1 : new Integer[] { 1, null })
2622 >    {
2623 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2624 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2625 >        final Noop r = new Noop();
2626 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2627 >        final CFException ex = new CFException();
2628  
2629 <    /**
2630 <     * thenAcceptAsync result completes normally after normal
2631 <     * completion of source
2548 <     */
2549 <    public void testThenAcceptAsyncE() {
2550 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2551 <        IncAction r = new IncAction();
2552 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2553 <        f.complete(one);
2554 <        checkCompletedNormally(g, null);
2555 <        assertEquals(r.value, 2);
2556 <    }
2629 >        g.completeExceptionally(ex);
2630 >        checkCompletedWithWrappedCFException(h, ex);
2631 >        f.complete(v1);
2632  
2633 <    /**
2634 <     * thenAcceptAsync result completes exceptionally after exceptional
2635 <     * completion of source
2636 <     */
2637 <    public void testThenAcceptAsync2E() {
2563 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2564 <        IncAction r = new IncAction();
2565 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2566 <        f.completeExceptionally(new CFException());
2567 <        checkCompletedWithWrappedCFException(g);
2568 <    }
2633 >        assertEquals(0, r.invocationCount);
2634 >        checkCompletedNormally(f, v1);
2635 >        checkCompletedWithWrappedCFException(g, ex);
2636 >        checkCompletedWithWrappedCFException(h, ex);
2637 >    }}
2638  
2639 <    /**
2640 <     * thenAcceptAsync result completes exceptionally if action does
2641 <     */
2642 <    public void testThenAcceptAsync3E() {
2643 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2644 <        FailingConsumer r = new FailingConsumer();
2645 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2646 <        f.complete(null);
2578 <        checkCompletedWithWrappedCFException(g);
2579 <    }
2639 >    public void testRunAfterEither_exceptionalCompletion3() {
2640 >        for (ExecutionMode m : ExecutionMode.values())
2641 >        for (Integer v1 : new Integer[] { 1, null })
2642 >    {
2643 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2644 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2645 >        final Noop r = new Noop();
2646 >        final CFException ex = new CFException();
2647  
2648 <    /**
2649 <     * thenAcceptAsync result completes exceptionally if source cancelled
2650 <     */
2584 <    public void testThenAcceptAsync4E() {
2585 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2586 <        IncAction r = new IncAction();
2587 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2588 <        assertTrue(f.cancel(true));
2589 <        checkCompletedWithWrappedCancellationException(g);
2590 <    }
2648 >        g.completeExceptionally(ex);
2649 >        f.complete(v1);
2650 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2651  
2652 <    /**
2653 <     * applyToEitherAsync result completes normally after normal
2654 <     * completion of sources
2655 <     */
2656 <    public void testApplyToEitherAsyncE() {
2657 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2658 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2659 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2660 <        f.complete(one);
2601 <        checkCompletedNormally(g, two);
2652 >        // unspecified behavior
2653 >        Integer v;
2654 >        try {
2655 >            assertNull(h.join());
2656 >            assertEquals(1, r.invocationCount);
2657 >        } catch (CompletionException ok) {
2658 >            checkCompletedWithWrappedCFException(h, ex);
2659 >            assertEquals(0, r.invocationCount);
2660 >        }
2661  
2662 <        f = new CompletableFuture<>();
2663 <        f.complete(one);
2664 <        f2 = new CompletableFuture<>();
2606 <        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2607 <        checkCompletedNormally(g, two);
2608 <    }
2662 >        checkCompletedWithWrappedCFException(g, ex);
2663 >        checkCompletedNormally(f, v1);
2664 >    }}
2665  
2666 <    /**
2667 <     * applyToEitherAsync result completes exceptionally after exceptional
2668 <     * completion of source
2669 <     */
2670 <    public void testApplyToEitherAsync2E() {
2671 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2672 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2673 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2618 <        f.completeExceptionally(new CFException());
2619 <        checkCompletedWithWrappedCFException(g);
2666 >    public void testRunAfterEither_exceptionalCompletion4() {
2667 >        for (ExecutionMode m : ExecutionMode.values())
2668 >        for (Integer v1 : new Integer[] { 1, null })
2669 >    {
2670 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2671 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2672 >        final Noop r = new Noop();
2673 >        final CFException ex = new CFException();
2674  
2675 <        f = new CompletableFuture<>();
2676 <        f2 = new CompletableFuture<>();
2677 <        f2.completeExceptionally(new CFException());
2624 <        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2625 <        f.complete(one);
2626 <        checkCompletedWithWrappedCFException(g);
2627 <    }
2675 >        f.completeExceptionally(ex);
2676 >        g.complete(v1);
2677 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2678  
2679 <    /**
2680 <     * applyToEitherAsync result completes exceptionally if action does
2681 <     */
2682 <    public void testApplyToEitherAsync3E() {
2683 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2684 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2685 <        FailingFunction r = new FailingFunction();
2686 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, r, new ThreadExecutor());
2687 <        f.complete(one);
2688 <        checkCompletedWithWrappedCFException(g);
2689 <    }
2679 >        // unspecified behavior
2680 >        Integer v;
2681 >        try {
2682 >            assertNull(h.join());
2683 >            assertEquals(1, r.invocationCount);
2684 >        } catch (CompletionException ok) {
2685 >            checkCompletedWithWrappedCFException(h, ex);
2686 >            assertEquals(0, r.invocationCount);
2687 >        }
2688 >
2689 >        checkCompletedWithWrappedCFException(f, ex);
2690 >        checkCompletedNormally(g, v1);
2691 >    }}
2692  
2693      /**
2694 <     * applyToEitherAsync result completes exceptionally if either source cancelled
2694 >     * runAfterEither result completes exceptionally if action does
2695       */
2696 <    public void testApplyToEitherAsync4E() {
2697 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2698 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2699 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2700 <        assertTrue(f.cancel(true));
2701 <        checkCompletedWithWrappedCancellationException(g);
2696 >    public void testRunAfterEither_actionFailed1() {
2697 >        for (ExecutionMode m : ExecutionMode.values())
2698 >        for (Integer v1 : new Integer[] { 1, null })
2699 >        for (Integer v2 : new Integer[] { 2, null })
2700 >    {
2701 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2702 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2703 >        final FailingRunnable r = new FailingRunnable();
2704 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2705  
2706 <        f = new CompletableFuture<>();
2707 <        f2 = new CompletableFuture<>();
2708 <        assertTrue(f2.cancel(true));
2709 <        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2710 <        checkCompletedWithWrappedCancellationException(g);
2711 <    }
2706 >        f.complete(v1);
2707 >        checkCompletedWithWrappedCFException(h);
2708 >        g.complete(v2);
2709 >        checkCompletedNormally(f, v1);
2710 >        checkCompletedNormally(g, v2);
2711 >    }}
2712  
2713 <    /**
2714 <     * acceptEitherAsync result completes normally after normal
2715 <     * completion of sources
2716 <     */
2717 <    public void testAcceptEitherAsyncE() {
2718 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2719 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2720 <        IncAction r = new IncAction();
2721 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2667 <        f.complete(one);
2668 <        checkCompletedNormally(g, null);
2669 <        assertEquals(r.value, 2);
2713 >    public void testRunAfterEither_actionFailed2() {
2714 >        for (ExecutionMode m : ExecutionMode.values())
2715 >        for (Integer v1 : new Integer[] { 1, null })
2716 >        for (Integer v2 : new Integer[] { 2, null })
2717 >    {
2718 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2719 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2720 >        final FailingRunnable r = new FailingRunnable();
2721 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2722  
2723 <        r = new IncAction();
2724 <        f = new CompletableFuture<>();
2725 <        f.complete(one);
2726 <        f2 = new CompletableFuture<>();
2727 <        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2728 <        checkCompletedNormally(g, null);
2677 <        assertEquals(r.value, 2);
2678 <    }
2723 >        g.complete(v2);
2724 >        checkCompletedWithWrappedCFException(h);
2725 >        f.complete(v1);
2726 >        checkCompletedNormally(f, v1);
2727 >        checkCompletedNormally(g, v2);
2728 >    }}
2729  
2730      /**
2731 <     * acceptEitherAsync result completes exceptionally after exceptional
2682 <     * completion of source
2731 >     * runAfterEither result completes exceptionally if either source cancelled
2732       */
2733 <    public void testAcceptEitherAsync2E() {
2734 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2735 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2736 <        IncAction r = new IncAction();
2737 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2738 <        f.completeExceptionally(new CFException());
2739 <        checkCompletedWithWrappedCFException(g);
2733 >    public void testRunAfterEither_sourceCancelled1() {
2734 >        for (ExecutionMode m : ExecutionMode.values())
2735 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2736 >        for (Integer v1 : new Integer[] { 1, null })
2737 >    {
2738 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2739 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2740 >        final Noop r = new Noop();
2741 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2742  
2743 <        r = new IncAction();
2744 <        f = new CompletableFuture<>();
2745 <        f2 = new CompletableFuture<>();
2695 <        f2.completeExceptionally(new CFException());
2696 <        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2697 <        f.complete(one);
2698 <        checkCompletedWithWrappedCFException(g);
2699 <    }
2743 >        assertTrue(f.cancel(mayInterruptIfRunning));
2744 >        checkCompletedWithWrappedCancellationException(h);
2745 >        g.complete(v1);
2746  
2747 <    /**
2748 <     * acceptEitherAsync result completes exceptionally if action does
2749 <     */
2750 <    public void testAcceptEitherAsync3E() {
2751 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2706 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2707 <        FailingConsumer r = new FailingConsumer();
2708 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2709 <        f.complete(one);
2710 <        checkCompletedWithWrappedCFException(g);
2711 <    }
2747 >        checkCancelled(f);
2748 >        assertEquals(0, r.invocationCount);
2749 >        checkCompletedNormally(g, v1);
2750 >        checkCompletedWithWrappedCancellationException(h);
2751 >    }}
2752  
2753 <    /**
2754 <     * acceptEitherAsync result completes exceptionally if either
2755 <     * source cancelled
2756 <     */
2757 <    public void testAcceptEitherAsync4E() {
2758 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2759 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2760 <        IncAction r = new IncAction();
2761 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2722 <        assertTrue(f.cancel(true));
2723 <        checkCompletedWithWrappedCancellationException(g);
2753 >    public void testRunAfterEither_sourceCancelled2() {
2754 >        for (ExecutionMode m : ExecutionMode.values())
2755 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2756 >        for (Integer v1 : new Integer[] { 1, null })
2757 >    {
2758 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2759 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2760 >        final Noop r = new Noop();
2761 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2762  
2763 <        r = new IncAction();
2764 <        f = new CompletableFuture<>();
2765 <        f2 = new CompletableFuture<>();
2728 <        assertTrue(f2.cancel(true));
2729 <        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2730 <        checkCompletedWithWrappedCancellationException(g);
2731 <    }
2763 >        assertTrue(g.cancel(mayInterruptIfRunning));
2764 >        checkCompletedWithWrappedCancellationException(h);
2765 >        f.complete(v1);
2766  
2767 <    /**
2768 <     * runAfterEitherAsync result completes normally after normal
2769 <     * completion of sources
2770 <     */
2771 <    public void testRunAfterEitherAsyncE() {
2738 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2739 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2740 <        Noop r = new Noop();
2741 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2742 <        f.complete(one);
2743 <        checkCompletedNormally(g, null);
2744 <        assertTrue(r.ran);
2767 >        checkCancelled(g);
2768 >        assertEquals(0, r.invocationCount);
2769 >        checkCompletedNormally(f, v1);
2770 >        checkCompletedWithWrappedCancellationException(h);
2771 >    }}
2772  
2773 <        r = new Noop();
2774 <        f = new CompletableFuture<>();
2775 <        f.complete(one);
2776 <        f2 = new CompletableFuture<>();
2777 <        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2778 <        checkCompletedNormally(g, null);
2779 <        assertTrue(r.ran);
2780 <    }
2773 >    public void testRunAfterEither_sourceCancelled3() {
2774 >        for (ExecutionMode m : ExecutionMode.values())
2775 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2776 >        for (Integer v1 : new Integer[] { 1, null })
2777 >    {
2778 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2779 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2780 >        final Noop r = new Noop();
2781  
2782 <    /**
2783 <     * runAfterEitherAsync result completes exceptionally after exceptional
2784 <     * completion of source
2758 <     */
2759 <    public void testRunAfterEitherAsync2E() {
2760 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2761 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2762 <        Noop r = new Noop();
2763 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2764 <        f.completeExceptionally(new CFException());
2765 <        checkCompletedWithWrappedCFException(g);
2782 >        assertTrue(g.cancel(mayInterruptIfRunning));
2783 >        f.complete(v1);
2784 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2785  
2786 <        r = new Noop();
2787 <        f = new CompletableFuture<>();
2788 <        f2 = new CompletableFuture<>();
2789 <        f2.completeExceptionally(new CFException());
2790 <        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2791 <        f.complete(one);
2792 <        checkCompletedWithWrappedCFException(g);
2793 <    }
2786 >        // unspecified behavior
2787 >        Integer v;
2788 >        try {
2789 >            assertNull(h.join());
2790 >            assertEquals(1, r.invocationCount);
2791 >        } catch (CompletionException ok) {
2792 >            checkCompletedWithWrappedCancellationException(h);
2793 >            assertEquals(0, r.invocationCount);
2794 >        }
2795  
2796 <    /**
2797 <     * runAfterEitherAsync result completes exceptionally if action does
2798 <     */
2799 <    public void testRunAfterEitherAsync3E() {
2800 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2801 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2802 <        FailingNoop r = new FailingNoop();
2803 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2804 <        f.complete(one);
2805 <        checkCompletedWithWrappedCFException(g);
2806 <    }
2796 >        checkCancelled(g);
2797 >        checkCompletedNormally(f, v1);
2798 >    }}
2799 >
2800 >    public void testRunAfterEither_sourceCancelled4() {
2801 >        for (ExecutionMode m : ExecutionMode.values())
2802 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2803 >        for (Integer v1 : new Integer[] { 1, null })
2804 >    {
2805 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2806 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2807 >        final Noop r = new Noop();
2808 >
2809 >        assertTrue(f.cancel(mayInterruptIfRunning));
2810 >        g.complete(v1);
2811 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2812 >
2813 >        // unspecified behavior
2814 >        Integer v;
2815 >        try {
2816 >            assertNull(h.join());
2817 >            assertEquals(1, r.invocationCount);
2818 >        } catch (CompletionException ok) {
2819 >            checkCompletedWithWrappedCancellationException(h);
2820 >            assertEquals(0, r.invocationCount);
2821 >        }
2822 >
2823 >        checkCancelled(f);
2824 >        checkCompletedNormally(g, v1);
2825 >    }}
2826  
2827      /**
2828 <     * runAfterEitherAsync result completes exceptionally if either
2790 <     * source cancelled
2828 >     * thenCompose result completes normally after normal completion of source
2829       */
2830 <    public void testRunAfterEitherAsync4E() {
2831 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2832 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2833 <        Noop r = new Noop();
2834 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2835 <        assertTrue(f.cancel(true));
2836 <        checkCompletedWithWrappedCancellationException(g);
2830 >    public void testThenCompose_normalCompletion() {
2831 >        for (ExecutionMode m : ExecutionMode.values())
2832 >        for (boolean createIncomplete : new boolean[] { true, false })
2833 >        for (Integer v1 : new Integer[] { 1, null })
2834 >    {
2835 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2836 >        final CompletableFutureInc r = new CompletableFutureInc();
2837 >        if (!createIncomplete) f.complete(v1);
2838 >        final CompletableFuture<Integer> g = f.thenCompose(r);
2839 >        if (createIncomplete) f.complete(v1);
2840  
2841 <        r = new Noop();
2842 <        f = new CompletableFuture<>();
2843 <        f2 = new CompletableFuture<>();
2844 <        assertTrue(f2.cancel(true));
2804 <        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2805 <        checkCompletedWithWrappedCancellationException(g);
2806 <    }
2841 >        checkCompletedNormally(g, inc(v1));
2842 >        checkCompletedNormally(f, v1);
2843 >        assertEquals(1, r.invocationCount);
2844 >    }}
2845  
2846      /**
2847 <     * thenComposeAsync result completes normally after normal
2847 >     * thenCompose result completes exceptionally after exceptional
2848       * completion of source
2849       */
2850 <    public void testThenComposeAsyncE() {
2851 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2852 <        CompletableFutureInc r = new CompletableFutureInc();
2853 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2854 <        f.complete(one);
2855 <        checkCompletedNormally(g, two);
2856 <    }
2850 >    public void testThenCompose_exceptionalCompletion() {
2851 >        for (ExecutionMode m : ExecutionMode.values())
2852 >        for (boolean createIncomplete : new boolean[] { true, false })
2853 >    {
2854 >        final CFException ex = new CFException();
2855 >        final CompletableFutureInc r = new CompletableFutureInc();
2856 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2857 >        if (!createIncomplete) f.completeExceptionally(ex);
2858 >        final CompletableFuture<Integer> g = f.thenCompose(r);
2859 >        if (createIncomplete) f.completeExceptionally(ex);
2860  
2861 <    /**
2862 <     * thenComposeAsync result completes exceptionally after
2863 <     * exceptional completion of source
2864 <     */
2824 <    public void testThenComposeAsync2E() {
2825 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2826 <        CompletableFutureInc r = new CompletableFutureInc();
2827 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2828 <        f.completeExceptionally(new CFException());
2829 <        checkCompletedWithWrappedCFException(g);
2830 <    }
2861 >        checkCompletedWithWrappedCFException(g, ex);
2862 >        checkCompletedWithWrappedCFException(f, ex);
2863 >        assertEquals(0, r.invocationCount);
2864 >    }}
2865  
2866      /**
2867 <     * thenComposeAsync result completes exceptionally if action does
2867 >     * thenCompose result completes exceptionally if action does
2868       */
2869 <    public void testThenComposeAsync3E() {
2870 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2871 <        FailingCompletableFutureFunction r = new FailingCompletableFutureFunction();
2872 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2873 <        f.complete(one);
2869 >    public void testThenCompose_actionFailed() {
2870 >        for (ExecutionMode m : ExecutionMode.values())
2871 >        for (boolean createIncomplete : new boolean[] { true, false })
2872 >        for (Integer v1 : new Integer[] { 1, null })
2873 >    {
2874 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2875 >        final FailingCompletableFutureFunction r
2876 >            = new FailingCompletableFutureFunction();
2877 >        if (!createIncomplete) f.complete(v1);
2878 >        final CompletableFuture<Integer> g = f.thenCompose(r);
2879 >        if (createIncomplete) f.complete(v1);
2880 >
2881          checkCompletedWithWrappedCFException(g);
2882 <    }
2882 >        checkCompletedNormally(f, v1);
2883 >    }}
2884  
2885      /**
2886 <     * thenComposeAsync result completes exceptionally if source cancelled
2886 >     * thenCompose result completes exceptionally if source cancelled
2887       */
2888 <    public void testThenComposeAsync4E() {
2889 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2890 <        CompletableFutureInc r = new CompletableFutureInc();
2891 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2892 <        assertTrue(f.cancel(true));
2888 >    public void testThenCompose_sourceCancelled() {
2889 >        for (ExecutionMode m : ExecutionMode.values())
2890 >        for (boolean createIncomplete : new boolean[] { true, false })
2891 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2892 >    {
2893 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2894 >        final CompletableFutureInc r = new CompletableFutureInc();
2895 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2896 >        final CompletableFuture<Integer> g = f.thenCompose(r);
2897 >        if (createIncomplete) {
2898 >            checkIncomplete(g);
2899 >            assertTrue(f.cancel(mayInterruptIfRunning));
2900 >        }
2901 >
2902          checkCompletedWithWrappedCancellationException(g);
2903 <    }
2903 >        checkCancelled(f);
2904 >    }}
2905  
2906      // other static methods
2907  
# Line 3049 | Line 3101 | public class CompletableFutureTest exten
3101       * whenComplete action executes on normal completion, propagating
3102       * source result.
3103       */
3104 <    public void testWhenComplete1() {
3105 <        final AtomicInteger a = new AtomicInteger();
3106 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3107 <        CompletableFuture<Integer> g =
3108 <            f.whenComplete((Integer x, Throwable t) -> a.getAndIncrement());
3109 <        f.complete(three);
3110 <        checkCompletedNormally(f, three);
3111 <        checkCompletedNormally(g, three);
3112 <        assertEquals(a.get(), 1);
3113 <    }
3114 <
3115 <    /**
3116 <     * whenComplete action executes on exceptional completion, propagating
3117 <     * source result.
3118 <     */
3119 <    public void testWhenComplete2() {
3068 <        final AtomicInteger a = new AtomicInteger();
3069 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3070 <        CompletableFuture<Integer> g =
3071 <            f.whenComplete((Integer x, Throwable t) -> a.getAndIncrement());
3072 <        f.completeExceptionally(new CFException());
3073 <        assertTrue(f.isCompletedExceptionally());
3074 <        assertTrue(g.isCompletedExceptionally());
3075 <        assertEquals(a.get(), 1);
3076 <    }
3077 <
3078 <    /**
3079 <     * If a whenComplete action throws an exception when triggered by
3080 <     * a normal completion, it completes exceptionally
3081 <     */
3082 <    public void testWhenComplete3() {
3083 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3084 <        CompletableFuture<Integer> g =
3085 <            f.whenComplete((Integer x, Throwable t) ->
3086 <                           { throw new CFException(); } );
3087 <        f.complete(three);
3088 <        checkCompletedNormally(f, three);
3089 <        assertTrue(g.isCompletedExceptionally());
3090 <        checkCompletedWithWrappedCFException(g);
3091 <    }
3092 <
3093 <    /**
3094 <     * whenCompleteAsync action executes on normal completion, propagating
3095 <     * source result.
3096 <     */
3097 <    public void testWhenCompleteAsync1() {
3098 <        final AtomicInteger a = new AtomicInteger();
3099 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3100 <        CompletableFuture<Integer> g =
3101 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement());
3102 <        f.complete(three);
3103 <        checkCompletedNormally(f, three);
3104 <        checkCompletedNormally(g, three);
3105 <        assertEquals(a.get(), 1);
3106 <    }
3107 <
3108 <    /**
3109 <     * whenCompleteAsync action executes on exceptional completion, propagating
3110 <     * source result.
3111 <     */
3112 <    public void testWhenCompleteAsync2() {
3113 <        final AtomicInteger a = new AtomicInteger();
3114 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3115 <        CompletableFuture<Integer> g =
3116 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement());
3117 <        f.completeExceptionally(new CFException());
3118 <        checkCompletedWithWrappedCFException(f);
3119 <        checkCompletedWithWrappedCFException(g);
3120 <    }
3104 >    public void testWhenComplete_normalCompletion1() {
3105 >        for (ExecutionMode m : ExecutionMode.values())
3106 >        for (boolean createIncomplete : new boolean[] { true, false })
3107 >        for (Integer v1 : new Integer[] { 1, null })
3108 >    {
3109 >        final AtomicInteger a = new AtomicInteger(0);
3110 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
3111 >        if (!createIncomplete) f.complete(v1);
3112 >        final CompletableFuture<Integer> g = m.whenComplete
3113 >            (f,
3114 >             (Integer x, Throwable t) -> {
3115 >                threadAssertSame(x, v1);
3116 >                threadAssertNull(t);
3117 >                a.getAndIncrement();
3118 >            });
3119 >        if (createIncomplete) f.complete(v1);
3120  
3121 <    /**
3122 <     * If a whenCompleteAsync action throws an exception when
3123 <     * triggered by a normal completion, it completes exceptionally
3124 <     */
3126 <    public void testWhenCompleteAsync3() {
3127 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3128 <        CompletableFuture<Integer> g =
3129 <            f.whenCompleteAsync((Integer x, Throwable t) ->
3130 <                           { throw new CFException(); } );
3131 <        f.complete(three);
3132 <        checkCompletedNormally(f, three);
3133 <        checkCompletedWithWrappedCFException(g);
3134 <    }
3121 >        checkCompletedNormally(g, v1);
3122 >        checkCompletedNormally(f, v1);
3123 >        assertEquals(1, a.get());
3124 >    }}
3125  
3126      /**
3127 <     * whenCompleteAsync action executes on normal completion, propagating
3127 >     * whenComplete action executes on exceptional completion, propagating
3128       * source result.
3129       */
3130 <    public void testWhenCompleteAsync1e() {
3131 <        final AtomicInteger a = new AtomicInteger();
3132 <        ThreadExecutor exec = new ThreadExecutor();
3133 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3134 <        CompletableFuture<Integer> g =
3135 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement(),
3136 <                                exec);
3137 <        f.complete(three);
3138 <        checkCompletedNormally(f, three);
3139 <        checkCompletedNormally(g, three);
3140 <        assertEquals(a.get(), 1);
3141 <    }
3130 >    public void testWhenComplete_exceptionalCompletion() {
3131 >        for (ExecutionMode m : ExecutionMode.values())
3132 >        for (boolean createIncomplete : new boolean[] { true, false })
3133 >        for (Integer v1 : new Integer[] { 1, null })
3134 >    {
3135 >        final AtomicInteger a = new AtomicInteger(0);
3136 >        final CFException ex = new CFException();
3137 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
3138 >        if (!createIncomplete) f.completeExceptionally(ex);
3139 >        final CompletableFuture<Integer> g = m.whenComplete
3140 >            (f,
3141 >             (Integer x, Throwable t) -> {
3142 >                threadAssertNull(x);
3143 >                threadAssertSame(t, ex);
3144 >                a.getAndIncrement();
3145 >            });
3146 >        if (createIncomplete) f.completeExceptionally(ex);
3147 >        checkCompletedWithWrappedCFException(f, ex);
3148 >        checkCompletedWithWrappedCFException(g, ex);
3149 >        assertEquals(1, a.get());
3150 >    }}
3151  
3152      /**
3153 <     * whenCompleteAsync action executes on exceptional completion, propagating
3154 <     * source result.
3153 >     * whenComplete action executes on cancelled source, propagating
3154 >     * CancellationException.
3155       */
3156 <    public void testWhenCompleteAsync2e() {
3157 <        final AtomicInteger a = new AtomicInteger();
3158 <        ThreadExecutor exec = new ThreadExecutor();
3159 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3160 <        CompletableFuture<Integer> g =
3161 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement(),
3162 <                                exec);
3163 <        f.completeExceptionally(new CFException());
3164 <        checkCompletedWithWrappedCFException(f);
3165 <        checkCompletedWithWrappedCFException(g);
3166 <    }
3156 >    public void testWhenComplete_sourceCancelled() {
3157 >        for (ExecutionMode m : ExecutionMode.values())
3158 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3159 >        for (boolean createIncomplete : new boolean[] { true, false })
3160 >    {
3161 >        final AtomicInteger a = new AtomicInteger(0);
3162 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
3163 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
3164 >        final CompletableFuture<Integer> g = m.whenComplete
3165 >            (f,
3166 >             (Integer x, Throwable t) -> {
3167 >                threadAssertNull(x);
3168 >                threadAssertTrue(t instanceof CancellationException);
3169 >                a.getAndIncrement();
3170 >            });
3171 >        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
3172  
3173 <    /**
3174 <     * If a whenCompleteAsync action throws an exception when triggered
3175 <     * by a normal completion, it completes exceptionally
3176 <     */
3177 <    public void testWhenCompleteAsync3e() {
3174 <        ThreadExecutor exec = new ThreadExecutor();
3175 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3176 <        CompletableFuture<Integer> g =
3177 <            f.whenCompleteAsync((Integer x, Throwable t) ->
3178 <                                { throw new CFException(); },
3179 <                                exec);
3180 <        f.complete(three);
3181 <        checkCompletedNormally(f, three);
3182 <        checkCompletedWithWrappedCFException(g);
3183 <    }
3173 >        //try { g.join(); } catch (Throwable t) { throw new Error(t); }
3174 >        checkCompletedWithWrappedCancellationException(g);
3175 >        checkCancelled(f);
3176 >        assertEquals(1, a.get());
3177 >    }}
3178  
3179      /**
3180 <     * handleAsync action completes normally with function value on
3181 <     * either normal or exceptional completion of source
3180 >     * If a whenComplete action throws an exception when triggered by
3181 >     * a normal completion, it completes exceptionally
3182       */
3183 <    public void testHandleAsync() {
3184 <        CompletableFuture<Integer> f, g;
3185 <        IntegerHandler r;
3186 <
3187 <        f = new CompletableFuture<>();
3188 <        g = f.handleAsync(r = new IntegerHandler());
3189 <        assertFalse(r.ran);
3190 <        f.completeExceptionally(new CFException());
3191 <        checkCompletedWithWrappedCFException(f);
3192 <        checkCompletedNormally(g, three);
3193 <        assertTrue(r.ran);
3194 <
3195 <        f = new CompletableFuture<>();
3196 <        g = f.handleAsync(r = new IntegerHandler());
3197 <        assertFalse(r.ran);
3198 <        f.completeExceptionally(new CFException());
3199 <        checkCompletedWithWrappedCFException(f);
3200 <        checkCompletedNormally(g, three);
3201 <        assertTrue(r.ran);
3202 <
3203 <        f = new CompletableFuture<>();
3204 <        g = f.handleAsync(r = new IntegerHandler());
3211 <        assertFalse(r.ran);
3212 <        f.complete(one);
3213 <        checkCompletedNormally(f, one);
3214 <        checkCompletedNormally(g, two);
3215 <        assertTrue(r.ran);
3216 <
3217 <        f = new CompletableFuture<>();
3218 <        g = f.handleAsync(r = new IntegerHandler());
3219 <        assertFalse(r.ran);
3220 <        f.complete(one);
3221 <        checkCompletedNormally(f, one);
3222 <        checkCompletedNormally(g, two);
3223 <        assertTrue(r.ran);
3224 <    }
3183 >    public void testWhenComplete_actionFailed() {
3184 >        for (boolean createIncomplete : new boolean[] { true, false })
3185 >        for (ExecutionMode m : ExecutionMode.values())
3186 >        for (Integer v1 : new Integer[] { 1, null })
3187 >    {
3188 >        final AtomicInteger a = new AtomicInteger(0);
3189 >        final CFException ex = new CFException();
3190 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
3191 >        if (!createIncomplete) f.complete(v1);
3192 >        final CompletableFuture<Integer> g = m.whenComplete
3193 >            (f,
3194 >             (Integer x, Throwable t) -> {
3195 >                threadAssertSame(x, v1);
3196 >                threadAssertNull(t);
3197 >                a.getAndIncrement();
3198 >                throw ex;
3199 >            });
3200 >        if (createIncomplete) f.complete(v1);
3201 >        checkCompletedNormally(f, v1);
3202 >        checkCompletedWithWrappedCFException(g, ex);
3203 >        assertEquals(1, a.get());
3204 >    }}
3205  
3206      /**
3207 <     * handleAsync action with Executor completes normally with
3208 <     * function value on either normal or exceptional completion of
3209 <     * source
3207 >     * If a whenComplete action throws an exception when triggered by
3208 >     * a source completion that also throws an exception, the source
3209 >     * exception takes precedence.
3210       */
3211 <    public void testHandleAsync2() {
3212 <        CompletableFuture<Integer> f, g;
3213 <        ThreadExecutor exec = new ThreadExecutor();
3214 <        IntegerHandler r;
3215 <
3216 <        f = new CompletableFuture<>();
3217 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3218 <        assertFalse(r.ran);
3219 <        f.completeExceptionally(new CFException());
3220 <        checkCompletedWithWrappedCFException(f);
3221 <        checkCompletedNormally(g, three);
3222 <        assertTrue(r.ran);
3223 <
3224 <        f = new CompletableFuture<>();
3225 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3226 <        assertFalse(r.ran);
3227 <        f.completeExceptionally(new CFException());
3228 <        checkCompletedWithWrappedCFException(f);
3229 <        checkCompletedNormally(g, three);
3230 <        assertTrue(r.ran);
3231 <
3232 <        f = new CompletableFuture<>();
3233 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3234 <        assertFalse(r.ran);
3235 <        f.complete(one);
3256 <        checkCompletedNormally(f, one);
3257 <        checkCompletedNormally(g, two);
3258 <        assertTrue(r.ran);
3259 <
3260 <        f = new CompletableFuture<>();
3261 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3262 <        assertFalse(r.ran);
3263 <        f.complete(one);
3264 <        checkCompletedNormally(f, one);
3265 <        checkCompletedNormally(g, two);
3266 <        assertTrue(r.ran);
3267 <    }
3211 >    public void testWhenComplete_actionFailedSourceFailed() {
3212 >        for (boolean createIncomplete : new boolean[] { true, false })
3213 >        for (ExecutionMode m : ExecutionMode.values())
3214 >        for (Integer v1 : new Integer[] { 1, null })
3215 >    {
3216 >        final AtomicInteger a = new AtomicInteger(0);
3217 >        final CFException ex1 = new CFException();
3218 >        final CFException ex2 = new CFException();
3219 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
3220 >
3221 >        if (!createIncomplete) f.completeExceptionally(ex1);
3222 >        final CompletableFuture<Integer> g = m.whenComplete
3223 >            (f,
3224 >             (Integer x, Throwable t) -> {
3225 >                threadAssertSame(t, ex1);
3226 >                threadAssertNull(x);
3227 >                a.getAndIncrement();
3228 >                throw ex2;
3229 >            });
3230 >        if (createIncomplete) f.completeExceptionally(ex1);
3231 >
3232 >        checkCompletedWithWrappedCFException(f, ex1);
3233 >        checkCompletedWithWrappedCFException(g, ex1);
3234 >        assertEquals(1, a.get());
3235 >    }}
3236  
3237   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines