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.33 by jsr166, Sun Jun 1 20:40:13 2014 UTC vs.
Revision 1.52 by jsr166, Mon Jun 2 20:10:04 2014 UTC

# Line 16 | Line 16 | import java.util.concurrent.ExecutionExc
16   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 246 | 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 278 | 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 317 | Line 322 | public class CompletableFutureTest exten
322  
323      // Choose non-commutative actions for better coverage
324  
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 =
340          (Integer x) -> Integer.valueOf(x.intValue() + 1);
341      static final BiFunction<Integer, Integer, Integer> subtract =
342 <        (Integer x, Integer y) -> Integer.valueOf(x.intValue() - y.intValue());
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 <        int value;
360 >        int invocationCount = 0;
361 >        Integer value;
362 >        // Check this action was invoked exactly once when result is computed.
363          public void accept(Integer x, Integer y) {
364 <            value = x.intValue() - y.intValue();
364 >            invocationCount++;
365 >            value = subtract(x, y);
366 >        }
367 >    }
368 >    static final class SubtractFunction implements BiFunction<Integer, Integer, Integer> {
369 >        int invocationCount = 0;
370 >        Integer value;
371 >        // Check this action was invoked exactly once when result is computed.
372 >        public Integer apply(Integer x, Integer y) {
373 >            invocationCount++;
374 >            return value = subtract(x, y);
375          }
376      }
377      static final class Noop implements Runnable {
378 <        boolean ran;
379 <        public void run() { ran = true; }
378 >        int invocationCount = 0;
379 >        public void run() {
380 >            invocationCount++;
381 >        }
382      }
383  
384      static final class FailingSupplier implements Supplier<Integer> {
385 <        boolean ran;
386 <        public Integer get() { ran = true; throw new CFException(); }
385 >        int invocationCount = 0;
386 >        public Integer get() {
387 >            invocationCount++;
388 >            throw new CFException();
389 >        }
390      }
391      static final class FailingConsumer implements Consumer<Integer> {
392 <        boolean ran;
393 <        public void accept(Integer x) { ran = true; throw new CFException(); }
392 >        int invocationCount = 0;
393 >        public void accept(Integer x) {
394 >            invocationCount++;
395 >            throw new CFException();
396 >        }
397      }
398      static final class FailingBiConsumer implements BiConsumer<Integer, Integer> {
399 <        boolean ran;
400 <        public void accept(Integer x, Integer y) { ran = true; throw new CFException(); }
399 >        int invocationCount = 0;
400 >        public void accept(Integer x, Integer y) {
401 >            invocationCount++;
402 >            throw new CFException();
403 >        }
404      }
405      static final class FailingFunction implements Function<Integer, Integer> {
406 <        boolean ran;
407 <        public Integer apply(Integer x) { ran = true; throw new CFException(); }
406 >        int invocationCount = 0;
407 >        public Integer apply(Integer x) {
408 >            invocationCount++;
409 >            throw new CFException();
410 >        }
411      }
412      static final class FailingBiFunction implements BiFunction<Integer, Integer, Integer> {
413 <        boolean ran;
414 <        public Integer apply(Integer x, Integer y) { ran = true; throw new CFException(); }
413 >        int invocationCount = 0;
414 >        public Integer apply(Integer x, Integer y) {
415 >            invocationCount++;
416 >            throw new CFException();
417 >        }
418      }
419 <    static final class FailingNoop implements Runnable {
420 <        boolean ran;
421 <        public void run() { ran = true; throw new CFException(); }
419 >    static final class FailingRunnable implements Runnable {
420 >        int invocationCount = 0;
421 >        public void run() {
422 >            invocationCount++;
423 >            throw new CFException();
424 >        }
425      }
426  
427      static final class CompletableFutureInc
428          implements Function<Integer, CompletableFuture<Integer>> {
429 <        boolean ran;
429 >        int invocationCount = 0;
430          public CompletableFuture<Integer> apply(Integer x) {
431 <            ran = true;
431 >            invocationCount++;
432              CompletableFuture<Integer> f = new CompletableFuture<>();
433 <            f.complete(Integer.valueOf(x.intValue() + 1));
433 >            f.complete(inc(x));
434              return f;
435          }
436      }
437  
438      static final class FailingCompletableFutureFunction
439          implements Function<Integer, CompletableFuture<Integer>> {
440 <        boolean ran;
440 >        int invocationCount = 0;
441          public CompletableFuture<Integer> apply(Integer x) {
442 <            ran = true; throw new CFException();
442 >            invocationCount++;
443 >            throw new CFException();
444          }
445      }
446  
# Line 392 | Line 454 | public class CompletableFutureTest exten
454          }
455      }
456  
457 <    static final class ExceptionToInteger implements Function<Throwable, Integer> {
458 <        public Integer apply(Throwable x) { return Integer.valueOf(3); }
459 <    }
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);
496 >            }
497 >            public <T,U> CompletableFuture<Void> thenAcceptBoth
498 >                (CompletableFuture<T> f,
499 >                 CompletionStage<? extends U> g,
500 >                 BiConsumer<? super T,? super U> a) {
501 >                return f.thenAcceptBoth(g, a);
502 >            }
503 >            public <T,U,V> CompletableFuture<V> thenCombine
504 >                (CompletableFuture<T> f,
505 >                 CompletionStage<? extends U> g,
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 <    static final class IntegerHandler implements BiFunction<Integer, Throwable, Integer> {
530 <        boolean ran;
531 <        public Integer apply(Integer x, Throwable t) {
532 <            ran = true;
533 <            return (t == null) ? two : three;
534 <        }
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);
564 >            }
565 >            public <T,U> CompletableFuture<Void> thenAcceptBoth
566 >                (CompletableFuture<T> f,
567 >                 CompletionStage<? extends U> g,
568 >                 BiConsumer<? super T,? super U> a) {
569 >                return f.thenAcceptBothAsync(g, a);
570 >            }
571 >            public <T,U,V> CompletableFuture<V> thenCombine
572 >                (CompletableFuture<T> f,
573 >                 CompletionStage<? extends U> g,
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 >
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());
631 >            }
632 >            public <T,U> CompletableFuture<Void> thenAcceptBoth
633 >                (CompletableFuture<T> f,
634 >                 CompletionStage<? extends U> g,
635 >                 BiConsumer<? super T,? super U> a) {
636 >                return f.thenAcceptBothAsync(g, a, new ThreadExecutor());
637 >            }
638 >            public <T,U,V> CompletableFuture<V> thenCombine
639 >                (CompletableFuture<T> f,
640 >                 CompletionStage<? extends U> g,
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
683 >            (CompletableFuture<T> f,
684 >             CompletionStage<? extends U> g,
685 >             BiConsumer<? super T,? super U> a);
686 >        public abstract <T,U,V> CompletableFuture<V> thenCombine
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 normal
776 >     * completion of source
777 >     */
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 >        checkCompletedNormally(g, inc(v1));
797 >        checkCompletedNormally(f, v1);
798 >        assertEquals(1, a.get());
799 >    }}
800  
801      /**
802 <     * handle action completes normally with function value on either
803 <     * normal or exceptional completion of source
802 >     * handle action completes normally with function value on
803 >     * exceptional completion of source
804       */
805 <    public void testHandle() {
806 <        CompletableFuture<Integer> f, g;
807 <        IntegerHandler r;
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.completeExceptionally(new CFException());
826 <        g = f.handle(r = new IntegerHandler());
827 <        assertTrue(r.ran);
437 <        checkCompletedNormally(g, three);
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.completeExceptionally(new CFException());
833 <        checkCompletedNormally(g, three);
834 <        assertTrue(r.ran);
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 <        f = new CompletableFuture<>();
853 <        f.complete(one);
854 <        g = f.handle(r = new IntegerHandler());
855 <        assertTrue(r.ran);
450 <        checkCompletedNormally(g, two);
852 >        checkCompletedNormally(g, v1);
853 >        checkCancelled(f);
854 >        assertEquals(1, a.get());
855 >    }}
856  
857 <        f = new CompletableFuture<>();
858 <        g = f.handle(r = new IntegerHandler());
859 <        assertFalse(r.ran);
860 <        f.complete(one);
861 <        assertTrue(r.ran);
862 <        checkCompletedNormally(g, two);
863 <    }
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 464 | 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 476 | 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 485 | 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 518 | 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 526 | 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  
540        f = new CompletableFuture<>();
541        f.complete(null);
542        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);
566 <        assertFalse(r.ran);
567 <    }
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);
586 <    }
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());
604 <        checkCompletedWithWrappedCancellationException(g);
605 <    }
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() {
632 <        CompletableFuture<Integer> f = new CompletableFuture<>();
633 <        CompletableFuture<Integer> g = f.thenApply(new FailingFunction());
634 <        f.complete(one);
635 <        checkCompletedWithWrappedCFException(g);
636 <    }
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 >     * thenApply result completes exceptionally if action does
1131 >     */
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 >
1146 >        checkCompletedWithWrappedCFException(g);
1147 >        checkCompletedNormally(f, v1);
1148 >    }}
1149  
1150      /**
1151       * thenAccept result completes normally after normal completion of source
1152       */
1153 <    public void testThenAccept() {
1154 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1155 <        IncAction r = new IncAction();
1156 <        CompletableFuture<Void> g = f.thenAccept(r);
1157 <        f.complete(one);
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          checkCompletedNormally(g, null);
1168 <        assertEquals(r.value, 2);
1169 <    }
1168 >        checkCompletedNormally(f, v1);
1169 >        assertEquals(1, r.invocationCount);
1170 >        assertEquals(inc(v1), r.value);
1171 >    }}
1172  
1173      /**
1174       * thenAccept result completes exceptionally after exceptional
1175       * completion of source
1176       */
1177 <    public void testThenAccept2() {
1178 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1179 <        IncAction r = new IncAction();
1180 <        CompletableFuture<Void> g = f.thenAccept(r);
1181 <        f.completeExceptionally(new CFException());
1182 <        checkCompletedWithWrappedCFException(g);
1183 <    }
1177 >    public void testThenAccept_exceptionalCompletion() {
1178 >        for (ExecutionMode m : ExecutionMode.values())
1179 >        for (boolean createIncomplete : new boolean[] { true, false })
1180 >    {
1181 >        final CFException ex = new CFException();
1182 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
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 >        }
1190 >
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 testThenAccept3() {
1200 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1201 <        FailingConsumer r = new FailingConsumer();
1202 <        CompletableFuture<Void> g = f.thenAccept(r);
1203 <        f.complete(one);
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 >    {
1204 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
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          checkCompletedWithWrappedCFException(g);
1214 <        assertTrue(r.ran);
1215 <    }
1214 >        checkCompletedNormally(f, v1);
1215 >    }}
1216  
1217      /**
1218       * thenAccept result completes exceptionally if source cancelled
1219       */
1220 <    public void testThenAccept4() {
1221 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1222 <        IncAction r = new IncAction();
1223 <        CompletableFuture<Void> g = f.thenAccept(r);
1224 <        assertTrue(f.cancel(true));
1220 >    public void testThenAccept_sourceCancelled() {
1221 >        for (ExecutionMode m : ExecutionMode.values())
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 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 >        }
1233 >
1234          checkCompletedWithWrappedCancellationException(g);
1235 <    }
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() {
1244 <        CompletableFuture<Integer> f, g, h;
1245 <
1246 <        f = new CompletableFuture<>();
1247 <        g = new CompletableFuture<>();
1248 <        h = f.thenCombine(g, subtract);
1249 <        f.complete(3);
1250 <        checkIncomplete(h);
1251 <        g.complete(1);
1252 <        checkCompletedNormally(h, 2);
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 >    {
1250 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1251 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1252 >        final SubtractFunction r = new SubtractFunction();
1253  
1254 <        f = new CompletableFuture<>();
1255 <        g = new CompletableFuture<>();
1256 <        h = f.thenCombine(g, subtract);
1257 <        g.complete(1);
1258 <        checkIncomplete(h);
1259 <        f.complete(3);
1260 <        checkCompletedNormally(h, 2);
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 <        f = new CompletableFuture<>();
1265 <        g = new CompletableFuture<>();
1266 <        g.complete(1);
1267 <        f.complete(3);
1268 <        h = f.thenCombine(g, subtract);
723 <        checkCompletedNormally(h, 2);
724 <    }
1264 >        checkCompletedNormally(h, subtract(v1, v2));
1265 >        checkCompletedNormally(f, v1);
1266 >        checkCompletedNormally(g, v2);
1267 >        assertEquals(1, r.invocationCount);
1268 >    }}
1269  
1270      /**
1271       * thenCombine result completes exceptionally after exceptional
1272       * completion of either source
1273       */
1274 <    public void testThenCombine2() {
1275 <        CompletableFuture<Integer> f, g, h;
1276 <
1277 <        f = new CompletableFuture<>();
1278 <        g = new CompletableFuture<>();
1279 <        h = f.thenCombine(g, subtract);
1280 <        f.completeExceptionally(new CFException());
1281 <        checkIncomplete(h);
1282 <        g.complete(1);
1283 <        checkCompletedWithWrappedCFException(h);
740 <
741 <        f = new CompletableFuture<>();
742 <        g = new CompletableFuture<>();
743 <        h = f.thenCombine(g, subtract);
744 <        g.completeExceptionally(new CFException());
745 <        checkIncomplete(h);
746 <        f.complete(3);
747 <        checkCompletedWithWrappedCFException(h);
1274 >    public void testThenCombine_exceptionalCompletion() {
1275 >        for (ExecutionMode m : ExecutionMode.values())
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<>();
1282 >        final CFException ex = new CFException();
1283 >        final SubtractFunction r = new SubtractFunction();
1284  
1285 <        f = new CompletableFuture<>();
1286 <        g = new CompletableFuture<>();
1287 <        f.complete(3);
1288 <        g.completeExceptionally(new CFException());
1289 <        h = f.thenCombine(g, subtract);
1290 <        checkCompletedWithWrappedCFException(h);
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 >        if (createIncomplete) {
1290 >            checkIncomplete(h);
1291 >            (!fFirst ? f : g).completeExceptionally(ex);
1292 >        }
1293  
1294 <        f = new CompletableFuture<>();
1295 <        g = new CompletableFuture<>();
1296 <        f.completeExceptionally(new CFException());
1297 <        g.complete(3);
1298 <        h = f.thenCombine(g, subtract);
761 <        checkCompletedWithWrappedCFException(h);
762 <    }
1294 >        checkCompletedWithWrappedCFException(h, ex);
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 testThenCombine3() {
1304 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1305 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1306 <        FailingBiFunction r = new FailingBiFunction();
1307 <        CompletableFuture<Integer> g = f.thenCombine(f2, r);
1308 <        f.complete(one);
1309 <        checkIncomplete(g);
1310 <        assertFalse(r.ran);
1311 <        f2.complete(two);
1312 <        checkCompletedWithWrappedCFException(g);
1313 <        assertTrue(r.ran);
1314 <    }
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 >    {
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 >        if (fFirst) {
1315 >            f.complete(v1);
1316 >            g.complete(v2);
1317 >        } else {
1318 >            g.complete(v2);
1319 >            f.complete(v1);
1320 >        }
1321 >
1322 >        checkCompletedWithWrappedCFException(h);
1323 >        checkCompletedNormally(f, v1);
1324 >        checkCompletedNormally(g, v2);
1325 >    }}
1326  
1327      /**
1328       * thenCombine result completes exceptionally if either source cancelled
1329       */
1330 <    public void testThenCombine4() {
1331 <        CompletableFuture<Integer> f, g, h;
1332 <
1333 <        f = new CompletableFuture<>();
1334 <        g = new CompletableFuture<>();
1335 <        h = f.thenCombine(g, subtract);
1336 <        assertTrue(f.cancel(true));
1337 <        checkIncomplete(h);
1338 <        g.complete(1);
1339 <        checkCompletedWithWrappedCancellationException(h);
1330 >    public void testThenCombine_sourceCancelled() {
1331 >        for (ExecutionMode m : ExecutionMode.values())
1332 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
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 <        f = new CompletableFuture<>();
1342 <        g = new CompletableFuture<>();
1343 <        h = f.thenCombine(g, subtract);
1344 <        assertTrue(g.cancel(true));
1345 <        checkIncomplete(h);
1346 <        f.complete(3);
1347 <        checkCompletedWithWrappedCancellationException(h);
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 >        if (createIncomplete) {
1346 >            checkIncomplete(h);
1347 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1348 >        }
1349  
802        f = new CompletableFuture<>();
803        g = new CompletableFuture<>();
804        assertTrue(f.cancel(true));
805        assertTrue(g.cancel(true));
806        h = f.thenCombine(g, subtract);
1350          checkCompletedWithWrappedCancellationException(h);
1351 <    }
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
1358       * completion of sources
1359       */
1360 <    public void testThenAcceptBoth() {
1361 <        CompletableFuture<Integer> f, g;
1362 <        CompletableFuture<Void> h;
1363 <        SubtractAction r;
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 >    {
1365 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1366 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1367 >        final SubtractAction r = new SubtractAction();
1368 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1369  
1370 <        f = new CompletableFuture<>();
820 <        g = new CompletableFuture<>();
821 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
822 <        f.complete(3);
1370 >        f.complete(v1);
1371          checkIncomplete(h);
1372 <        g.complete(1);
1372 >        assertEquals(0, r.invocationCount);
1373 >        g.complete(v2);
1374 >
1375          checkCompletedNormally(h, null);
1376 <        assertEquals(r.value, 2);
1376 >        assertEquals(subtract(v1, v2), r.value);
1377 >        checkCompletedNormally(f, v1);
1378 >        checkCompletedNormally(g, v2);
1379 >    }}
1380  
1381 <        f = new CompletableFuture<>();
1382 <        g = new CompletableFuture<>();
1383 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
1384 <        g.complete(1);
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 >    {
1386 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1387 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1388 >        final SubtractAction r = new SubtractAction();
1389 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1390 >
1391 >        g.complete(v2);
1392          checkIncomplete(h);
1393 <        f.complete(3);
1393 >        assertEquals(0, r.invocationCount);
1394 >        f.complete(v1);
1395 >
1396          checkCompletedNormally(h, null);
1397 <        assertEquals(r.value, 2);
1397 >        assertEquals(subtract(v1, v2), r.value);
1398 >        checkCompletedNormally(f, v1);
1399 >        checkCompletedNormally(g, v2);
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 >    {
1407 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1408 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1409 >        final SubtractAction r = new SubtractAction();
1410 >
1411 >        g.complete(v2);
1412 >        f.complete(v1);
1413 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1414  
837        f = new CompletableFuture<>();
838        g = new CompletableFuture<>();
839        g.complete(1);
840        f.complete(3);
841        h = f.thenAcceptBoth(g, r = new SubtractAction());
1415          checkCompletedNormally(h, null);
1416 <        assertEquals(r.value, 2);
1417 <    }
1416 >        assertEquals(subtract(v1, v2), r.value);
1417 >        checkCompletedNormally(f, v1);
1418 >        checkCompletedNormally(g, v2);
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 >    {
1426 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1427 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1428 >        final SubtractAction r = new SubtractAction();
1429 >
1430 >        f.complete(v1);
1431 >        g.complete(v2);
1432 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1433 >
1434 >        checkCompletedNormally(h, null);
1435 >        assertEquals(subtract(v1, v2), r.value);
1436 >        checkCompletedNormally(f, v1);
1437 >        checkCompletedNormally(g, v2);
1438 >    }}
1439  
1440      /**
1441       * thenAcceptBoth result completes exceptionally after exceptional
1442       * completion of either source
1443       */
1444 <    public void testThenAcceptBoth2() {
1445 <        CompletableFuture<Integer> f, g;
1446 <        CompletableFuture<Void> h;
1447 <        SubtractAction r;
1444 >    public void testThenAcceptBoth_exceptionalCompletion1() {
1445 >        for (ExecutionMode m : ExecutionMode.values())
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();
1451 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1452 >        final CFException ex = new CFException();
1453  
1454 <        f = new CompletableFuture<>();
856 <        g = new CompletableFuture<>();
857 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
858 <        f.completeExceptionally(new CFException());
1454 >        f.completeExceptionally(ex);
1455          checkIncomplete(h);
1456 <        g.complete(1);
861 <        checkCompletedWithWrappedCFException(h);
1456 >        g.complete(v1);
1457  
1458 <        f = new CompletableFuture<>();
1459 <        g = new CompletableFuture<>();
1460 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
1461 <        g.completeExceptionally(new CFException());
1458 >        checkCompletedWithWrappedCFException(h, ex);
1459 >        checkCompletedWithWrappedCFException(f, ex);
1460 >        assertEquals(0, r.invocationCount);
1461 >        checkCompletedNormally(g, v1);
1462 >    }}
1463 >
1464 >    public void testThenAcceptBoth_exceptionalCompletion2() {
1465 >        for (ExecutionMode m : ExecutionMode.values())
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();
1471 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1472 >        final CFException ex = new CFException();
1473 >
1474 >        g.completeExceptionally(ex);
1475          checkIncomplete(h);
1476 <        f.complete(3);
869 <        checkCompletedWithWrappedCFException(h);
1476 >        f.complete(v1);
1477  
1478 <        f = new CompletableFuture<>();
1479 <        g = new CompletableFuture<>();
1480 <        f.complete(3);
1481 <        g.completeExceptionally(new CFException());
1482 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
876 <        checkCompletedWithWrappedCFException(h);
1478 >        checkCompletedWithWrappedCFException(h, ex);
1479 >        checkCompletedWithWrappedCFException(g, ex);
1480 >        assertEquals(0, r.invocationCount);
1481 >        checkCompletedNormally(f, v1);
1482 >    }}
1483  
1484 <        f = new CompletableFuture<>();
1485 <        g = new CompletableFuture<>();
1486 <        f.completeExceptionally(new CFException());
1487 <        g.complete(3);
1488 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
1489 <        checkCompletedWithWrappedCFException(h);
1490 <    }
1484 >    public void testThenAcceptBoth_exceptionalCompletion3() {
1485 >        for (ExecutionMode m : ExecutionMode.values())
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();
1491 >        final CFException ex = new CFException();
1492 >
1493 >        g.completeExceptionally(ex);
1494 >        f.complete(v1);
1495 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1496 >
1497 >        checkCompletedWithWrappedCFException(h, ex);
1498 >        checkCompletedWithWrappedCFException(g, ex);
1499 >        assertEquals(0, r.invocationCount);
1500 >        checkCompletedNormally(f, v1);
1501 >    }}
1502 >
1503 >    public void testThenAcceptBoth_exceptionalCompletion4() {
1504 >        for (ExecutionMode m : ExecutionMode.values())
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();
1510 >        final CFException ex = new CFException();
1511 >
1512 >        f.completeExceptionally(ex);
1513 >        g.complete(v1);
1514 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1515 >
1516 >        checkCompletedWithWrappedCFException(h, ex);
1517 >        checkCompletedWithWrappedCFException(f, ex);
1518 >        assertEquals(0, r.invocationCount);
1519 >        checkCompletedNormally(g, v1);
1520 >    }}
1521  
1522      /**
1523       * thenAcceptBoth result completes exceptionally if action does
1524       */
1525 <    public void testThenAcceptBoth3() {
1526 <        CompletableFuture<Integer> f, g;
1527 <        CompletableFuture<Void> h;
1528 <        FailingBiConsumer r;
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 >    {
1530 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1531 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1532 >        final FailingBiConsumer r = new FailingBiConsumer();
1533 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1534  
1535 <        f = new CompletableFuture<>();
895 <        g = new CompletableFuture<>();
896 <        h = f.thenAcceptBoth(g, r = new FailingBiConsumer());
897 <        f.complete(3);
1535 >        f.complete(v1);
1536          checkIncomplete(h);
1537 <        g.complete(1);
1537 >        g.complete(v2);
1538 >
1539          checkCompletedWithWrappedCFException(h);
1540 +        checkCompletedNormally(f, v1);
1541 +        checkCompletedNormally(g, v2);
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 +    {
1549 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
1550 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
1551 +        final FailingBiConsumer r = new FailingBiConsumer();
1552 +        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1553 +
1554 +        g.complete(v2);
1555 +        checkIncomplete(h);
1556 +        f.complete(v1);
1557  
902        f = new CompletableFuture<>();
903        g = new CompletableFuture<>();
904        f.complete(3);
905        g.complete(1);
906        h = f.thenAcceptBoth(g, r = new FailingBiConsumer());
1558          checkCompletedWithWrappedCFException(h);
1559 <    }
1559 >        checkCompletedNormally(f, v1);
1560 >        checkCompletedNormally(g, v2);
1561 >    }}
1562  
1563      /**
1564       * thenAcceptBoth result completes exceptionally if either source cancelled
1565       */
1566 <    public void testThenAcceptBoth4() {
1567 <        CompletableFuture<Integer> f, g;
1568 <        CompletableFuture<Void> h;
1569 <        SubtractAction r;
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 >    {
1571 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1572 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1573 >        final SubtractAction r = new SubtractAction();
1574 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1575  
1576 <        f = new CompletableFuture<>();
919 <        g = new CompletableFuture<>();
920 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
921 <        assertTrue(f.cancel(true));
1576 >        assertTrue(f.cancel(mayInterruptIfRunning));
1577          checkIncomplete(h);
1578 <        g.complete(1);
1578 >        g.complete(v1);
1579 >
1580          checkCompletedWithWrappedCancellationException(h);
1581 +        checkCancelled(f);
1582 +        assertEquals(0, r.invocationCount);
1583 +        checkCompletedNormally(g, v1);
1584 +    }}
1585  
1586 <        f = new CompletableFuture<>();
1587 <        g = new CompletableFuture<>();
1588 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
1589 <        assertTrue(g.cancel(true));
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 >    {
1591 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1592 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1593 >        final SubtractAction r = new SubtractAction();
1594 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1595 >
1596 >        assertTrue(g.cancel(mayInterruptIfRunning));
1597          checkIncomplete(h);
1598 <        f.complete(3);
1598 >        f.complete(v1);
1599 >
1600          checkCompletedWithWrappedCancellationException(h);
1601 +        checkCancelled(g);
1602 +        assertEquals(0, r.invocationCount);
1603 +        checkCompletedNormally(f, v1);
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 +    {
1611 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
1612 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
1613 +        final SubtractAction r = new SubtractAction();
1614 +
1615 +        assertTrue(g.cancel(mayInterruptIfRunning));
1616 +        f.complete(v1);
1617 +        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1618  
934        f = new CompletableFuture<>();
935        g = new CompletableFuture<>();
936        f.complete(3);
937        assertTrue(g.cancel(true));
938        h = f.thenAcceptBoth(g, r = new SubtractAction());
1619          checkCompletedWithWrappedCancellationException(h);
1620 +        checkCancelled(g);
1621 +        assertEquals(0, r.invocationCount);
1622 +        checkCompletedNormally(f, v1);
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 +    {
1630 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
1631 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
1632 +        final SubtractAction r = new SubtractAction();
1633 +
1634 +        assertTrue(f.cancel(mayInterruptIfRunning));
1635 +        g.complete(v1);
1636 +        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1637  
941        f = new CompletableFuture<>();
942        g = new CompletableFuture<>();
943        assertTrue(f.cancel(true));
944        g.complete(3);
945        h = f.thenAcceptBoth(g, r = new SubtractAction());
1638          checkCompletedWithWrappedCancellationException(h);
1639 <    }
1639 >        checkCancelled(f);
1640 >        assertEquals(0, r.invocationCount);
1641 >        checkCompletedNormally(g, v1);
1642 >    }}
1643  
1644      /**
1645       * runAfterBoth result completes normally after normal
1646       * completion of sources
1647       */
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();
1656 <        final CompletableFuture<Void> h = f.runAfterBoth(g, r);
1656 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
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 <        }
972 <    }
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();
1677 <        final CompletableFuture<Void> h = f.runAfterBoth(g, r);
1677 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
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 <        }
993 <    }
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();
1698  
1699          g.complete(v2);
1700          f.complete(v1);
1701 <        final CompletableFuture<Void> h = f.runAfterBoth(g, r);
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 <        }
1012 <    }
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();
1717  
1718          f.complete(v1);
1719          g.complete(v2);
1720 <        final CompletableFuture<Void> h = f.runAfterBoth(g, r);
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 <        }
1031 <    }
1726 >    }}
1727  
1728      /**
1729       * runAfterBoth result completes exceptionally after exceptional
1730       * completion of either source
1731       */
1732      public void testRunAfterBoth_exceptionalCompletion1() {
1733 <        for (Integer v1 : new Integer[] { 1, null }) {
1734 <
1733 >        for (ExecutionMode m : ExecutionMode.values())
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();
1739 <        final CompletableFuture<Void> h = f.runAfterBoth(g, r);
1739 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1740          final CFException ex = new CFException();
1741  
1742          f.completeExceptionally(ex);
# Line 1049 | 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 <        }
1055 <    }
1750 >    }}
1751  
1752      public void testRunAfterBoth_exceptionalCompletion2() {
1753 <        for (Integer v1 : new Integer[] { 1, null }) {
1754 <
1753 >        for (ExecutionMode m : ExecutionMode.values())
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();
1759 <        final CompletableFuture<Void> h = f.runAfterBoth(g, r);
1759 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1760          final CFException ex = new CFException();
1761  
1762          g.completeExceptionally(ex);
# Line 1069 | 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 <        }
1075 <    }
1770 >    }}
1771  
1772      public void testRunAfterBoth_exceptionalCompletion3() {
1773 <        for (Integer v1 : new Integer[] { 1, null }) {
1774 <
1773 >        for (ExecutionMode m : ExecutionMode.values())
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 1084 | Line 1780 | public class CompletableFutureTest exten
1780  
1781          g.completeExceptionally(ex);
1782          f.complete(v1);
1783 <        final CompletableFuture<Void> h = f.runAfterBoth(g, r);
1783 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1784  
1785          checkCompletedWithWrappedCFException(h, ex);
1786          checkCompletedWithWrappedCFException(g, ex);
1787 <        assertFalse(r.ran);
1787 >        assertEquals(0, r.invocationCount);
1788          checkCompletedNormally(f, v1);
1789 <        }
1094 <    }
1789 >    }}
1790  
1791      public void testRunAfterBoth_exceptionalCompletion4() {
1792 <        for (Integer v1 : new Integer[] { 1, null }) {
1793 <
1792 >        for (ExecutionMode m : ExecutionMode.values())
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 1103 | Line 1799 | public class CompletableFutureTest exten
1799  
1800          f.completeExceptionally(ex);
1801          g.complete(v1);
1802 <        final CompletableFuture<Void> h = f.runAfterBoth(g, r);
1802 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1803  
1804          checkCompletedWithWrappedCFException(h, ex);
1805          checkCompletedWithWrappedCFException(f, ex);
1806 <        assertFalse(r.ran);
1806 >        assertEquals(0, r.invocationCount);
1807          checkCompletedNormally(g, v1);
1808 <        }
1113 <    }
1808 >    }}
1809  
1810      /**
1811       * runAfterBoth result completes exceptionally if action does
1812       */
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();
1821 <        final CompletableFuture<Void> h = f.runAfterBoth(g, r);
1820 >        final FailingRunnable r = new FailingRunnable();
1821 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1822  
1823          f.complete(v1);
1824          checkIncomplete(h);
# Line 1131 | Line 1827 | public class CompletableFutureTest exten
1827          checkCompletedWithWrappedCFException(h);
1828          checkCompletedNormally(f, v1);
1829          checkCompletedNormally(g, v2);
1830 <        }
1135 <    }
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();
1840 <        final CompletableFuture<Void> h = f.runAfterBoth(g, r);
1839 >        final FailingRunnable r = new FailingRunnable();
1840 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1841  
1842          g.complete(v2);
1843          checkIncomplete(h);
# Line 1150 | Line 1846 | public class CompletableFutureTest exten
1846          checkCompletedWithWrappedCFException(h);
1847          checkCompletedNormally(f, v1);
1848          checkCompletedNormally(g, v2);
1849 <        }
1154 <    }
1849 >    }}
1850  
1851      /**
1852       * runAfterBoth result completes exceptionally if either source cancelled
1853       */
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();
1862 <        final CompletableFuture<Void> h = f.runAfterBoth(g, r);
1862 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1863  
1864          assertTrue(f.cancel(mayInterruptIfRunning));
1865          checkIncomplete(h);
# Line 1171 | 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 <        }
1177 <    }
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();
1882 <        final CompletableFuture<Void> h = f.runAfterBoth(g, r);
1882 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1883  
1884          assertTrue(g.cancel(mayInterruptIfRunning));
1885          checkIncomplete(h);
# Line 1191 | 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 <        }
1197 <    }
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();
1902  
1903          assertTrue(g.cancel(mayInterruptIfRunning));
1904          f.complete(v1);
1905 <        final CompletableFuture<Void> h = f.runAfterBoth(g, r);
1905 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1906  
1907          checkCompletedWithWrappedCancellationException(h);
1908          checkCancelled(g);
1909 <        assertFalse(r.ran);
1909 >        assertEquals(0, r.invocationCount);
1910          checkCompletedNormally(f, v1);
1911 <        }
1216 <    }
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();
1921  
1922          assertTrue(f.cancel(mayInterruptIfRunning));
1923          g.complete(v1);
1924 <        final CompletableFuture<Void> h = f.runAfterBoth(g, r);
1924 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1925  
1926          checkCompletedWithWrappedCancellationException(h);
1927          checkCancelled(f);
1928 <        assertFalse(r.ran);
1928 >        assertEquals(0, r.invocationCount);
1929          checkCompletedNormally(g, v1);
1930 <        }
1235 <    }
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);
1944 <
1250 <        f = new CompletableFuture<>();
1251 <        f.complete(one);
1252 <        f2 = new CompletableFuture<>();
1253 <        g = f.applyToEither(f2, inc);
1254 <        checkCompletedNormally(g, two);
1255 <    }
1256 <
1257 <    /**
1258 <     * applyToEither result completes exceptionally after exceptional
1259 <     * completion of either source
1260 <     */
1261 <    public void testApplyToEither2() {
1262 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1263 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1264 <        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
1265 <        f.completeExceptionally(new CFException());
1266 <        f2.complete(one);
1267 <        checkCompletedWithWrappedCFException(g);
1268 <
1269 <        f = new CompletableFuture<>();
1270 <        f2 = new CompletableFuture<>();
1271 <        f2.completeExceptionally(new CFException());
1272 <        g = f.applyToEither(f2, inc);
1273 <        checkCompletedWithWrappedCFException(g);
1274 <    }
1275 <
1276 <    /**
1277 <     * applyToEither result completes exceptionally if action does
1278 <     */
1279 <    public void testApplyToEither3() {
1280 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1281 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1282 <        FailingFunction r = new FailingFunction();
1283 <        CompletableFuture<Integer> g = f.applyToEither(f2, r);
1284 <        f2.complete(two);
1285 <        checkCompletedWithWrappedCFException(g);
1286 <    }
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 <    /**
1947 <     * applyToEither result completes exceptionally if either source cancelled
1948 <     */
1291 <    public void testApplyToEither4() {
1292 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1293 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1294 <        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
1295 <        assertTrue(f.cancel(true));
1296 <        checkCompletedWithWrappedCancellationException(g);
1297 <        f = new CompletableFuture<>();
1298 <        f2 = new CompletableFuture<>();
1299 <        assertTrue(f2.cancel(true));
1300 <        checkCompletedWithWrappedCancellationException(g);
1301 <    }
1946 >        f.complete(v1);
1947 >        checkCompletedNormally(h, inc(v1));
1948 >        g.complete(v2);
1949  
1950 <    /**
1951 <     * acceptEither result completes normally after normal completion
1952 <     * of either source
1953 <     */
1307 <    public void testAcceptEither() {
1308 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1309 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1310 <        IncAction r = new IncAction();
1311 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
1312 <        f.complete(one);
1313 <        checkCompletedNormally(g, null);
1314 <        f2.complete(one);
1315 <        checkCompletedNormally(g, null);
1316 <        assertEquals(r.value, 2);
1950 >        checkCompletedNormally(f, v1);
1951 >        checkCompletedNormally(g, v2);
1952 >        checkCompletedNormally(h, inc(v1));
1953 >    }}
1954  
1955 <        r = new IncAction();
1956 <        f = new CompletableFuture<>();
1957 <        f.complete(one);
1958 <        f2 = new CompletableFuture<>();
1959 <        g = f.acceptEither(f2, r);
1960 <        checkCompletedNormally(g, null);
1961 <        assertEquals(r.value, 2);
1962 <    }
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 <     * acceptEither result completes exceptionally after exceptional
1967 <     * completion of either source
1330 <     */
1331 <    public void testAcceptEither2() {
1332 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1333 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1334 <        IncAction r = new IncAction();
1335 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
1336 <        f.completeExceptionally(new CFException());
1337 <        f2.complete(one);
1338 <        checkCompletedWithWrappedCFException(g);
1965 >        g.complete(v2);
1966 >        checkCompletedNormally(h, inc(v2));
1967 >        f.complete(v1);
1968  
1969 <        r = new IncAction();
1970 <        f = new CompletableFuture<>();
1971 <        f2 = new CompletableFuture<>();
1972 <        f2.completeExceptionally(new CFException());
1344 <        g = f.acceptEither(f2, r);
1345 <        checkCompletedWithWrappedCFException(g);
1346 <    }
1969 >        checkCompletedNormally(f, v1);
1970 >        checkCompletedNormally(g, v2);
1971 >        checkCompletedNormally(h, inc(v2));
1972 >        }}
1973  
1974 <    /**
1975 <     * acceptEither result completes exceptionally if action does
1976 <     */
1977 <    public void testAcceptEither3() {
1978 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1979 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1980 <        FailingConsumer r = new FailingConsumer();
1981 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
1356 <        f2.complete(two);
1357 <        checkCompletedWithWrappedCFException(g);
1358 <    }
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 <    /**
1984 <     * acceptEither result completes exceptionally if either source cancelled
1985 <     */
1363 <    public void testAcceptEither4() {
1364 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1365 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1366 <        IncAction r = new IncAction();
1367 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
1368 <        assertTrue(f.cancel(true));
1369 <        checkCompletedWithWrappedCancellationException(g);
1370 <        f = new CompletableFuture<>();
1371 <        f2 = new CompletableFuture<>();
1372 <        assertTrue(f2.cancel(true));
1373 <        checkCompletedWithWrappedCancellationException(g);
1374 <    }
1983 >        f.complete(v1);
1984 >        g.complete(v2);
1985 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1986  
1987 <    /**
1988 <     * runAfterEither result completes normally after normal completion
1378 <     * of either source
1379 <     */
1380 <    public void testRunAfterEither() {
1381 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1382 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1383 <        Noop r = new Noop();
1384 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
1385 <        f.complete(one);
1386 <        checkCompletedNormally(g, null);
1387 <        f2.complete(one);
1388 <        checkCompletedNormally(g, null);
1389 <        assertTrue(r.ran);
1987 >        checkCompletedNormally(f, v1);
1988 >        checkCompletedNormally(g, v2);
1989  
1990 <        r = new Noop();
1991 <        f = new CompletableFuture<>();
1992 <        f.complete(one);
1993 <        f2 = new CompletableFuture<>();
1994 <        g = f.runAfterEither(f2, r);
1396 <        checkCompletedNormally(g, null);
1397 <        assertTrue(r.ran);
1398 <    }
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 <     * runAfterEither result completes exceptionally after exceptional
1997 >     * applyToEither result completes exceptionally after exceptional
1998       * completion of either source
1999       */
2000 <    public void testRunAfterEither2() {
2001 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2002 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2003 <        Noop r = new Noop();
2004 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
2005 <        f.completeExceptionally(new CFException());
2006 <        f2.complete(one);
2007 <        checkCompletedWithWrappedCFException(g);
2008 <
1413 <        r = new Noop();
1414 <        f = new CompletableFuture<>();
1415 <        f2 = new CompletableFuture<>();
1416 <        f2.completeExceptionally(new CFException());
1417 <        g = f.runAfterEither(f2, r);
1418 <        checkCompletedWithWrappedCFException(g);
1419 <    }
1420 <
1421 <    /**
1422 <     * runAfterEither result completes exceptionally if action does
1423 <     */
1424 <    public void testRunAfterEither3() {
1425 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1426 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1427 <        FailingNoop r = new FailingNoop();
1428 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
1429 <        f2.complete(two);
1430 <        checkCompletedWithWrappedCFException(g);
1431 <    }
1432 <
1433 <    /**
1434 <     * runAfterEither result completes exceptionally if either source cancelled
1435 <     */
1436 <    public void testRunAfterEither4() {
1437 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1438 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1439 <        Noop r = new Noop();
1440 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
1441 <        assertTrue(f.cancel(true));
1442 <        checkCompletedWithWrappedCancellationException(g);
1443 <        f = new CompletableFuture<>();
1444 <        f2 = new CompletableFuture<>();
1445 <        assertTrue(f2.cancel(true));
1446 <        checkCompletedWithWrappedCancellationException(g);
1447 <    }
1448 <
1449 <    /**
1450 <     * thenCompose result completes normally after normal completion of source
1451 <     */
1452 <    public void testThenCompose() {
1453 <        CompletableFuture<Integer> f, g;
1454 <        CompletableFutureInc r;
1455 <
1456 <        f = new CompletableFuture<>();
1457 <        g = f.thenCompose(r = new CompletableFutureInc());
1458 <        f.complete(one);
1459 <        checkCompletedNormally(g, two);
1460 <        assertTrue(r.ran);
1461 <
1462 <        f = new CompletableFuture<>();
1463 <        f.complete(one);
1464 <        g = f.thenCompose(r = new CompletableFutureInc());
1465 <        checkCompletedNormally(g, two);
1466 <        assertTrue(r.ran);
1467 <    }
1468 <
1469 <    /**
1470 <     * thenCompose result completes exceptionally after exceptional
1471 <     * completion of source
1472 <     */
1473 <    public void testThenCompose2() {
1474 <        CompletableFuture<Integer> f, g;
1475 <        CompletableFutureInc r;
1476 <
1477 <        f = new CompletableFuture<>();
1478 <        g = f.thenCompose(r = new CompletableFutureInc());
1479 <        f.completeExceptionally(new CFException());
1480 <        checkCompletedWithWrappedCFException(g);
1481 <
1482 <        f = new CompletableFuture<>();
1483 <        f.completeExceptionally(new CFException());
1484 <        g = f.thenCompose(r = new CompletableFutureInc());
1485 <        checkCompletedWithWrappedCFException(g);
1486 <    }
1487 <
1488 <    /**
1489 <     * thenCompose result completes exceptionally if action does
1490 <     */
1491 <    public void testThenCompose3() {
1492 <        CompletableFuture<Integer> f, g;
1493 <        FailingCompletableFutureFunction r;
1494 <
1495 <        f = new CompletableFuture<>();
1496 <        g = f.thenCompose(r = new FailingCompletableFutureFunction());
1497 <        f.complete(one);
1498 <        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 <        f = new CompletableFuture<>();
2011 <        f.complete(one);
2012 <        g = f.thenCompose(r = new FailingCompletableFutureFunction());
1503 <        checkCompletedWithWrappedCFException(g);
1504 <    }
2010 >        f.completeExceptionally(ex);
2011 >        checkCompletedWithWrappedCFException(h, ex);
2012 >        g.complete(v1);
2013  
2014 <    /**
2015 <     * thenCompose result completes exceptionally if source cancelled
2016 <     */
2017 <    public void testThenCompose4() {
2018 <        CompletableFuture<Integer> f, g;
1511 <        CompletableFutureInc r;
2014 >        assertEquals(0, r.invocationCount);
2015 >        checkCompletedNormally(g, v1);
2016 >        checkCompletedWithWrappedCFException(f, ex);
2017 >        checkCompletedWithWrappedCFException(h, ex);
2018 >    }}
2019  
2020 <        f = new CompletableFuture<>();
2021 <        g = f.thenCompose(r = new CompletableFutureInc());
2022 <        assertTrue(f.cancel(true));
2023 <        checkCompletedWithWrappedCancellationException(g);
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 <        f = new CompletableFuture<>();
2031 <        assertTrue(f.cancel(true));
2032 <        g = f.thenCompose(r = new CompletableFutureInc());
1521 <        checkCompletedWithWrappedCancellationException(g);
1522 <    }
2030 >        g.completeExceptionally(ex);
2031 >        checkCompletedWithWrappedCFException(h, ex);
2032 >        f.complete(v1);
2033  
2034 <    // asyncs
2034 >        assertEquals(0, r.invocationCount);
2035 >        checkCompletedNormally(f, v1);
2036 >        checkCompletedWithWrappedCFException(g, ex);
2037 >        checkCompletedWithWrappedCFException(h, ex);
2038 >    }}
2039  
2040 <    /**
2041 <     * thenRunAsync result completes normally after normal completion of source
2042 <     */
2043 <    public void testThenRunAsync() {
2044 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2045 <        Noop r = new Noop();
2046 <        CompletableFuture<Void> g = f.thenRunAsync(r);
2047 <        f.complete(null);
1534 <        checkCompletedNormally(g, null);
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 <        // reordered version
2050 <        f = new CompletableFuture<>();
2051 <        f.complete(null);
1539 <        r = new Noop();
1540 <        g = f.thenRunAsync(r);
1541 <        checkCompletedNormally(g, null);
1542 <    }
2049 >        g.completeExceptionally(ex);
2050 >        f.complete(v1);
2051 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2052  
2053 <    /**
2054 <     * thenRunAsync result completes exceptionally after exceptional
1546 <     * completion of source
1547 <     */
1548 <    public void testThenRunAsync2() {
1549 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1550 <        Noop r = new Noop();
1551 <        CompletableFuture<Void> g = f.thenRunAsync(r);
1552 <        f.completeExceptionally(new CFException());
2053 >        // unspecified behavior
2054 >        Integer v;
2055          try {
2056 <            g.join();
2057 <            shouldThrow();
2058 <        } catch (CompletionException success) {}
2059 <        checkCompletedWithWrappedCFException(g);
2060 <    }
2061 <
1560 <    /**
1561 <     * thenRunAsync result completes exceptionally if action does
1562 <     */
1563 <    public void testThenRunAsync3() {
1564 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1565 <        FailingNoop r = new FailingNoop();
1566 <        CompletableFuture<Void> g = f.thenRunAsync(r);
1567 <        f.complete(null);
1568 <        checkCompletedWithWrappedCFException(g);
1569 <    }
1570 <
1571 <    /**
1572 <     * thenRunAsync result completes exceptionally if source cancelled
1573 <     */
1574 <    public void testThenRunAsync4() {
1575 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1576 <        Noop r = new Noop();
1577 <        CompletableFuture<Void> g = f.thenRunAsync(r);
1578 <        assertTrue(f.cancel(true));
1579 <        checkCompletedWithWrappedCancellationException(g);
1580 <    }
1581 <
1582 <    /**
1583 <     * thenApplyAsync result completes normally after normal completion of source
1584 <     */
1585 <    public void testThenApplyAsync() {
1586 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1587 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
1588 <        f.complete(one);
1589 <        checkCompletedNormally(g, two);
1590 <    }
1591 <
1592 <    /**
1593 <     * thenApplyAsync result completes exceptionally after exceptional
1594 <     * completion of source
1595 <     */
1596 <    public void testThenApplyAsync2() {
1597 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1598 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
1599 <        f.completeExceptionally(new CFException());
1600 <        checkCompletedWithWrappedCFException(g);
1601 <    }
1602 <
1603 <    /**
1604 <     * thenApplyAsync result completes exceptionally if action does
1605 <     */
1606 <    public void testThenApplyAsync3() {
1607 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1608 <        FailingFunction r = new FailingFunction();
1609 <        CompletableFuture<Integer> g = f.thenApplyAsync(r);
1610 <        f.complete(null);
1611 <        checkCompletedWithWrappedCFException(g);
1612 <    }
1613 <
1614 <    /**
1615 <     * thenApplyAsync result completes exceptionally if source cancelled
1616 <     */
1617 <    public void testThenApplyAsync4() {
1618 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1619 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
1620 <        assertTrue(f.cancel(true));
1621 <        checkCompletedWithWrappedCancellationException(g);
1622 <    }
1623 <
1624 <    /**
1625 <     * thenAcceptAsync result completes normally after normal
1626 <     * completion of source
1627 <     */
1628 <    public void testThenAcceptAsync() {
1629 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1630 <        IncAction r = new IncAction();
1631 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
1632 <        f.complete(one);
1633 <        checkCompletedNormally(g, null);
1634 <        assertEquals(r.value, 2);
1635 <    }
1636 <
1637 <    /**
1638 <     * thenAcceptAsync result completes exceptionally after exceptional
1639 <     * completion of source
1640 <     */
1641 <    public void testThenAcceptAsync2() {
1642 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1643 <        IncAction r = new IncAction();
1644 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
1645 <        f.completeExceptionally(new CFException());
1646 <        checkCompletedWithWrappedCFException(g);
1647 <    }
1648 <
1649 <    /**
1650 <     * thenAcceptAsync result completes exceptionally if action does
1651 <     */
1652 <    public void testThenAcceptAsync3() {
1653 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1654 <        FailingConsumer r = new FailingConsumer();
1655 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
1656 <        f.complete(null);
1657 <        checkCompletedWithWrappedCFException(g);
1658 <    }
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 <     * thenAcceptAsync result completes exceptionally if source cancelled
2065 <     */
1663 <    public void testThenAcceptAsync4() {
1664 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1665 <        IncAction r = new IncAction();
1666 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
1667 <        assertTrue(f.cancel(true));
1668 <        checkCompletedWithWrappedCancellationException(g);
1669 <    }
2063 >        checkCompletedWithWrappedCFException(g, ex);
2064 >        checkCompletedNormally(f, v1);
2065 >    }}
2066  
2067 <    /**
2068 <     * thenCombineAsync result completes normally after normal
2069 <     * completion of sources
2070 <     */
2071 <    public void testThenCombineAsync() {
2072 <        CompletableFuture<Integer> f, g, h;
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 = new CompletableFuture<>();
2078 <        h = f.thenCombineAsync(g, subtract);
1681 <        f.complete(3);
1682 <        checkIncomplete(h);
1683 <        g.complete(1);
1684 <        checkCompletedNormally(h, 2);
2076 >        f.completeExceptionally(ex);
2077 >        g.complete(v1);
2078 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2079  
2080 <        f = new CompletableFuture<>();
2081 <        g = new CompletableFuture<>();
2082 <        h = f.thenCombineAsync(g, subtract);
2083 <        g.complete(1);
2084 <        checkIncomplete(h);
2085 <        f.complete(3);
2086 <        checkCompletedNormally(h, 2);
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 <        f = new CompletableFuture<>();
2091 <        g = new CompletableFuture<>();
2092 <        g.complete(1);
1697 <        f.complete(3);
1698 <        h = f.thenCombineAsync(g, subtract);
1699 <        checkCompletedNormally(h, 2);
1700 <    }
2090 >        checkCompletedWithWrappedCFException(f, ex);
2091 >        checkCompletedNormally(g, v1);
2092 >    }}
2093  
2094      /**
2095 <     * thenCombineAsync result completes exceptionally after exceptional
1704 <     * completion of either source
2095 >     * applyToEither result completes exceptionally if action does
2096       */
2097 <    public void testThenCombineAsync2() {
2098 <        CompletableFuture<Integer> f, g, h;
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<>();
1710 <        g = new CompletableFuture<>();
1711 <        h = f.thenCombineAsync(g, subtract);
1712 <        f.completeExceptionally(new CFException());
1713 <        checkIncomplete(h);
1714 <        g.complete(1);
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 <        g = new CompletableFuture<>();
2116 <        h = f.thenCombineAsync(g, subtract);
2117 <        g.completeExceptionally(new CFException());
2118 <        checkIncomplete(h);
2119 <        f.complete(3);
2120 <        checkCompletedWithWrappedCFException(h);
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 <        f = new CompletableFuture<>();
1726 <        g = new CompletableFuture<>();
1727 <        g.completeExceptionally(new CFException());
1728 <        f.complete(3);
1729 <        h = f.thenCombineAsync(g, subtract);
2124 >        g.complete(v2);
2125          checkCompletedWithWrappedCFException(h);
2126 <    }
2127 <
2128 <    /**
2129 <     * thenCombineAsync result completes exceptionally if action does
1735 <     */
1736 <    public void testThenCombineAsync3() {
1737 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1738 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1739 <        FailingBiFunction r = new FailingBiFunction();
1740 <        CompletableFuture<Integer> g = f.thenCombineAsync(f2, r);
1741 <        f.complete(one);
1742 <        checkIncomplete(g);
1743 <        assertFalse(r.ran);
1744 <        f2.complete(two);
1745 <        checkCompletedWithWrappedCFException(g);
1746 <        assertTrue(r.ran);
1747 <    }
2126 >        f.complete(v1);
2127 >        checkCompletedNormally(f, v1);
2128 >        checkCompletedNormally(g, v2);
2129 >    }}
2130  
2131      /**
2132 <     * thenCombineAsync result completes exceptionally if either source cancelled
2132 >     * applyToEither result completes exceptionally if either source cancelled
2133       */
2134 <    public void testThenCombineAsync4() {
2135 <        CompletableFuture<Integer> f, g, h;
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<>();
1756 <        g = new CompletableFuture<>();
1757 <        h = f.thenCombineAsync(g, subtract);
1758 <        assertTrue(f.cancel(true));
1759 <        checkIncomplete(h);
1760 <        g.complete(1);
2144 >        assertTrue(f.cancel(mayInterruptIfRunning));
2145          checkCompletedWithWrappedCancellationException(h);
2146 +        g.complete(v1);
2147  
2148 <        f = new CompletableFuture<>();
2149 <        g = new CompletableFuture<>();
2150 <        h = f.thenCombineAsync(g, subtract);
1766 <        assertTrue(g.cancel(true));
1767 <        checkIncomplete(h);
1768 <        f.complete(3);
2148 >        checkCancelled(f);
2149 >        assertEquals(0, r.invocationCount);
2150 >        checkCompletedNormally(g, v1);
2151          checkCompletedWithWrappedCancellationException(h);
2152 +    }}
2153  
2154 <        f = new CompletableFuture<>();
2155 <        g = new CompletableFuture<>();
2156 <        g.complete(3);
2157 <        assertTrue(f.cancel(true));
2158 <        h = f.thenCombineAsync(g, subtract);
2159 <        checkCompletedWithWrappedCancellationException(h);
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<>();
1779 <        g = new CompletableFuture<>();
1780 <        f.complete(3);
1781 <        assertTrue(g.cancel(true));
1782 <        h = f.thenCombineAsync(g, subtract);
2164 >        assertTrue(g.cancel(mayInterruptIfRunning));
2165          checkCompletedWithWrappedCancellationException(h);
2166 <    }
1785 <
1786 <    /**
1787 <     * thenAcceptBothAsync result completes normally after normal
1788 <     * completion of sources
1789 <     */
1790 <    public void testThenAcceptBothAsync() {
1791 <        CompletableFuture<Integer> f, g;
1792 <        CompletableFuture<Void> h;
1793 <        SubtractAction r;
1794 <
1795 <        f = new CompletableFuture<>();
1796 <        g = new CompletableFuture<>();
1797 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1798 <        f.complete(3);
1799 <        checkIncomplete(h);
1800 <        g.complete(1);
1801 <        checkCompletedNormally(h, null);
1802 <        assertEquals(r.value, 2);
1803 <
1804 <        f = new CompletableFuture<>();
1805 <        g = new CompletableFuture<>();
1806 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1807 <        g.complete(1);
1808 <        checkIncomplete(h);
1809 <        f.complete(3);
1810 <        checkCompletedNormally(h, null);
1811 <        assertEquals(r.value, 2);
1812 <
1813 <        f = new CompletableFuture<>();
1814 <        g = new CompletableFuture<>();
1815 <        g.complete(1);
1816 <        f.complete(3);
1817 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1818 <        checkCompletedNormally(h, null);
1819 <        assertEquals(r.value, 2);
1820 <    }
1821 <
1822 <    /**
1823 <     * thenAcceptBothAsync result completes exceptionally after exceptional
1824 <     * completion of source
1825 <     */
1826 <    public void testThenAcceptBothAsync2() {
1827 <        CompletableFuture<Integer> f, g;
1828 <        CompletableFuture<Void> h;
1829 <        SubtractAction r;
1830 <
1831 <        f = new CompletableFuture<>();
1832 <        g = new CompletableFuture<>();
1833 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1834 <        f.completeExceptionally(new CFException());
1835 <        checkIncomplete(h);
1836 <        g.complete(1);
1837 <        checkCompletedWithWrappedCFException(h);
1838 <
1839 <        f = new CompletableFuture<>();
1840 <        g = new CompletableFuture<>();
1841 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1842 <        g.completeExceptionally(new CFException());
1843 <        checkIncomplete(h);
1844 <        f.complete(3);
1845 <        checkCompletedWithWrappedCFException(h);
1846 <
1847 <        f = new CompletableFuture<>();
1848 <        g = new CompletableFuture<>();
1849 <        f.complete(3);
1850 <        g.completeExceptionally(new CFException());
1851 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1852 <        checkCompletedWithWrappedCFException(h);
1853 <
1854 <        f = new CompletableFuture<>();
1855 <        g = new CompletableFuture<>();
1856 <        f.completeExceptionally(new CFException());
1857 <        g.complete(3);
1858 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1859 <        checkCompletedWithWrappedCFException(h);
1860 <    }
1861 <
1862 <    /**
1863 <     * thenAcceptBothAsync result completes exceptionally if action does
1864 <     */
1865 <    public void testThenAcceptBothAsync3() {
1866 <        CompletableFuture<Integer> f, g;
1867 <        CompletableFuture<Void> h;
1868 <        FailingBiConsumer r;
1869 <
1870 <        f = new CompletableFuture<>();
1871 <        g = new CompletableFuture<>();
1872 <        h = f.thenAcceptBothAsync(g, r = new FailingBiConsumer());
1873 <        f.complete(3);
1874 <        checkIncomplete(h);
1875 <        g.complete(1);
1876 <        checkCompletedWithWrappedCFException(h);
2166 >        f.complete(v1);
2167  
2168 <        f = new CompletableFuture<>();
2169 <        g = new CompletableFuture<>();
2170 <        f.complete(3);
2171 <        g.complete(1);
2172 <        h = f.thenAcceptBothAsync(g, r = new FailingBiConsumer());
1883 <        checkCompletedWithWrappedCFException(h);
1884 <    }
2168 >        checkCancelled(g);
2169 >        assertEquals(0, r.invocationCount);
2170 >        checkCompletedNormally(f, v1);
2171 >        checkCompletedWithWrappedCancellationException(h);
2172 >    }}
2173  
2174 <    /**
2175 <     * thenAcceptBothAsync result completes exceptionally if either source cancelled
2176 <     */
2177 <    public void testThenAcceptBothAsync4() {
2178 <        CompletableFuture<Integer> f, g;
2179 <        CompletableFuture<Void> h;
2180 <        SubtractAction r;
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 <        f = new CompletableFuture<>();
2184 <        g = new CompletableFuture<>();
2185 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1897 <        assertTrue(f.cancel(true));
1898 <        checkIncomplete(h);
1899 <        g.complete(1);
1900 <        checkCompletedWithWrappedCancellationException(h);
2183 >        assertTrue(g.cancel(mayInterruptIfRunning));
2184 >        f.complete(v1);
2185 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2186  
2187 <        f = new CompletableFuture<>();
2188 <        g = new CompletableFuture<>();
2189 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
2190 <        assertTrue(g.cancel(true));
2191 <        checkIncomplete(h);
2192 <        f.complete(3);
2193 <        checkCompletedWithWrappedCancellationException(h);
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 <        f = new CompletableFuture<>();
2198 <        g = new CompletableFuture<>();
2199 <        f.complete(3);
1913 <        assertTrue(g.cancel(true));
1914 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1915 <        checkCompletedWithWrappedCancellationException(h);
2197 >        checkCancelled(g);
2198 >        checkCompletedNormally(f, v1);
2199 >    }}
2200  
2201 <        f = new CompletableFuture<>();
2202 <        g = new CompletableFuture<>();
2203 <        assertTrue(f.cancel(true));
2204 <        g.complete(3);
2205 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
2206 <        checkCompletedWithWrappedCancellationException(h);
2207 <    }
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 <    /**
2211 <     * runAfterBothAsync result completes normally after normal
2212 <     * completion of sources
1928 <     */
1929 <    public void testRunAfterBothAsync() {
1930 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1931 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1932 <        Noop r = new Noop();
1933 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r);
1934 <        f.complete(one);
1935 <        checkIncomplete(g);
1936 <        f2.complete(two);
1937 <        checkCompletedNormally(g, null);
1938 <        assertTrue(r.ran);
1939 <    }
2210 >        assertTrue(f.cancel(mayInterruptIfRunning));
2211 >        g.complete(v1);
2212 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2213  
2214 <    /**
2215 <     * runAfterBothAsync result completes exceptionally after exceptional
2216 <     * completion of source
2217 <     */
2218 <    public void testRunAfterBothAsync2() {
2219 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2220 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2221 <        Noop r = new Noop();
2222 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r);
1950 <        f.completeExceptionally(new CFException());
1951 <        f2.complete(two);
1952 <        checkCompletedWithWrappedCFException(g);
2214 >        // unspecified behavior
2215 >        Integer v;
2216 >        try {
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 <        r = new Noop();
2225 <        f = new CompletableFuture<>();
2226 <        f2 = new CompletableFuture<>();
1957 <        g = f.runAfterBothAsync(f2, r);
1958 <        f.complete(one);
1959 <        f2.completeExceptionally(new CFException());
1960 <        checkCompletedWithWrappedCFException(g);
1961 <    }
2224 >        checkCancelled(f);
2225 >        checkCompletedNormally(g, v1);
2226 >    }}
2227  
2228      /**
2229 <     * runAfterBothAsync result completes exceptionally if action does
2229 >     * acceptEither result completes normally after normal completion
2230 >     * of either source
2231       */
2232 <    public void testRunAfterBothAsync3() {
2233 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2234 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2235 <        FailingNoop r = new FailingNoop();
2236 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r);
2237 <        f.complete(one);
2238 <        checkIncomplete(g);
2239 <        f2.complete(two);
2240 <        checkCompletedWithWrappedCFException(g);
1975 <    }
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 <     * runAfterBothAsync result completes exceptionally if either source cancelled
2244 <     */
2245 <    public void testRunAfterBothAsync4() {
1981 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1982 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1983 <        Noop r = new Noop();
1984 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r);
1985 <        assertTrue(f.cancel(true));
1986 <        f2.complete(two);
1987 <        checkCompletedWithWrappedCancellationException(g);
2242 >        f.complete(v1);
2243 >        checkCompletedNormally(h, null);
2244 >        assertEquals(inc(v1), r.value);
2245 >        g.complete(v2);
2246  
2247 <        r = new Noop();
2248 <        f = new CompletableFuture<>();
2249 <        f2 = new CompletableFuture<>();
2250 <        g = f.runAfterBothAsync(f2, r);
1993 <        f.complete(one);
1994 <        assertTrue(f2.cancel(true));
1995 <        checkCompletedWithWrappedCancellationException(g);
1996 <    }
2247 >        checkCompletedNormally(f, v1);
2248 >        checkCompletedNormally(g, v2);
2249 >        checkCompletedNormally(h, null);
2250 >    }}
2251  
2252 <    /**
2253 <     * applyToEitherAsync result completes normally after normal
2254 <     * completion of sources
2255 <     */
2256 <    public void testApplyToEitherAsync() {
2257 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2258 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2259 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
2260 <        f.complete(one);
2007 <        checkCompletedNormally(g, two);
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 <        f = new CompletableFuture<>();
2263 <        f.complete(one);
2264 <        f2 = new CompletableFuture<>();
2265 <        g = f.applyToEitherAsync(f2, inc);
2013 <        checkCompletedNormally(g, two);
2014 <    }
2262 >        g.complete(v2);
2263 >        checkCompletedNormally(h, null);
2264 >        assertEquals(inc(v2), r.value);
2265 >        f.complete(v1);
2266  
2267 <    /**
2268 <     * applyToEitherAsync result completes exceptionally after exceptional
2269 <     * completion of source
2270 <     */
2020 <    public void testApplyToEitherAsync2() {
2021 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2022 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2023 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
2024 <        f.completeExceptionally(new CFException());
2025 <        checkCompletedWithWrappedCFException(g);
2267 >        checkCompletedNormally(f, v1);
2268 >        checkCompletedNormally(g, v2);
2269 >        checkCompletedNormally(h, null);
2270 >    }}
2271  
2272 <        f = new CompletableFuture<>();
2273 <        f2 = new CompletableFuture<>();
2274 <        f2.completeExceptionally(new CFException());
2275 <        g = f.applyToEitherAsync(f2, inc);
2276 <        f.complete(one);
2277 <        checkCompletedWithWrappedCFException(g);
2278 <    }
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 <     * applyToEitherAsync result completes exceptionally if action does
2283 <     */
2038 <    public void testApplyToEitherAsync3() {
2039 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2040 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2041 <        FailingFunction r = new FailingFunction();
2042 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, r);
2043 <        f.complete(one);
2044 <        checkCompletedWithWrappedCFException(g);
2045 <    }
2281 >        f.complete(v1);
2282 >        g.complete(v2);
2283 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2284  
2285 <    /**
2286 <     * applyToEitherAsync result completes exceptionally if either source cancelled
2287 <     */
2050 <    public void testApplyToEitherAsync4() {
2051 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2052 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2053 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
2054 <        assertTrue(f.cancel(true));
2055 <        checkCompletedWithWrappedCancellationException(g);
2285 >        checkCompletedNormally(h, null);
2286 >        checkCompletedNormally(f, v1);
2287 >        checkCompletedNormally(g, v2);
2288  
2289 <        f = new CompletableFuture<>();
2290 <        f2 = new CompletableFuture<>();
2291 <        assertTrue(f2.cancel(true));
2292 <        g = f.applyToEitherAsync(f2, inc);
2061 <        checkCompletedWithWrappedCancellationException(g);
2062 <    }
2289 >        // unspecified behavior
2290 >        assertTrue(Objects.equals(r.value, inc(v1)) ||
2291 >                   Objects.equals(r.value, inc(v2)));
2292 >    }}
2293  
2294      /**
2295 <     * acceptEitherAsync 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 testAcceptEitherAsync() {
2299 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2300 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2301 <        IncAction r = new IncAction();
2302 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
2303 <        f.complete(one);
2304 <        checkCompletedNormally(g, null);
2305 <        assertEquals(r.value, 2);
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 <        r = new IncAction();
2309 <        f = new CompletableFuture<>();
2310 <        f.complete(one);
2080 <        f2 = new CompletableFuture<>();
2081 <        g = f.acceptEitherAsync(f2, r);
2082 <        checkCompletedNormally(g, null);
2083 <        assertEquals(r.value, 2);
2084 <    }
2308 >        f.completeExceptionally(ex);
2309 >        checkCompletedWithWrappedCFException(h, ex);
2310 >        g.complete(v1);
2311  
2312 <    /**
2313 <     * acceptEitherAsync result completes exceptionally after exceptional
2314 <     * completion of source
2315 <     */
2316 <    public void testAcceptEitherAsync2() {
2091 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2092 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2093 <        IncAction r = new IncAction();
2094 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
2095 <        f.completeExceptionally(new CFException());
2096 <        checkCompletedWithWrappedCFException(g);
2312 >        assertEquals(0, r.invocationCount);
2313 >        checkCompletedNormally(g, v1);
2314 >        checkCompletedWithWrappedCFException(f, ex);
2315 >        checkCompletedWithWrappedCFException(h, ex);
2316 >    }}
2317  
2318 <        r = new IncAction();
2319 <        f = new CompletableFuture<>();
2320 <        f2 = new CompletableFuture<>();
2321 <        f2.completeExceptionally(new CFException());
2322 <        g = f.acceptEitherAsync(f2, r);
2323 <        f.complete(one);
2324 <        checkCompletedWithWrappedCFException(g);
2325 <    }
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 <     * acceptEitherAsync result completes exceptionally if action does
2330 <     */
2110 <    public void testAcceptEitherAsync3() {
2111 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2112 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2113 <        FailingConsumer r = new FailingConsumer();
2114 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
2115 <        f.complete(one);
2116 <        checkCompletedWithWrappedCFException(g);
2117 <    }
2328 >        g.completeExceptionally(ex);
2329 >        checkCompletedWithWrappedCFException(h, ex);
2330 >        f.complete(v1);
2331  
2332 <    /**
2333 <     * acceptEitherAsync result completes exceptionally if either
2334 <     * source cancelled
2335 <     */
2336 <    public void testAcceptEitherAsync4() {
2124 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2125 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2126 <        IncAction r = new IncAction();
2127 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
2128 <        assertTrue(f.cancel(true));
2129 <        checkCompletedWithWrappedCancellationException(g);
2332 >        assertEquals(0, r.invocationCount);
2333 >        checkCompletedNormally(f, v1);
2334 >        checkCompletedWithWrappedCFException(g, ex);
2335 >        checkCompletedWithWrappedCFException(h, ex);
2336 >    }}
2337  
2338 <        r = new IncAction();
2339 <        f = new CompletableFuture<>();
2340 <        f2 = new CompletableFuture<>();
2341 <        assertTrue(f2.cancel(true));
2342 <        g = f.acceptEitherAsync(f2, r);
2343 <        checkCompletedWithWrappedCancellationException(g);
2344 <    }
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 <     * runAfterEitherAsync result completes normally after normal
2349 <     * completion of sources
2142 <     */
2143 <    public void testRunAfterEitherAsync() {
2144 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2145 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2146 <        Noop r = new Noop();
2147 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
2148 <        f.complete(one);
2149 <        checkCompletedNormally(g, null);
2150 <        assertTrue(r.ran);
2347 >        g.completeExceptionally(ex);
2348 >        f.complete(v1);
2349 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2350  
2351 <        r = new Noop();
2352 <        f = new CompletableFuture<>();
2353 <        f.complete(one);
2354 <        f2 = new CompletableFuture<>();
2355 <        g = f.runAfterEitherAsync(f2, r);
2356 <        checkCompletedNormally(g, null);
2357 <        assertTrue(r.ran);
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 <     * runAfterEitherAsync result completes exceptionally after exceptional
2364 <     * completion of source
2164 <     */
2165 <    public void testRunAfterEitherAsync2() {
2166 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2167 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2168 <        Noop r = new Noop();
2169 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
2170 <        f.completeExceptionally(new CFException());
2171 <        checkCompletedWithWrappedCFException(g);
2362 >        checkCompletedWithWrappedCFException(g, ex);
2363 >        checkCompletedNormally(f, v1);
2364 >    }}
2365  
2366 <        r = new Noop();
2367 <        f = new CompletableFuture<>();
2368 <        f2 = new CompletableFuture<>();
2369 <        f2.completeExceptionally(new CFException());
2370 <        g = f.runAfterEitherAsync(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 <     * runAfterEitherAsync result completes exceptionally if action does
2377 <     */
2185 <    public void testRunAfterEitherAsync3() {
2186 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2187 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2188 <        FailingNoop r = new FailingNoop();
2189 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
2190 <        f.complete(one);
2191 <        checkCompletedWithWrappedCFException(g);
2192 <    }
2375 >        f.completeExceptionally(ex);
2376 >        g.complete(v1);
2377 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2378  
2379 <    /**
2380 <     * runAfterEitherAsync result completes exceptionally if either
2381 <     * source cancelled
2382 <     */
2383 <    public void testRunAfterEitherAsync4() {
2384 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2385 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2386 <        Noop r = new Noop();
2387 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
2388 <        assertTrue(f.cancel(true));
2204 <        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 Noop();
2391 <        f = new CompletableFuture<>();
2392 <        f2 = new CompletableFuture<>();
2209 <        assertTrue(f2.cancel(true));
2210 <        g = f.runAfterEitherAsync(f2, r);
2211 <        checkCompletedWithWrappedCancellationException(g);
2212 <    }
2390 >        checkCompletedWithWrappedCFException(f, ex);
2391 >        checkCompletedNormally(g, v1);
2392 >    }}
2393  
2394      /**
2395 <     * thenComposeAsync result completes normally after normal
2216 <     * completion of source
2395 >     * acceptEither result completes exceptionally if action does
2396       */
2397 <    public void testThenComposeAsync() {
2398 <        CompletableFuture<Integer> f, g;
2399 <        CompletableFutureInc r;
2400 <
2401 <        f = new CompletableFuture<>();
2402 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2403 <        f.complete(one);
2404 <        checkCompletedNormally(g, two);
2405 <
2227 <        f = new CompletableFuture<>();
2228 <        f.complete(one);
2229 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2230 <        checkCompletedNormally(g, two);
2231 <    }
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 <    /**
2408 <     * thenComposeAsync result completes exceptionally after
2409 <     * exceptional completion of source
2410 <     */
2411 <    public void testThenComposeAsync2() {
2412 <        CompletableFuture<Integer> f, g;
2239 <        CompletableFutureInc r;
2407 >        f.complete(v1);
2408 >        checkCompletedWithWrappedCFException(h);
2409 >        g.complete(v2);
2410 >        checkCompletedNormally(f, v1);
2411 >        checkCompletedNormally(g, v2);
2412 >    }}
2413  
2414 <        f = new CompletableFuture<>();
2415 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2416 <        f.completeExceptionally(new CFException());
2417 <        checkCompletedWithWrappedCFException(g);
2418 <        assertFalse(r.ran);
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 <        f = new CompletableFuture<>();
2425 <        f.completeExceptionally(new CFException());
2426 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2427 <        checkCompletedWithWrappedCFException(g);
2428 <        assertFalse(r.ran);
2429 <    }
2424 >        g.complete(v2);
2425 >        checkCompletedWithWrappedCFException(h);
2426 >        f.complete(v1);
2427 >        checkCompletedNormally(f, v1);
2428 >        checkCompletedNormally(g, v2);
2429 >    }}
2430  
2431      /**
2432 <     * thenComposeAsync result completes exceptionally if action does
2432 >     * acceptEither result completes exceptionally if either source cancelled
2433       */
2434 <    public void testThenComposeAsync3() {
2435 <        CompletableFuture<Integer> f, g;
2436 <        FailingCompletableFutureFunction r;
2437 <
2438 <        f = new CompletableFuture<>();
2439 <        g = f.thenComposeAsync(r = new FailingCompletableFutureFunction());
2440 <        f.complete(one);
2441 <        checkCompletedWithWrappedCFException(g);
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 <        f = new CompletableFuture<>();
2445 <        f.complete(one);
2446 <        g = f.thenComposeAsync(r = new FailingCompletableFutureFunction());
2269 <        checkCompletedWithWrappedCFException(g);
2270 <    }
2444 >        assertTrue(f.cancel(mayInterruptIfRunning));
2445 >        checkCompletedWithWrappedCancellationException(h);
2446 >        g.complete(v1);
2447  
2448 <    /**
2449 <     * thenComposeAsync result completes exceptionally if source cancelled
2450 <     */
2451 <    public void testThenComposeAsync4() {
2452 <        CompletableFuture<Integer> f, g;
2277 <        CompletableFutureInc r;
2448 >        checkCancelled(f);
2449 >        assertEquals(0, r.invocationCount);
2450 >        checkCompletedNormally(g, v1);
2451 >        checkCompletedWithWrappedCancellationException(h);
2452 >    }}
2453  
2454 <        f = new CompletableFuture<>();
2455 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2456 <        assertTrue(f.cancel(true));
2457 <        checkCompletedWithWrappedCancellationException(g);
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 <        assertTrue(f.cancel(true));
2466 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2287 <        checkCompletedWithWrappedCancellationException(g);
2288 <    }
2464 >        assertTrue(g.cancel(mayInterruptIfRunning));
2465 >        checkCompletedWithWrappedCancellationException(h);
2466 >        f.complete(v1);
2467  
2468 <    // async with explicit executors
2468 >        checkCancelled(g);
2469 >        assertEquals(0, r.invocationCount);
2470 >        checkCompletedNormally(f, v1);
2471 >        checkCompletedWithWrappedCancellationException(h);
2472 >    }}
2473  
2474 <    /**
2475 <     * thenRunAsync result completes normally after normal completion of source
2476 <     */
2477 <    public void testThenRunAsyncE() {
2478 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2479 <        Noop r = new Noop();
2480 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2481 <        f.complete(null);
2300 <        checkCompletedNormally(g, null);
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 <        // reordered version
2484 <        f = new CompletableFuture<>();
2485 <        f.complete(null);
2305 <        r = new Noop();
2306 <        g = f.thenRunAsync(r, new ThreadExecutor());
2307 <        checkCompletedNormally(g, null);
2308 <    }
2483 >        assertTrue(g.cancel(mayInterruptIfRunning));
2484 >        f.complete(v1);
2485 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2486  
2487 <    /**
2488 <     * thenRunAsync result completes exceptionally after exceptional
2312 <     * completion of source
2313 <     */
2314 <    public void testThenRunAsync2E() {
2315 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2316 <        Noop r = new Noop();
2317 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2318 <        f.completeExceptionally(new CFException());
2487 >        // unspecified behavior
2488 >        Integer v;
2489          try {
2490 <            g.join();
2491 <            shouldThrow();
2492 <        } catch (CompletionException success) {}
2493 <        checkCompletedWithWrappedCFException(g);
2494 <    }
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 <     * thenRunAsync result completes exceptionally if action does
2500 <     */
2329 <    public void testThenRunAsync3E() {
2330 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2331 <        FailingNoop r = new FailingNoop();
2332 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2333 <        f.complete(null);
2334 <        checkCompletedWithWrappedCFException(g);
2335 <    }
2498 >        checkCancelled(g);
2499 >        checkCompletedNormally(f, v1);
2500 >    }}
2501  
2502 <    /**
2503 <     * thenRunAsync result completes exceptionally if source cancelled
2504 <     */
2505 <    public void testThenRunAsync4E() {
2506 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2507 <        Noop r = new Noop();
2508 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2509 <        assertTrue(f.cancel(true));
2345 <        checkCompletedWithWrappedCancellationException(g);
2346 <    }
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 <    /**
2512 <     * thenApplyAsync result completes normally after normal completion of source
2513 <     */
2351 <    public void testThenApplyAsyncE() {
2352 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2353 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
2354 <        f.complete(one);
2355 <        checkCompletedNormally(g, two);
2356 <    }
2511 >        assertTrue(f.cancel(mayInterruptIfRunning));
2512 >        g.complete(v1);
2513 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2514  
2515 <    /**
2516 <     * thenApplyAsync result completes exceptionally after exceptional
2517 <     * completion of source
2518 <     */
2519 <    public void testThenApplyAsync2E() {
2520 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2521 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
2522 <        f.completeExceptionally(new CFException());
2523 <        checkCompletedWithWrappedCFException(g);
2524 <    }
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 <    /**
2527 <     * thenApplyAsync result completes exceptionally if action does
2528 <     */
2372 <    public void testThenApplyAsync3E() {
2373 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2374 <        FailingFunction r = new FailingFunction();
2375 <        CompletableFuture<Integer> g = f.thenApplyAsync(r, new ThreadExecutor());
2376 <        f.complete(null);
2377 <        checkCompletedWithWrappedCFException(g);
2378 <    }
2526 >        checkCancelled(f);
2527 >        checkCompletedNormally(g, v1);
2528 >    }}
2529  
2530      /**
2531 <     * thenApplyAsync result completes exceptionally if source cancelled
2531 >     * runAfterEither result completes normally after normal completion
2532 >     * of either source
2533       */
2534 <    public void testThenApplyAsync4E() {
2535 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2536 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
2537 <        assertTrue(f.cancel(true));
2538 <        checkCompletedWithWrappedCancellationException(g);
2539 <    }
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 <    /**
2545 <     * thenAcceptAsync result completes normally after normal
2546 <     * completion of source
2547 <     */
2394 <    public void testThenAcceptAsyncE() {
2395 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2396 <        IncAction r = new IncAction();
2397 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2398 <        f.complete(one);
2399 <        checkCompletedNormally(g, null);
2400 <        assertEquals(r.value, 2);
2401 <    }
2544 >        f.complete(v1);
2545 >        checkCompletedNormally(h, null);
2546 >        assertEquals(1, r.invocationCount);
2547 >        g.complete(v2);
2548  
2549 <    /**
2550 <     * thenAcceptAsync result completes exceptionally after exceptional
2551 <     * completion of source
2552 <     */
2553 <    public void testThenAcceptAsync2E() {
2408 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2409 <        IncAction r = new IncAction();
2410 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2411 <        f.completeExceptionally(new CFException());
2412 <        checkCompletedWithWrappedCFException(g);
2413 <    }
2549 >        checkCompletedNormally(f, v1);
2550 >        checkCompletedNormally(g, v2);
2551 >        checkCompletedNormally(h, null);
2552 >        assertEquals(1, r.invocationCount);
2553 >    }}
2554  
2555 <    /**
2556 <     * thenAcceptAsync result completes exceptionally if action does
2557 <     */
2558 <    public void testThenAcceptAsync3E() {
2559 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2560 <        FailingConsumer r = new FailingConsumer();
2561 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2562 <        f.complete(null);
2563 <        checkCompletedWithWrappedCFException(g);
2424 <    }
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 <     * thenAcceptAsync result completes exceptionally if source cancelled
2567 <     */
2568 <    public void testThenAcceptAsync4E() {
2430 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2431 <        IncAction r = new IncAction();
2432 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2433 <        assertTrue(f.cancel(true));
2434 <        checkCompletedWithWrappedCancellationException(g);
2435 <    }
2565 >        g.complete(v2);
2566 >        checkCompletedNormally(h, null);
2567 >        assertEquals(1, r.invocationCount);
2568 >        f.complete(v1);
2569  
2570 <    /**
2571 <     * thenCombineAsync result completes normally after normal
2572 <     * completion of sources
2573 <     */
2574 <    public void testThenCombineAsyncE() {
2442 <        CompletableFuture<Integer> f, g, h;
2443 <        ThreadExecutor e = new ThreadExecutor();
2444 <        int count = 0;
2570 >        checkCompletedNormally(f, v1);
2571 >        checkCompletedNormally(g, v2);
2572 >        checkCompletedNormally(h, null);
2573 >        assertEquals(1, r.invocationCount);
2574 >        }}
2575  
2576 <        f = new CompletableFuture<>();
2577 <        g = new CompletableFuture<>();
2578 <        h = f.thenCombineAsync(g, subtract, e);
2579 <        f.complete(3);
2580 <        checkIncomplete(h);
2581 <        g.complete(1);
2582 <        checkCompletedNormally(h, 2);
2583 <        assertEquals(++count, e.count.get());
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 <        f = new CompletableFuture<>();
2586 <        g = new CompletableFuture<>();
2587 <        h = f.thenCombineAsync(g, subtract, e);
2458 <        g.complete(1);
2459 <        checkIncomplete(h);
2460 <        f.complete(3);
2461 <        checkCompletedNormally(h, 2);
2462 <        assertEquals(++count, e.count.get());
2585 >        f.complete(v1);
2586 >        g.complete(v2);
2587 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2588  
2589 <        f = new CompletableFuture<>();
2590 <        g = new CompletableFuture<>();
2591 <        g.complete(1);
2592 <        f.complete(3);
2593 <        h = f.thenCombineAsync(g, subtract, e);
2469 <        checkCompletedNormally(h, 2);
2470 <        assertEquals(++count, e.count.get());
2471 <    }
2589 >        checkCompletedNormally(h, null);
2590 >        checkCompletedNormally(f, v1);
2591 >        checkCompletedNormally(g, v2);
2592 >        assertEquals(1, r.invocationCount);
2593 >    }}
2594  
2595      /**
2596 <     * thenCombineAsync result completes exceptionally after exceptional
2596 >     * runAfterEither result completes exceptionally after exceptional
2597       * completion of either source
2598       */
2599 <    public void testThenCombineAsync2E() {
2600 <        CompletableFuture<Integer> f, g, h;
2601 <        ThreadExecutor e = new ThreadExecutor();
2602 <        int count = 0;
2603 <
2604 <        f = new CompletableFuture<>();
2605 <        g = new CompletableFuture<>();
2606 <        h = f.thenCombineAsync(g, subtract, e);
2607 <        f.completeExceptionally(new CFException());
2486 <        checkIncomplete(h);
2487 <        g.complete(1);
2488 <        checkCompletedWithWrappedCFException(h);
2489 <
2490 <        f = new CompletableFuture<>();
2491 <        g = new CompletableFuture<>();
2492 <        h = f.thenCombineAsync(g, subtract, e);
2493 <        g.completeExceptionally(new CFException());
2494 <        checkIncomplete(h);
2495 <        f.complete(3);
2496 <        checkCompletedWithWrappedCFException(h);
2497 <
2498 <        f = new CompletableFuture<>();
2499 <        g = new CompletableFuture<>();
2500 <        g.completeExceptionally(new CFException());
2501 <        h = f.thenCombineAsync(g, subtract, e);
2502 <        checkIncomplete(h);
2503 <        f.complete(3);
2504 <        checkCompletedWithWrappedCFException(h);
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 <        assertEquals(0, e.count.get());
2610 <    }
2609 >        f.completeExceptionally(ex);
2610 >        checkCompletedWithWrappedCFException(h, ex);
2611 >        g.complete(v1);
2612  
2613 <    /**
2614 <     * thenCombineAsync result completes exceptionally if action does
2615 <     */
2616 <    public void testThenCombineAsync3E() {
2617 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2514 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2515 <        FailingBiFunction r = new FailingBiFunction();
2516 <        CompletableFuture<Integer> g = f.thenCombineAsync(f2, r, new ThreadExecutor());
2517 <        f.complete(one);
2518 <        checkIncomplete(g);
2519 <        assertFalse(r.ran);
2520 <        f2.complete(two);
2521 <        checkCompletedWithWrappedCFException(g);
2522 <        assertTrue(r.ran);
2523 <    }
2613 >        assertEquals(0, r.invocationCount);
2614 >        checkCompletedNormally(g, v1);
2615 >        checkCompletedWithWrappedCFException(f, ex);
2616 >        checkCompletedWithWrappedCFException(h, ex);
2617 >    }}
2618  
2619 <    /**
2620 <     * thenCombineAsync result completes exceptionally if either source cancelled
2621 <     */
2622 <    public void testThenCombineAsync4E() {
2623 <        CompletableFuture<Integer> f, g, h;
2624 <        ThreadExecutor e = new ThreadExecutor();
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 <        f = new CompletableFuture<>();
2630 <        g = new CompletableFuture<>();
2631 <        h = f.thenCombineAsync(g, subtract, e);
2535 <        assertTrue(f.cancel(true));
2536 <        checkIncomplete(h);
2537 <        g.complete(1);
2538 <        checkCompletedWithWrappedCancellationException(h);
2629 >        g.completeExceptionally(ex);
2630 >        checkCompletedWithWrappedCFException(h, ex);
2631 >        f.complete(v1);
2632  
2633 <        f = new CompletableFuture<>();
2634 <        g = new CompletableFuture<>();
2635 <        h = f.thenCombineAsync(g, subtract, e);
2636 <        assertTrue(g.cancel(true));
2637 <        checkIncomplete(h);
2545 <        f.complete(3);
2546 <        checkCompletedWithWrappedCancellationException(h);
2633 >        assertEquals(0, r.invocationCount);
2634 >        checkCompletedNormally(f, v1);
2635 >        checkCompletedWithWrappedCFException(g, ex);
2636 >        checkCompletedWithWrappedCFException(h, ex);
2637 >    }}
2638  
2639 <        f = new CompletableFuture<>();
2640 <        g = new CompletableFuture<>();
2641 <        assertTrue(g.cancel(true));
2642 <        h = f.thenCombineAsync(g, subtract, e);
2643 <        checkIncomplete(h);
2644 <        f.complete(3);
2645 <        checkCompletedWithWrappedCancellationException(h);
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 <        f = new CompletableFuture<>();
2649 <        g = new CompletableFuture<>();
2650 <        assertTrue(f.cancel(true));
2559 <        assertTrue(g.cancel(true));
2560 <        h = f.thenCombineAsync(g, subtract, e);
2561 <        checkCompletedWithWrappedCancellationException(h);
2648 >        g.completeExceptionally(ex);
2649 >        f.complete(v1);
2650 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2651  
2652 <        assertEquals(0, e.count.get());
2653 <    }
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 <    /**
2663 <     * thenAcceptBothAsync result completes normally after normal
2664 <     * completion of sources
2569 <     */
2570 <    public void testThenAcceptBothAsyncE() {
2571 <        CompletableFuture<Integer> f, g;
2572 <        CompletableFuture<Void> h;
2573 <        SubtractAction r;
2574 <        ThreadExecutor e = new ThreadExecutor();
2662 >        checkCompletedWithWrappedCFException(g, ex);
2663 >        checkCompletedNormally(f, v1);
2664 >    }}
2665  
2666 <        f = new CompletableFuture<>();
2667 <        g = new CompletableFuture<>();
2668 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2669 <        f.complete(3);
2670 <        checkIncomplete(h);
2671 <        g.complete(1);
2672 <        checkCompletedNormally(h, null);
2673 <        assertEquals(r.value, 2);
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 <        g = new CompletableFuture<>();
2677 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2588 <        g.complete(1);
2589 <        checkIncomplete(h);
2590 <        f.complete(3);
2591 <        checkCompletedNormally(h, null);
2592 <        assertEquals(r.value, 2);
2675 >        f.completeExceptionally(ex);
2676 >        g.complete(v1);
2677 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2678  
2679 <        f = new CompletableFuture<>();
2680 <        g = new CompletableFuture<>();
2681 <        g.complete(1);
2682 <        f.complete(3);
2683 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2684 <        checkCompletedNormally(h, null);
2685 <        assertEquals(r.value, 2);
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 <        assertEquals(3, e.count.get());
2690 <    }
2689 >        checkCompletedWithWrappedCFException(f, ex);
2690 >        checkCompletedNormally(g, v1);
2691 >    }}
2692  
2693      /**
2694 <     * thenAcceptBothAsync result completes exceptionally after exceptional
2607 <     * completion of source
2694 >     * runAfterEither result completes exceptionally if action does
2695       */
2696 <    public void testThenAcceptBothAsync2E() {
2697 <        CompletableFuture<Integer> f, g;
2698 <        CompletableFuture<Void> h;
2699 <        SubtractAction r;
2700 <        ThreadExecutor e = new ThreadExecutor();
2701 <
2702 <        f = new CompletableFuture<>();
2703 <        g = new CompletableFuture<>();
2704 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2618 <        f.completeExceptionally(new CFException());
2619 <        checkIncomplete(h);
2620 <        g.complete(1);
2621 <        checkCompletedWithWrappedCFException(h);
2622 <
2623 <        f = new CompletableFuture<>();
2624 <        g = new CompletableFuture<>();
2625 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2626 <        g.completeExceptionally(new CFException());
2627 <        checkIncomplete(h);
2628 <        f.complete(3);
2629 <        checkCompletedWithWrappedCFException(h);
2630 <
2631 <        f = new CompletableFuture<>();
2632 <        g = new CompletableFuture<>();
2633 <        f.complete(3);
2634 <        g.completeExceptionally(new CFException());
2635 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2636 <        checkCompletedWithWrappedCFException(h);
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<>();
2639 <        g = new CompletableFuture<>();
2640 <        f.completeExceptionally(new CFException());
2641 <        g.complete(3);
2642 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2706 >        f.complete(v1);
2707          checkCompletedWithWrappedCFException(h);
2708 +        g.complete(v2);
2709 +        checkCompletedNormally(f, v1);
2710 +        checkCompletedNormally(g, v2);
2711 +    }}
2712  
2713 <        assertEquals(0, e.count.get());
2714 <    }
2715 <
2716 <    /**
2717 <     * thenAcceptBothAsync result completes exceptionally if action does
2718 <     */
2719 <    public void testThenAcceptBothAsync3E() {
2720 <        CompletableFuture<Integer> f, g;
2721 <        CompletableFuture<Void> h;
2654 <        FailingBiConsumer r;
2655 <        ThreadExecutor e = new ThreadExecutor();
2656 <
2657 <        f = new CompletableFuture<>();
2658 <        g = new CompletableFuture<>();
2659 <        h = f.thenAcceptBothAsync(g, r = new FailingBiConsumer(), e);
2660 <        f.complete(3);
2661 <        checkIncomplete(h);
2662 <        g.complete(1);
2663 <        checkCompletedWithWrappedCFException(h);
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 <        f = new CompletableFuture<>();
2666 <        g = new CompletableFuture<>();
2667 <        f.complete(3);
2668 <        g.complete(1);
2669 <        h = f.thenAcceptBothAsync(g, r = new FailingBiConsumer(), e);
2723 >        g.complete(v2);
2724          checkCompletedWithWrappedCFException(h);
2725 <
2726 <        assertEquals(2, e.count.get());
2727 <    }
2725 >        f.complete(v1);
2726 >        checkCompletedNormally(f, v1);
2727 >        checkCompletedNormally(g, v2);
2728 >    }}
2729  
2730      /**
2731 <     * thenAcceptBothAsync result completes exceptionally if either source cancelled
2731 >     * runAfterEither result completes exceptionally if either source cancelled
2732       */
2733 <    public void testThenAcceptBothAsync4E() {
2734 <        CompletableFuture<Integer> f, g;
2735 <        CompletableFuture<Void> h;
2736 <        SubtractAction r;
2737 <        ThreadExecutor e = new ThreadExecutor();
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 <        f = new CompletableFuture<>();
2685 <        g = new CompletableFuture<>();
2686 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2687 <        assertTrue(f.cancel(true));
2688 <        checkIncomplete(h);
2689 <        g.complete(1);
2743 >        assertTrue(f.cancel(mayInterruptIfRunning));
2744          checkCompletedWithWrappedCancellationException(h);
2745 +        g.complete(v1);
2746  
2747 <        f = new CompletableFuture<>();
2748 <        g = new CompletableFuture<>();
2749 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2695 <        assertTrue(g.cancel(true));
2696 <        checkIncomplete(h);
2697 <        f.complete(3);
2747 >        checkCancelled(f);
2748 >        assertEquals(0, r.invocationCount);
2749 >        checkCompletedNormally(g, v1);
2750          checkCompletedWithWrappedCancellationException(h);
2751 +    }}
2752  
2753 <        f = new CompletableFuture<>();
2754 <        g = new CompletableFuture<>();
2755 <        f.complete(3);
2756 <        assertTrue(g.cancel(true));
2757 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2758 <        checkCompletedWithWrappedCancellationException(h);
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 <        f = new CompletableFuture<>();
2708 <        g = new CompletableFuture<>();
2709 <        assertTrue(f.cancel(true));
2710 <        g.complete(3);
2711 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2763 >        assertTrue(g.cancel(mayInterruptIfRunning));
2764          checkCompletedWithWrappedCancellationException(h);
2765 +        f.complete(v1);
2766  
2767 <        assertEquals(0, e.count.get());
2768 <    }
2769 <
2770 <    /**
2771 <     * runAfterBothAsync result completes normally after normal
2719 <     * completion of sources
2720 <     */
2721 <    public void testRunAfterBothAsyncE() {
2722 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2723 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2724 <        Noop r = new Noop();
2725 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2726 <        f.complete(one);
2727 <        checkIncomplete(g);
2728 <        f2.complete(two);
2729 <        checkCompletedNormally(g, null);
2730 <        assertTrue(r.ran);
2731 <    }
2732 <
2733 <    /**
2734 <     * runAfterBothAsync result completes exceptionally after exceptional
2735 <     * completion of source
2736 <     */
2737 <    public void testRunAfterBothAsync2E() {
2738 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2739 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2740 <        Noop r = new Noop();
2741 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2742 <        f.completeExceptionally(new CFException());
2743 <        f2.complete(two);
2744 <        checkCompletedWithWrappedCFException(g);
2745 <
2746 <        r = new Noop();
2747 <        f = new CompletableFuture<>();
2748 <        f2 = new CompletableFuture<>();
2749 <        g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2750 <        f.complete(one);
2751 <        f2.completeExceptionally(new CFException());
2752 <        checkCompletedWithWrappedCFException(g);
2753 <    }
2754 <
2755 <    /**
2756 <     * runAfterBothAsync result completes exceptionally if action does
2757 <     */
2758 <    public void testRunAfterBothAsync3E() {
2759 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2760 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2761 <        FailingNoop r = new FailingNoop();
2762 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2763 <        f.complete(one);
2764 <        checkIncomplete(g);
2765 <        f2.complete(two);
2766 <        checkCompletedWithWrappedCFException(g);
2767 <    }
2768 <
2769 <    /**
2770 <     * runAfterBothAsync result completes exceptionally if either source cancelled
2771 <     */
2772 <    public void testRunAfterBothAsync4E() {
2773 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2774 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2775 <        Noop r = new Noop();
2776 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2777 <        assertTrue(f.cancel(true));
2778 <        f2.complete(two);
2779 <        checkCompletedWithWrappedCancellationException(g);
2780 <
2781 <        r = new Noop();
2782 <        f = new CompletableFuture<>();
2783 <        f2 = new CompletableFuture<>();
2784 <        g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2785 <        f.complete(one);
2786 <        assertTrue(f2.cancel(true));
2787 <        checkCompletedWithWrappedCancellationException(g);
2788 <    }
2789 <
2790 <    /**
2791 <     * applyToEitherAsync result completes normally after normal
2792 <     * completion of sources
2793 <     */
2794 <    public void testApplyToEitherAsyncE() {
2795 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2796 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2797 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2798 <        f.complete(one);
2799 <        checkCompletedNormally(g, two);
2800 <
2801 <        f = new CompletableFuture<>();
2802 <        f.complete(one);
2803 <        f2 = new CompletableFuture<>();
2804 <        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2805 <        checkCompletedNormally(g, two);
2806 <    }
2807 <
2808 <    /**
2809 <     * applyToEitherAsync result completes exceptionally after exceptional
2810 <     * completion of source
2811 <     */
2812 <    public void testApplyToEitherAsync2E() {
2813 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2814 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2815 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2816 <        f.completeExceptionally(new CFException());
2817 <        checkCompletedWithWrappedCFException(g);
2818 <
2819 <        f = new CompletableFuture<>();
2820 <        f2 = new CompletableFuture<>();
2821 <        f2.completeExceptionally(new CFException());
2822 <        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2823 <        f.complete(one);
2824 <        checkCompletedWithWrappedCFException(g);
2825 <    }
2826 <
2827 <    /**
2828 <     * applyToEitherAsync result completes exceptionally if action does
2829 <     */
2830 <    public void testApplyToEitherAsync3E() {
2831 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2832 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2833 <        FailingFunction r = new FailingFunction();
2834 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, r, new ThreadExecutor());
2835 <        f.complete(one);
2836 <        checkCompletedWithWrappedCFException(g);
2837 <    }
2838 <
2839 <    /**
2840 <     * applyToEitherAsync result completes exceptionally if either source cancelled
2841 <     */
2842 <    public void testApplyToEitherAsync4E() {
2843 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2844 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2845 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2846 <        assertTrue(f.cancel(true));
2847 <        checkCompletedWithWrappedCancellationException(g);
2767 >        checkCancelled(g);
2768 >        assertEquals(0, r.invocationCount);
2769 >        checkCompletedNormally(f, v1);
2770 >        checkCompletedWithWrappedCancellationException(h);
2771 >    }}
2772  
2773 <        f = new CompletableFuture<>();
2774 <        f2 = new CompletableFuture<>();
2775 <        assertTrue(f2.cancel(true));
2776 <        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2777 <        checkCompletedWithWrappedCancellationException(g);
2778 <    }
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 <     * acceptEitherAsync result completes normally after normal
2784 <     * completion of sources
2859 <     */
2860 <    public void testAcceptEitherAsyncE() {
2861 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2862 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2863 <        IncAction r = new IncAction();
2864 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2865 <        f.complete(one);
2866 <        checkCompletedNormally(g, null);
2867 <        assertEquals(r.value, 2);
2782 >        assertTrue(g.cancel(mayInterruptIfRunning));
2783 >        f.complete(v1);
2784 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2785  
2786 <        r = new IncAction();
2787 <        f = new CompletableFuture<>();
2788 <        f.complete(one);
2789 <        f2 = new CompletableFuture<>();
2790 <        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2791 <        checkCompletedNormally(g, null);
2792 <        assertEquals(r.value, 2);
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 <     * acceptEitherAsync result completes exceptionally after exceptional
2798 <     * completion of source
2881 <     */
2882 <    public void testAcceptEitherAsync2E() {
2883 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2884 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2885 <        IncAction r = new IncAction();
2886 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2887 <        f.completeExceptionally(new CFException());
2888 <        checkCompletedWithWrappedCFException(g);
2796 >        checkCancelled(g);
2797 >        checkCompletedNormally(f, v1);
2798 >    }}
2799  
2800 <        r = new IncAction();
2801 <        f = new CompletableFuture<>();
2802 <        f2 = new CompletableFuture<>();
2803 <        f2.completeExceptionally(new CFException());
2804 <        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2805 <        f.complete(one);
2806 <        checkCompletedWithWrappedCFException(g);
2807 <    }
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 <    /**
2810 <     * acceptEitherAsync result completes exceptionally if action does
2811 <     */
2902 <    public void testAcceptEitherAsync3E() {
2903 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2904 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2905 <        FailingConsumer r = new FailingConsumer();
2906 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2907 <        f.complete(one);
2908 <        checkCompletedWithWrappedCFException(g);
2909 <    }
2809 >        assertTrue(f.cancel(mayInterruptIfRunning));
2810 >        g.complete(v1);
2811 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2812  
2813 <    /**
2814 <     * acceptEitherAsync result completes exceptionally if either
2815 <     * source cancelled
2816 <     */
2817 <    public void testAcceptEitherAsync4E() {
2818 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2819 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2820 <        IncAction r = new IncAction();
2821 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2920 <        assertTrue(f.cancel(true));
2921 <        checkCompletedWithWrappedCancellationException(g);
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 <        r = new IncAction();
2824 <        f = new CompletableFuture<>();
2825 <        f2 = new CompletableFuture<>();
2926 <        assertTrue(f2.cancel(true));
2927 <        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2928 <        checkCompletedWithWrappedCancellationException(g);
2929 <    }
2823 >        checkCancelled(f);
2824 >        checkCompletedNormally(g, v1);
2825 >    }}
2826  
2827      /**
2828 <     * runAfterEitherAsync result completes normally after normal
2933 <     * completion of sources
2828 >     * thenCompose result completes normally after normal completion of source
2829       */
2830 <    public void testRunAfterEitherAsyncE() {
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 <        f.complete(one);
2836 <        checkCompletedNormally(g, null);
2837 <        assertTrue(r.ran);
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 <        f.complete(one);
2844 <        f2 = new CompletableFuture<>();
2948 <        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2949 <        checkCompletedNormally(g, null);
2950 <        assertTrue(r.ran);
2951 <    }
2841 >        checkCompletedNormally(g, inc(v1));
2842 >        checkCompletedNormally(f, v1);
2843 >        assertEquals(1, r.invocationCount);
2844 >    }}
2845  
2846      /**
2847 <     * runAfterEitherAsync result completes exceptionally after exceptional
2847 >     * thenCompose result completes exceptionally after exceptional
2848       * completion of source
2849       */
2850 <    public void testRunAfterEitherAsync2E() {
2851 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2852 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2853 <        Noop r = new Noop();
2854 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2855 <        f.completeExceptionally(new CFException());
2856 <        checkCompletedWithWrappedCFException(g);
2857 <
2858 <        r = new Noop();
2859 <        f = new CompletableFuture<>();
2967 <        f2 = new CompletableFuture<>();
2968 <        f2.completeExceptionally(new CFException());
2969 <        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2970 <        f.complete(one);
2971 <        checkCompletedWithWrappedCFException(g);
2972 <    }
2973 <
2974 <    /**
2975 <     * runAfterEitherAsync result completes exceptionally if action does
2976 <     */
2977 <    public void testRunAfterEitherAsync3E() {
2978 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2979 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2980 <        FailingNoop r = new FailingNoop();
2981 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2982 <        f.complete(one);
2983 <        checkCompletedWithWrappedCFException(g);
2984 <    }
2985 <
2986 <    /**
2987 <     * runAfterEitherAsync result completes exceptionally if either
2988 <     * source cancelled
2989 <     */
2990 <    public void testRunAfterEitherAsync4E() {
2991 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2992 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2993 <        Noop r = new Noop();
2994 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2995 <        assertTrue(f.cancel(true));
2996 <        checkCompletedWithWrappedCancellationException(g);
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 <        r = new Noop();
2862 <        f = new CompletableFuture<>();
2863 <        f2 = new CompletableFuture<>();
2864 <        assertTrue(f2.cancel(true));
3002 <        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
3003 <        checkCompletedWithWrappedCancellationException(g);
3004 <    }
2861 >        checkCompletedWithWrappedCFException(g, ex);
2862 >        checkCompletedWithWrappedCFException(f, ex);
2863 >        assertEquals(0, r.invocationCount);
2864 >    }}
2865  
2866      /**
2867 <     * thenComposeAsync result completes normally after normal
3008 <     * completion of source
2867 >     * thenCompose result completes exceptionally if action does
2868       */
2869 <    public void testThenComposeAsyncE() {
2870 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2871 <        CompletableFutureInc r = new CompletableFutureInc();
2872 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2873 <        f.complete(one);
2874 <        checkCompletedNormally(g, two);
2875 <    }
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  
3018    /**
3019     * thenComposeAsync result completes exceptionally after
3020     * exceptional completion of source
3021     */
3022    public void testThenComposeAsync2E() {
3023        CompletableFuture<Integer> f = new CompletableFuture<>();
3024        CompletableFutureInc r = new CompletableFutureInc();
3025        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
3026        f.completeExceptionally(new CFException());
2881          checkCompletedWithWrappedCFException(g);
2882 <    }
2882 >        checkCompletedNormally(f, v1);
2883 >    }}
2884  
2885      /**
2886 <     * thenComposeAsync result completes exceptionally if action does
2886 >     * thenCompose result completes exceptionally if source cancelled
2887       */
2888 <    public void testThenComposeAsync3E() {
2889 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2890 <        FailingCompletableFutureFunction r = new FailingCompletableFutureFunction();
2891 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2892 <        f.complete(one);
2893 <        checkCompletedWithWrappedCFException(g);
2894 <    }
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  
3041    /**
3042     * thenComposeAsync result completes exceptionally if source cancelled
3043     */
3044    public void testThenComposeAsync4E() {
3045        CompletableFuture<Integer> f = new CompletableFuture<>();
3046        CompletableFutureInc r = new CompletableFutureInc();
3047        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
3048        assertTrue(f.cancel(true));
2902          checkCompletedWithWrappedCancellationException(g);
2903 <    }
2903 >        checkCancelled(f);
2904 >    }}
2905  
2906      // other static methods
2907  
# Line 3247 | 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() {
3266 <        final AtomicInteger a = new AtomicInteger();
3267 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3268 <        CompletableFuture<Integer> g =
3269 <            f.whenComplete((Integer x, Throwable t) -> a.getAndIncrement());
3270 <        f.completeExceptionally(new CFException());
3271 <        assertTrue(f.isCompletedExceptionally());
3272 <        assertTrue(g.isCompletedExceptionally());
3273 <        assertEquals(a.get(), 1);
3274 <    }
3275 <
3276 <    /**
3277 <     * If a whenComplete action throws an exception when triggered by
3278 <     * a normal completion, it completes exceptionally
3279 <     */
3280 <    public void testWhenComplete3() {
3281 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3282 <        CompletableFuture<Integer> g =
3283 <            f.whenComplete((Integer x, Throwable t) ->
3284 <                           { throw new CFException(); } );
3285 <        f.complete(three);
3286 <        checkCompletedNormally(f, three);
3287 <        assertTrue(g.isCompletedExceptionally());
3288 <        checkCompletedWithWrappedCFException(g);
3289 <    }
3290 <
3291 <    /**
3292 <     * whenCompleteAsync action executes on normal completion, propagating
3293 <     * source result.
3294 <     */
3295 <    public void testWhenCompleteAsync1() {
3296 <        final AtomicInteger a = new AtomicInteger();
3297 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3298 <        CompletableFuture<Integer> g =
3299 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement());
3300 <        f.complete(three);
3301 <        checkCompletedNormally(f, three);
3302 <        checkCompletedNormally(g, three);
3303 <        assertEquals(a.get(), 1);
3304 <    }
3305 <
3306 <    /**
3307 <     * whenCompleteAsync action executes on exceptional completion, propagating
3308 <     * source result.
3309 <     */
3310 <    public void testWhenCompleteAsync2() {
3311 <        final AtomicInteger a = new AtomicInteger();
3312 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3313 <        CompletableFuture<Integer> g =
3314 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement());
3315 <        f.completeExceptionally(new CFException());
3316 <        checkCompletedWithWrappedCFException(f);
3317 <        checkCompletedWithWrappedCFException(g);
3318 <    }
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 <     */
3324 <    public void testWhenCompleteAsync3() {
3325 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3326 <        CompletableFuture<Integer> g =
3327 <            f.whenCompleteAsync((Integer x, Throwable t) ->
3328 <                           { throw new CFException(); } );
3329 <        f.complete(three);
3330 <        checkCompletedNormally(f, three);
3331 <        checkCompletedWithWrappedCFException(g);
3332 <    }
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() {
3372 <        ThreadExecutor exec = new ThreadExecutor();
3373 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3374 <        CompletableFuture<Integer> g =
3375 <            f.whenCompleteAsync((Integer x, Throwable t) ->
3376 <                                { throw new CFException(); },
3377 <                                exec);
3378 <        f.complete(three);
3379 <        checkCompletedNormally(f, three);
3380 <        checkCompletedWithWrappedCFException(g);
3381 <    }
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());
3409 <        assertFalse(r.ran);
3410 <        f.complete(one);
3411 <        checkCompletedNormally(f, one);
3412 <        checkCompletedNormally(g, two);
3413 <        assertTrue(r.ran);
3414 <
3415 <        f = new CompletableFuture<>();
3416 <        g = f.handleAsync(r = new IntegerHandler());
3417 <        assertFalse(r.ran);
3418 <        f.complete(one);
3419 <        checkCompletedNormally(f, one);
3420 <        checkCompletedNormally(g, two);
3421 <        assertTrue(r.ran);
3422 <    }
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());
3438 <        checkCompletedWithWrappedCFException(f);
3439 <        checkCompletedNormally(g, three);
3440 <        assertTrue(r.ran);
3441 <
3442 <        f = new CompletableFuture<>();
3443 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3444 <        assertFalse(r.ran);
3445 <        f.completeExceptionally(new CFException());
3446 <        checkCompletedWithWrappedCFException(f);
3447 <        checkCompletedNormally(g, three);
3448 <        assertTrue(r.ran);
3449 <
3450 <        f = new CompletableFuture<>();
3451 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3452 <        assertFalse(r.ran);
3453 <        f.complete(one);
3454 <        checkCompletedNormally(f, one);
3455 <        checkCompletedNormally(g, two);
3456 <        assertTrue(r.ran);
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 <        f = new CompletableFuture<>();
3222 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3223 <        assertFalse(r.ran);
3224 <        f.complete(one);
3225 <        checkCompletedNormally(f, one);
3226 <        checkCompletedNormally(g, two);
3227 <        assertTrue(r.ran);
3228 <    }
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