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.49 by jsr166, Mon Jun 2 19:20:51 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(); }
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 488 | Line 936 | public class CompletableFutureTest exten
936          FailingNoop r = new FailingNoop();
937          CompletableFuture<Void> f = CompletableFuture.runAsync(r);
938          checkCompletedWithWrappedCFException(f);
939 <        assertTrue(r.ran);
939 >        assertEquals(1, r.invocationCount);
940      }
941  
942      /**
# Line 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) f.complete(v1);
987  
540        f = new CompletableFuture<>();
541        f.complete(null);
542        g = f.thenRun(r = new Noop());
988          checkCompletedNormally(g, null);
989 <        assertTrue(r.ran);
990 <    }
989 >        checkCompletedNormally(f, v1);
990 >        assertEquals(1, r.invocationCount);
991 >    }}
992  
993      /**
994       * thenRun result completes exceptionally after exceptional
995       * completion of source
996       */
997 <    public void testThenRun2() {
998 <        CompletableFuture<Integer> f;
999 <        CompletableFuture<Void> g;
1000 <        Noop r;
1001 <
1002 <        f = new CompletableFuture<>();
1003 <        g = f.thenRun(r = new Noop());
1004 <        f.completeExceptionally(new CFException());
1005 <        checkCompletedWithWrappedCFException(g);
1006 <        assertFalse(r.ran);
997 >    public void testThenRun_exceptionalCompletion() {
998 >        for (ExecutionMode m : ExecutionMode.values())
999 >        for (boolean createIncomplete : new boolean[] { true, false })
1000 >    {
1001 >        final CFException ex = new CFException();
1002 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1003 >        final Noop r = new Noop();
1004 >        if (!createIncomplete) f.completeExceptionally(ex);
1005 >        final CompletableFuture<Void> g = m.thenRun(f, r);
1006 >        if (createIncomplete) f.completeExceptionally(ex);
1007  
1008 <        f = new CompletableFuture<>();
1009 <        f.completeExceptionally(new CFException());
1010 <        g = f.thenRun(r = new Noop());
1011 <        checkCompletedWithWrappedCFException(g);
566 <        assertFalse(r.ran);
567 <    }
1008 >        checkCompletedWithWrappedCFException(g, ex);
1009 >        checkCompletedWithWrappedCFException(f, ex);
1010 >        assertEquals(0, r.invocationCount);
1011 >    }}
1012  
1013      /**
1014 <     * thenRun result completes exceptionally if action does
1014 >     * thenRun result completes exceptionally if source cancelled
1015       */
1016 <    public void testThenRun3() {
1017 <        CompletableFuture<Integer> f;
1018 <        CompletableFuture<Void> g;
1019 <        FailingNoop r;
1020 <
1021 <        f = new CompletableFuture<>();
1022 <        g = f.thenRun(r = new FailingNoop());
1023 <        f.complete(null);
1024 <        checkCompletedWithWrappedCFException(g);
1016 >    public void testThenRun_sourceCancelled() {
1017 >        for (ExecutionMode m : ExecutionMode.values())
1018 >        for (boolean createIncomplete : new boolean[] { true, false })
1019 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1020 >    {
1021 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1022 >        final Noop r = new Noop();
1023 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1024 >        final CompletableFuture<Void> g = f.thenRun(r);
1025 >        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1026  
1027 <        f = new CompletableFuture<>();
1028 <        f.complete(null);
1029 <        g = f.thenRun(r = new FailingNoop());
1030 <        checkCompletedWithWrappedCFException(g);
586 <    }
1027 >        checkCompletedWithWrappedCancellationException(g);
1028 >        checkCancelled(f);
1029 >        assertEquals(0, r.invocationCount);
1030 >    }}
1031  
1032      /**
1033 <     * thenRun result completes exceptionally if source cancelled
1033 >     * thenRun result completes exceptionally if action does
1034       */
1035 <    public void testThenRun4() {
1036 <        CompletableFuture<Integer> f;
1037 <        CompletableFuture<Void> g;
1038 <        Noop r;
1039 <
1040 <        f = new CompletableFuture<>();
1041 <        g = f.thenRun(r = new Noop());
1042 <        assertTrue(f.cancel(true));
1043 <        checkCompletedWithWrappedCancellationException(g);
1035 >    public void testThenRun_actionFailed() {
1036 >        for (ExecutionMode m : ExecutionMode.values())
1037 >        for (boolean createIncomplete : new boolean[] { true, false })
1038 >        for (Integer v1 : new Integer[] { 1, null })
1039 >    {
1040 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1041 >        final FailingNoop r = new FailingNoop();
1042 >        if (!createIncomplete) f.complete(v1);
1043 >        final CompletableFuture<Void> g = f.thenRun(r);
1044 >        if (createIncomplete) f.complete(v1);
1045  
1046 <        f = new CompletableFuture<>();
1047 <        assertTrue(f.cancel(true));
1048 <        g = f.thenRun(r = new Noop());
604 <        checkCompletedWithWrappedCancellationException(g);
605 <    }
1046 >        checkCompletedWithWrappedCFException(g);
1047 >        checkCompletedNormally(f, v1);
1048 >    }}
1049  
1050      /**
1051       * thenApply result completes normally after normal completion of source
1052       */
1053 <    public void testThenApply() {
1054 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1055 <        CompletableFuture<Integer> g = f.thenApply(inc);
1056 <        f.complete(one);
1057 <        checkCompletedNormally(g, two);
1058 <    }
1053 >    public void testThenApply_normalCompletion() {
1054 >        for (ExecutionMode m : ExecutionMode.values())
1055 >        for (boolean createIncomplete : new boolean[] { true, false })
1056 >        for (Integer v1 : new Integer[] { 1, null })
1057 >    {
1058 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1059 >        final IncFunction r = new IncFunction();
1060 >        if (!createIncomplete) f.complete(v1);
1061 >        final CompletableFuture<Integer> g = m.thenApply(f, r);
1062 >        if (createIncomplete) {
1063 >            checkIncomplete(g);
1064 >            f.complete(v1);
1065 >        }
1066 >
1067 >        checkCompletedNormally(g, inc(v1));
1068 >        checkCompletedNormally(f, v1);
1069 >        assertEquals(1, r.invocationCount);
1070 >    }}
1071  
1072      /**
1073       * thenApply result completes exceptionally after exceptional
1074       * completion of source
1075       */
1076 <    public void testThenApply2() {
1077 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1078 <        CompletableFuture<Integer> g = f.thenApply(inc);
1079 <        f.completeExceptionally(new CFException());
1080 <        checkCompletedWithWrappedCFException(g);
1081 <    }
1076 >    public void testThenApply_exceptionalCompletion() {
1077 >        for (ExecutionMode m : ExecutionMode.values())
1078 >        for (boolean createIncomplete : new boolean[] { true, false })
1079 >    {
1080 >        final CFException ex = new CFException();
1081 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1082 >        final IncFunction r = new IncFunction();
1083 >        if (!createIncomplete) f.completeExceptionally(ex);
1084 >        final CompletableFuture<Integer> g = m.thenApply(f, r);
1085 >        if (createIncomplete) f.completeExceptionally(ex);
1086  
1087 <    /**
1088 <     * thenApply result completes exceptionally if action does
1089 <     */
1090 <    public void testThenApply3() {
632 <        CompletableFuture<Integer> f = new CompletableFuture<>();
633 <        CompletableFuture<Integer> g = f.thenApply(new FailingFunction());
634 <        f.complete(one);
635 <        checkCompletedWithWrappedCFException(g);
636 <    }
1087 >        checkCompletedWithWrappedCFException(g, ex);
1088 >        checkCompletedWithWrappedCFException(f, ex);
1089 >        assertEquals(0, r.invocationCount);
1090 >    }}
1091  
1092      /**
1093       * thenApply result completes exceptionally if source cancelled
1094       */
1095 <    public void testThenApply4() {
1096 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1097 <        CompletableFuture<Integer> g = f.thenApply(inc);
1098 <        assertTrue(f.cancel(true));
1095 >    public void testThenApply_sourceCancelled() {
1096 >        for (ExecutionMode m : ExecutionMode.values())
1097 >        for (boolean createIncomplete : new boolean[] { true, false })
1098 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1099 >    {
1100 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1101 >        final IncFunction r = new IncFunction();
1102 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1103 >        final CompletableFuture<Integer> g = f.thenApply(r);
1104 >        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1105 >
1106          checkCompletedWithWrappedCancellationException(g);
1107 <    }
1107 >        checkCancelled(f);
1108 >        assertEquals(0, r.invocationCount);
1109 >    }}
1110 >
1111 >    /**
1112 >     * thenApply result completes exceptionally if action does
1113 >     */
1114 >    public void testThenApply_actionFailed() {
1115 >        for (ExecutionMode m : ExecutionMode.values())
1116 >        for (boolean createIncomplete : new boolean[] { true, false })
1117 >        for (Integer v1 : new Integer[] { 1, null })
1118 >    {
1119 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1120 >        final FailingFunction r = new FailingFunction();
1121 >        if (!createIncomplete) f.complete(v1);
1122 >        final CompletableFuture<Integer> g = f.thenApply(r);
1123 >        if (createIncomplete) f.complete(v1);
1124 >
1125 >        checkCompletedWithWrappedCFException(g);
1126 >        checkCompletedNormally(f, v1);
1127 >    }}
1128  
1129      /**
1130       * thenAccept result completes normally after normal completion of source
# Line 654 | Line 1135 | public class CompletableFutureTest exten
1135          CompletableFuture<Void> g = f.thenAccept(r);
1136          f.complete(one);
1137          checkCompletedNormally(g, null);
1138 <        assertEquals(r.value, 2);
1138 >        assertEquals(r.value, (Integer) 2);
1139      }
1140  
1141      /**
# Line 678 | Line 1159 | public class CompletableFutureTest exten
1159          CompletableFuture<Void> g = f.thenAccept(r);
1160          f.complete(one);
1161          checkCompletedWithWrappedCFException(g);
1162 <        assertTrue(r.ran);
1162 >        assertEquals(1, r.invocationCount);
1163      }
1164  
1165      /**
# Line 696 | Line 1177 | public class CompletableFutureTest exten
1177       * thenCombine result completes normally after normal completion
1178       * of sources
1179       */
1180 <    public void testThenCombine() {
1181 <        CompletableFuture<Integer> f, g, h;
1182 <
1183 <        f = new CompletableFuture<>();
1184 <        g = new CompletableFuture<>();
1185 <        h = f.thenCombine(g, subtract);
1186 <        f.complete(3);
1187 <        checkIncomplete(h);
1188 <        g.complete(1);
1189 <        checkCompletedNormally(h, 2);
1190 <
1191 <        f = new CompletableFuture<>();
1192 <        g = new CompletableFuture<>();
1193 <        h = f.thenCombine(g, subtract);
1194 <        g.complete(1);
1195 <        checkIncomplete(h);
1196 <        f.complete(3);
1197 <        checkCompletedNormally(h, 2);
1180 >    public void testThenCombine_normalCompletion1() {
1181 >        for (boolean createIncomplete : new boolean[] { true, false })
1182 >        for (boolean fFirst : new boolean[] { true, false })
1183 >        for (ExecutionMode m : ExecutionMode.values())
1184 >        for (Integer v1 : new Integer[] { 1, null })
1185 >        for (Integer v2 : new Integer[] { 2, null })
1186 >    {
1187 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1188 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1189 >        final SubtractFunction r = new SubtractFunction();
1190 >        CompletableFuture<Integer> h = null;
1191 >        if (createIncomplete) h = m.thenCombine(f, g, r);
1192 >
1193 >        if (fFirst)
1194 >            f.complete(v1);
1195 >        else
1196 >            g.complete(v2);
1197 >        if (createIncomplete) checkIncomplete(h);
1198 >        assertEquals(0, r.invocationCount);
1199 >        if (!fFirst)
1200 >            f.complete(v1);
1201 >        else
1202 >            g.complete(v2);
1203 >        if (!createIncomplete) h = m.thenCombine(f, g, r);
1204  
1205 <        f = new CompletableFuture<>();
1206 <        g = new CompletableFuture<>();
1207 <        g.complete(1);
1208 <        f.complete(3);
1209 <        h = f.thenCombine(g, subtract);
723 <        checkCompletedNormally(h, 2);
724 <    }
1205 >        checkCompletedNormally(h, subtract(v1, v2));
1206 >        checkCompletedNormally(f, v1);
1207 >        checkCompletedNormally(g, v2);
1208 >        assertEquals(1, r.invocationCount);
1209 >    }}
1210  
1211      /**
1212       * thenCombine result completes exceptionally after exceptional
1213       * completion of either source
1214       */
1215 <    public void testThenCombine2() {
1216 <        CompletableFuture<Integer> f, g, h;
1215 >    public void testThenCombine_exceptionalCompletion1() {
1216 >        for (ExecutionMode m : ExecutionMode.values())
1217 >        for (Integer v1 : new Integer[] { 1, null })
1218 >    {
1219 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1220 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1221 >        final SubtractFunction r = new SubtractFunction();
1222 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1223 >        final CFException ex = new CFException();
1224  
1225 <        f = new CompletableFuture<>();
734 <        g = new CompletableFuture<>();
735 <        h = f.thenCombine(g, subtract);
736 <        f.completeExceptionally(new CFException());
1225 >        f.completeExceptionally(ex);
1226          checkIncomplete(h);
1227 <        g.complete(1);
739 <        checkCompletedWithWrappedCFException(h);
1227 >        g.complete(v1);
1228  
1229 <        f = new CompletableFuture<>();
1230 <        g = new CompletableFuture<>();
1231 <        h = f.thenCombine(g, subtract);
1232 <        g.completeExceptionally(new CFException());
1229 >        checkCompletedWithWrappedCFException(h, ex);
1230 >        checkCompletedWithWrappedCFException(f, ex);
1231 >        assertEquals(0, r.invocationCount);
1232 >        checkCompletedNormally(g, v1);
1233 >    }}
1234 >
1235 >    public void testThenCombine_exceptionalCompletion2() {
1236 >        for (ExecutionMode m : ExecutionMode.values())
1237 >        for (Integer v1 : new Integer[] { 1, null })
1238 >    {
1239 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1240 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1241 >        final SubtractFunction r = new SubtractFunction();
1242 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1243 >        final CFException ex = new CFException();
1244 >
1245 >        g.completeExceptionally(ex);
1246          checkIncomplete(h);
1247 <        f.complete(3);
747 <        checkCompletedWithWrappedCFException(h);
1247 >        f.complete(v1);
1248  
1249 <        f = new CompletableFuture<>();
1250 <        g = new CompletableFuture<>();
1251 <        f.complete(3);
1252 <        g.completeExceptionally(new CFException());
1253 <        h = f.thenCombine(g, subtract);
754 <        checkCompletedWithWrappedCFException(h);
1249 >        checkCompletedWithWrappedCFException(h, ex);
1250 >        checkCompletedWithWrappedCFException(g, ex);
1251 >        assertEquals(0, r.invocationCount);
1252 >        checkCompletedNormally(f, v1);
1253 >    }}
1254  
1255 <        f = new CompletableFuture<>();
1256 <        g = new CompletableFuture<>();
1257 <        f.completeExceptionally(new CFException());
1258 <        g.complete(3);
1259 <        h = f.thenCombine(g, subtract);
1260 <        checkCompletedWithWrappedCFException(h);
1261 <    }
1255 >    public void testThenCombine_exceptionalCompletion3() {
1256 >        for (ExecutionMode m : ExecutionMode.values())
1257 >        for (Integer v1 : new Integer[] { 1, null })
1258 >    {
1259 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1260 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1261 >        final SubtractFunction r = new SubtractFunction();
1262 >        final CFException ex = new CFException();
1263 >
1264 >        g.completeExceptionally(ex);
1265 >        f.complete(v1);
1266 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1267 >
1268 >        checkCompletedWithWrappedCFException(h, ex);
1269 >        checkCompletedWithWrappedCFException(g, ex);
1270 >        assertEquals(0, r.invocationCount);
1271 >        checkCompletedNormally(f, v1);
1272 >    }}
1273 >
1274 >    public void testThenCombine_exceptionalCompletion4() {
1275 >        for (ExecutionMode m : ExecutionMode.values())
1276 >        for (Integer v1 : new Integer[] { 1, null })
1277 >    {
1278 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1279 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1280 >        final SubtractFunction r = new SubtractFunction();
1281 >        final CFException ex = new CFException();
1282 >
1283 >        f.completeExceptionally(ex);
1284 >        g.complete(v1);
1285 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1286 >
1287 >        checkCompletedWithWrappedCFException(h, ex);
1288 >        checkCompletedWithWrappedCFException(f, ex);
1289 >        assertEquals(0, r.invocationCount);
1290 >        checkCompletedNormally(g, v1);
1291 >    }}
1292  
1293      /**
1294       * thenCombine result completes exceptionally if action does
1295       */
1296 <    public void testThenCombine3() {
1297 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1298 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1299 <        FailingBiFunction r = new FailingBiFunction();
1300 <        CompletableFuture<Integer> g = f.thenCombine(f2, r);
1301 <        f.complete(one);
1302 <        checkIncomplete(g);
1303 <        assertFalse(r.ran);
1304 <        f2.complete(two);
1305 <        checkCompletedWithWrappedCFException(g);
1306 <        assertTrue(r.ran);
1307 <    }
1296 >    public void testThenCombine_actionFailed1() {
1297 >        for (ExecutionMode m : ExecutionMode.values())
1298 >        for (Integer v1 : new Integer[] { 1, null })
1299 >        for (Integer v2 : new Integer[] { 2, null })
1300 >    {
1301 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1302 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1303 >        final FailingBiFunction r = new FailingBiFunction();
1304 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1305 >
1306 >        f.complete(v1);
1307 >        checkIncomplete(h);
1308 >        g.complete(v2);
1309 >
1310 >        checkCompletedWithWrappedCFException(h);
1311 >        checkCompletedNormally(f, v1);
1312 >        checkCompletedNormally(g, v2);
1313 >    }}
1314 >
1315 >    public void testThenCombine_actionFailed2() {
1316 >        for (ExecutionMode m : ExecutionMode.values())
1317 >        for (Integer v1 : new Integer[] { 1, null })
1318 >        for (Integer v2 : new Integer[] { 2, null })
1319 >    {
1320 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1321 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1322 >        final FailingBiFunction r = new FailingBiFunction();
1323 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1324 >
1325 >        g.complete(v2);
1326 >        checkIncomplete(h);
1327 >        f.complete(v1);
1328 >
1329 >        checkCompletedWithWrappedCFException(h);
1330 >        checkCompletedNormally(f, v1);
1331 >        checkCompletedNormally(g, v2);
1332 >    }}
1333  
1334      /**
1335       * thenCombine result completes exceptionally if either source cancelled
1336       */
1337 <    public void testThenCombine4() {
1338 <        CompletableFuture<Integer> f, g, h;
1337 >    public void testThenCombine_sourceCancelled1() {
1338 >        for (ExecutionMode m : ExecutionMode.values())
1339 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1340 >        for (Integer v1 : new Integer[] { 1, null })
1341 >    {
1342 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1343 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1344 >        final SubtractFunction r = new SubtractFunction();
1345 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1346  
1347 <        f = new CompletableFuture<>();
787 <        g = new CompletableFuture<>();
788 <        h = f.thenCombine(g, subtract);
789 <        assertTrue(f.cancel(true));
1347 >        assertTrue(f.cancel(mayInterruptIfRunning));
1348          checkIncomplete(h);
1349 <        g.complete(1);
1349 >        g.complete(v1);
1350 >
1351          checkCompletedWithWrappedCancellationException(h);
1352 +        checkCancelled(f);
1353 +        assertEquals(0, r.invocationCount);
1354 +        checkCompletedNormally(g, v1);
1355 +    }}
1356  
1357 <        f = new CompletableFuture<>();
1358 <        g = new CompletableFuture<>();
1359 <        h = f.thenCombine(g, subtract);
1360 <        assertTrue(g.cancel(true));
1357 >    public void testThenCombine_sourceCancelled2() {
1358 >        for (ExecutionMode m : ExecutionMode.values())
1359 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1360 >        for (Integer v1 : new Integer[] { 1, null })
1361 >    {
1362 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1363 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1364 >        final SubtractFunction r = new SubtractFunction();
1365 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1366 >
1367 >        assertTrue(g.cancel(mayInterruptIfRunning));
1368          checkIncomplete(h);
1369 <        f.complete(3);
1369 >        f.complete(v1);
1370 >
1371          checkCompletedWithWrappedCancellationException(h);
1372 +        checkCancelled(g);
1373 +        assertEquals(0, r.invocationCount);
1374 +        checkCompletedNormally(f, v1);
1375 +    }}
1376 +
1377 +    public void testThenCombine_sourceCancelled3() {
1378 +        for (ExecutionMode m : ExecutionMode.values())
1379 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1380 +        for (Integer v1 : new Integer[] { 1, null })
1381 +    {
1382 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
1383 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
1384 +        final SubtractFunction r = new SubtractFunction();
1385 +
1386 +        assertTrue(g.cancel(mayInterruptIfRunning));
1387 +        f.complete(v1);
1388 +        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1389  
802        f = new CompletableFuture<>();
803        g = new CompletableFuture<>();
804        assertTrue(f.cancel(true));
805        assertTrue(g.cancel(true));
806        h = f.thenCombine(g, subtract);
1390          checkCompletedWithWrappedCancellationException(h);
1391 <    }
1391 >        checkCancelled(g);
1392 >        assertEquals(0, r.invocationCount);
1393 >        checkCompletedNormally(f, v1);
1394 >    }}
1395 >
1396 >    public void testThenCombine_sourceCancelled4() {
1397 >        for (ExecutionMode m : ExecutionMode.values())
1398 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1399 >        for (Integer v1 : new Integer[] { 1, null })
1400 >    {
1401 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1402 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1403 >        final SubtractFunction r = new SubtractFunction();
1404 >
1405 >        assertTrue(f.cancel(mayInterruptIfRunning));
1406 >        g.complete(v1);
1407 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1408 >
1409 >        checkCompletedWithWrappedCancellationException(h);
1410 >        checkCancelled(f);
1411 >        assertEquals(0, r.invocationCount);
1412 >        checkCompletedNormally(g, v1);
1413 >    }}
1414  
1415      /**
1416       * thenAcceptBoth result completes normally after normal
1417       * completion of sources
1418       */
1419 <    public void testThenAcceptBoth() {
1420 <        CompletableFuture<Integer> f, g;
1421 <        CompletableFuture<Void> h;
1422 <        SubtractAction r;
1419 >    public void testThenAcceptBoth_normalCompletion1() {
1420 >        for (ExecutionMode m : ExecutionMode.values())
1421 >        for (Integer v1 : new Integer[] { 1, null })
1422 >        for (Integer v2 : new Integer[] { 2, null })
1423 >    {
1424 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1425 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1426 >        final SubtractAction r = new SubtractAction();
1427 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1428  
1429 <        f = new CompletableFuture<>();
820 <        g = new CompletableFuture<>();
821 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
822 <        f.complete(3);
1429 >        f.complete(v1);
1430          checkIncomplete(h);
1431 <        g.complete(1);
1431 >        assertEquals(0, r.invocationCount);
1432 >        g.complete(v2);
1433 >
1434          checkCompletedNormally(h, null);
1435 <        assertEquals(r.value, 2);
1435 >        assertEquals(subtract(v1, v2), r.value);
1436 >        checkCompletedNormally(f, v1);
1437 >        checkCompletedNormally(g, v2);
1438 >    }}
1439  
1440 <        f = new CompletableFuture<>();
1441 <        g = new CompletableFuture<>();
1442 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
1443 <        g.complete(1);
1440 >    public void testThenAcceptBoth_normalCompletion2() {
1441 >        for (ExecutionMode m : ExecutionMode.values())
1442 >        for (Integer v1 : new Integer[] { 1, null })
1443 >        for (Integer v2 : new Integer[] { 2, null })
1444 >    {
1445 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1446 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1447 >        final SubtractAction r = new SubtractAction();
1448 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1449 >
1450 >        g.complete(v2);
1451          checkIncomplete(h);
1452 <        f.complete(3);
1452 >        assertEquals(0, r.invocationCount);
1453 >        f.complete(v1);
1454 >
1455          checkCompletedNormally(h, null);
1456 <        assertEquals(r.value, 2);
1456 >        assertEquals(subtract(v1, v2), r.value);
1457 >        checkCompletedNormally(f, v1);
1458 >        checkCompletedNormally(g, v2);
1459 >    }}
1460 >
1461 >    public void testThenAcceptBoth_normalCompletion3() {
1462 >        for (ExecutionMode m : ExecutionMode.values())
1463 >        for (Integer v1 : new Integer[] { 1, null })
1464 >        for (Integer v2 : new Integer[] { 2, null })
1465 >    {
1466 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1467 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1468 >        final SubtractAction r = new SubtractAction();
1469 >
1470 >        g.complete(v2);
1471 >        f.complete(v1);
1472 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1473  
837        f = new CompletableFuture<>();
838        g = new CompletableFuture<>();
839        g.complete(1);
840        f.complete(3);
841        h = f.thenAcceptBoth(g, r = new SubtractAction());
1474          checkCompletedNormally(h, null);
1475 <        assertEquals(r.value, 2);
1476 <    }
1475 >        assertEquals(subtract(v1, v2), r.value);
1476 >        checkCompletedNormally(f, v1);
1477 >        checkCompletedNormally(g, v2);
1478 >    }}
1479 >
1480 >    public void testThenAcceptBoth_normalCompletion4() {
1481 >        for (ExecutionMode m : ExecutionMode.values())
1482 >        for (Integer v1 : new Integer[] { 1, null })
1483 >        for (Integer v2 : new Integer[] { 2, null })
1484 >    {
1485 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1486 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1487 >        final SubtractAction r = new SubtractAction();
1488 >
1489 >        f.complete(v1);
1490 >        g.complete(v2);
1491 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1492 >
1493 >        checkCompletedNormally(h, null);
1494 >        assertEquals(subtract(v1, v2), r.value);
1495 >        checkCompletedNormally(f, v1);
1496 >        checkCompletedNormally(g, v2);
1497 >    }}
1498  
1499      /**
1500       * thenAcceptBoth result completes exceptionally after exceptional
1501       * completion of either source
1502       */
1503 <    public void testThenAcceptBoth2() {
1504 <        CompletableFuture<Integer> f, g;
1505 <        CompletableFuture<Void> h;
1506 <        SubtractAction r;
1503 >    public void testThenAcceptBoth_exceptionalCompletion1() {
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 CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1511 >        final CFException ex = new CFException();
1512  
1513 <        f = new CompletableFuture<>();
856 <        g = new CompletableFuture<>();
857 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
858 <        f.completeExceptionally(new CFException());
1513 >        f.completeExceptionally(ex);
1514          checkIncomplete(h);
1515 <        g.complete(1);
861 <        checkCompletedWithWrappedCFException(h);
1515 >        g.complete(v1);
1516  
1517 <        f = new CompletableFuture<>();
1518 <        g = new CompletableFuture<>();
1519 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
1520 <        g.completeExceptionally(new CFException());
1517 >        checkCompletedWithWrappedCFException(h, ex);
1518 >        checkCompletedWithWrappedCFException(f, ex);
1519 >        assertEquals(0, r.invocationCount);
1520 >        checkCompletedNormally(g, v1);
1521 >    }}
1522 >
1523 >    public void testThenAcceptBoth_exceptionalCompletion2() {
1524 >        for (ExecutionMode m : ExecutionMode.values())
1525 >        for (Integer v1 : new Integer[] { 1, null })
1526 >    {
1527 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1528 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1529 >        final SubtractAction r = new SubtractAction();
1530 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1531 >        final CFException ex = new CFException();
1532 >
1533 >        g.completeExceptionally(ex);
1534          checkIncomplete(h);
1535 <        f.complete(3);
869 <        checkCompletedWithWrappedCFException(h);
1535 >        f.complete(v1);
1536  
1537 <        f = new CompletableFuture<>();
1538 <        g = new CompletableFuture<>();
1539 <        f.complete(3);
1540 <        g.completeExceptionally(new CFException());
1541 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
876 <        checkCompletedWithWrappedCFException(h);
1537 >        checkCompletedWithWrappedCFException(h, ex);
1538 >        checkCompletedWithWrappedCFException(g, ex);
1539 >        assertEquals(0, r.invocationCount);
1540 >        checkCompletedNormally(f, v1);
1541 >    }}
1542  
1543 <        f = new CompletableFuture<>();
1544 <        g = new CompletableFuture<>();
1545 <        f.completeExceptionally(new CFException());
1546 <        g.complete(3);
1547 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
1548 <        checkCompletedWithWrappedCFException(h);
1549 <    }
1543 >    public void testThenAcceptBoth_exceptionalCompletion3() {
1544 >        for (ExecutionMode m : ExecutionMode.values())
1545 >        for (Integer v1 : new Integer[] { 1, null })
1546 >    {
1547 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1548 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1549 >        final SubtractAction r = new SubtractAction();
1550 >        final CFException ex = new CFException();
1551 >
1552 >        g.completeExceptionally(ex);
1553 >        f.complete(v1);
1554 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1555 >
1556 >        checkCompletedWithWrappedCFException(h, ex);
1557 >        checkCompletedWithWrappedCFException(g, ex);
1558 >        assertEquals(0, r.invocationCount);
1559 >        checkCompletedNormally(f, v1);
1560 >    }}
1561 >
1562 >    public void testThenAcceptBoth_exceptionalCompletion4() {
1563 >        for (ExecutionMode m : ExecutionMode.values())
1564 >        for (Integer v1 : new Integer[] { 1, null })
1565 >    {
1566 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1567 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1568 >        final SubtractAction r = new SubtractAction();
1569 >        final CFException ex = new CFException();
1570 >
1571 >        f.completeExceptionally(ex);
1572 >        g.complete(v1);
1573 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1574 >
1575 >        checkCompletedWithWrappedCFException(h, ex);
1576 >        checkCompletedWithWrappedCFException(f, ex);
1577 >        assertEquals(0, r.invocationCount);
1578 >        checkCompletedNormally(g, v1);
1579 >    }}
1580  
1581      /**
1582       * thenAcceptBoth result completes exceptionally if action does
1583       */
1584 <    public void testThenAcceptBoth3() {
1585 <        CompletableFuture<Integer> f, g;
1586 <        CompletableFuture<Void> h;
1587 <        FailingBiConsumer r;
1584 >    public void testThenAcceptBoth_actionFailed1() {
1585 >        for (ExecutionMode m : ExecutionMode.values())
1586 >        for (Integer v1 : new Integer[] { 1, null })
1587 >        for (Integer v2 : new Integer[] { 2, null })
1588 >    {
1589 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1590 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1591 >        final FailingBiConsumer r = new FailingBiConsumer();
1592 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1593  
1594 <        f = new CompletableFuture<>();
895 <        g = new CompletableFuture<>();
896 <        h = f.thenAcceptBoth(g, r = new FailingBiConsumer());
897 <        f.complete(3);
1594 >        f.complete(v1);
1595          checkIncomplete(h);
1596 <        g.complete(1);
1596 >        g.complete(v2);
1597 >
1598          checkCompletedWithWrappedCFException(h);
1599 +        checkCompletedNormally(f, v1);
1600 +        checkCompletedNormally(g, v2);
1601 +    }}
1602 +
1603 +    public void testThenAcceptBoth_actionFailed2() {
1604 +        for (ExecutionMode m : ExecutionMode.values())
1605 +        for (Integer v1 : new Integer[] { 1, null })
1606 +        for (Integer v2 : new Integer[] { 2, null })
1607 +    {
1608 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
1609 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
1610 +        final FailingBiConsumer r = new FailingBiConsumer();
1611 +        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1612 +
1613 +        g.complete(v2);
1614 +        checkIncomplete(h);
1615 +        f.complete(v1);
1616  
902        f = new CompletableFuture<>();
903        g = new CompletableFuture<>();
904        f.complete(3);
905        g.complete(1);
906        h = f.thenAcceptBoth(g, r = new FailingBiConsumer());
1617          checkCompletedWithWrappedCFException(h);
1618 <    }
1618 >        checkCompletedNormally(f, v1);
1619 >        checkCompletedNormally(g, v2);
1620 >    }}
1621  
1622      /**
1623       * thenAcceptBoth result completes exceptionally if either source cancelled
1624       */
1625 <    public void testThenAcceptBoth4() {
1626 <        CompletableFuture<Integer> f, g;
1627 <        CompletableFuture<Void> h;
1628 <        SubtractAction r;
1625 >    public void testThenAcceptBoth_sourceCancelled1() {
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 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1634  
1635 <        f = new CompletableFuture<>();
919 <        g = new CompletableFuture<>();
920 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
921 <        assertTrue(f.cancel(true));
1635 >        assertTrue(f.cancel(mayInterruptIfRunning));
1636          checkIncomplete(h);
1637 <        g.complete(1);
1637 >        g.complete(v1);
1638 >
1639          checkCompletedWithWrappedCancellationException(h);
1640 +        checkCancelled(f);
1641 +        assertEquals(0, r.invocationCount);
1642 +        checkCompletedNormally(g, v1);
1643 +    }}
1644  
1645 <        f = new CompletableFuture<>();
1646 <        g = new CompletableFuture<>();
1647 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
1648 <        assertTrue(g.cancel(true));
1645 >    public void testThenAcceptBoth_sourceCancelled2() {
1646 >        for (ExecutionMode m : ExecutionMode.values())
1647 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1648 >        for (Integer v1 : new Integer[] { 1, null })
1649 >    {
1650 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1651 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1652 >        final SubtractAction r = new SubtractAction();
1653 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1654 >
1655 >        assertTrue(g.cancel(mayInterruptIfRunning));
1656          checkIncomplete(h);
1657 <        f.complete(3);
1657 >        f.complete(v1);
1658 >
1659          checkCompletedWithWrappedCancellationException(h);
1660 +        checkCancelled(g);
1661 +        assertEquals(0, r.invocationCount);
1662 +        checkCompletedNormally(f, v1);
1663 +    }}
1664 +
1665 +    public void testThenAcceptBoth_sourceCancelled3() {
1666 +        for (ExecutionMode m : ExecutionMode.values())
1667 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1668 +        for (Integer v1 : new Integer[] { 1, null })
1669 +    {
1670 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
1671 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
1672 +        final SubtractAction r = new SubtractAction();
1673 +
1674 +        assertTrue(g.cancel(mayInterruptIfRunning));
1675 +        f.complete(v1);
1676 +        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1677  
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());
1678          checkCompletedWithWrappedCancellationException(h);
1679 +        checkCancelled(g);
1680 +        assertEquals(0, r.invocationCount);
1681 +        checkCompletedNormally(f, v1);
1682 +    }}
1683 +
1684 +    public void testThenAcceptBoth_sourceCancelled4() {
1685 +        for (ExecutionMode m : ExecutionMode.values())
1686 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1687 +        for (Integer v1 : new Integer[] { 1, null })
1688 +    {
1689 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
1690 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
1691 +        final SubtractAction r = new SubtractAction();
1692 +
1693 +        assertTrue(f.cancel(mayInterruptIfRunning));
1694 +        g.complete(v1);
1695 +        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1696  
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());
1697          checkCompletedWithWrappedCancellationException(h);
1698 <    }
1698 >        checkCancelled(f);
1699 >        assertEquals(0, r.invocationCount);
1700 >        checkCompletedNormally(g, v1);
1701 >    }}
1702  
1703      /**
1704       * runAfterBoth result completes normally after normal
1705       * completion of sources
1706       */
1707      public void testRunAfterBoth_normalCompletion1() {
1708 +        for (ExecutionMode m : ExecutionMode.values())
1709          for (Integer v1 : new Integer[] { 1, null })
1710 <        for (Integer v2 : new Integer[] { 2, null }) {
1711 <
1710 >        for (Integer v2 : new Integer[] { 2, null })
1711 >    {
1712          final CompletableFuture<Integer> f = new CompletableFuture<>();
1713          final CompletableFuture<Integer> g = new CompletableFuture<>();
1714          final Noop r = new Noop();
1715 <        final CompletableFuture<Void> h = f.runAfterBoth(g, r);
1715 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1716  
1717          f.complete(v1);
1718          checkIncomplete(h);
1719 <        assertFalse(r.ran);
1719 >        assertEquals(0, r.invocationCount);
1720          g.complete(v2);
1721  
1722          checkCompletedNormally(h, null);
1723 <        assertTrue(r.ran);
1723 >        assertEquals(1, r.invocationCount);
1724          checkCompletedNormally(f, v1);
1725          checkCompletedNormally(g, v2);
1726 <        }
972 <    }
1726 >    }}
1727  
1728      public void testRunAfterBoth_normalCompletion2() {
1729 +        for (ExecutionMode m : ExecutionMode.values())
1730          for (Integer v1 : new Integer[] { 1, null })
1731 <        for (Integer v2 : new Integer[] { 2, null }) {
1732 <
1731 >        for (Integer v2 : new Integer[] { 2, null })
1732 >    {
1733          final CompletableFuture<Integer> f = new CompletableFuture<>();
1734          final CompletableFuture<Integer> g = new CompletableFuture<>();
1735          final Noop r = new Noop();
1736 <        final CompletableFuture<Void> h = f.runAfterBoth(g, r);
1736 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1737  
1738          g.complete(v2);
1739          checkIncomplete(h);
1740 <        assertFalse(r.ran);
1740 >        assertEquals(0, r.invocationCount);
1741          f.complete(v1);
1742  
1743          checkCompletedNormally(h, null);
1744 <        assertTrue(r.ran);
1744 >        assertEquals(1, r.invocationCount);
1745          checkCompletedNormally(f, v1);
1746          checkCompletedNormally(g, v2);
1747 <        }
993 <    }
1747 >    }}
1748  
1749      public void testRunAfterBoth_normalCompletion3() {
1750 +        for (ExecutionMode m : ExecutionMode.values())
1751          for (Integer v1 : new Integer[] { 1, null })
1752 <        for (Integer v2 : new Integer[] { 2, null }) {
1753 <
1752 >        for (Integer v2 : new Integer[] { 2, null })
1753 >    {
1754          final CompletableFuture<Integer> f = new CompletableFuture<>();
1755          final CompletableFuture<Integer> g = new CompletableFuture<>();
1756          final Noop r = new Noop();
1757  
1758          g.complete(v2);
1759          f.complete(v1);
1760 <        final CompletableFuture<Void> h = f.runAfterBoth(g, r);
1760 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1761  
1762          checkCompletedNormally(h, null);
1763 <        assertTrue(r.ran);
1763 >        assertEquals(1, r.invocationCount);
1764          checkCompletedNormally(f, v1);
1765          checkCompletedNormally(g, v2);
1766 <        }
1012 <    }
1766 >    }}
1767  
1768      public void testRunAfterBoth_normalCompletion4() {
1769 +        for (ExecutionMode m : ExecutionMode.values())
1770          for (Integer v1 : new Integer[] { 1, null })
1771 <        for (Integer v2 : new Integer[] { 2, null }) {
1772 <
1771 >        for (Integer v2 : new Integer[] { 2, null })
1772 >    {
1773          final CompletableFuture<Integer> f = new CompletableFuture<>();
1774          final CompletableFuture<Integer> g = new CompletableFuture<>();
1775          final Noop r = new Noop();
1776  
1777          f.complete(v1);
1778          g.complete(v2);
1779 <        final CompletableFuture<Void> h = f.runAfterBoth(g, r);
1779 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1780  
1781          checkCompletedNormally(h, null);
1782 <        assertTrue(r.ran);
1782 >        assertEquals(1, r.invocationCount);
1783          checkCompletedNormally(f, v1);
1784          checkCompletedNormally(g, v2);
1785 <        }
1031 <    }
1785 >    }}
1786  
1787      /**
1788       * runAfterBoth result completes exceptionally after exceptional
1789       * completion of either source
1790       */
1791      public void testRunAfterBoth_exceptionalCompletion1() {
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();
1798 <        final CompletableFuture<Void> h = f.runAfterBoth(g, r);
1798 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1799          final CFException ex = new CFException();
1800  
1801          f.completeExceptionally(ex);
# Line 1049 | Line 1804 | public class CompletableFutureTest exten
1804  
1805          checkCompletedWithWrappedCFException(h, ex);
1806          checkCompletedWithWrappedCFException(f, ex);
1807 <        assertFalse(r.ran);
1807 >        assertEquals(0, r.invocationCount);
1808          checkCompletedNormally(g, v1);
1809 <        }
1055 <    }
1809 >    }}
1810  
1811      public void testRunAfterBoth_exceptionalCompletion2() {
1812 <        for (Integer v1 : new Integer[] { 1, null }) {
1813 <
1812 >        for (ExecutionMode m : ExecutionMode.values())
1813 >        for (Integer v1 : new Integer[] { 1, null })
1814 >    {
1815          final CompletableFuture<Integer> f = new CompletableFuture<>();
1816          final CompletableFuture<Integer> g = new CompletableFuture<>();
1817          final Noop r = new Noop();
1818 <        final CompletableFuture<Void> h = f.runAfterBoth(g, r);
1818 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1819          final CFException ex = new CFException();
1820  
1821          g.completeExceptionally(ex);
# Line 1069 | Line 1824 | public class CompletableFutureTest exten
1824  
1825          checkCompletedWithWrappedCFException(h, ex);
1826          checkCompletedWithWrappedCFException(g, ex);
1827 <        assertFalse(r.ran);
1827 >        assertEquals(0, r.invocationCount);
1828          checkCompletedNormally(f, v1);
1829 <        }
1075 <    }
1829 >    }}
1830  
1831      public void testRunAfterBoth_exceptionalCompletion3() {
1832 <        for (Integer v1 : new Integer[] { 1, null }) {
1833 <
1832 >        for (ExecutionMode m : ExecutionMode.values())
1833 >        for (Integer v1 : new Integer[] { 1, null })
1834 >    {
1835          final CompletableFuture<Integer> f = new CompletableFuture<>();
1836          final CompletableFuture<Integer> g = new CompletableFuture<>();
1837          final Noop r = new Noop();
# Line 1084 | Line 1839 | public class CompletableFutureTest exten
1839  
1840          g.completeExceptionally(ex);
1841          f.complete(v1);
1842 <        final CompletableFuture<Void> h = f.runAfterBoth(g, r);
1842 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1843  
1844          checkCompletedWithWrappedCFException(h, ex);
1845          checkCompletedWithWrappedCFException(g, ex);
1846 <        assertFalse(r.ran);
1846 >        assertEquals(0, r.invocationCount);
1847          checkCompletedNormally(f, v1);
1848 <        }
1094 <    }
1848 >    }}
1849  
1850      public void testRunAfterBoth_exceptionalCompletion4() {
1851 <        for (Integer v1 : new Integer[] { 1, null }) {
1852 <
1851 >        for (ExecutionMode m : ExecutionMode.values())
1852 >        for (Integer v1 : new Integer[] { 1, null })
1853 >    {
1854          final CompletableFuture<Integer> f = new CompletableFuture<>();
1855          final CompletableFuture<Integer> g = new CompletableFuture<>();
1856          final Noop r = new Noop();
# Line 1103 | Line 1858 | public class CompletableFutureTest exten
1858  
1859          f.completeExceptionally(ex);
1860          g.complete(v1);
1861 <        final CompletableFuture<Void> h = f.runAfterBoth(g, r);
1861 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1862  
1863          checkCompletedWithWrappedCFException(h, ex);
1864          checkCompletedWithWrappedCFException(f, ex);
1865 <        assertFalse(r.ran);
1865 >        assertEquals(0, r.invocationCount);
1866          checkCompletedNormally(g, v1);
1867 <        }
1113 <    }
1867 >    }}
1868  
1869      /**
1870       * runAfterBoth result completes exceptionally if action does
1871       */
1872      public void testRunAfterBoth_actionFailed1() {
1873 +        for (ExecutionMode m : ExecutionMode.values())
1874          for (Integer v1 : new Integer[] { 1, null })
1875 <        for (Integer v2 : new Integer[] { 2, null }) {
1876 <
1875 >        for (Integer v2 : new Integer[] { 2, null })
1876 >    {
1877          final CompletableFuture<Integer> f = new CompletableFuture<>();
1878          final CompletableFuture<Integer> g = new CompletableFuture<>();
1879          final FailingNoop r = new FailingNoop();
1880 <        final CompletableFuture<Void> h = f.runAfterBoth(g, r);
1880 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1881  
1882          f.complete(v1);
1883          checkIncomplete(h);
# Line 1131 | Line 1886 | public class CompletableFutureTest exten
1886          checkCompletedWithWrappedCFException(h);
1887          checkCompletedNormally(f, v1);
1888          checkCompletedNormally(g, v2);
1889 <        }
1135 <    }
1889 >    }}
1890  
1891      public void testRunAfterBoth_actionFailed2() {
1892 +        for (ExecutionMode m : ExecutionMode.values())
1893          for (Integer v1 : new Integer[] { 1, null })
1894 <        for (Integer v2 : new Integer[] { 2, null }) {
1895 <
1894 >        for (Integer v2 : new Integer[] { 2, null })
1895 >    {
1896          final CompletableFuture<Integer> f = new CompletableFuture<>();
1897          final CompletableFuture<Integer> g = new CompletableFuture<>();
1898          final FailingNoop r = new FailingNoop();
1899 <        final CompletableFuture<Void> h = f.runAfterBoth(g, r);
1899 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1900  
1901          g.complete(v2);
1902          checkIncomplete(h);
# Line 1150 | Line 1905 | public class CompletableFutureTest exten
1905          checkCompletedWithWrappedCFException(h);
1906          checkCompletedNormally(f, v1);
1907          checkCompletedNormally(g, v2);
1908 <        }
1154 <    }
1908 >    }}
1909  
1910      /**
1911       * runAfterBoth result completes exceptionally if either source cancelled
1912       */
1913      public void testRunAfterBoth_sourceCancelled1() {
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 <        final CompletableFuture<Void> h = f.runAfterBoth(g, r);
1921 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1922  
1923          assertTrue(f.cancel(mayInterruptIfRunning));
1924          checkIncomplete(h);
# Line 1171 | Line 1926 | public class CompletableFutureTest exten
1926  
1927          checkCompletedWithWrappedCancellationException(h);
1928          checkCancelled(f);
1929 <        assertFalse(r.ran);
1929 >        assertEquals(0, r.invocationCount);
1930          checkCompletedNormally(g, v1);
1931 <        }
1177 <    }
1931 >    }}
1932  
1933      public void testRunAfterBoth_sourceCancelled2() {
1934 +        for (ExecutionMode m : ExecutionMode.values())
1935          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1936 <        for (Integer v1 : new Integer[] { 1, null }) {
1937 <
1936 >        for (Integer v1 : new Integer[] { 1, null })
1937 >    {
1938          final CompletableFuture<Integer> f = new CompletableFuture<>();
1939          final CompletableFuture<Integer> g = new CompletableFuture<>();
1940          final Noop r = new Noop();
1941 <        final CompletableFuture<Void> h = f.runAfterBoth(g, r);
1941 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1942  
1943          assertTrue(g.cancel(mayInterruptIfRunning));
1944          checkIncomplete(h);
# Line 1191 | Line 1946 | public class CompletableFutureTest exten
1946  
1947          checkCompletedWithWrappedCancellationException(h);
1948          checkCancelled(g);
1949 <        assertFalse(r.ran);
1949 >        assertEquals(0, r.invocationCount);
1950          checkCompletedNormally(f, v1);
1951 <        }
1197 <    }
1951 >    }}
1952  
1953      public void testRunAfterBoth_sourceCancelled3() {
1954 +        for (ExecutionMode m : ExecutionMode.values())
1955          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1956 <        for (Integer v1 : new Integer[] { 1, null }) {
1957 <
1956 >        for (Integer v1 : new Integer[] { 1, null })
1957 >    {
1958          final CompletableFuture<Integer> f = new CompletableFuture<>();
1959          final CompletableFuture<Integer> g = new CompletableFuture<>();
1960          final Noop r = new Noop();
1961  
1962          assertTrue(g.cancel(mayInterruptIfRunning));
1963          f.complete(v1);
1964 <        final CompletableFuture<Void> h = f.runAfterBoth(g, r);
1964 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1965  
1966          checkCompletedWithWrappedCancellationException(h);
1967          checkCancelled(g);
1968 <        assertFalse(r.ran);
1968 >        assertEquals(0, r.invocationCount);
1969          checkCompletedNormally(f, v1);
1970 <        }
1216 <    }
1970 >    }}
1971  
1972      public void testRunAfterBoth_sourceCancelled4() {
1973 +        for (ExecutionMode m : ExecutionMode.values())
1974          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1975 <        for (Integer v1 : new Integer[] { 1, null }) {
1976 <
1975 >        for (Integer v1 : new Integer[] { 1, null })
1976 >    {
1977          final CompletableFuture<Integer> f = new CompletableFuture<>();
1978          final CompletableFuture<Integer> g = new CompletableFuture<>();
1979          final Noop r = new Noop();
1980  
1981          assertTrue(f.cancel(mayInterruptIfRunning));
1982          g.complete(v1);
1983 <        final CompletableFuture<Void> h = f.runAfterBoth(g, r);
1983 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1984  
1985          checkCompletedWithWrappedCancellationException(h);
1986          checkCancelled(f);
1987 <        assertFalse(r.ran);
1987 >        assertEquals(0, r.invocationCount);
1988          checkCompletedNormally(g, v1);
1989 <        }
1235 <    }
1989 >    }}
1990  
1991      /**
1992       * applyToEither result completes normally after normal completion
1993       * of either source
1994       */
1995 <    public void testApplyToEither() {
1996 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1997 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1998 <        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
1999 <        f.complete(one);
2000 <        checkCompletedNormally(g, two);
2001 <        f2.complete(one);
2002 <        checkCompletedNormally(g, two);
2003 <
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 <    }
1995 >    public void testApplyToEither_normalCompletion1() {
1996 >        for (ExecutionMode m : ExecutionMode.values())
1997 >        for (Integer v1 : new Integer[] { 1, null })
1998 >        for (Integer v2 : new Integer[] { 2, null })
1999 >    {
2000 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2001 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2002 >        final IncFunction r = new IncFunction();
2003 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2004  
2005 <    /**
2006 <     * applyToEither result completes exceptionally if either source cancelled
2007 <     */
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 <    }
2005 >        f.complete(v1);
2006 >        checkCompletedNormally(h, inc(v1));
2007 >        g.complete(v2);
2008  
2009 <    /**
2010 <     * acceptEither result completes normally after normal completion
2011 <     * of either source
2012 <     */
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);
2009 >        checkCompletedNormally(f, v1);
2010 >        checkCompletedNormally(g, v2);
2011 >        checkCompletedNormally(h, inc(v1));
2012 >    }}
2013  
2014 <        r = new IncAction();
2015 <        f = new CompletableFuture<>();
2016 <        f.complete(one);
2017 <        f2 = new CompletableFuture<>();
2018 <        g = f.acceptEither(f2, r);
2019 <        checkCompletedNormally(g, null);
2020 <        assertEquals(r.value, 2);
2021 <    }
2014 >    public void testApplyToEither_normalCompletion2() {
2015 >        for (ExecutionMode m : ExecutionMode.values())
2016 >        for (Integer v1 : new Integer[] { 1, null })
2017 >        for (Integer v2 : new Integer[] { 2, null })
2018 >    {
2019 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2020 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2021 >        final IncFunction r = new IncFunction();
2022 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2023  
2024 <    /**
2025 <     * acceptEither result completes exceptionally after exceptional
2026 <     * 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);
2024 >        g.complete(v2);
2025 >        checkCompletedNormally(h, inc(v2));
2026 >        f.complete(v1);
2027  
2028 <        r = new IncAction();
2029 <        f = new CompletableFuture<>();
2030 <        f2 = new CompletableFuture<>();
2031 <        f2.completeExceptionally(new CFException());
1344 <        g = f.acceptEither(f2, r);
1345 <        checkCompletedWithWrappedCFException(g);
1346 <    }
2028 >        checkCompletedNormally(f, v1);
2029 >        checkCompletedNormally(g, v2);
2030 >        checkCompletedNormally(h, inc(v2));
2031 >        }}
2032  
2033 <    /**
2034 <     * acceptEither result completes exceptionally if action does
2035 <     */
2036 <    public void testAcceptEither3() {
2037 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2038 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2039 <        FailingConsumer r = new FailingConsumer();
2040 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
1356 <        f2.complete(two);
1357 <        checkCompletedWithWrappedCFException(g);
1358 <    }
2033 >    public void testApplyToEither_normalCompletion3() {
2034 >        for (ExecutionMode m : ExecutionMode.values())
2035 >        for (Integer v1 : new Integer[] { 1, null })
2036 >        for (Integer v2 : new Integer[] { 2, null })
2037 >    {
2038 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2039 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2040 >        final IncFunction r = new IncFunction();
2041  
2042 <    /**
2043 <     * acceptEither result completes exceptionally if either source cancelled
2044 <     */
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 <    }
2042 >        f.complete(v1);
2043 >        g.complete(v2);
2044 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2045  
2046 <    /**
2047 <     * 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);
2046 >        checkCompletedNormally(f, v1);
2047 >        checkCompletedNormally(g, v2);
2048  
2049 <        r = new Noop();
2050 <        f = new CompletableFuture<>();
2051 <        f.complete(one);
2052 <        f2 = new CompletableFuture<>();
2053 <        g = f.runAfterEither(f2, r);
1396 <        checkCompletedNormally(g, null);
1397 <        assertTrue(r.ran);
1398 <    }
2049 >        // unspecified behavior
2050 >        assertTrue(Objects.equals(h.join(), inc(v1)) ||
2051 >                   Objects.equals(h.join(), inc(v2)));
2052 >        assertEquals(1, r.invocationCount);
2053 >    }}
2054  
2055      /**
2056 <     * runAfterEither result completes exceptionally after exceptional
2056 >     * applyToEither result completes exceptionally after exceptional
2057       * completion of either source
2058       */
2059 <    public void testRunAfterEither2() {
2060 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2061 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2062 <        Noop r = new Noop();
2063 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
2064 <        f.completeExceptionally(new CFException());
2065 <        f2.complete(one);
2066 <        checkCompletedWithWrappedCFException(g);
2067 <
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);
2059 >    public void testApplyToEither_exceptionalCompletion1() {
2060 >        for (ExecutionMode m : ExecutionMode.values())
2061 >        for (Integer v1 : new Integer[] { 1, null })
2062 >    {
2063 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2064 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2065 >        final IncFunction r = new IncFunction();
2066 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2067 >        final CFException ex = new CFException();
2068  
2069 <        f = new CompletableFuture<>();
2070 <        f.complete(one);
2071 <        g = f.thenCompose(r = new FailingCompletableFutureFunction());
1503 <        checkCompletedWithWrappedCFException(g);
1504 <    }
2069 >        f.completeExceptionally(ex);
2070 >        checkCompletedWithWrappedCFException(h, ex);
2071 >        g.complete(v1);
2072  
2073 <    /**
2074 <     * thenCompose result completes exceptionally if source cancelled
2075 <     */
2076 <    public void testThenCompose4() {
2077 <        CompletableFuture<Integer> f, g;
1511 <        CompletableFutureInc r;
2073 >        assertEquals(0, r.invocationCount);
2074 >        checkCompletedNormally(g, v1);
2075 >        checkCompletedWithWrappedCFException(f, ex);
2076 >        checkCompletedWithWrappedCFException(h, ex);
2077 >    }}
2078  
2079 <        f = new CompletableFuture<>();
2080 <        g = f.thenCompose(r = new CompletableFutureInc());
2081 <        assertTrue(f.cancel(true));
2082 <        checkCompletedWithWrappedCancellationException(g);
2079 >    public void testApplyToEither_exceptionalCompletion2() {
2080 >        for (ExecutionMode m : ExecutionMode.values())
2081 >        for (Integer v1 : new Integer[] { 1, null })
2082 >    {
2083 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2084 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2085 >        final IncFunction r = new IncFunction();
2086 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2087 >        final CFException ex = new CFException();
2088  
2089 <        f = new CompletableFuture<>();
2090 <        assertTrue(f.cancel(true));
2091 <        g = f.thenCompose(r = new CompletableFutureInc());
1521 <        checkCompletedWithWrappedCancellationException(g);
1522 <    }
2089 >        g.completeExceptionally(ex);
2090 >        checkCompletedWithWrappedCFException(h, ex);
2091 >        f.complete(v1);
2092  
2093 <    // asyncs
2093 >        assertEquals(0, r.invocationCount);
2094 >        checkCompletedNormally(f, v1);
2095 >        checkCompletedWithWrappedCFException(g, ex);
2096 >        checkCompletedWithWrappedCFException(h, ex);
2097 >    }}
2098  
2099 <    /**
2100 <     * thenRunAsync result completes normally after normal completion of source
2101 <     */
2102 <    public void testThenRunAsync() {
2103 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2104 <        Noop r = new Noop();
2105 <        CompletableFuture<Void> g = f.thenRunAsync(r);
2106 <        f.complete(null);
1534 <        checkCompletedNormally(g, null);
2099 >    public void testApplyToEither_exceptionalCompletion3() {
2100 >        for (ExecutionMode m : ExecutionMode.values())
2101 >        for (Integer v1 : new Integer[] { 1, null })
2102 >    {
2103 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2104 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2105 >        final IncFunction r = new IncFunction();
2106 >        final CFException ex = new CFException();
2107  
2108 <        // reordered version
2109 <        f = new CompletableFuture<>();
2110 <        f.complete(null);
1539 <        r = new Noop();
1540 <        g = f.thenRunAsync(r);
1541 <        checkCompletedNormally(g, null);
1542 <    }
2108 >        g.completeExceptionally(ex);
2109 >        f.complete(v1);
2110 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2111  
2112 <    /**
2113 <     * 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());
2112 >        // unspecified behavior
2113 >        Integer v;
2114          try {
2115 <            g.join();
2116 <            shouldThrow();
2117 <        } catch (CompletionException success) {}
2118 <        checkCompletedWithWrappedCFException(g);
2119 <    }
2120 <
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 <    }
2115 >            assertEquals(inc(v1), h.join());
2116 >            assertEquals(1, r.invocationCount);
2117 >        } catch (CompletionException ok) {
2118 >            checkCompletedWithWrappedCFException(h, ex);
2119 >            assertEquals(0, r.invocationCount);
2120 >        }
2121  
2122 <    /**
2123 <     * thenAcceptAsync result completes exceptionally if source cancelled
2124 <     */
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 <    }
2122 >        checkCompletedWithWrappedCFException(g, ex);
2123 >        checkCompletedNormally(f, v1);
2124 >    }}
2125  
2126 <    /**
2127 <     * thenCombineAsync result completes normally after normal
2128 <     * completion of sources
2129 <     */
2130 <    public void testThenCombineAsync() {
2131 <        CompletableFuture<Integer> f, g, h;
2126 >    public void testApplyToEither_exceptionalCompletion4() {
2127 >        for (ExecutionMode m : ExecutionMode.values())
2128 >        for (Integer v1 : new Integer[] { 1, null })
2129 >    {
2130 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2131 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2132 >        final IncFunction r = new IncFunction();
2133 >        final CFException ex = new CFException();
2134  
2135 <        f = new CompletableFuture<>();
2136 <        g = new CompletableFuture<>();
2137 <        h = f.thenCombineAsync(g, subtract);
1681 <        f.complete(3);
1682 <        checkIncomplete(h);
1683 <        g.complete(1);
1684 <        checkCompletedNormally(h, 2);
2135 >        f.completeExceptionally(ex);
2136 >        g.complete(v1);
2137 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2138  
2139 <        f = new CompletableFuture<>();
2140 <        g = new CompletableFuture<>();
2141 <        h = f.thenCombineAsync(g, subtract);
2142 <        g.complete(1);
2143 <        checkIncomplete(h);
2144 <        f.complete(3);
2145 <        checkCompletedNormally(h, 2);
2139 >        // unspecified behavior
2140 >        Integer v;
2141 >        try {
2142 >            assertEquals(inc(v1), h.join());
2143 >            assertEquals(1, r.invocationCount);
2144 >        } catch (CompletionException ok) {
2145 >            checkCompletedWithWrappedCFException(h, ex);
2146 >            assertEquals(0, r.invocationCount);
2147 >        }
2148  
2149 <        f = new CompletableFuture<>();
2150 <        g = new CompletableFuture<>();
2151 <        g.complete(1);
1697 <        f.complete(3);
1698 <        h = f.thenCombineAsync(g, subtract);
1699 <        checkCompletedNormally(h, 2);
1700 <    }
2149 >        checkCompletedWithWrappedCFException(f, ex);
2150 >        checkCompletedNormally(g, v1);
2151 >    }}
2152  
2153      /**
2154 <     * thenCombineAsync result completes exceptionally after exceptional
1704 <     * completion of either source
2154 >     * applyToEither result completes exceptionally if action does
2155       */
2156 <    public void testThenCombineAsync2() {
2157 <        CompletableFuture<Integer> f, g, h;
2156 >    public void testApplyToEither_actionFailed1() {
2157 >        for (ExecutionMode m : ExecutionMode.values())
2158 >        for (Integer v1 : new Integer[] { 1, null })
2159 >        for (Integer v2 : new Integer[] { 2, null })
2160 >    {
2161 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2162 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2163 >        final FailingFunction r = new FailingFunction();
2164 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2165  
2166 <        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);
2166 >        f.complete(v1);
2167          checkCompletedWithWrappedCFException(h);
2168 +        g.complete(v2);
2169 +        checkCompletedNormally(f, v1);
2170 +        checkCompletedNormally(g, v2);
2171 +    }}
2172  
2173 <        f = new CompletableFuture<>();
2174 <        g = new CompletableFuture<>();
2175 <        h = f.thenCombineAsync(g, subtract);
2176 <        g.completeExceptionally(new CFException());
2177 <        checkIncomplete(h);
2178 <        f.complete(3);
2179 <        checkCompletedWithWrappedCFException(h);
2173 >    public void testApplyToEither_actionFailed2() {
2174 >        for (ExecutionMode m : ExecutionMode.values())
2175 >        for (Integer v1 : new Integer[] { 1, null })
2176 >        for (Integer v2 : new Integer[] { 2, null })
2177 >    {
2178 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2179 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2180 >        final FailingFunction r = new FailingFunction();
2181 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2182  
2183 <        f = new CompletableFuture<>();
1726 <        g = new CompletableFuture<>();
1727 <        g.completeExceptionally(new CFException());
1728 <        f.complete(3);
1729 <        h = f.thenCombineAsync(g, subtract);
2183 >        g.complete(v2);
2184          checkCompletedWithWrappedCFException(h);
2185 <    }
2186 <
2187 <    /**
2188 <     * 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 <    }
2185 >        f.complete(v1);
2186 >        checkCompletedNormally(f, v1);
2187 >        checkCompletedNormally(g, v2);
2188 >    }}
2189  
2190      /**
2191 <     * thenCombineAsync result completes exceptionally if either source cancelled
2191 >     * applyToEither result completes exceptionally if either source cancelled
2192       */
2193 <    public void testThenCombineAsync4() {
2194 <        CompletableFuture<Integer> f, g, h;
2193 >    public void testApplyToEither_sourceCancelled1() {
2194 >        for (ExecutionMode m : ExecutionMode.values())
2195 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2196 >        for (Integer v1 : new Integer[] { 1, null })
2197 >    {
2198 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2199 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2200 >        final IncFunction r = new IncFunction();
2201 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2202  
2203 <        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);
2203 >        assertTrue(f.cancel(mayInterruptIfRunning));
2204          checkCompletedWithWrappedCancellationException(h);
2205 +        g.complete(v1);
2206  
2207 <        f = new CompletableFuture<>();
2208 <        g = new CompletableFuture<>();
2209 <        h = f.thenCombineAsync(g, subtract);
1766 <        assertTrue(g.cancel(true));
1767 <        checkIncomplete(h);
1768 <        f.complete(3);
2207 >        checkCancelled(f);
2208 >        assertEquals(0, r.invocationCount);
2209 >        checkCompletedNormally(g, v1);
2210          checkCompletedWithWrappedCancellationException(h);
2211 +    }}
2212  
2213 <        f = new CompletableFuture<>();
2214 <        g = new CompletableFuture<>();
2215 <        g.complete(3);
2216 <        assertTrue(f.cancel(true));
2217 <        h = f.thenCombineAsync(g, subtract);
2218 <        checkCompletedWithWrappedCancellationException(h);
2213 >    public void testApplyToEither_sourceCancelled2() {
2214 >        for (ExecutionMode m : ExecutionMode.values())
2215 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2216 >        for (Integer v1 : new Integer[] { 1, null })
2217 >    {
2218 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2219 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2220 >        final IncFunction r = new IncFunction();
2221 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2222  
2223 <        f = new CompletableFuture<>();
1779 <        g = new CompletableFuture<>();
1780 <        f.complete(3);
1781 <        assertTrue(g.cancel(true));
1782 <        h = f.thenCombineAsync(g, subtract);
2223 >        assertTrue(g.cancel(mayInterruptIfRunning));
2224          checkCompletedWithWrappedCancellationException(h);
2225 <    }
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);
2225 >        f.complete(v1);
2226  
2227 <        f = new CompletableFuture<>();
2228 <        g = new CompletableFuture<>();
2229 <        f.complete(3);
2230 <        g.complete(1);
2231 <        h = f.thenAcceptBothAsync(g, r = new FailingBiConsumer());
1883 <        checkCompletedWithWrappedCFException(h);
1884 <    }
2227 >        checkCancelled(g);
2228 >        assertEquals(0, r.invocationCount);
2229 >        checkCompletedNormally(f, v1);
2230 >        checkCompletedWithWrappedCancellationException(h);
2231 >    }}
2232  
2233 <    /**
2234 <     * thenAcceptBothAsync result completes exceptionally if either source cancelled
2235 <     */
2236 <    public void testThenAcceptBothAsync4() {
2237 <        CompletableFuture<Integer> f, g;
2238 <        CompletableFuture<Void> h;
2239 <        SubtractAction r;
2233 >    public void testApplyToEither_sourceCancelled3() {
2234 >        for (ExecutionMode m : ExecutionMode.values())
2235 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2236 >        for (Integer v1 : new Integer[] { 1, null })
2237 >    {
2238 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2239 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2240 >        final IncFunction r = new IncFunction();
2241  
2242 <        f = new CompletableFuture<>();
2243 <        g = new CompletableFuture<>();
2244 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1897 <        assertTrue(f.cancel(true));
1898 <        checkIncomplete(h);
1899 <        g.complete(1);
1900 <        checkCompletedWithWrappedCancellationException(h);
2242 >        assertTrue(g.cancel(mayInterruptIfRunning));
2243 >        f.complete(v1);
2244 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2245  
2246 <        f = new CompletableFuture<>();
2247 <        g = new CompletableFuture<>();
2248 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
2249 <        assertTrue(g.cancel(true));
2250 <        checkIncomplete(h);
2251 <        f.complete(3);
2252 <        checkCompletedWithWrappedCancellationException(h);
2246 >        // unspecified behavior
2247 >        Integer v;
2248 >        try {
2249 >            assertEquals(inc(v1), h.join());
2250 >            assertEquals(1, r.invocationCount);
2251 >        } catch (CompletionException ok) {
2252 >            checkCompletedWithWrappedCancellationException(h);
2253 >            assertEquals(0, r.invocationCount);
2254 >        }
2255  
2256 <        f = new CompletableFuture<>();
2257 <        g = new CompletableFuture<>();
2258 <        f.complete(3);
1913 <        assertTrue(g.cancel(true));
1914 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1915 <        checkCompletedWithWrappedCancellationException(h);
2256 >        checkCancelled(g);
2257 >        checkCompletedNormally(f, v1);
2258 >    }}
2259  
2260 <        f = new CompletableFuture<>();
2261 <        g = new CompletableFuture<>();
2262 <        assertTrue(f.cancel(true));
2263 <        g.complete(3);
2264 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
2265 <        checkCompletedWithWrappedCancellationException(h);
2266 <    }
2260 >    public void testApplyToEither_sourceCancelled4() {
2261 >        for (ExecutionMode m : ExecutionMode.values())
2262 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2263 >        for (Integer v1 : new Integer[] { 1, null })
2264 >    {
2265 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2266 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2267 >        final IncFunction r = new IncFunction();
2268  
2269 <    /**
2270 <     * runAfterBothAsync result completes normally after normal
2271 <     * 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 <    }
2269 >        assertTrue(f.cancel(mayInterruptIfRunning));
2270 >        g.complete(v1);
2271 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2272  
2273 <    /**
2274 <     * runAfterBothAsync result completes exceptionally after exceptional
2275 <     * completion of source
2276 <     */
2277 <    public void testRunAfterBothAsync2() {
2278 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2279 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2280 <        Noop r = new Noop();
2281 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r);
1950 <        f.completeExceptionally(new CFException());
1951 <        f2.complete(two);
1952 <        checkCompletedWithWrappedCFException(g);
2273 >        // unspecified behavior
2274 >        Integer v;
2275 >        try {
2276 >            assertEquals(inc(v1), h.join());
2277 >            assertEquals(1, r.invocationCount);
2278 >        } catch (CompletionException ok) {
2279 >            checkCompletedWithWrappedCancellationException(h);
2280 >            assertEquals(0, r.invocationCount);
2281 >        }
2282  
2283 <        r = new Noop();
2284 <        f = new CompletableFuture<>();
2285 <        f2 = new CompletableFuture<>();
1957 <        g = f.runAfterBothAsync(f2, r);
1958 <        f.complete(one);
1959 <        f2.completeExceptionally(new CFException());
1960 <        checkCompletedWithWrappedCFException(g);
1961 <    }
2283 >        checkCancelled(f);
2284 >        checkCompletedNormally(g, v1);
2285 >    }}
2286  
2287      /**
2288 <     * runAfterBothAsync result completes exceptionally if action does
2288 >     * acceptEither result completes normally after normal completion
2289 >     * of either source
2290       */
2291 <    public void testRunAfterBothAsync3() {
2292 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2293 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2294 <        FailingNoop r = new FailingNoop();
2295 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r);
2296 <        f.complete(one);
2297 <        checkIncomplete(g);
2298 <        f2.complete(two);
2299 <        checkCompletedWithWrappedCFException(g);
1975 <    }
2291 >    public void testAcceptEither_normalCompletion1() {
2292 >        for (ExecutionMode m : ExecutionMode.values())
2293 >        for (Integer v1 : new Integer[] { 1, null })
2294 >        for (Integer v2 : new Integer[] { 2, null })
2295 >    {
2296 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2297 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2298 >        final IncAction r = new IncAction();
2299 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2300  
2301 <    /**
2302 <     * runAfterBothAsync result completes exceptionally if either source cancelled
2303 <     */
2304 <    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);
2301 >        f.complete(v1);
2302 >        checkCompletedNormally(h, null);
2303 >        assertEquals(inc(v1), r.value);
2304 >        g.complete(v2);
2305  
2306 <        r = new Noop();
2307 <        f = new CompletableFuture<>();
2308 <        f2 = new CompletableFuture<>();
2309 <        g = f.runAfterBothAsync(f2, r);
1993 <        f.complete(one);
1994 <        assertTrue(f2.cancel(true));
1995 <        checkCompletedWithWrappedCancellationException(g);
1996 <    }
2306 >        checkCompletedNormally(f, v1);
2307 >        checkCompletedNormally(g, v2);
2308 >        checkCompletedNormally(h, null);
2309 >    }}
2310  
2311 <    /**
2312 <     * applyToEitherAsync result completes normally after normal
2313 <     * completion of sources
2314 <     */
2315 <    public void testApplyToEitherAsync() {
2316 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2317 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2318 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
2319 <        f.complete(one);
2007 <        checkCompletedNormally(g, two);
2311 >    public void testAcceptEither_normalCompletion2() {
2312 >        for (ExecutionMode m : ExecutionMode.values())
2313 >        for (Integer v1 : new Integer[] { 1, null })
2314 >        for (Integer v2 : new Integer[] { 2, null })
2315 >    {
2316 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2317 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2318 >        final IncAction r = new IncAction();
2319 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2320  
2321 <        f = new CompletableFuture<>();
2322 <        f.complete(one);
2323 <        f2 = new CompletableFuture<>();
2324 <        g = f.applyToEitherAsync(f2, inc);
2013 <        checkCompletedNormally(g, two);
2014 <    }
2321 >        g.complete(v2);
2322 >        checkCompletedNormally(h, null);
2323 >        assertEquals(inc(v2), r.value);
2324 >        f.complete(v1);
2325  
2326 <    /**
2327 <     * applyToEitherAsync result completes exceptionally after exceptional
2328 <     * completion of source
2329 <     */
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);
2326 >        checkCompletedNormally(f, v1);
2327 >        checkCompletedNormally(g, v2);
2328 >        checkCompletedNormally(h, null);
2329 >    }}
2330  
2331 <        f = new CompletableFuture<>();
2332 <        f2 = new CompletableFuture<>();
2333 <        f2.completeExceptionally(new CFException());
2334 <        g = f.applyToEitherAsync(f2, inc);
2335 <        f.complete(one);
2336 <        checkCompletedWithWrappedCFException(g);
2337 <    }
2331 >    public void testAcceptEither_normalCompletion3() {
2332 >        for (ExecutionMode m : ExecutionMode.values())
2333 >        for (Integer v1 : new Integer[] { 1, null })
2334 >        for (Integer v2 : new Integer[] { 2, null })
2335 >    {
2336 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2337 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2338 >        final IncAction r = new IncAction();
2339  
2340 <    /**
2341 <     * applyToEitherAsync result completes exceptionally if action does
2342 <     */
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 <    }
2340 >        f.complete(v1);
2341 >        g.complete(v2);
2342 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2343  
2344 <    /**
2345 <     * applyToEitherAsync result completes exceptionally if either source cancelled
2346 <     */
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);
2344 >        checkCompletedNormally(h, null);
2345 >        checkCompletedNormally(f, v1);
2346 >        checkCompletedNormally(g, v2);
2347  
2348 <        f = new CompletableFuture<>();
2349 <        f2 = new CompletableFuture<>();
2350 <        assertTrue(f2.cancel(true));
2351 <        g = f.applyToEitherAsync(f2, inc);
2061 <        checkCompletedWithWrappedCancellationException(g);
2062 <    }
2348 >        // unspecified behavior
2349 >        assertTrue(Objects.equals(r.value, inc(v1)) ||
2350 >                   Objects.equals(r.value, inc(v2)));
2351 >    }}
2352  
2353      /**
2354 <     * acceptEitherAsync result completes normally after normal
2355 <     * completion of sources
2354 >     * acceptEither result completes exceptionally after exceptional
2355 >     * completion of either source
2356       */
2357 <    public void testAcceptEitherAsync() {
2358 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2359 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2360 <        IncAction r = new IncAction();
2361 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
2362 <        f.complete(one);
2363 <        checkCompletedNormally(g, null);
2364 <        assertEquals(r.value, 2);
2357 >    public void testAcceptEither_exceptionalCompletion1() {
2358 >        for (ExecutionMode m : ExecutionMode.values())
2359 >        for (Integer v1 : new Integer[] { 1, null })
2360 >    {
2361 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2362 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2363 >        final IncAction r = new IncAction();
2364 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2365 >        final CFException ex = new CFException();
2366  
2367 <        r = new IncAction();
2368 <        f = new CompletableFuture<>();
2369 <        f.complete(one);
2080 <        f2 = new CompletableFuture<>();
2081 <        g = f.acceptEitherAsync(f2, r);
2082 <        checkCompletedNormally(g, null);
2083 <        assertEquals(r.value, 2);
2084 <    }
2367 >        f.completeExceptionally(ex);
2368 >        checkCompletedWithWrappedCFException(h, ex);
2369 >        g.complete(v1);
2370  
2371 <    /**
2372 <     * acceptEitherAsync result completes exceptionally after exceptional
2373 <     * completion of source
2374 <     */
2375 <    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);
2371 >        assertEquals(0, r.invocationCount);
2372 >        checkCompletedNormally(g, v1);
2373 >        checkCompletedWithWrappedCFException(f, ex);
2374 >        checkCompletedWithWrappedCFException(h, ex);
2375 >    }}
2376  
2377 <        r = new IncAction();
2378 <        f = new CompletableFuture<>();
2379 <        f2 = new CompletableFuture<>();
2380 <        f2.completeExceptionally(new CFException());
2381 <        g = f.acceptEitherAsync(f2, r);
2382 <        f.complete(one);
2383 <        checkCompletedWithWrappedCFException(g);
2384 <    }
2377 >    public void testAcceptEither_exceptionalCompletion2() {
2378 >        for (ExecutionMode m : ExecutionMode.values())
2379 >        for (Integer v1 : new Integer[] { 1, null })
2380 >    {
2381 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2382 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2383 >        final IncAction r = new IncAction();
2384 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2385 >        final CFException ex = new CFException();
2386  
2387 <    /**
2388 <     * acceptEitherAsync result completes exceptionally if action does
2389 <     */
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 <    }
2387 >        g.completeExceptionally(ex);
2388 >        checkCompletedWithWrappedCFException(h, ex);
2389 >        f.complete(v1);
2390  
2391 <    /**
2392 <     * acceptEitherAsync result completes exceptionally if either
2393 <     * source cancelled
2394 <     */
2395 <    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);
2391 >        assertEquals(0, r.invocationCount);
2392 >        checkCompletedNormally(f, v1);
2393 >        checkCompletedWithWrappedCFException(g, ex);
2394 >        checkCompletedWithWrappedCFException(h, ex);
2395 >    }}
2396  
2397 <        r = new IncAction();
2398 <        f = new CompletableFuture<>();
2399 <        f2 = new CompletableFuture<>();
2400 <        assertTrue(f2.cancel(true));
2401 <        g = f.acceptEitherAsync(f2, r);
2402 <        checkCompletedWithWrappedCancellationException(g);
2403 <    }
2397 >    public void testAcceptEither_exceptionalCompletion3() {
2398 >        for (ExecutionMode m : ExecutionMode.values())
2399 >        for (Integer v1 : new Integer[] { 1, null })
2400 >    {
2401 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2402 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2403 >        final IncAction r = new IncAction();
2404 >        final CFException ex = new CFException();
2405  
2406 <    /**
2407 <     * runAfterEitherAsync result completes normally after normal
2408 <     * 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);
2406 >        g.completeExceptionally(ex);
2407 >        f.complete(v1);
2408 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2409  
2410 <        r = new Noop();
2411 <        f = new CompletableFuture<>();
2412 <        f.complete(one);
2413 <        f2 = new CompletableFuture<>();
2414 <        g = f.runAfterEitherAsync(f2, r);
2415 <        checkCompletedNormally(g, null);
2416 <        assertTrue(r.ran);
2417 <    }
2410 >        // unspecified behavior
2411 >        Integer v;
2412 >        try {
2413 >            assertNull(h.join());
2414 >            assertEquals(1, r.invocationCount);
2415 >            assertEquals(inc(v1), r.value);
2416 >        } catch (CompletionException ok) {
2417 >            checkCompletedWithWrappedCFException(h, ex);
2418 >            assertEquals(0, r.invocationCount);
2419 >        }
2420  
2421 <    /**
2422 <     * runAfterEitherAsync result completes exceptionally after exceptional
2423 <     * 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);
2421 >        checkCompletedWithWrappedCFException(g, ex);
2422 >        checkCompletedNormally(f, v1);
2423 >    }}
2424  
2425 <        r = new Noop();
2426 <        f = new CompletableFuture<>();
2427 <        f2 = new CompletableFuture<>();
2428 <        f2.completeExceptionally(new CFException());
2429 <        g = f.runAfterEitherAsync(f2, r);
2430 <        f.complete(one);
2431 <        checkCompletedWithWrappedCFException(g);
2432 <    }
2425 >    public void testAcceptEither_exceptionalCompletion4() {
2426 >        for (ExecutionMode m : ExecutionMode.values())
2427 >        for (Integer v1 : new Integer[] { 1, null })
2428 >    {
2429 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2430 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2431 >        final IncAction r = new IncAction();
2432 >        final CFException ex = new CFException();
2433  
2434 <    /**
2435 <     * runAfterEitherAsync result completes exceptionally if action does
2436 <     */
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 <    }
2434 >        f.completeExceptionally(ex);
2435 >        g.complete(v1);
2436 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2437  
2438 <    /**
2439 <     * runAfterEitherAsync result completes exceptionally if either
2440 <     * source cancelled
2441 <     */
2442 <    public void testRunAfterEitherAsync4() {
2443 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2444 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2445 <        Noop r = new Noop();
2446 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
2447 <        assertTrue(f.cancel(true));
2204 <        checkCompletedWithWrappedCancellationException(g);
2438 >        // unspecified behavior
2439 >        Integer v;
2440 >        try {
2441 >            assertNull(h.join());
2442 >            assertEquals(1, r.invocationCount);
2443 >            assertEquals(inc(v1), r.value);
2444 >        } catch (CompletionException ok) {
2445 >            checkCompletedWithWrappedCFException(h, ex);
2446 >            assertEquals(0, r.invocationCount);
2447 >        }
2448  
2449 <        r = new Noop();
2450 <        f = new CompletableFuture<>();
2451 <        f2 = new CompletableFuture<>();
2209 <        assertTrue(f2.cancel(true));
2210 <        g = f.runAfterEitherAsync(f2, r);
2211 <        checkCompletedWithWrappedCancellationException(g);
2212 <    }
2449 >        checkCompletedWithWrappedCFException(f, ex);
2450 >        checkCompletedNormally(g, v1);
2451 >    }}
2452  
2453      /**
2454 <     * thenComposeAsync result completes normally after normal
2216 <     * completion of source
2454 >     * acceptEither result completes exceptionally if action does
2455       */
2456 <    public void testThenComposeAsync() {
2457 <        CompletableFuture<Integer> f, g;
2458 <        CompletableFutureInc r;
2459 <
2460 <        f = new CompletableFuture<>();
2461 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2462 <        f.complete(one);
2463 <        checkCompletedNormally(g, two);
2464 <
2227 <        f = new CompletableFuture<>();
2228 <        f.complete(one);
2229 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2230 <        checkCompletedNormally(g, two);
2231 <    }
2456 >    public void testAcceptEither_actionFailed1() {
2457 >        for (ExecutionMode m : ExecutionMode.values())
2458 >        for (Integer v1 : new Integer[] { 1, null })
2459 >        for (Integer v2 : new Integer[] { 2, null })
2460 >    {
2461 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2462 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2463 >        final FailingConsumer r = new FailingConsumer();
2464 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2465  
2466 <    /**
2467 <     * thenComposeAsync result completes exceptionally after
2468 <     * exceptional completion of source
2469 <     */
2470 <    public void testThenComposeAsync2() {
2471 <        CompletableFuture<Integer> f, g;
2239 <        CompletableFutureInc r;
2466 >        f.complete(v1);
2467 >        checkCompletedWithWrappedCFException(h);
2468 >        g.complete(v2);
2469 >        checkCompletedNormally(f, v1);
2470 >        checkCompletedNormally(g, v2);
2471 >    }}
2472  
2473 <        f = new CompletableFuture<>();
2474 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2475 <        f.completeExceptionally(new CFException());
2476 <        checkCompletedWithWrappedCFException(g);
2477 <        assertFalse(r.ran);
2473 >    public void testAcceptEither_actionFailed2() {
2474 >        for (ExecutionMode m : ExecutionMode.values())
2475 >        for (Integer v1 : new Integer[] { 1, null })
2476 >        for (Integer v2 : new Integer[] { 2, null })
2477 >    {
2478 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2479 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2480 >        final FailingConsumer r = new FailingConsumer();
2481 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2482  
2483 <        f = new CompletableFuture<>();
2484 <        f.completeExceptionally(new CFException());
2485 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2486 <        checkCompletedWithWrappedCFException(g);
2487 <        assertFalse(r.ran);
2488 <    }
2483 >        g.complete(v2);
2484 >        checkCompletedWithWrappedCFException(h);
2485 >        f.complete(v1);
2486 >        checkCompletedNormally(f, v1);
2487 >        checkCompletedNormally(g, v2);
2488 >    }}
2489  
2490      /**
2491 <     * thenComposeAsync result completes exceptionally if action does
2491 >     * acceptEither result completes exceptionally if either source cancelled
2492       */
2493 <    public void testThenComposeAsync3() {
2494 <        CompletableFuture<Integer> f, g;
2495 <        FailingCompletableFutureFunction r;
2496 <
2497 <        f = new CompletableFuture<>();
2498 <        g = f.thenComposeAsync(r = new FailingCompletableFutureFunction());
2499 <        f.complete(one);
2500 <        checkCompletedWithWrappedCFException(g);
2493 >    public void testAcceptEither_sourceCancelled1() {
2494 >        for (ExecutionMode m : ExecutionMode.values())
2495 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2496 >        for (Integer v1 : new Integer[] { 1, null })
2497 >    {
2498 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2499 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2500 >        final IncAction r = new IncAction();
2501 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2502  
2503 <        f = new CompletableFuture<>();
2504 <        f.complete(one);
2505 <        g = f.thenComposeAsync(r = new FailingCompletableFutureFunction());
2269 <        checkCompletedWithWrappedCFException(g);
2270 <    }
2503 >        assertTrue(f.cancel(mayInterruptIfRunning));
2504 >        checkCompletedWithWrappedCancellationException(h);
2505 >        g.complete(v1);
2506  
2507 <    /**
2508 <     * thenComposeAsync result completes exceptionally if source cancelled
2509 <     */
2510 <    public void testThenComposeAsync4() {
2511 <        CompletableFuture<Integer> f, g;
2277 <        CompletableFutureInc r;
2507 >        checkCancelled(f);
2508 >        assertEquals(0, r.invocationCount);
2509 >        checkCompletedNormally(g, v1);
2510 >        checkCompletedWithWrappedCancellationException(h);
2511 >    }}
2512  
2513 <        f = new CompletableFuture<>();
2514 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2515 <        assertTrue(f.cancel(true));
2516 <        checkCompletedWithWrappedCancellationException(g);
2513 >    public void testAcceptEither_sourceCancelled2() {
2514 >        for (ExecutionMode m : ExecutionMode.values())
2515 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2516 >        for (Integer v1 : new Integer[] { 1, null })
2517 >    {
2518 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2519 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2520 >        final IncAction r = new IncAction();
2521 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2522  
2523 <        f = new CompletableFuture<>();
2524 <        assertTrue(f.cancel(true));
2525 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2287 <        checkCompletedWithWrappedCancellationException(g);
2288 <    }
2523 >        assertTrue(g.cancel(mayInterruptIfRunning));
2524 >        checkCompletedWithWrappedCancellationException(h);
2525 >        f.complete(v1);
2526  
2527 <    // async with explicit executors
2527 >        checkCancelled(g);
2528 >        assertEquals(0, r.invocationCount);
2529 >        checkCompletedNormally(f, v1);
2530 >        checkCompletedWithWrappedCancellationException(h);
2531 >    }}
2532  
2533 <    /**
2534 <     * thenRunAsync result completes normally after normal completion of source
2535 <     */
2536 <    public void testThenRunAsyncE() {
2537 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2538 <        Noop r = new Noop();
2539 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2540 <        f.complete(null);
2300 <        checkCompletedNormally(g, null);
2533 >    public void testAcceptEither_sourceCancelled3() {
2534 >        for (ExecutionMode m : ExecutionMode.values())
2535 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2536 >        for (Integer v1 : new Integer[] { 1, null })
2537 >    {
2538 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2539 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2540 >        final IncAction r = new IncAction();
2541  
2542 <        // reordered version
2543 <        f = new CompletableFuture<>();
2544 <        f.complete(null);
2305 <        r = new Noop();
2306 <        g = f.thenRunAsync(r, new ThreadExecutor());
2307 <        checkCompletedNormally(g, null);
2308 <    }
2542 >        assertTrue(g.cancel(mayInterruptIfRunning));
2543 >        f.complete(v1);
2544 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2545  
2546 <    /**
2547 <     * 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());
2546 >        // unspecified behavior
2547 >        Integer v;
2548          try {
2549 <            g.join();
2550 <            shouldThrow();
2551 <        } catch (CompletionException success) {}
2552 <        checkCompletedWithWrappedCFException(g);
2553 <    }
2549 >            assertNull(h.join());
2550 >            assertEquals(1, r.invocationCount);
2551 >            assertEquals(inc(v1), r.value);
2552 >        } catch (CompletionException ok) {
2553 >            checkCompletedWithWrappedCancellationException(h);
2554 >            assertEquals(0, r.invocationCount);
2555 >        }
2556  
2557 <    /**
2558 <     * thenRunAsync result completes exceptionally if action does
2559 <     */
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 <    }
2557 >        checkCancelled(g);
2558 >        checkCompletedNormally(f, v1);
2559 >    }}
2560  
2561 <    /**
2562 <     * thenRunAsync result completes exceptionally if source cancelled
2563 <     */
2564 <    public void testThenRunAsync4E() {
2565 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2566 <        Noop r = new Noop();
2567 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2568 <        assertTrue(f.cancel(true));
2345 <        checkCompletedWithWrappedCancellationException(g);
2346 <    }
2561 >    public void testAcceptEither_sourceCancelled4() {
2562 >        for (ExecutionMode m : ExecutionMode.values())
2563 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2564 >        for (Integer v1 : new Integer[] { 1, null })
2565 >    {
2566 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2567 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2568 >        final IncAction r = new IncAction();
2569  
2570 <    /**
2571 <     * thenApplyAsync result completes normally after normal completion of source
2572 <     */
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 <    }
2570 >        assertTrue(f.cancel(mayInterruptIfRunning));
2571 >        g.complete(v1);
2572 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2573  
2574 <    /**
2575 <     * thenApplyAsync result completes exceptionally after exceptional
2576 <     * completion of source
2577 <     */
2578 <    public void testThenApplyAsync2E() {
2579 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2580 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
2581 <        f.completeExceptionally(new CFException());
2582 <        checkCompletedWithWrappedCFException(g);
2583 <    }
2574 >        // unspecified behavior
2575 >        Integer v;
2576 >        try {
2577 >            assertNull(h.join());
2578 >            assertEquals(1, r.invocationCount);
2579 >            assertEquals(inc(v1), r.value);
2580 >        } catch (CompletionException ok) {
2581 >            checkCompletedWithWrappedCancellationException(h);
2582 >            assertEquals(0, r.invocationCount);
2583 >        }
2584  
2585 <    /**
2586 <     * thenApplyAsync result completes exceptionally if action does
2587 <     */
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 <    }
2585 >        checkCancelled(f);
2586 >        checkCompletedNormally(g, v1);
2587 >    }}
2588  
2589      /**
2590 <     * thenApplyAsync result completes exceptionally if source cancelled
2590 >     * runAfterEither result completes normally after normal completion
2591 >     * of either source
2592       */
2593 <    public void testThenApplyAsync4E() {
2594 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2595 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
2596 <        assertTrue(f.cancel(true));
2597 <        checkCompletedWithWrappedCancellationException(g);
2598 <    }
2593 >    public void testRunAfterEither_normalCompletion1() {
2594 >        for (ExecutionMode m : ExecutionMode.values())
2595 >        for (Integer v1 : new Integer[] { 1, null })
2596 >        for (Integer v2 : new Integer[] { 2, null })
2597 >    {
2598 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2599 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2600 >        final Noop r = new Noop();
2601 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2602  
2603 <    /**
2604 <     * thenAcceptAsync result completes normally after normal
2605 <     * completion of source
2606 <     */
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 <    }
2603 >        f.complete(v1);
2604 >        checkCompletedNormally(h, null);
2605 >        assertEquals(1, r.invocationCount);
2606 >        g.complete(v2);
2607  
2608 <    /**
2609 <     * thenAcceptAsync result completes exceptionally after exceptional
2610 <     * completion of source
2611 <     */
2612 <    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 <    }
2608 >        checkCompletedNormally(f, v1);
2609 >        checkCompletedNormally(g, v2);
2610 >        checkCompletedNormally(h, null);
2611 >        assertEquals(1, r.invocationCount);
2612 >    }}
2613  
2614 <    /**
2615 <     * thenAcceptAsync result completes exceptionally if action does
2616 <     */
2617 <    public void testThenAcceptAsync3E() {
2618 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2619 <        FailingConsumer r = new FailingConsumer();
2620 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2621 <        f.complete(null);
2622 <        checkCompletedWithWrappedCFException(g);
2424 <    }
2614 >    public void testRunAfterEither_normalCompletion2() {
2615 >        for (ExecutionMode m : ExecutionMode.values())
2616 >        for (Integer v1 : new Integer[] { 1, null })
2617 >        for (Integer v2 : new Integer[] { 2, null })
2618 >    {
2619 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2620 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2621 >        final Noop r = new Noop();
2622 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2623  
2624 <    /**
2625 <     * thenAcceptAsync result completes exceptionally if source cancelled
2626 <     */
2627 <    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 <    }
2624 >        g.complete(v2);
2625 >        checkCompletedNormally(h, null);
2626 >        assertEquals(1, r.invocationCount);
2627 >        f.complete(v1);
2628  
2629 <    /**
2630 <     * thenCombineAsync result completes normally after normal
2631 <     * completion of sources
2632 <     */
2633 <    public void testThenCombineAsyncE() {
2442 <        CompletableFuture<Integer> f, g, h;
2443 <        ThreadExecutor e = new ThreadExecutor();
2444 <        int count = 0;
2629 >        checkCompletedNormally(f, v1);
2630 >        checkCompletedNormally(g, v2);
2631 >        checkCompletedNormally(h, null);
2632 >        assertEquals(1, r.invocationCount);
2633 >        }}
2634  
2635 <        f = new CompletableFuture<>();
2636 <        g = new CompletableFuture<>();
2637 <        h = f.thenCombineAsync(g, subtract, e);
2638 <        f.complete(3);
2639 <        checkIncomplete(h);
2640 <        g.complete(1);
2641 <        checkCompletedNormally(h, 2);
2642 <        assertEquals(++count, e.count.get());
2635 >    public void testRunAfterEither_normalCompletion3() {
2636 >        for (ExecutionMode m : ExecutionMode.values())
2637 >        for (Integer v1 : new Integer[] { 1, null })
2638 >        for (Integer v2 : new Integer[] { 2, null })
2639 >    {
2640 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2641 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2642 >        final Noop r = new Noop();
2643  
2644 <        f = new CompletableFuture<>();
2645 <        g = new CompletableFuture<>();
2646 <        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());
2644 >        f.complete(v1);
2645 >        g.complete(v2);
2646 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2647  
2648 <        f = new CompletableFuture<>();
2649 <        g = new CompletableFuture<>();
2650 <        g.complete(1);
2651 <        f.complete(3);
2652 <        h = f.thenCombineAsync(g, subtract, e);
2469 <        checkCompletedNormally(h, 2);
2470 <        assertEquals(++count, e.count.get());
2471 <    }
2648 >        checkCompletedNormally(h, null);
2649 >        checkCompletedNormally(f, v1);
2650 >        checkCompletedNormally(g, v2);
2651 >        assertEquals(1, r.invocationCount);
2652 >    }}
2653  
2654      /**
2655 <     * thenCombineAsync result completes exceptionally after exceptional
2655 >     * runAfterEither result completes exceptionally after exceptional
2656       * completion of either source
2657       */
2658 <    public void testThenCombineAsync2E() {
2659 <        CompletableFuture<Integer> f, g, h;
2660 <        ThreadExecutor e = new ThreadExecutor();
2661 <        int count = 0;
2662 <
2663 <        f = new CompletableFuture<>();
2664 <        g = new CompletableFuture<>();
2665 <        h = f.thenCombineAsync(g, subtract, e);
2666 <        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);
2658 >    public void testRunAfterEither_exceptionalCompletion1() {
2659 >        for (ExecutionMode m : ExecutionMode.values())
2660 >        for (Integer v1 : new Integer[] { 1, null })
2661 >    {
2662 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2663 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2664 >        final Noop r = new Noop();
2665 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2666 >        final CFException ex = new CFException();
2667  
2668 <        assertEquals(0, e.count.get());
2669 <    }
2668 >        f.completeExceptionally(ex);
2669 >        checkCompletedWithWrappedCFException(h, ex);
2670 >        g.complete(v1);
2671  
2672 <    /**
2673 <     * thenCombineAsync result completes exceptionally if action does
2674 <     */
2675 <    public void testThenCombineAsync3E() {
2676 <        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 <    }
2672 >        assertEquals(0, r.invocationCount);
2673 >        checkCompletedNormally(g, v1);
2674 >        checkCompletedWithWrappedCFException(f, ex);
2675 >        checkCompletedWithWrappedCFException(h, ex);
2676 >    }}
2677  
2678 <    /**
2679 <     * thenCombineAsync result completes exceptionally if either source cancelled
2680 <     */
2681 <    public void testThenCombineAsync4E() {
2682 <        CompletableFuture<Integer> f, g, h;
2683 <        ThreadExecutor e = new ThreadExecutor();
2678 >    public void testRunAfterEither_exceptionalCompletion2() {
2679 >        for (ExecutionMode m : ExecutionMode.values())
2680 >        for (Integer v1 : new Integer[] { 1, null })
2681 >    {
2682 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2683 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2684 >        final Noop r = new Noop();
2685 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2686 >        final CFException ex = new CFException();
2687  
2688 <        f = new CompletableFuture<>();
2689 <        g = new CompletableFuture<>();
2690 <        h = f.thenCombineAsync(g, subtract, e);
2535 <        assertTrue(f.cancel(true));
2536 <        checkIncomplete(h);
2537 <        g.complete(1);
2538 <        checkCompletedWithWrappedCancellationException(h);
2688 >        g.completeExceptionally(ex);
2689 >        checkCompletedWithWrappedCFException(h, ex);
2690 >        f.complete(v1);
2691  
2692 <        f = new CompletableFuture<>();
2693 <        g = new CompletableFuture<>();
2694 <        h = f.thenCombineAsync(g, subtract, e);
2695 <        assertTrue(g.cancel(true));
2696 <        checkIncomplete(h);
2545 <        f.complete(3);
2546 <        checkCompletedWithWrappedCancellationException(h);
2692 >        assertEquals(0, r.invocationCount);
2693 >        checkCompletedNormally(f, v1);
2694 >        checkCompletedWithWrappedCFException(g, ex);
2695 >        checkCompletedWithWrappedCFException(h, ex);
2696 >    }}
2697  
2698 <        f = new CompletableFuture<>();
2699 <        g = new CompletableFuture<>();
2700 <        assertTrue(g.cancel(true));
2701 <        h = f.thenCombineAsync(g, subtract, e);
2702 <        checkIncomplete(h);
2703 <        f.complete(3);
2704 <        checkCompletedWithWrappedCancellationException(h);
2698 >    public void testRunAfterEither_exceptionalCompletion3() {
2699 >        for (ExecutionMode m : ExecutionMode.values())
2700 >        for (Integer v1 : new Integer[] { 1, null })
2701 >    {
2702 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2703 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2704 >        final Noop r = new Noop();
2705 >        final CFException ex = new CFException();
2706  
2707 <        f = new CompletableFuture<>();
2708 <        g = new CompletableFuture<>();
2709 <        assertTrue(f.cancel(true));
2559 <        assertTrue(g.cancel(true));
2560 <        h = f.thenCombineAsync(g, subtract, e);
2561 <        checkCompletedWithWrappedCancellationException(h);
2707 >        g.completeExceptionally(ex);
2708 >        f.complete(v1);
2709 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2710  
2711 <        assertEquals(0, e.count.get());
2712 <    }
2711 >        // unspecified behavior
2712 >        Integer v;
2713 >        try {
2714 >            assertNull(h.join());
2715 >            assertEquals(1, r.invocationCount);
2716 >        } catch (CompletionException ok) {
2717 >            checkCompletedWithWrappedCFException(h, ex);
2718 >            assertEquals(0, r.invocationCount);
2719 >        }
2720  
2721 <    /**
2722 <     * thenAcceptBothAsync result completes normally after normal
2723 <     * 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();
2721 >        checkCompletedWithWrappedCFException(g, ex);
2722 >        checkCompletedNormally(f, v1);
2723 >    }}
2724  
2725 <        f = new CompletableFuture<>();
2726 <        g = new CompletableFuture<>();
2727 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2728 <        f.complete(3);
2729 <        checkIncomplete(h);
2730 <        g.complete(1);
2731 <        checkCompletedNormally(h, null);
2732 <        assertEquals(r.value, 2);
2725 >    public void testRunAfterEither_exceptionalCompletion4() {
2726 >        for (ExecutionMode m : ExecutionMode.values())
2727 >        for (Integer v1 : new Integer[] { 1, null })
2728 >    {
2729 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2730 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2731 >        final Noop r = new Noop();
2732 >        final CFException ex = new CFException();
2733  
2734 <        f = new CompletableFuture<>();
2735 <        g = new CompletableFuture<>();
2736 <        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);
2734 >        f.completeExceptionally(ex);
2735 >        g.complete(v1);
2736 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2737  
2738 <        f = new CompletableFuture<>();
2739 <        g = new CompletableFuture<>();
2740 <        g.complete(1);
2741 <        f.complete(3);
2742 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2743 <        checkCompletedNormally(h, null);
2744 <        assertEquals(r.value, 2);
2738 >        // unspecified behavior
2739 >        Integer v;
2740 >        try {
2741 >            assertNull(h.join());
2742 >            assertEquals(1, r.invocationCount);
2743 >        } catch (CompletionException ok) {
2744 >            checkCompletedWithWrappedCFException(h, ex);
2745 >            assertEquals(0, r.invocationCount);
2746 >        }
2747  
2748 <        assertEquals(3, e.count.get());
2749 <    }
2748 >        checkCompletedWithWrappedCFException(f, ex);
2749 >        checkCompletedNormally(g, v1);
2750 >    }}
2751  
2752      /**
2753 <     * thenAcceptBothAsync result completes exceptionally after exceptional
2607 <     * completion of source
2753 >     * runAfterEither result completes exceptionally if action does
2754       */
2755 <    public void testThenAcceptBothAsync2E() {
2756 <        CompletableFuture<Integer> f, g;
2757 <        CompletableFuture<Void> h;
2758 <        SubtractAction r;
2759 <        ThreadExecutor e = new ThreadExecutor();
2760 <
2761 <        f = new CompletableFuture<>();
2762 <        g = new CompletableFuture<>();
2763 <        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);
2755 >    public void testRunAfterEither_actionFailed1() {
2756 >        for (ExecutionMode m : ExecutionMode.values())
2757 >        for (Integer v1 : new Integer[] { 1, null })
2758 >        for (Integer v2 : new Integer[] { 2, null })
2759 >    {
2760 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2761 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2762 >        final FailingNoop r = new FailingNoop();
2763 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2764  
2765 <        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);
2765 >        f.complete(v1);
2766          checkCompletedWithWrappedCFException(h);
2767 +        g.complete(v2);
2768 +        checkCompletedNormally(f, v1);
2769 +        checkCompletedNormally(g, v2);
2770 +    }}
2771  
2772 <        assertEquals(0, e.count.get());
2773 <    }
2774 <
2775 <    /**
2776 <     * thenAcceptBothAsync result completes exceptionally if action does
2777 <     */
2778 <    public void testThenAcceptBothAsync3E() {
2779 <        CompletableFuture<Integer> f, g;
2780 <        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);
2772 >    public void testRunAfterEither_actionFailed2() {
2773 >        for (ExecutionMode m : ExecutionMode.values())
2774 >        for (Integer v1 : new Integer[] { 1, null })
2775 >        for (Integer v2 : new Integer[] { 2, null })
2776 >    {
2777 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2778 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2779 >        final FailingNoop r = new FailingNoop();
2780 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2781  
2782 <        f = new CompletableFuture<>();
2666 <        g = new CompletableFuture<>();
2667 <        f.complete(3);
2668 <        g.complete(1);
2669 <        h = f.thenAcceptBothAsync(g, r = new FailingBiConsumer(), e);
2782 >        g.complete(v2);
2783          checkCompletedWithWrappedCFException(h);
2784 <
2785 <        assertEquals(2, e.count.get());
2786 <    }
2784 >        f.complete(v1);
2785 >        checkCompletedNormally(f, v1);
2786 >        checkCompletedNormally(g, v2);
2787 >    }}
2788  
2789      /**
2790 <     * thenAcceptBothAsync result completes exceptionally if either source cancelled
2790 >     * runAfterEither result completes exceptionally if either source cancelled
2791       */
2792 <    public void testThenAcceptBothAsync4E() {
2793 <        CompletableFuture<Integer> f, g;
2794 <        CompletableFuture<Void> h;
2795 <        SubtractAction r;
2796 <        ThreadExecutor e = new ThreadExecutor();
2792 >    public void testRunAfterEither_sourceCancelled1() {
2793 >        for (ExecutionMode m : ExecutionMode.values())
2794 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2795 >        for (Integer v1 : new Integer[] { 1, null })
2796 >    {
2797 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2798 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2799 >        final Noop r = new Noop();
2800 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2801  
2802 <        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);
2802 >        assertTrue(f.cancel(mayInterruptIfRunning));
2803          checkCompletedWithWrappedCancellationException(h);
2804 +        g.complete(v1);
2805  
2806 <        f = new CompletableFuture<>();
2807 <        g = new CompletableFuture<>();
2808 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2695 <        assertTrue(g.cancel(true));
2696 <        checkIncomplete(h);
2697 <        f.complete(3);
2806 >        checkCancelled(f);
2807 >        assertEquals(0, r.invocationCount);
2808 >        checkCompletedNormally(g, v1);
2809          checkCompletedWithWrappedCancellationException(h);
2810 +    }}
2811  
2812 <        f = new CompletableFuture<>();
2813 <        g = new CompletableFuture<>();
2814 <        f.complete(3);
2815 <        assertTrue(g.cancel(true));
2816 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2812 >    public void testRunAfterEither_sourceCancelled2() {
2813 >        for (ExecutionMode m : ExecutionMode.values())
2814 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2815 >        for (Integer v1 : new Integer[] { 1, null })
2816 >    {
2817 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2818 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2819 >        final Noop r = new Noop();
2820 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2821 >
2822 >        assertTrue(g.cancel(mayInterruptIfRunning));
2823          checkCompletedWithWrappedCancellationException(h);
2824 +        f.complete(v1);
2825  
2826 <        f = new CompletableFuture<>();
2827 <        g = new CompletableFuture<>();
2828 <        assertTrue(f.cancel(true));
2710 <        g.complete(3);
2711 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2826 >        checkCancelled(g);
2827 >        assertEquals(0, r.invocationCount);
2828 >        checkCompletedNormally(f, v1);
2829          checkCompletedWithWrappedCancellationException(h);
2830 +    }}
2831  
2832 <        assertEquals(0, e.count.get());
2833 <    }
2832 >    public void testRunAfterEither_sourceCancelled3() {
2833 >        for (ExecutionMode m : ExecutionMode.values())
2834 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2835 >        for (Integer v1 : new Integer[] { 1, null })
2836 >    {
2837 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2838 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2839 >        final Noop r = new Noop();
2840  
2841 <    /**
2842 <     * runAfterBothAsync result completes normally after normal
2843 <     * 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 <    }
2841 >        assertTrue(g.cancel(mayInterruptIfRunning));
2842 >        f.complete(v1);
2843 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2844  
2845 <    /**
2846 <     * runAfterBothAsync result completes exceptionally after exceptional
2847 <     * completion of source
2848 <     */
2849 <    public void testRunAfterBothAsync2E() {
2850 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2851 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2852 <        Noop r = new Noop();
2853 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2742 <        f.completeExceptionally(new CFException());
2743 <        f2.complete(two);
2744 <        checkCompletedWithWrappedCFException(g);
2845 >        // unspecified behavior
2846 >        Integer v;
2847 >        try {
2848 >            assertNull(h.join());
2849 >            assertEquals(1, r.invocationCount);
2850 >        } catch (CompletionException ok) {
2851 >            checkCompletedWithWrappedCancellationException(h);
2852 >            assertEquals(0, r.invocationCount);
2853 >        }
2854  
2855 <        r = new Noop();
2856 <        f = new CompletableFuture<>();
2857 <        f2 = new CompletableFuture<>();
2749 <        g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2750 <        f.complete(one);
2751 <        f2.completeExceptionally(new CFException());
2752 <        checkCompletedWithWrappedCFException(g);
2753 <    }
2855 >        checkCancelled(g);
2856 >        checkCompletedNormally(f, v1);
2857 >    }}
2858  
2859 <    /**
2860 <     * runAfterBothAsync result completes exceptionally if action does
2861 <     */
2862 <    public void testRunAfterBothAsync3E() {
2863 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2864 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2865 <        FailingNoop r = new FailingNoop();
2866 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2763 <        f.complete(one);
2764 <        checkIncomplete(g);
2765 <        f2.complete(two);
2766 <        checkCompletedWithWrappedCFException(g);
2767 <    }
2859 >    public void testRunAfterEither_sourceCancelled4() {
2860 >        for (ExecutionMode m : ExecutionMode.values())
2861 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2862 >        for (Integer v1 : new Integer[] { 1, null })
2863 >    {
2864 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2865 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2866 >        final Noop r = new Noop();
2867  
2868 <    /**
2869 <     * runAfterBothAsync result completes exceptionally if either source cancelled
2870 <     */
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);
2868 >        assertTrue(f.cancel(mayInterruptIfRunning));
2869 >        g.complete(v1);
2870 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2871  
2872 <        r = new Noop();
2873 <        f = new CompletableFuture<>();
2874 <        f2 = new CompletableFuture<>();
2875 <        g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2876 <        f.complete(one);
2877 <        assertTrue(f2.cancel(true));
2878 <        checkCompletedWithWrappedCancellationException(g);
2879 <    }
2872 >        // unspecified behavior
2873 >        Integer v;
2874 >        try {
2875 >            assertNull(h.join());
2876 >            assertEquals(1, r.invocationCount);
2877 >        } catch (CompletionException ok) {
2878 >            checkCompletedWithWrappedCancellationException(h);
2879 >            assertEquals(0, r.invocationCount);
2880 >        }
2881 >
2882 >        checkCancelled(f);
2883 >        checkCompletedNormally(g, v1);
2884 >    }}
2885  
2886      /**
2887 <     * applyToEitherAsync result completes normally after normal
2792 <     * completion of sources
2887 >     * thenCompose result completes normally after normal completion of source
2888       */
2889 <    public void testApplyToEitherAsyncE() {
2890 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2891 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2892 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2893 <        f.complete(one);
2894 <        checkCompletedNormally(g, two);
2889 >    public void testThenCompose_normalCompletion() {
2890 >        for (ExecutionMode m : ExecutionMode.values())
2891 >        for (boolean createIncomplete : new boolean[] { true, false })
2892 >        for (Integer v1 : new Integer[] { 1, null })
2893 >    {
2894 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2895 >        final CompletableFutureInc r = new CompletableFutureInc();
2896 >        if (!createIncomplete) f.complete(v1);
2897 >        final CompletableFuture<Integer> g = f.thenCompose(r);
2898 >        if (createIncomplete) f.complete(v1);
2899  
2900 <        f = new CompletableFuture<>();
2901 <        f.complete(one);
2902 <        f2 = new CompletableFuture<>();
2903 <        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2805 <        checkCompletedNormally(g, two);
2806 <    }
2900 >        checkCompletedNormally(g, inc(v1));
2901 >        checkCompletedNormally(f, v1);
2902 >        assertEquals(1, r.invocationCount);
2903 >    }}
2904  
2905      /**
2906 <     * applyToEitherAsync result completes exceptionally after exceptional
2906 >     * thenCompose result completes exceptionally after exceptional
2907       * completion of source
2908       */
2909 <    public void testApplyToEitherAsync2E() {
2910 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2911 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2912 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2913 <        f.completeExceptionally(new CFException());
2914 <        checkCompletedWithWrappedCFException(g);
2909 >    public void testThenCompose_exceptionalCompletion() {
2910 >        for (ExecutionMode m : ExecutionMode.values())
2911 >        for (boolean createIncomplete : new boolean[] { true, false })
2912 >    {
2913 >        final CFException ex = new CFException();
2914 >        final CompletableFutureInc r = new CompletableFutureInc();
2915 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2916 >        if (!createIncomplete) f.completeExceptionally(ex);
2917 >        final CompletableFuture<Integer> g = f.thenCompose(r);
2918 >        if (createIncomplete) f.completeExceptionally(ex);
2919  
2920 <        f = new CompletableFuture<>();
2921 <        f2 = new CompletableFuture<>();
2922 <        f2.completeExceptionally(new CFException());
2923 <        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2823 <        f.complete(one);
2824 <        checkCompletedWithWrappedCFException(g);
2825 <    }
2920 >        checkCompletedWithWrappedCFException(g, ex);
2921 >        checkCompletedWithWrappedCFException(f, ex);
2922 >        assertEquals(0, r.invocationCount);
2923 >    }}
2924  
2925      /**
2926 <     * applyToEitherAsync result completes exceptionally if action does
2926 >     * thenCompose result completes exceptionally if action does
2927       */
2928 <    public void testApplyToEitherAsync3E() {
2929 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2930 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2931 <        FailingFunction r = new FailingFunction();
2932 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, r, new ThreadExecutor());
2933 <        f.complete(one);
2928 >    public void testThenCompose_actionFailed() {
2929 >        for (ExecutionMode m : ExecutionMode.values())
2930 >        for (boolean createIncomplete : new boolean[] { true, false })
2931 >        for (Integer v1 : new Integer[] { 1, null })
2932 >    {
2933 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2934 >        final FailingCompletableFutureFunction r
2935 >            = new FailingCompletableFutureFunction();
2936 >        if (!createIncomplete) f.complete(v1);
2937 >        final CompletableFuture<Integer> g = f.thenCompose(r);
2938 >        if (createIncomplete) f.complete(v1);
2939 >
2940          checkCompletedWithWrappedCFException(g);
2941 <    }
2941 >        checkCompletedNormally(f, v1);
2942 >    }}
2943  
2944      /**
2945 <     * applyToEitherAsync result completes exceptionally if either source cancelled
2945 >     * thenCompose result completes exceptionally if source cancelled
2946       */
2947 <    public void testApplyToEitherAsync4E() {
2948 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2949 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2950 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2951 <        assertTrue(f.cancel(true));
2952 <        checkCompletedWithWrappedCancellationException(g);
2947 >    public void testThenCompose_sourceCancelled() {
2948 >        for (ExecutionMode m : ExecutionMode.values())
2949 >        for (boolean createIncomplete : new boolean[] { true, false })
2950 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2951 >    {
2952 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2953 >        final CompletableFutureInc r = new CompletableFutureInc();
2954 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2955 >        final CompletableFuture<Integer> g = f.thenCompose(r);
2956 >        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2957  
2849        f = new CompletableFuture<>();
2850        f2 = new CompletableFuture<>();
2851        assertTrue(f2.cancel(true));
2852        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2958          checkCompletedWithWrappedCancellationException(g);
2959 <    }
2959 >        checkCancelled(f);
2960 >    }}
2961 >
2962 >    // asyncs
2963  
2964      /**
2965 <     * acceptEitherAsync result completes normally after normal
2966 <     * completion of sources
2965 >     * thenAcceptAsync result completes normally after normal
2966 >     * completion of source
2967       */
2968 <    public void testAcceptEitherAsyncE() {
2968 >    public void testThenAcceptAsync() {
2969          CompletableFuture<Integer> f = new CompletableFuture<>();
2862        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2970          IncAction r = new IncAction();
2971 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2865 <        f.complete(one);
2866 <        checkCompletedNormally(g, null);
2867 <        assertEquals(r.value, 2);
2868 <
2869 <        r = new IncAction();
2870 <        f = new CompletableFuture<>();
2971 >        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2972          f.complete(one);
2872        f2 = new CompletableFuture<>();
2873        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2973          checkCompletedNormally(g, null);
2974 <        assertEquals(r.value, 2);
2974 >        assertEquals(r.value, (Integer) 2);
2975      }
2976  
2977      /**
2978 <     * acceptEitherAsync result completes exceptionally after exceptional
2978 >     * thenAcceptAsync result completes exceptionally after exceptional
2979       * completion of source
2980       */
2981 <    public void testAcceptEitherAsync2E() {
2981 >    public void testThenAcceptAsync2() {
2982          CompletableFuture<Integer> f = new CompletableFuture<>();
2884        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2983          IncAction r = new IncAction();
2984 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2984 >        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2985          f.completeExceptionally(new CFException());
2986          checkCompletedWithWrappedCFException(g);
2889
2890        r = new IncAction();
2891        f = new CompletableFuture<>();
2892        f2 = new CompletableFuture<>();
2893        f2.completeExceptionally(new CFException());
2894        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2895        f.complete(one);
2896        checkCompletedWithWrappedCFException(g);
2987      }
2988  
2989      /**
2990 <     * acceptEitherAsync result completes exceptionally if action does
2990 >     * thenAcceptAsync result completes exceptionally if action does
2991       */
2992 <    public void testAcceptEitherAsync3E() {
2992 >    public void testThenAcceptAsync3() {
2993          CompletableFuture<Integer> f = new CompletableFuture<>();
2904        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2994          FailingConsumer r = new FailingConsumer();
2995 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2996 <        f.complete(one);
2995 >        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2996 >        f.complete(null);
2997          checkCompletedWithWrappedCFException(g);
2998      }
2999  
3000      /**
3001 <     * acceptEitherAsync result completes exceptionally if either
2913 <     * source cancelled
3001 >     * thenAcceptAsync result completes exceptionally if source cancelled
3002       */
3003 <    public void testAcceptEitherAsync4E() {
3003 >    public void testThenAcceptAsync4() {
3004          CompletableFuture<Integer> f = new CompletableFuture<>();
2917        CompletableFuture<Integer> f2 = new CompletableFuture<>();
3005          IncAction r = new IncAction();
3006 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
3006 >        CompletableFuture<Void> g = f.thenAcceptAsync(r);
3007          assertTrue(f.cancel(true));
3008          checkCompletedWithWrappedCancellationException(g);
2922
2923        r = new IncAction();
2924        f = new CompletableFuture<>();
2925        f2 = new CompletableFuture<>();
2926        assertTrue(f2.cancel(true));
2927        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2928        checkCompletedWithWrappedCancellationException(g);
3009      }
3010  
3011 <    /**
2932 <     * runAfterEitherAsync result completes normally after normal
2933 <     * completion of sources
2934 <     */
2935 <    public void testRunAfterEitherAsyncE() {
2936 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2937 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2938 <        Noop r = new Noop();
2939 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2940 <        f.complete(one);
2941 <        checkCompletedNormally(g, null);
2942 <        assertTrue(r.ran);
2943 <
2944 <        r = new Noop();
2945 <        f = new CompletableFuture<>();
2946 <        f.complete(one);
2947 <        f2 = new CompletableFuture<>();
2948 <        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2949 <        checkCompletedNormally(g, null);
2950 <        assertTrue(r.ran);
2951 <    }
3011 >    // async with explicit executors
3012  
3013      /**
3014 <     * runAfterEitherAsync result completes exceptionally after exceptional
3014 >     * thenAcceptAsync result completes normally after normal
3015       * completion of source
3016       */
3017 <    public void testRunAfterEitherAsync2E() {
2958 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2959 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2960 <        Noop r = new Noop();
2961 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2962 <        f.completeExceptionally(new CFException());
2963 <        checkCompletedWithWrappedCFException(g);
2964 <
2965 <        r = new Noop();
2966 <        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() {
3017 >    public void testThenAcceptAsyncE() {
3018          CompletableFuture<Integer> f = new CompletableFuture<>();
3019 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
3020 <        FailingNoop r = new FailingNoop();
2981 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
3019 >        IncAction r = new IncAction();
3020 >        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3021          f.complete(one);
3022 <        checkCompletedWithWrappedCFException(g);
3023 <    }
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);
2997 <
2998 <        r = new Noop();
2999 <        f = new CompletableFuture<>();
3000 <        f2 = new CompletableFuture<>();
3001 <        assertTrue(f2.cancel(true));
3002 <        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
3003 <        checkCompletedWithWrappedCancellationException(g);
3022 >        checkCompletedNormally(g, null);
3023 >        assertEquals(r.value, (Integer) 2);
3024      }
3025  
3026      /**
3027 <     * thenComposeAsync result completes normally after normal
3027 >     * thenAcceptAsync result completes exceptionally after exceptional
3028       * completion of source
3029       */
3030 <    public void testThenComposeAsyncE() {
3011 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3012 <        CompletableFutureInc r = new CompletableFutureInc();
3013 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
3014 <        f.complete(one);
3015 <        checkCompletedNormally(g, two);
3016 <    }
3017 <
3018 <    /**
3019 <     * thenComposeAsync result completes exceptionally after
3020 <     * exceptional completion of source
3021 <     */
3022 <    public void testThenComposeAsync2E() {
3030 >    public void testThenAcceptAsync2E() {
3031          CompletableFuture<Integer> f = new CompletableFuture<>();
3032 <        CompletableFutureInc r = new CompletableFutureInc();
3033 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
3032 >        IncAction r = new IncAction();
3033 >        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3034          f.completeExceptionally(new CFException());
3035          checkCompletedWithWrappedCFException(g);
3036      }
3037  
3038      /**
3039 <     * thenComposeAsync result completes exceptionally if action does
3039 >     * thenAcceptAsync result completes exceptionally if action does
3040       */
3041 <    public void testThenComposeAsync3E() {
3041 >    public void testThenAcceptAsync3E() {
3042          CompletableFuture<Integer> f = new CompletableFuture<>();
3043 <        FailingCompletableFutureFunction r = new FailingCompletableFutureFunction();
3044 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
3045 <        f.complete(one);
3043 >        FailingConsumer r = new FailingConsumer();
3044 >        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3045 >        f.complete(null);
3046          checkCompletedWithWrappedCFException(g);
3047      }
3048  
3049      /**
3050 <     * thenComposeAsync result completes exceptionally if source cancelled
3050 >     * thenAcceptAsync result completes exceptionally if source cancelled
3051       */
3052 <    public void testThenComposeAsync4E() {
3052 >    public void testThenAcceptAsync4E() {
3053          CompletableFuture<Integer> f = new CompletableFuture<>();
3054 <        CompletableFutureInc r = new CompletableFutureInc();
3055 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
3054 >        IncAction r = new IncAction();
3055 >        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3056          assertTrue(f.cancel(true));
3057          checkCompletedWithWrappedCancellationException(g);
3058      }
# Line 3247 | Line 3255 | public class CompletableFutureTest exten
3255       * whenComplete action executes on normal completion, propagating
3256       * source result.
3257       */
3258 <    public void testWhenComplete1() {
3259 <        final AtomicInteger a = new AtomicInteger();
3260 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3261 <        CompletableFuture<Integer> g =
3262 <            f.whenComplete((Integer x, Throwable t) -> a.getAndIncrement());
3263 <        f.complete(three);
3264 <        checkCompletedNormally(f, three);
3265 <        checkCompletedNormally(g, three);
3266 <        assertEquals(a.get(), 1);
3267 <    }
3268 <
3269 <    /**
3270 <     * whenComplete action executes on exceptional completion, propagating
3271 <     * source result.
3272 <     */
3273 <    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 <    }
3258 >    public void testWhenComplete_normalCompletion1() {
3259 >        for (ExecutionMode m : ExecutionMode.values())
3260 >        for (boolean createIncomplete : new boolean[] { true, false })
3261 >        for (Integer v1 : new Integer[] { 1, null })
3262 >    {
3263 >        final AtomicInteger a = new AtomicInteger(0);
3264 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
3265 >        if (!createIncomplete) f.complete(v1);
3266 >        final CompletableFuture<Integer> g = m.whenComplete
3267 >            (f,
3268 >             (Integer x, Throwable t) -> {
3269 >                threadAssertSame(x, v1);
3270 >                threadAssertNull(t);
3271 >                a.getAndIncrement();
3272 >            });
3273 >        if (createIncomplete) f.complete(v1);
3274  
3275 <    /**
3276 <     * If a whenCompleteAsync action throws an exception when
3277 <     * triggered by a normal completion, it completes exceptionally
3278 <     */
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 <    }
3275 >        checkCompletedNormally(g, v1);
3276 >        checkCompletedNormally(f, v1);
3277 >        assertEquals(1, a.get());
3278 >    }}
3279  
3280      /**
3281 <     * whenCompleteAsync action executes on normal completion, propagating
3281 >     * whenComplete action executes on exceptional completion, propagating
3282       * source result.
3283       */
3284 <    public void testWhenCompleteAsync1e() {
3285 <        final AtomicInteger a = new AtomicInteger();
3286 <        ThreadExecutor exec = new ThreadExecutor();
3287 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3288 <        CompletableFuture<Integer> g =
3289 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement(),
3290 <                                exec);
3291 <        f.complete(three);
3292 <        checkCompletedNormally(f, three);
3293 <        checkCompletedNormally(g, three);
3294 <        assertEquals(a.get(), 1);
3295 <    }
3284 >    public void testWhenComplete_exceptionalCompletion() {
3285 >        for (ExecutionMode m : ExecutionMode.values())
3286 >        for (boolean createIncomplete : new boolean[] { true, false })
3287 >        for (Integer v1 : new Integer[] { 1, null })
3288 >    {
3289 >        final AtomicInteger a = new AtomicInteger(0);
3290 >        final CFException ex = new CFException();
3291 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
3292 >        if (!createIncomplete) f.completeExceptionally(ex);
3293 >        final CompletableFuture<Integer> g = m.whenComplete
3294 >            (f,
3295 >             (Integer x, Throwable t) -> {
3296 >                threadAssertNull(x);
3297 >                threadAssertSame(t, ex);
3298 >                a.getAndIncrement();
3299 >            });
3300 >        if (createIncomplete) f.completeExceptionally(ex);
3301 >        checkCompletedWithWrappedCFException(f, ex);
3302 >        checkCompletedWithWrappedCFException(g, ex);
3303 >        assertEquals(1, a.get());
3304 >    }}
3305  
3306      /**
3307 <     * whenCompleteAsync action executes on exceptional completion, propagating
3308 <     * source result.
3307 >     * whenComplete action executes on cancelled source, propagating
3308 >     * CancellationException.
3309       */
3310 <    public void testWhenCompleteAsync2e() {
3311 <        final AtomicInteger a = new AtomicInteger();
3312 <        ThreadExecutor exec = new ThreadExecutor();
3313 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3314 <        CompletableFuture<Integer> g =
3315 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement(),
3316 <                                exec);
3317 <        f.completeExceptionally(new CFException());
3318 <        checkCompletedWithWrappedCFException(f);
3319 <        checkCompletedWithWrappedCFException(g);
3320 <    }
3310 >    public void testWhenComplete_sourceCancelled() {
3311 >        for (ExecutionMode m : ExecutionMode.values())
3312 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3313 >        for (boolean createIncomplete : new boolean[] { true, false })
3314 >    {
3315 >        final AtomicInteger a = new AtomicInteger(0);
3316 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
3317 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
3318 >        final CompletableFuture<Integer> g = m.whenComplete
3319 >            (f,
3320 >             (Integer x, Throwable t) -> {
3321 >                threadAssertNull(x);
3322 >                threadAssertTrue(t instanceof CancellationException);
3323 >                a.getAndIncrement();
3324 >            });
3325 >        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
3326  
3327 <    /**
3328 <     * If a whenCompleteAsync action throws an exception when triggered
3329 <     * by a normal completion, it completes exceptionally
3330 <     */
3331 <    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 <    }
3327 >        //try { g.join(); } catch (Throwable t) { throw new Error(t); }
3328 >        checkCompletedWithWrappedCancellationException(g);
3329 >        checkCancelled(f);
3330 >        assertEquals(1, a.get());
3331 >    }}
3332  
3333      /**
3334 <     * handleAsync action completes normally with function value on
3335 <     * either normal or exceptional completion of source
3334 >     * If a whenComplete action throws an exception when triggered by
3335 >     * a normal completion, it completes exceptionally
3336       */
3337 <    public void testHandleAsync() {
3338 <        CompletableFuture<Integer> f, g;
3339 <        IntegerHandler r;
3340 <
3341 <        f = new CompletableFuture<>();
3342 <        g = f.handleAsync(r = new IntegerHandler());
3343 <        assertFalse(r.ran);
3344 <        f.completeExceptionally(new CFException());
3345 <        checkCompletedWithWrappedCFException(f);
3346 <        checkCompletedNormally(g, three);
3347 <        assertTrue(r.ran);
3348 <
3349 <        f = new CompletableFuture<>();
3350 <        g = f.handleAsync(r = new IntegerHandler());
3351 <        assertFalse(r.ran);
3352 <        f.completeExceptionally(new CFException());
3353 <        checkCompletedWithWrappedCFException(f);
3354 <        checkCompletedNormally(g, three);
3355 <        assertTrue(r.ran);
3356 <
3357 <        f = new CompletableFuture<>();
3358 <        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 <    }
3337 >    public void testWhenComplete_actionFailed() {
3338 >        for (boolean createIncomplete : new boolean[] { true, false })
3339 >        for (ExecutionMode m : ExecutionMode.values())
3340 >        for (Integer v1 : new Integer[] { 1, null })
3341 >    {
3342 >        final AtomicInteger a = new AtomicInteger(0);
3343 >        final CFException ex = new CFException();
3344 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
3345 >        if (!createIncomplete) f.complete(v1);
3346 >        final CompletableFuture<Integer> g = m.whenComplete
3347 >            (f,
3348 >             (Integer x, Throwable t) -> {
3349 >                threadAssertSame(x, v1);
3350 >                threadAssertNull(t);
3351 >                a.getAndIncrement();
3352 >                throw ex;
3353 >            });
3354 >        if (createIncomplete) f.complete(v1);
3355 >        checkCompletedNormally(f, v1);
3356 >        checkCompletedWithWrappedCFException(g, ex);
3357 >        assertEquals(1, a.get());
3358 >    }}
3359  
3360      /**
3361 <     * handleAsync action with Executor completes normally with
3362 <     * function value on either normal or exceptional completion of
3363 <     * source
3361 >     * If a whenComplete action throws an exception when triggered by
3362 >     * a source completion that also throws an exception, the source
3363 >     * exception takes precedence.
3364       */
3365 <    public void testHandleAsync2() {
3366 <        CompletableFuture<Integer> f, g;
3367 <        ThreadExecutor exec = new ThreadExecutor();
3368 <        IntegerHandler r;
3369 <
3370 <        f = new CompletableFuture<>();
3371 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3372 <        assertFalse(r.ran);
3373 <        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);
3365 >    public void testWhenComplete_actionFailedSourceFailed() {
3366 >        for (boolean createIncomplete : new boolean[] { true, false })
3367 >        for (ExecutionMode m : ExecutionMode.values())
3368 >        for (Integer v1 : new Integer[] { 1, null })
3369 >    {
3370 >        final AtomicInteger a = new AtomicInteger(0);
3371 >        final CFException ex1 = new CFException();
3372 >        final CFException ex2 = new CFException();
3373 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
3374  
3375 <        f = new CompletableFuture<>();
3376 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3377 <        assertFalse(r.ran);
3378 <        f.complete(one);
3379 <        checkCompletedNormally(f, one);
3380 <        checkCompletedNormally(g, two);
3381 <        assertTrue(r.ran);
3382 <    }
3375 >        if (!createIncomplete) f.completeExceptionally(ex1);
3376 >        final CompletableFuture<Integer> g = m.whenComplete
3377 >            (f,
3378 >             (Integer x, Throwable t) -> {
3379 >                threadAssertSame(t, ex1);
3380 >                threadAssertNull(x);
3381 >                a.getAndIncrement();
3382 >                throw ex2;
3383 >            });
3384 >        if (createIncomplete) f.completeExceptionally(ex1);
3385 >
3386 >        checkCompletedWithWrappedCFException(f, ex1);
3387 >        checkCompletedWithWrappedCFException(g, ex1);
3388 >        assertEquals(1, a.get());
3389 >    }}
3390  
3391   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines