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.32 by jsr166, Mon May 26 17:25:36 2014 UTC vs.
Revision 1.51 by jsr166, Mon Jun 2 19:49:28 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 102 | Line 105 | public class CompletableFutureTest exten
105          assertTrue(f.toString().contains("[Completed exceptionally]"));
106      }
107  
108 +    void checkCompletedWithWrappedCFException(CompletableFuture<?> f,
109 +                                              CFException ex) {
110 +        try {
111 +            f.get(LONG_DELAY_MS, MILLISECONDS);
112 +            shouldThrow();
113 +        } catch (ExecutionException success) {
114 +            assertSame(ex, success.getCause());
115 +        } catch (Throwable fail) { threadUnexpectedException(fail); }
116 +        try {
117 +            f.join();
118 +            shouldThrow();
119 +        } catch (CompletionException success) {
120 +            assertSame(ex, success.getCause());
121 +        }
122 +        try {
123 +            f.getNow(null);
124 +            shouldThrow();
125 +        } catch (CompletionException success) {
126 +            assertSame(ex, success.getCause());
127 +        }
128 +        try {
129 +            f.get();
130 +            shouldThrow();
131 +        } catch (ExecutionException success) {
132 +            assertSame(ex, success.getCause());
133 +        } catch (Throwable fail) { threadUnexpectedException(fail); }
134 +        assertTrue(f.isDone());
135 +        assertFalse(f.isCancelled());
136 +        assertTrue(f.toString().contains("[Completed exceptionally]"));
137 +    }
138 +
139      void checkCancelled(CompletableFuture<?> f) {
140          try {
141              f.get(LONG_DELAY_MS, MILLISECONDS);
# Line 215 | 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 247 | 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 286 | Line 322 | public class CompletableFutureTest exten
322  
323      // Choose non-commutative actions for better coverage
324  
325 +    // A non-commutative function that handles and produces null values as well.
326 +    static Integer subtract(Integer x, Integer y) {
327 +        return (x == null && y == null) ? null :
328 +            ((x == null) ? 42 : x.intValue())
329 +            - ((y == null) ? 99 : y.intValue());
330 +    }
331 +
332 +    // A function that handles and produces null values as well.
333 +    static Integer inc(Integer x) {
334 +        return (x == null) ? null : x + 1;
335 +    }
336 +
337      static final Supplier<Integer> supplyOne =
338          () -> Integer.valueOf(1);
339      static final Function<Integer, Integer> inc =
340          (Integer x) -> Integer.valueOf(x.intValue() + 1);
341      static final BiFunction<Integer, Integer, Integer> subtract =
342 <        (Integer x, Integer y) -> Integer.valueOf(x.intValue() - y.intValue());
342 >        (Integer x, Integer y) -> subtract(x, y);
343      static final class IncAction implements Consumer<Integer> {
344 <        int value;
345 <        public void accept(Integer x) { value = x.intValue() + 1; }
344 >        int invocationCount = 0;
345 >        Integer value;
346 >        public void accept(Integer x) {
347 >            invocationCount++;
348 >            value = inc(x);
349 >        }
350 >    }
351 >    static final class IncFunction implements Function<Integer,Integer> {
352 >        int invocationCount = 0;
353 >        Integer value;
354 >        public Integer apply(Integer x) {
355 >            invocationCount++;
356 >            return value = inc(x);
357 >        }
358      }
359      static final class SubtractAction implements BiConsumer<Integer, Integer> {
360 <        int value;
360 >        int invocationCount = 0;
361 >        Integer value;
362 >        // Check this action was invoked exactly once when result is computed.
363          public void accept(Integer x, Integer y) {
364 <            value = x.intValue() - y.intValue();
364 >            invocationCount++;
365 >            value = subtract(x, y);
366 >        }
367 >    }
368 >    static final class SubtractFunction implements BiFunction<Integer, Integer, Integer> {
369 >        int invocationCount = 0;
370 >        Integer value;
371 >        // Check this action was invoked exactly once when result is computed.
372 >        public Integer apply(Integer x, Integer y) {
373 >            invocationCount++;
374 >            return value = subtract(x, y);
375          }
376      }
377      static final class Noop implements Runnable {
378 <        boolean ran;
379 <        public void run() { ran = true; }
378 >        int invocationCount = 0;
379 >        public void run() {
380 >            invocationCount++;
381 >        }
382      }
383  
384      static final class FailingSupplier implements Supplier<Integer> {
385 <        boolean ran;
386 <        public Integer get() { ran = true; throw new CFException(); }
385 >        int invocationCount = 0;
386 >        public Integer get() {
387 >            invocationCount++;
388 >            throw new CFException();
389 >        }
390      }
391      static final class FailingConsumer implements Consumer<Integer> {
392 <        boolean ran;
393 <        public void accept(Integer x) { ran = true; throw new CFException(); }
392 >        int invocationCount = 0;
393 >        public void accept(Integer x) {
394 >            invocationCount++;
395 >            throw new CFException();
396 >        }
397      }
398      static final class FailingBiConsumer implements BiConsumer<Integer, Integer> {
399 <        boolean ran;
400 <        public void accept(Integer x, Integer y) { ran = true; throw new CFException(); }
399 >        int invocationCount = 0;
400 >        public void accept(Integer x, Integer y) {
401 >            invocationCount++;
402 >            throw new CFException();
403 >        }
404      }
405      static final class FailingFunction implements Function<Integer, Integer> {
406 <        boolean ran;
407 <        public Integer apply(Integer x) { ran = true; throw new CFException(); }
406 >        int invocationCount = 0;
407 >        public Integer apply(Integer x) {
408 >            invocationCount++;
409 >            throw new CFException();
410 >        }
411      }
412      static final class FailingBiFunction implements BiFunction<Integer, Integer, Integer> {
413 <        boolean ran;
414 <        public Integer apply(Integer x, Integer y) { ran = true; throw new CFException(); }
413 >        int invocationCount = 0;
414 >        public Integer apply(Integer x, Integer y) {
415 >            invocationCount++;
416 >            throw new CFException();
417 >        }
418      }
419 <    static final class FailingNoop implements Runnable {
420 <        boolean ran;
421 <        public void run() { ran = true; throw new CFException(); }
419 >    static final class FailingRunnable implements Runnable {
420 >        int invocationCount = 0;
421 >        public void run() {
422 >            invocationCount++;
423 >            throw new CFException();
424 >        }
425      }
426  
427      static final class CompletableFutureInc
428          implements Function<Integer, CompletableFuture<Integer>> {
429 <        boolean ran;
429 >        int invocationCount = 0;
430          public CompletableFuture<Integer> apply(Integer x) {
431 <            ran = true;
431 >            invocationCount++;
432              CompletableFuture<Integer> f = new CompletableFuture<>();
433 <            f.complete(Integer.valueOf(x.intValue() + 1));
433 >            f.complete(inc(x));
434              return f;
435          }
436      }
437  
438      static final class FailingCompletableFutureFunction
439          implements Function<Integer, CompletableFuture<Integer>> {
440 <        boolean ran;
440 >        int invocationCount = 0;
441          public CompletableFuture<Integer> apply(Integer x) {
442 <            ran = true; throw new CFException();
442 >            invocationCount++;
443 >            throw new CFException();
444          }
445      }
446  
# Line 361 | 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 completes with function value on source
706 <     * exception; otherwise with source value
707 <     */
708 <    public void testExceptionally() {
709 <        CompletableFuture<Integer> f = new CompletableFuture<>();
710 <        ExceptionToInteger r = new ExceptionToInteger();
711 <        CompletableFuture<Integer> g = f.exceptionally(r);
712 <        f.completeExceptionally(new CFException());
713 <        checkCompletedNormally(g, three);
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  
387        f = new CompletableFuture<>();
388        r = new ExceptionToInteger();
389        g = f.exceptionally(r);
390        f.complete(one);
391        checkCompletedNormally(g, one);
392    }
728  
729      /**
730 <     * handle action completes normally with function value on either
731 <     * normal or exceptional completion of source
730 >     * exceptionally action completes with function value on source
731 >     * exception
732       */
733 <    public void testHandle() {
734 <        CompletableFuture<Integer> f, g;
735 <        IntegerHandler r;
736 <
737 <        f = new CompletableFuture<>();
738 <        f.completeExceptionally(new CFException());
739 <        g = f.handle(r = new IntegerHandler());
740 <        assertTrue(r.ran);
741 <        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 >        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 <        f = new CompletableFuture<>();
802 <        g = f.handle(r = new IntegerHandler());
803 <        assertFalse(r.ran);
804 <        f.completeExceptionally(new CFException());
805 <        checkCompletedNormally(g, three);
806 <        assertTrue(r.ran);
801 >    /**
802 >     * handle action completes normally with function value on
803 >     * exceptional completion of source
804 >     */
805 >    public void testHandle_exceptionalCompletion() {
806 >        for (ExecutionMode m : ExecutionMode.values())
807 >        for (boolean createIncomplete : new boolean[] { true, false })
808 >        for (Integer v1 : new Integer[] { 1, null })
809 >    {
810 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
811 >        final AtomicInteger a = new AtomicInteger(0);
812 >        final CFException ex = new CFException();
813 >        if (!createIncomplete) f.completeExceptionally(ex);
814 >        final CompletableFuture<Integer> g = m.handle
815 >            (f,
816 >             (Integer x, Throwable t) -> {
817 >                threadAssertNull(x);
818 >                threadAssertSame(t, ex);
819 >                a.getAndIncrement();
820 >                return v1;
821 >            });
822 >        if (createIncomplete) f.completeExceptionally(ex);
823 >
824 >        checkCompletedNormally(g, v1);
825 >        checkCompletedWithWrappedCFException(f, ex);
826 >        assertEquals(1, a.get());
827 >    }}
828 >
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);
419 <        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 433 | 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 445 | 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 454 | Line 933 | public class CompletableFutureTest exten
933       * failing runAsync completes exceptionally after running Runnable
934       */
935      public void testRunAsync3() {
936 <        FailingNoop r = new FailingNoop();
936 >        FailingRunnable r = new FailingRunnable();
937          CompletableFuture<Void> f = CompletableFuture.runAsync(r);
938          checkCompletedWithWrappedCFException(f);
939 <        assertTrue(r.ran);
939 >        assertEquals(1, r.invocationCount);
940      }
941  
942      /**
# Line 487 | 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 495 | Line 974 | public class CompletableFutureTest exten
974      /**
975       * thenRun result completes normally after normal completion of source
976       */
977 <    public void testThenRun() {
978 <        CompletableFuture<Integer> f;
979 <        CompletableFuture<Void> g;
980 <        Noop r;
981 <
982 <        f = new CompletableFuture<>();
983 <        g = f.thenRun(r = new Noop());
984 <        f.complete(null);
985 <        checkCompletedNormally(g, null);
986 <        assertTrue(r.ran);
977 >    public void testThenRun_normalCompletion() {
978 >        for (ExecutionMode m : ExecutionMode.values())
979 >        for (boolean createIncomplete : new boolean[] { true, false })
980 >        for (Integer v1 : new Integer[] { 1, null })
981 >    {
982 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
983 >        final Noop r = new Noop();
984 >        if (!createIncomplete) f.complete(v1);
985 >        final CompletableFuture<Void> g = m.thenRun(f, r);
986 >        if (createIncomplete) {
987 >            checkIncomplete(g);
988 >            f.complete(v1);
989 >        }
990  
509        f = new CompletableFuture<>();
510        f.complete(null);
511        g = f.thenRun(r = new Noop());
991          checkCompletedNormally(g, null);
992 <        assertTrue(r.ran);
993 <    }
992 >        checkCompletedNormally(f, v1);
993 >        assertEquals(1, r.invocationCount);
994 >    }}
995  
996      /**
997       * thenRun result completes exceptionally after exceptional
998       * completion of source
999       */
1000 <    public void testThenRun2() {
1001 <        CompletableFuture<Integer> f;
1002 <        CompletableFuture<Void> g;
1003 <        Noop r;
1000 >    public void testThenRun_exceptionalCompletion() {
1001 >        for (ExecutionMode m : ExecutionMode.values())
1002 >        for (boolean createIncomplete : new boolean[] { true, false })
1003 >    {
1004 >        final CFException ex = new CFException();
1005 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1006 >        final Noop r = new Noop();
1007 >        if (!createIncomplete) f.completeExceptionally(ex);
1008 >        final CompletableFuture<Void> g = m.thenRun(f, r);
1009 >        if (createIncomplete) {
1010 >            checkIncomplete(g);
1011 >            f.completeExceptionally(ex);
1012 >        }
1013  
1014 <        f = new CompletableFuture<>();
1015 <        g = f.thenRun(r = new Noop());
1016 <        f.completeExceptionally(new CFException());
1017 <        checkCompletedWithWrappedCFException(g);
529 <        assertFalse(r.ran);
530 <
531 <        f = new CompletableFuture<>();
532 <        f.completeExceptionally(new CFException());
533 <        g = f.thenRun(r = new Noop());
534 <        checkCompletedWithWrappedCFException(g);
535 <        assertFalse(r.ran);
536 <    }
1014 >        checkCompletedWithWrappedCFException(g, ex);
1015 >        checkCompletedWithWrappedCFException(f, ex);
1016 >        assertEquals(0, r.invocationCount);
1017 >    }}
1018  
1019      /**
1020 <     * thenRun result completes exceptionally if action does
1020 >     * thenRun result completes exceptionally if source cancelled
1021       */
1022 <    public void testThenRun3() {
1023 <        CompletableFuture<Integer> f;
1024 <        CompletableFuture<Void> g;
1025 <        FailingNoop r;
1026 <
1027 <        f = new CompletableFuture<>();
1028 <        g = f.thenRun(r = new FailingNoop());
1029 <        f.complete(null);
1030 <        checkCompletedWithWrappedCFException(g);
1022 >    public void testThenRun_sourceCancelled() {
1023 >        for (ExecutionMode m : ExecutionMode.values())
1024 >        for (boolean createIncomplete : new boolean[] { true, false })
1025 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1026 >    {
1027 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1028 >        final Noop r = new Noop();
1029 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1030 >        final CompletableFuture<Void> g = f.thenRun(r);
1031 >        if (createIncomplete) {
1032 >            checkIncomplete(g);
1033 >            assertTrue(f.cancel(mayInterruptIfRunning));
1034 >        }
1035  
1036 <        f = new CompletableFuture<>();
1037 <        f.complete(null);
1038 <        g = f.thenRun(r = new FailingNoop());
1039 <        checkCompletedWithWrappedCFException(g);
555 <    }
1036 >        checkCompletedWithWrappedCancellationException(g);
1037 >        checkCancelled(f);
1038 >        assertEquals(0, r.invocationCount);
1039 >    }}
1040  
1041      /**
1042 <     * thenRun result completes exceptionally if source cancelled
1042 >     * thenRun result completes exceptionally if action does
1043       */
1044 <    public void testThenRun4() {
1045 <        CompletableFuture<Integer> f;
1046 <        CompletableFuture<Void> g;
1047 <        Noop r;
1048 <
1049 <        f = new CompletableFuture<>();
1050 <        g = f.thenRun(r = new Noop());
1051 <        assertTrue(f.cancel(true));
1052 <        checkCompletedWithWrappedCancellationException(g);
1044 >    public void testThenRun_actionFailed() {
1045 >        for (ExecutionMode m : ExecutionMode.values())
1046 >        for (boolean createIncomplete : new boolean[] { true, false })
1047 >        for (Integer v1 : new Integer[] { 1, null })
1048 >    {
1049 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1050 >        final FailingRunnable r = new FailingRunnable();
1051 >        if (!createIncomplete) f.complete(v1);
1052 >        final CompletableFuture<Void> g = f.thenRun(r);
1053 >        if (createIncomplete) {
1054 >            checkIncomplete(g);
1055 >            f.complete(v1);
1056 >        }
1057  
1058 <        f = new CompletableFuture<>();
1059 <        assertTrue(f.cancel(true));
1060 <        g = f.thenRun(r = new Noop());
573 <        checkCompletedWithWrappedCancellationException(g);
574 <    }
1058 >        checkCompletedWithWrappedCFException(g);
1059 >        checkCompletedNormally(f, v1);
1060 >    }}
1061  
1062      /**
1063       * thenApply result completes normally after normal completion of source
1064       */
1065 <    public void testThenApply() {
1066 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1067 <        CompletableFuture<Integer> g = f.thenApply(inc);
1068 <        f.complete(one);
1069 <        checkCompletedNormally(g, two);
1070 <    }
1065 >    public void testThenApply_normalCompletion() {
1066 >        for (ExecutionMode m : ExecutionMode.values())
1067 >        for (boolean createIncomplete : new boolean[] { true, false })
1068 >        for (Integer v1 : new Integer[] { 1, null })
1069 >    {
1070 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1071 >        final IncFunction r = new IncFunction();
1072 >        if (!createIncomplete) f.complete(v1);
1073 >        final CompletableFuture<Integer> g = m.thenApply(f, r);
1074 >        if (createIncomplete) {
1075 >            checkIncomplete(g);
1076 >            f.complete(v1);
1077 >        }
1078 >
1079 >        checkCompletedNormally(g, inc(v1));
1080 >        checkCompletedNormally(f, v1);
1081 >        assertEquals(1, r.invocationCount);
1082 >    }}
1083  
1084      /**
1085       * thenApply result completes exceptionally after exceptional
1086       * completion of source
1087       */
1088 <    public void testThenApply2() {
1089 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1090 <        CompletableFuture<Integer> g = f.thenApply(inc);
1091 <        f.completeExceptionally(new CFException());
1092 <        checkCompletedWithWrappedCFException(g);
1093 <    }
1088 >    public void testThenApply_exceptionalCompletion() {
1089 >        for (ExecutionMode m : ExecutionMode.values())
1090 >        for (boolean createIncomplete : new boolean[] { true, false })
1091 >    {
1092 >        final CFException ex = new CFException();
1093 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1094 >        final IncFunction r = new IncFunction();
1095 >        if (!createIncomplete) f.completeExceptionally(ex);
1096 >        final CompletableFuture<Integer> g = m.thenApply(f, r);
1097 >        if (createIncomplete) {
1098 >            checkIncomplete(g);
1099 >            f.completeExceptionally(ex);
1100 >        }
1101  
1102 <    /**
1103 <     * thenApply result completes exceptionally if action does
1104 <     */
1105 <    public void testThenApply3() {
601 <        CompletableFuture<Integer> f = new CompletableFuture<>();
602 <        CompletableFuture<Integer> g = f.thenApply(new FailingFunction());
603 <        f.complete(one);
604 <        checkCompletedWithWrappedCFException(g);
605 <    }
1102 >        checkCompletedWithWrappedCFException(g, ex);
1103 >        checkCompletedWithWrappedCFException(f, ex);
1104 >        assertEquals(0, r.invocationCount);
1105 >    }}
1106  
1107      /**
1108       * thenApply result completes exceptionally if source cancelled
1109       */
1110 <    public void testThenApply4() {
1111 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1112 <        CompletableFuture<Integer> g = f.thenApply(inc);
1113 <        assertTrue(f.cancel(true));
1110 >    public void testThenApply_sourceCancelled() {
1111 >        for (ExecutionMode m : ExecutionMode.values())
1112 >        for (boolean createIncomplete : new boolean[] { true, false })
1113 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1114 >    {
1115 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1116 >        final IncFunction r = new IncFunction();
1117 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1118 >        final CompletableFuture<Integer> g = f.thenApply(r);
1119 >        if (createIncomplete) {
1120 >            checkIncomplete(g);
1121 >            assertTrue(f.cancel(mayInterruptIfRunning));
1122 >        }
1123 >
1124          checkCompletedWithWrappedCancellationException(g);
1125 <    }
1125 >        checkCancelled(f);
1126 >        assertEquals(0, r.invocationCount);
1127 >    }}
1128 >
1129 >    /**
1130 >     * thenApply result completes exceptionally if action does
1131 >     */
1132 >    public void testThenApply_actionFailed() {
1133 >        for (ExecutionMode m : ExecutionMode.values())
1134 >        for (boolean createIncomplete : new boolean[] { true, false })
1135 >        for (Integer v1 : new Integer[] { 1, null })
1136 >    {
1137 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1138 >        final FailingFunction r = new FailingFunction();
1139 >        if (!createIncomplete) f.complete(v1);
1140 >        final CompletableFuture<Integer> g = f.thenApply(r);
1141 >        if (createIncomplete) {
1142 >            checkIncomplete(g);
1143 >            f.complete(v1);
1144 >        }
1145 >
1146 >        checkCompletedWithWrappedCFException(g);
1147 >        checkCompletedNormally(f, v1);
1148 >    }}
1149  
1150      /**
1151       * thenAccept result completes normally after normal completion of source
1152       */
1153 <    public void testThenAccept() {
1154 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1155 <        IncAction r = new IncAction();
1156 <        CompletableFuture<Void> g = f.thenAccept(r);
1157 <        f.complete(one);
1153 >    public void testThenAccept_normalCompletion() {
1154 >        for (ExecutionMode m : ExecutionMode.values())
1155 >        for (boolean createIncomplete : new boolean[] { true, false })
1156 >        for (Integer v1 : new Integer[] { 1, null })
1157 >    {
1158 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1159 >        final IncAction r = new IncAction();
1160 >        if (!createIncomplete) f.complete(v1);
1161 >        final CompletableFuture<Void> g = m.thenAccept(f, r);
1162 >        if (createIncomplete) {
1163 >            checkIncomplete(g);
1164 >            f.complete(v1);
1165 >        }
1166 >
1167          checkCompletedNormally(g, null);
1168 <        assertEquals(r.value, 2);
1169 <    }
1168 >        checkCompletedNormally(f, v1);
1169 >        assertEquals(1, r.invocationCount);
1170 >        assertEquals(inc(v1), r.value);
1171 >    }}
1172  
1173      /**
1174       * thenAccept result completes exceptionally after exceptional
1175       * completion of source
1176       */
1177 <    public void testThenAccept2() {
1178 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1179 <        IncAction r = new IncAction();
1180 <        CompletableFuture<Void> g = f.thenAccept(r);
1181 <        f.completeExceptionally(new CFException());
1182 <        checkCompletedWithWrappedCFException(g);
1183 <    }
1177 >    public void testThenAccept_exceptionalCompletion() {
1178 >        for (ExecutionMode m : ExecutionMode.values())
1179 >        for (boolean createIncomplete : new boolean[] { true, false })
1180 >    {
1181 >        final CFException ex = new CFException();
1182 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1183 >        final IncAction r = new IncAction();
1184 >        if (!createIncomplete) f.completeExceptionally(ex);
1185 >        final CompletableFuture<Void> g = m.thenAccept(f, r);
1186 >        if (createIncomplete) {
1187 >            checkIncomplete(g);
1188 >            f.completeExceptionally(ex);
1189 >        }
1190 >
1191 >        checkCompletedWithWrappedCFException(g, ex);
1192 >        checkCompletedWithWrappedCFException(f, ex);
1193 >        assertEquals(0, r.invocationCount);
1194 >    }}
1195  
1196      /**
1197       * thenAccept result completes exceptionally if action does
1198       */
1199 <    public void testThenAccept3() {
1200 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1201 <        FailingConsumer r = new FailingConsumer();
1202 <        CompletableFuture<Void> g = f.thenAccept(r);
1203 <        f.complete(one);
1199 >    public void testThenAccept_actionFailed() {
1200 >        for (ExecutionMode m : ExecutionMode.values())
1201 >        for (boolean createIncomplete : new boolean[] { true, false })
1202 >        for (Integer v1 : new Integer[] { 1, null })
1203 >    {
1204 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1205 >        final FailingConsumer r = new FailingConsumer();
1206 >        if (!createIncomplete) f.complete(v1);
1207 >        final CompletableFuture<Void> g = f.thenAccept(r);
1208 >        if (createIncomplete) {
1209 >            checkIncomplete(g);
1210 >            f.complete(v1);
1211 >        }
1212 >
1213          checkCompletedWithWrappedCFException(g);
1214 <        assertTrue(r.ran);
1215 <    }
1214 >        checkCompletedNormally(f, v1);
1215 >    }}
1216  
1217      /**
1218       * thenAccept result completes exceptionally if source cancelled
1219       */
1220 <    public void testThenAccept4() {
1221 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1222 <        IncAction r = new IncAction();
1223 <        CompletableFuture<Void> g = f.thenAccept(r);
1224 <        assertTrue(f.cancel(true));
1220 >    public void testThenAccept_sourceCancelled() {
1221 >        for (ExecutionMode m : ExecutionMode.values())
1222 >        for (boolean createIncomplete : new boolean[] { true, false })
1223 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1224 >    {
1225 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1226 >        final IncAction r = new IncAction();
1227 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1228 >        final CompletableFuture<Void> g = f.thenAccept(r);
1229 >        if (createIncomplete) {
1230 >            checkIncomplete(g);
1231 >            assertTrue(f.cancel(mayInterruptIfRunning));
1232 >        }
1233 >
1234          checkCompletedWithWrappedCancellationException(g);
1235 <    }
1235 >        checkCancelled(f);
1236 >        assertEquals(0, r.invocationCount);
1237 >    }}
1238  
1239      /**
1240       * thenCombine result completes normally after normal completion
1241       * of sources
1242       */
1243 <    public void testThenCombine() {
1244 <        CompletableFuture<Integer> f, g, h;
1245 <
1246 <        f = new CompletableFuture<>();
1247 <        g = new CompletableFuture<>();
1248 <        h = f.thenCombine(g, subtract);
1249 <        f.complete(3);
1250 <        checkIncomplete(h);
1251 <        g.complete(1);
1252 <        checkCompletedNormally(h, 2);
1243 >    public void testThenCombine_normalCompletion() {
1244 >        for (ExecutionMode m : ExecutionMode.values())
1245 >        for (boolean createIncomplete : new boolean[] { true, false })
1246 >        for (boolean fFirst : new boolean[] { true, false })
1247 >        for (Integer v1 : new Integer[] { 1, null })
1248 >        for (Integer v2 : new Integer[] { 2, null })
1249 >    {
1250 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1251 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1252 >        final SubtractFunction r = new SubtractFunction();
1253 >
1254 >        if (fFirst) f.complete(v1); else g.complete(v2);
1255 >        if (!createIncomplete)
1256 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1257 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1258 >        if (createIncomplete) {
1259 >            checkIncomplete(h);
1260 >            assertEquals(0, r.invocationCount);
1261 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1262 >        }
1263  
1264 <        f = new CompletableFuture<>();
1265 <        g = new CompletableFuture<>();
1266 <        h = f.thenCombine(g, subtract);
1267 <        g.complete(1);
1268 <        checkIncomplete(h);
684 <        f.complete(3);
685 <        checkCompletedNormally(h, 2);
686 <
687 <        f = new CompletableFuture<>();
688 <        g = new CompletableFuture<>();
689 <        g.complete(1);
690 <        f.complete(3);
691 <        h = f.thenCombine(g, subtract);
692 <        checkCompletedNormally(h, 2);
693 <    }
1264 >        checkCompletedNormally(h, subtract(v1, v2));
1265 >        checkCompletedNormally(f, v1);
1266 >        checkCompletedNormally(g, v2);
1267 >        assertEquals(1, r.invocationCount);
1268 >    }}
1269  
1270      /**
1271       * thenCombine result completes exceptionally after exceptional
1272       * completion of either source
1273       */
1274 <    public void testThenCombine2() {
1275 <        CompletableFuture<Integer> f, g, h;
1276 <
1277 <        f = new CompletableFuture<>();
1278 <        g = new CompletableFuture<>();
1279 <        h = f.thenCombine(g, subtract);
1280 <        f.completeExceptionally(new CFException());
1281 <        checkIncomplete(h);
1282 <        g.complete(1);
1283 <        checkCompletedWithWrappedCFException(h);
1284 <
1285 <        f = new CompletableFuture<>();
1286 <        g = new CompletableFuture<>();
1287 <        h = f.thenCombine(g, subtract);
1288 <        g.completeExceptionally(new CFException());
1289 <        checkIncomplete(h);
1290 <        f.complete(3);
1291 <        checkCompletedWithWrappedCFException(h);
1292 <
1293 <        f = new CompletableFuture<>();
1294 <        g = new CompletableFuture<>();
1295 <        f.complete(3);
1296 <        g.completeExceptionally(new CFException());
1297 <        h = f.thenCombine(g, subtract);
1298 <        checkCompletedWithWrappedCFException(h);
1299 <
1300 <        f = new CompletableFuture<>();
1301 <        g = new CompletableFuture<>();
1302 <        f.completeExceptionally(new CFException());
1303 <        g.complete(3);
1304 <        h = f.thenCombine(g, subtract);
1305 <        checkCompletedWithWrappedCFException(h);
1306 <    }
1274 >    public void testThenCombine_exceptionalCompletion1() {
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 CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1282 >        final CFException ex = new CFException();
1283 >
1284 >        f.completeExceptionally(ex);
1285 >        checkIncomplete(h);
1286 >        g.complete(v1);
1287 >
1288 >        checkCompletedWithWrappedCFException(h, ex);
1289 >        checkCompletedWithWrappedCFException(f, ex);
1290 >        assertEquals(0, r.invocationCount);
1291 >        checkCompletedNormally(g, v1);
1292 >    }}
1293 >
1294 >    public void testThenCombine_exceptionalCompletion2() {
1295 >        for (ExecutionMode m : ExecutionMode.values())
1296 >        for (Integer v1 : new Integer[] { 1, null })
1297 >    {
1298 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1299 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1300 >        final SubtractFunction r = new SubtractFunction();
1301 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1302 >        final CFException ex = new CFException();
1303 >
1304 >        g.completeExceptionally(ex);
1305 >        checkIncomplete(h);
1306 >        f.complete(v1);
1307 >
1308 >        checkCompletedWithWrappedCFException(h, ex);
1309 >        checkCompletedWithWrappedCFException(g, ex);
1310 >        assertEquals(0, r.invocationCount);
1311 >        checkCompletedNormally(f, v1);
1312 >    }}
1313 >
1314 >    public void testThenCombine_exceptionalCompletion3() {
1315 >        for (ExecutionMode m : ExecutionMode.values())
1316 >        for (Integer v1 : new Integer[] { 1, null })
1317 >    {
1318 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1319 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1320 >        final SubtractFunction r = new SubtractFunction();
1321 >        final CFException ex = new CFException();
1322 >
1323 >        g.completeExceptionally(ex);
1324 >        f.complete(v1);
1325 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1326 >
1327 >        checkCompletedWithWrappedCFException(h, ex);
1328 >        checkCompletedWithWrappedCFException(g, ex);
1329 >        assertEquals(0, r.invocationCount);
1330 >        checkCompletedNormally(f, v1);
1331 >    }}
1332 >
1333 >    public void testThenCombine_exceptionalCompletion4() {
1334 >        for (ExecutionMode m : ExecutionMode.values())
1335 >        for (Integer v1 : new Integer[] { 1, null })
1336 >    {
1337 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1338 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1339 >        final SubtractFunction r = new SubtractFunction();
1340 >        final CFException ex = new CFException();
1341 >
1342 >        f.completeExceptionally(ex);
1343 >        g.complete(v1);
1344 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1345 >
1346 >        checkCompletedWithWrappedCFException(h, ex);
1347 >        checkCompletedWithWrappedCFException(f, ex);
1348 >        assertEquals(0, r.invocationCount);
1349 >        checkCompletedNormally(g, v1);
1350 >    }}
1351  
1352      /**
1353       * thenCombine result completes exceptionally if action does
1354       */
1355 <    public void testThenCombine3() {
1356 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1357 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1358 <        FailingBiFunction r = new FailingBiFunction();
1359 <        CompletableFuture<Integer> g = f.thenCombine(f2, r);
1360 <        f.complete(one);
1361 <        checkIncomplete(g);
1362 <        assertFalse(r.ran);
1363 <        f2.complete(two);
1364 <        checkCompletedWithWrappedCFException(g);
1365 <        assertTrue(r.ran);
1366 <    }
1355 >    public void testThenCombine_actionFailed1() {
1356 >        for (ExecutionMode m : ExecutionMode.values())
1357 >        for (Integer v1 : new Integer[] { 1, null })
1358 >        for (Integer v2 : new Integer[] { 2, null })
1359 >    {
1360 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1361 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1362 >        final FailingBiFunction r = new FailingBiFunction();
1363 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1364 >
1365 >        f.complete(v1);
1366 >        checkIncomplete(h);
1367 >        g.complete(v2);
1368 >
1369 >        checkCompletedWithWrappedCFException(h);
1370 >        checkCompletedNormally(f, v1);
1371 >        checkCompletedNormally(g, v2);
1372 >    }}
1373 >
1374 >    public void testThenCombine_actionFailed2() {
1375 >        for (ExecutionMode m : ExecutionMode.values())
1376 >        for (Integer v1 : new Integer[] { 1, null })
1377 >        for (Integer v2 : new Integer[] { 2, null })
1378 >    {
1379 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1380 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1381 >        final FailingBiFunction r = new FailingBiFunction();
1382 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1383 >
1384 >        g.complete(v2);
1385 >        checkIncomplete(h);
1386 >        f.complete(v1);
1387 >
1388 >        checkCompletedWithWrappedCFException(h);
1389 >        checkCompletedNormally(f, v1);
1390 >        checkCompletedNormally(g, v2);
1391 >    }}
1392  
1393      /**
1394       * thenCombine result completes exceptionally if either source cancelled
1395       */
1396 <    public void testThenCombine4() {
1397 <        CompletableFuture<Integer> f, g, h;
1396 >    public void testThenCombine_sourceCancelled1() {
1397 >        for (ExecutionMode m : ExecutionMode.values())
1398 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1399 >        for (Integer v1 : new Integer[] { 1, null })
1400 >    {
1401 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1402 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1403 >        final SubtractFunction r = new SubtractFunction();
1404 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1405  
1406 <        f = new CompletableFuture<>();
756 <        g = new CompletableFuture<>();
757 <        h = f.thenCombine(g, subtract);
758 <        assertTrue(f.cancel(true));
1406 >        assertTrue(f.cancel(mayInterruptIfRunning));
1407          checkIncomplete(h);
1408 <        g.complete(1);
761 <        checkCompletedWithWrappedCancellationException(h);
1408 >        g.complete(v1);
1409  
763        f = new CompletableFuture<>();
764        g = new CompletableFuture<>();
765        h = f.thenCombine(g, subtract);
766        assertTrue(g.cancel(true));
767        checkIncomplete(h);
768        f.complete(3);
1410          checkCompletedWithWrappedCancellationException(h);
1411 +        checkCancelled(f);
1412 +        assertEquals(0, r.invocationCount);
1413 +        checkCompletedNormally(g, v1);
1414 +    }}
1415 +
1416 +    public void testThenCombine_sourceCancelled2() {
1417 +        for (ExecutionMode m : ExecutionMode.values())
1418 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1419 +        for (Integer v1 : new Integer[] { 1, null })
1420 +    {
1421 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
1422 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
1423 +        final SubtractFunction r = new SubtractFunction();
1424 +        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1425 +
1426 +        assertTrue(g.cancel(mayInterruptIfRunning));
1427 +        checkIncomplete(h);
1428 +        f.complete(v1);
1429 +
1430 +        checkCompletedWithWrappedCancellationException(h);
1431 +        checkCancelled(g);
1432 +        assertEquals(0, r.invocationCount);
1433 +        checkCompletedNormally(f, v1);
1434 +    }}
1435 +
1436 +    public void testThenCombine_sourceCancelled3() {
1437 +        for (ExecutionMode m : ExecutionMode.values())
1438 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1439 +        for (Integer v1 : new Integer[] { 1, null })
1440 +    {
1441 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
1442 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
1443 +        final SubtractFunction r = new SubtractFunction();
1444 +
1445 +        assertTrue(g.cancel(mayInterruptIfRunning));
1446 +        f.complete(v1);
1447 +        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1448 +
1449 +        checkCompletedWithWrappedCancellationException(h);
1450 +        checkCancelled(g);
1451 +        assertEquals(0, r.invocationCount);
1452 +        checkCompletedNormally(f, v1);
1453 +    }}
1454 +
1455 +    public void testThenCombine_sourceCancelled4() {
1456 +        for (ExecutionMode m : ExecutionMode.values())
1457 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1458 +        for (Integer v1 : new Integer[] { 1, null })
1459 +    {
1460 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
1461 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
1462 +        final SubtractFunction r = new SubtractFunction();
1463 +
1464 +        assertTrue(f.cancel(mayInterruptIfRunning));
1465 +        g.complete(v1);
1466 +        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1467  
771        f = new CompletableFuture<>();
772        g = new CompletableFuture<>();
773        assertTrue(f.cancel(true));
774        assertTrue(g.cancel(true));
775        h = f.thenCombine(g, subtract);
1468          checkCompletedWithWrappedCancellationException(h);
1469 <    }
1469 >        checkCancelled(f);
1470 >        assertEquals(0, r.invocationCount);
1471 >        checkCompletedNormally(g, v1);
1472 >    }}
1473  
1474      /**
1475       * thenAcceptBoth result completes normally after normal
1476       * completion of sources
1477       */
1478 <    public void testThenAcceptBoth() {
1479 <        CompletableFuture<Integer> f, g;
1480 <        CompletableFuture<Void> h;
1481 <        SubtractAction r;
1478 >    public void testThenAcceptBoth_normalCompletion1() {
1479 >        for (ExecutionMode m : ExecutionMode.values())
1480 >        for (Integer v1 : new Integer[] { 1, null })
1481 >        for (Integer v2 : new Integer[] { 2, null })
1482 >    {
1483 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1484 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1485 >        final SubtractAction r = new SubtractAction();
1486 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1487  
1488 <        f = new CompletableFuture<>();
789 <        g = new CompletableFuture<>();
790 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
791 <        f.complete(3);
1488 >        f.complete(v1);
1489          checkIncomplete(h);
1490 <        g.complete(1);
1490 >        assertEquals(0, r.invocationCount);
1491 >        g.complete(v2);
1492 >
1493          checkCompletedNormally(h, null);
1494 <        assertEquals(r.value, 2);
1494 >        assertEquals(subtract(v1, v2), r.value);
1495 >        checkCompletedNormally(f, v1);
1496 >        checkCompletedNormally(g, v2);
1497 >    }}
1498 >
1499 >    public void testThenAcceptBoth_normalCompletion2() {
1500 >        for (ExecutionMode m : ExecutionMode.values())
1501 >        for (Integer v1 : new Integer[] { 1, null })
1502 >        for (Integer v2 : new Integer[] { 2, null })
1503 >    {
1504 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1505 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1506 >        final SubtractAction r = new SubtractAction();
1507 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1508  
1509 <        f = new CompletableFuture<>();
798 <        g = new CompletableFuture<>();
799 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
800 <        g.complete(1);
1509 >        g.complete(v2);
1510          checkIncomplete(h);
1511 <        f.complete(3);
1511 >        assertEquals(0, r.invocationCount);
1512 >        f.complete(v1);
1513 >
1514          checkCompletedNormally(h, null);
1515 <        assertEquals(r.value, 2);
1515 >        assertEquals(subtract(v1, v2), r.value);
1516 >        checkCompletedNormally(f, v1);
1517 >        checkCompletedNormally(g, v2);
1518 >    }}
1519 >
1520 >    public void testThenAcceptBoth_normalCompletion3() {
1521 >        for (ExecutionMode m : ExecutionMode.values())
1522 >        for (Integer v1 : new Integer[] { 1, null })
1523 >        for (Integer v2 : new Integer[] { 2, null })
1524 >    {
1525 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1526 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1527 >        final SubtractAction r = new SubtractAction();
1528 >
1529 >        g.complete(v2);
1530 >        f.complete(v1);
1531 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1532  
806        f = new CompletableFuture<>();
807        g = new CompletableFuture<>();
808        g.complete(1);
809        f.complete(3);
810        h = f.thenAcceptBoth(g, r = new SubtractAction());
1533          checkCompletedNormally(h, null);
1534 <        assertEquals(r.value, 2);
1535 <    }
1534 >        assertEquals(subtract(v1, v2), r.value);
1535 >        checkCompletedNormally(f, v1);
1536 >        checkCompletedNormally(g, v2);
1537 >    }}
1538 >
1539 >    public void testThenAcceptBoth_normalCompletion4() {
1540 >        for (ExecutionMode m : ExecutionMode.values())
1541 >        for (Integer v1 : new Integer[] { 1, null })
1542 >        for (Integer v2 : new Integer[] { 2, null })
1543 >    {
1544 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1545 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1546 >        final SubtractAction r = new SubtractAction();
1547 >
1548 >        f.complete(v1);
1549 >        g.complete(v2);
1550 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1551 >
1552 >        checkCompletedNormally(h, null);
1553 >        assertEquals(subtract(v1, v2), r.value);
1554 >        checkCompletedNormally(f, v1);
1555 >        checkCompletedNormally(g, v2);
1556 >    }}
1557  
1558      /**
1559       * thenAcceptBoth result completes exceptionally after exceptional
1560       * completion of either source
1561       */
1562 <    public void testThenAcceptBoth2() {
1563 <        CompletableFuture<Integer> f, g;
1564 <        CompletableFuture<Void> h;
1565 <        SubtractAction r;
1566 <
1567 <        f = new CompletableFuture<>();
1568 <        g = new CompletableFuture<>();
1569 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
1570 <        f.completeExceptionally(new CFException());
1571 <        checkIncomplete(h);
1572 <        g.complete(1);
1573 <        checkCompletedWithWrappedCFException(h);
1574 <
1575 <        f = new CompletableFuture<>();
1576 <        g = new CompletableFuture<>();
1577 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
1578 <        g.completeExceptionally(new CFException());
1579 <        checkIncomplete(h);
1580 <        f.complete(3);
1581 <        checkCompletedWithWrappedCFException(h);
1582 <
1583 <        f = new CompletableFuture<>();
1584 <        g = new CompletableFuture<>();
1585 <        f.complete(3);
1586 <        g.completeExceptionally(new CFException());
1587 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
1588 <        checkCompletedWithWrappedCFException(h);
1589 <
1590 <        f = new CompletableFuture<>();
1591 <        g = new CompletableFuture<>();
1592 <        f.completeExceptionally(new CFException());
1593 <        g.complete(3);
1594 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
1595 <        checkCompletedWithWrappedCFException(h);
1596 <    }
1562 >    public void testThenAcceptBoth_exceptionalCompletion1() {
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 CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1570 >        final CFException ex = new CFException();
1571 >
1572 >        f.completeExceptionally(ex);
1573 >        checkIncomplete(h);
1574 >        g.complete(v1);
1575 >
1576 >        checkCompletedWithWrappedCFException(h, ex);
1577 >        checkCompletedWithWrappedCFException(f, ex);
1578 >        assertEquals(0, r.invocationCount);
1579 >        checkCompletedNormally(g, v1);
1580 >    }}
1581 >
1582 >    public void testThenAcceptBoth_exceptionalCompletion2() {
1583 >        for (ExecutionMode m : ExecutionMode.values())
1584 >        for (Integer v1 : new Integer[] { 1, null })
1585 >    {
1586 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1587 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1588 >        final SubtractAction r = new SubtractAction();
1589 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1590 >        final CFException ex = new CFException();
1591 >
1592 >        g.completeExceptionally(ex);
1593 >        checkIncomplete(h);
1594 >        f.complete(v1);
1595 >
1596 >        checkCompletedWithWrappedCFException(h, ex);
1597 >        checkCompletedWithWrappedCFException(g, ex);
1598 >        assertEquals(0, r.invocationCount);
1599 >        checkCompletedNormally(f, v1);
1600 >    }}
1601 >
1602 >    public void testThenAcceptBoth_exceptionalCompletion3() {
1603 >        for (ExecutionMode m : ExecutionMode.values())
1604 >        for (Integer v1 : new Integer[] { 1, null })
1605 >    {
1606 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1607 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1608 >        final SubtractAction r = new SubtractAction();
1609 >        final CFException ex = new CFException();
1610 >
1611 >        g.completeExceptionally(ex);
1612 >        f.complete(v1);
1613 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1614 >
1615 >        checkCompletedWithWrappedCFException(h, ex);
1616 >        checkCompletedWithWrappedCFException(g, ex);
1617 >        assertEquals(0, r.invocationCount);
1618 >        checkCompletedNormally(f, v1);
1619 >    }}
1620 >
1621 >    public void testThenAcceptBoth_exceptionalCompletion4() {
1622 >        for (ExecutionMode m : ExecutionMode.values())
1623 >        for (Integer v1 : new Integer[] { 1, null })
1624 >    {
1625 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1626 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1627 >        final SubtractAction r = new SubtractAction();
1628 >        final CFException ex = new CFException();
1629 >
1630 >        f.completeExceptionally(ex);
1631 >        g.complete(v1);
1632 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1633 >
1634 >        checkCompletedWithWrappedCFException(h, ex);
1635 >        checkCompletedWithWrappedCFException(f, ex);
1636 >        assertEquals(0, r.invocationCount);
1637 >        checkCompletedNormally(g, v1);
1638 >    }}
1639  
1640      /**
1641       * thenAcceptBoth result completes exceptionally if action does
1642       */
1643 <    public void testThenAcceptBoth3() {
1644 <        CompletableFuture<Integer> f, g;
1645 <        CompletableFuture<Void> h;
1646 <        FailingBiConsumer r;
1647 <
1648 <        f = new CompletableFuture<>();
1649 <        g = new CompletableFuture<>();
1650 <        h = f.thenAcceptBoth(g, r = new FailingBiConsumer());
1651 <        f.complete(3);
1652 <        checkIncomplete(h);
1653 <        g.complete(1);
1654 <        checkCompletedWithWrappedCFException(h);
1655 <
1656 <        f = new CompletableFuture<>();
1657 <        g = new CompletableFuture<>();
1658 <        f.complete(3);
1659 <        g.complete(1);
1660 <        h = f.thenAcceptBoth(g, r = new FailingBiConsumer());
1661 <        checkCompletedWithWrappedCFException(h);
1662 <    }
1643 >    public void testThenAcceptBoth_actionFailed1() {
1644 >        for (ExecutionMode m : ExecutionMode.values())
1645 >        for (Integer v1 : new Integer[] { 1, null })
1646 >        for (Integer v2 : new Integer[] { 2, null })
1647 >    {
1648 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1649 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1650 >        final FailingBiConsumer r = new FailingBiConsumer();
1651 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1652 >
1653 >        f.complete(v1);
1654 >        checkIncomplete(h);
1655 >        g.complete(v2);
1656 >
1657 >        checkCompletedWithWrappedCFException(h);
1658 >        checkCompletedNormally(f, v1);
1659 >        checkCompletedNormally(g, v2);
1660 >    }}
1661 >
1662 >    public void testThenAcceptBoth_actionFailed2() {
1663 >        for (ExecutionMode m : ExecutionMode.values())
1664 >        for (Integer v1 : new Integer[] { 1, null })
1665 >        for (Integer v2 : new Integer[] { 2, null })
1666 >    {
1667 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1668 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1669 >        final FailingBiConsumer r = new FailingBiConsumer();
1670 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1671 >
1672 >        g.complete(v2);
1673 >        checkIncomplete(h);
1674 >        f.complete(v1);
1675 >
1676 >        checkCompletedWithWrappedCFException(h);
1677 >        checkCompletedNormally(f, v1);
1678 >        checkCompletedNormally(g, v2);
1679 >    }}
1680  
1681      /**
1682       * thenAcceptBoth result completes exceptionally if either source cancelled
1683       */
1684 <    public void testThenAcceptBoth4() {
1685 <        CompletableFuture<Integer> f, g;
1686 <        CompletableFuture<Void> h;
1687 <        SubtractAction r;
1684 >    public void testThenAcceptBoth_sourceCancelled1() {
1685 >        for (ExecutionMode m : ExecutionMode.values())
1686 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1687 >        for (Integer v1 : new Integer[] { 1, null })
1688 >    {
1689 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1690 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1691 >        final SubtractAction r = new SubtractAction();
1692 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1693  
1694 <        f = new CompletableFuture<>();
888 <        g = new CompletableFuture<>();
889 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
890 <        assertTrue(f.cancel(true));
891 <        checkIncomplete(h);
892 <        g.complete(1);
893 <        checkCompletedWithWrappedCancellationException(h);
894 <
895 <        f = new CompletableFuture<>();
896 <        g = new CompletableFuture<>();
897 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
898 <        assertTrue(g.cancel(true));
1694 >        assertTrue(f.cancel(mayInterruptIfRunning));
1695          checkIncomplete(h);
1696 <        f.complete(3);
901 <        checkCompletedWithWrappedCancellationException(h);
1696 >        g.complete(v1);
1697  
903        f = new CompletableFuture<>();
904        g = new CompletableFuture<>();
905        f.complete(3);
906        assertTrue(g.cancel(true));
907        h = f.thenAcceptBoth(g, r = new SubtractAction());
1698          checkCompletedWithWrappedCancellationException(h);
1699 +        checkCancelled(f);
1700 +        assertEquals(0, r.invocationCount);
1701 +        checkCompletedNormally(g, v1);
1702 +    }}
1703 +
1704 +    public void testThenAcceptBoth_sourceCancelled2() {
1705 +        for (ExecutionMode m : ExecutionMode.values())
1706 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1707 +        for (Integer v1 : new Integer[] { 1, null })
1708 +    {
1709 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
1710 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
1711 +        final SubtractAction r = new SubtractAction();
1712 +        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1713 +
1714 +        assertTrue(g.cancel(mayInterruptIfRunning));
1715 +        checkIncomplete(h);
1716 +        f.complete(v1);
1717 +
1718 +        checkCompletedWithWrappedCancellationException(h);
1719 +        checkCancelled(g);
1720 +        assertEquals(0, r.invocationCount);
1721 +        checkCompletedNormally(f, v1);
1722 +    }}
1723 +
1724 +    public void testThenAcceptBoth_sourceCancelled3() {
1725 +        for (ExecutionMode m : ExecutionMode.values())
1726 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1727 +        for (Integer v1 : new Integer[] { 1, null })
1728 +    {
1729 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
1730 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
1731 +        final SubtractAction r = new SubtractAction();
1732 +
1733 +        assertTrue(g.cancel(mayInterruptIfRunning));
1734 +        f.complete(v1);
1735 +        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1736 +
1737 +        checkCompletedWithWrappedCancellationException(h);
1738 +        checkCancelled(g);
1739 +        assertEquals(0, r.invocationCount);
1740 +        checkCompletedNormally(f, v1);
1741 +    }}
1742 +
1743 +    public void testThenAcceptBoth_sourceCancelled4() {
1744 +        for (ExecutionMode m : ExecutionMode.values())
1745 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1746 +        for (Integer v1 : new Integer[] { 1, null })
1747 +    {
1748 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
1749 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
1750 +        final SubtractAction r = new SubtractAction();
1751 +
1752 +        assertTrue(f.cancel(mayInterruptIfRunning));
1753 +        g.complete(v1);
1754 +        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1755  
910        f = new CompletableFuture<>();
911        g = new CompletableFuture<>();
912        assertTrue(f.cancel(true));
913        g.complete(3);
914        h = f.thenAcceptBoth(g, r = new SubtractAction());
1756          checkCompletedWithWrappedCancellationException(h);
1757 <    }
1757 >        checkCancelled(f);
1758 >        assertEquals(0, r.invocationCount);
1759 >        checkCompletedNormally(g, v1);
1760 >    }}
1761  
1762      /**
1763       * runAfterBoth result completes normally after normal
1764       * completion of sources
1765       */
1766 <    public void testRunAfterBoth() {
1767 <        CompletableFuture<Integer> f, g;
1768 <        CompletableFuture<Void> h;
1769 <        Noop r;
1766 >    public void testRunAfterBoth_normalCompletion1() {
1767 >        for (ExecutionMode m : ExecutionMode.values())
1768 >        for (Integer v1 : new Integer[] { 1, null })
1769 >        for (Integer v2 : new Integer[] { 2, null })
1770 >    {
1771 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1772 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1773 >        final Noop r = new Noop();
1774 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1775  
1776 <        f = new CompletableFuture<>();
928 <        g = new CompletableFuture<>();
929 <        h = f.runAfterBoth(g, r = new Noop());
930 <        f.complete(3);
1776 >        f.complete(v1);
1777          checkIncomplete(h);
1778 <        g.complete(1);
1778 >        assertEquals(0, r.invocationCount);
1779 >        g.complete(v2);
1780 >
1781          checkCompletedNormally(h, null);
1782 <        assertTrue(r.ran);
1782 >        assertEquals(1, r.invocationCount);
1783 >        checkCompletedNormally(f, v1);
1784 >        checkCompletedNormally(g, v2);
1785 >    }}
1786 >
1787 >    public void testRunAfterBoth_normalCompletion2() {
1788 >        for (ExecutionMode m : ExecutionMode.values())
1789 >        for (Integer v1 : new Integer[] { 1, null })
1790 >        for (Integer v2 : new Integer[] { 2, null })
1791 >    {
1792 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1793 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1794 >        final Noop r = new Noop();
1795 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1796  
1797 <        f = new CompletableFuture<>();
937 <        g = new CompletableFuture<>();
938 <        h = f.runAfterBoth(g, r = new Noop());
939 <        g.complete(1);
1797 >        g.complete(v2);
1798          checkIncomplete(h);
1799 <        f.complete(3);
1799 >        assertEquals(0, r.invocationCount);
1800 >        f.complete(v1);
1801 >
1802          checkCompletedNormally(h, null);
1803 <        assertTrue(r.ran);
1803 >        assertEquals(1, r.invocationCount);
1804 >        checkCompletedNormally(f, v1);
1805 >        checkCompletedNormally(g, v2);
1806 >    }}
1807 >
1808 >    public void testRunAfterBoth_normalCompletion3() {
1809 >        for (ExecutionMode m : ExecutionMode.values())
1810 >        for (Integer v1 : new Integer[] { 1, null })
1811 >        for (Integer v2 : new Integer[] { 2, null })
1812 >    {
1813 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1814 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1815 >        final Noop r = new Noop();
1816 >
1817 >        g.complete(v2);
1818 >        f.complete(v1);
1819 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1820  
945        f = new CompletableFuture<>();
946        g = new CompletableFuture<>();
947        g.complete(1);
948        f.complete(3);
949        h = f.runAfterBoth(g, r = new Noop());
1821          checkCompletedNormally(h, null);
1822 <        assertTrue(r.ran);
1823 <    }
1822 >        assertEquals(1, r.invocationCount);
1823 >        checkCompletedNormally(f, v1);
1824 >        checkCompletedNormally(g, v2);
1825 >    }}
1826 >
1827 >    public void testRunAfterBoth_normalCompletion4() {
1828 >        for (ExecutionMode m : ExecutionMode.values())
1829 >        for (Integer v1 : new Integer[] { 1, null })
1830 >        for (Integer v2 : new Integer[] { 2, null })
1831 >    {
1832 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1833 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1834 >        final Noop r = new Noop();
1835 >
1836 >        f.complete(v1);
1837 >        g.complete(v2);
1838 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1839 >
1840 >        checkCompletedNormally(h, null);
1841 >        assertEquals(1, r.invocationCount);
1842 >        checkCompletedNormally(f, v1);
1843 >        checkCompletedNormally(g, v2);
1844 >    }}
1845  
1846      /**
1847       * runAfterBoth result completes exceptionally after exceptional
1848       * completion of either source
1849       */
1850 <    public void testRunAfterBoth2() {
1851 <        CompletableFuture<Integer> f, g;
1852 <        CompletableFuture<Void> h;
1853 <        Noop r;
1854 <
1855 <        f = new CompletableFuture<>();
1856 <        g = new CompletableFuture<>();
1857 <        h = f.runAfterBoth(g, r = new Noop());
1858 <        f.completeExceptionally(new CFException());
1859 <        checkIncomplete(h);
1860 <        g.complete(1);
1861 <        checkCompletedWithWrappedCFException(h);
1862 <        assertFalse(r.ran);
1863 <
1864 <        f = new CompletableFuture<>();
1865 <        g = new CompletableFuture<>();
1866 <        h = f.runAfterBoth(g, r = new Noop());
1867 <        g.completeExceptionally(new CFException());
1868 <        checkIncomplete(h);
1869 <        f.complete(3);
1870 <        checkCompletedWithWrappedCFException(h);
1871 <        assertFalse(r.ran);
1872 <
1873 <        f = new CompletableFuture<>();
1874 <        g = new CompletableFuture<>();
1875 <        g.completeExceptionally(new CFException());
1876 <        f.complete(3);
1877 <        h = f.runAfterBoth(g, r = new Noop());
1878 <        checkCompletedWithWrappedCFException(h);
1879 <        assertFalse(r.ran);
1880 <
1881 <        f = new CompletableFuture<>();
1882 <        g = new CompletableFuture<>();
1883 <        f.completeExceptionally(new CFException());
1884 <        g.complete(1);
1885 <        h = f.runAfterBoth(g, r = new Noop());
1886 <        checkCompletedWithWrappedCFException(h);
1887 <        assertFalse(r.ran);
1888 <    }
1850 >    public void testRunAfterBoth_exceptionalCompletion1() {
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();
1857 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1858 >        final CFException ex = new CFException();
1859 >
1860 >        f.completeExceptionally(ex);
1861 >        checkIncomplete(h);
1862 >        g.complete(v1);
1863 >
1864 >        checkCompletedWithWrappedCFException(h, ex);
1865 >        checkCompletedWithWrappedCFException(f, ex);
1866 >        assertEquals(0, r.invocationCount);
1867 >        checkCompletedNormally(g, v1);
1868 >    }}
1869 >
1870 >    public void testRunAfterBoth_exceptionalCompletion2() {
1871 >        for (ExecutionMode m : ExecutionMode.values())
1872 >        for (Integer v1 : new Integer[] { 1, null })
1873 >    {
1874 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1875 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1876 >        final Noop r = new Noop();
1877 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1878 >        final CFException ex = new CFException();
1879 >
1880 >        g.completeExceptionally(ex);
1881 >        checkIncomplete(h);
1882 >        f.complete(v1);
1883 >
1884 >        checkCompletedWithWrappedCFException(h, ex);
1885 >        checkCompletedWithWrappedCFException(g, ex);
1886 >        assertEquals(0, r.invocationCount);
1887 >        checkCompletedNormally(f, v1);
1888 >    }}
1889 >
1890 >    public void testRunAfterBoth_exceptionalCompletion3() {
1891 >        for (ExecutionMode m : ExecutionMode.values())
1892 >        for (Integer v1 : new Integer[] { 1, null })
1893 >    {
1894 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1895 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1896 >        final Noop r = new Noop();
1897 >        final CFException ex = new CFException();
1898 >
1899 >        g.completeExceptionally(ex);
1900 >        f.complete(v1);
1901 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1902 >
1903 >        checkCompletedWithWrappedCFException(h, ex);
1904 >        checkCompletedWithWrappedCFException(g, ex);
1905 >        assertEquals(0, r.invocationCount);
1906 >        checkCompletedNormally(f, v1);
1907 >    }}
1908 >
1909 >    public void testRunAfterBoth_exceptionalCompletion4() {
1910 >        for (ExecutionMode m : ExecutionMode.values())
1911 >        for (Integer v1 : new Integer[] { 1, null })
1912 >    {
1913 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1914 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1915 >        final Noop r = new Noop();
1916 >        final CFException ex = new CFException();
1917 >
1918 >        f.completeExceptionally(ex);
1919 >        g.complete(v1);
1920 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1921 >
1922 >        checkCompletedWithWrappedCFException(h, ex);
1923 >        checkCompletedWithWrappedCFException(f, ex);
1924 >        assertEquals(0, r.invocationCount);
1925 >        checkCompletedNormally(g, v1);
1926 >    }}
1927  
1928      /**
1929       * runAfterBoth result completes exceptionally if action does
1930       */
1931 <    public void testRunAfterBoth3() {
1932 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1933 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1934 <        FailingNoop r = new FailingNoop();
1935 <        CompletableFuture<Void> g = f.runAfterBoth(f2, r);
1936 <        f.complete(one);
1937 <        checkIncomplete(g);
1938 <        f2.complete(two);
1939 <        checkCompletedWithWrappedCFException(g);
1940 <    }
1931 >    public void testRunAfterBoth_actionFailed1() {
1932 >        for (ExecutionMode m : ExecutionMode.values())
1933 >        for (Integer v1 : new Integer[] { 1, null })
1934 >        for (Integer v2 : new Integer[] { 2, null })
1935 >    {
1936 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1937 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1938 >        final FailingRunnable r = new FailingRunnable();
1939 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1940 >
1941 >        f.complete(v1);
1942 >        checkIncomplete(h);
1943 >        g.complete(v2);
1944 >
1945 >        checkCompletedWithWrappedCFException(h);
1946 >        checkCompletedNormally(f, v1);
1947 >        checkCompletedNormally(g, v2);
1948 >    }}
1949 >
1950 >    public void testRunAfterBoth_actionFailed2() {
1951 >        for (ExecutionMode m : ExecutionMode.values())
1952 >        for (Integer v1 : new Integer[] { 1, null })
1953 >        for (Integer v2 : new Integer[] { 2, null })
1954 >    {
1955 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1956 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1957 >        final FailingRunnable r = new FailingRunnable();
1958 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1959 >
1960 >        g.complete(v2);
1961 >        checkIncomplete(h);
1962 >        f.complete(v1);
1963 >
1964 >        checkCompletedWithWrappedCFException(h);
1965 >        checkCompletedNormally(f, v1);
1966 >        checkCompletedNormally(g, v2);
1967 >    }}
1968  
1969      /**
1970       * runAfterBoth result completes exceptionally if either source cancelled
1971       */
1972 <    public void testRunAfterBoth4() {
1973 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1974 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1975 <        Noop r = new Noop();
1976 <        CompletableFuture<Void> g = f.runAfterBoth(f2, r);
1977 <        assertTrue(f.cancel(true));
1978 <        f2.complete(two);
1979 <        checkCompletedWithWrappedCancellationException(g);
1980 <        f = new CompletableFuture<>();
1024 <        f2 = new CompletableFuture<>();
1025 <        r = new Noop();
1026 <        g = f.runAfterBoth(f2, r);
1027 <        f.complete(one);
1028 <        assertTrue(f2.cancel(true));
1029 <        checkCompletedWithWrappedCancellationException(g);
1030 <    }
1031 <
1032 <    /**
1033 <     * applyToEither result completes normally after normal completion
1034 <     * of either source
1035 <     */
1036 <    public void testApplyToEither() {
1037 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1038 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1039 <        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
1040 <        f.complete(one);
1041 <        checkCompletedNormally(g, two);
1042 <        f2.complete(one);
1043 <        checkCompletedNormally(g, two);
1044 <
1045 <        f = new CompletableFuture<>();
1046 <        f.complete(one);
1047 <        f2 = new CompletableFuture<>();
1048 <        g = f.applyToEither(f2, inc);
1049 <        checkCompletedNormally(g, two);
1050 <    }
1051 <
1052 <    /**
1053 <     * applyToEither result completes exceptionally after exceptional
1054 <     * completion of either source
1055 <     */
1056 <    public void testApplyToEither2() {
1057 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1058 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1059 <        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
1060 <        f.completeExceptionally(new CFException());
1061 <        f2.complete(one);
1062 <        checkCompletedWithWrappedCFException(g);
1063 <
1064 <        f = new CompletableFuture<>();
1065 <        f2 = new CompletableFuture<>();
1066 <        f2.completeExceptionally(new CFException());
1067 <        g = f.applyToEither(f2, inc);
1068 <        checkCompletedWithWrappedCFException(g);
1069 <    }
1070 <
1071 <    /**
1072 <     * applyToEither result completes exceptionally if action does
1073 <     */
1074 <    public void testApplyToEither3() {
1075 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1076 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1077 <        FailingFunction r = new FailingFunction();
1078 <        CompletableFuture<Integer> g = f.applyToEither(f2, r);
1079 <        f2.complete(two);
1080 <        checkCompletedWithWrappedCFException(g);
1081 <    }
1082 <
1083 <    /**
1084 <     * applyToEither result completes exceptionally if either source cancelled
1085 <     */
1086 <    public void testApplyToEither4() {
1087 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1088 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1089 <        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
1090 <        assertTrue(f.cancel(true));
1091 <        checkCompletedWithWrappedCancellationException(g);
1092 <        f = new CompletableFuture<>();
1093 <        f2 = new CompletableFuture<>();
1094 <        assertTrue(f2.cancel(true));
1095 <        checkCompletedWithWrappedCancellationException(g);
1096 <    }
1097 <
1098 <    /**
1099 <     * acceptEither result completes normally after normal completion
1100 <     * of either source
1101 <     */
1102 <    public void testAcceptEither() {
1103 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1104 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1105 <        IncAction r = new IncAction();
1106 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
1107 <        f.complete(one);
1108 <        checkCompletedNormally(g, null);
1109 <        f2.complete(one);
1110 <        checkCompletedNormally(g, null);
1111 <        assertEquals(r.value, 2);
1112 <
1113 <        r = new IncAction();
1114 <        f = new CompletableFuture<>();
1115 <        f.complete(one);
1116 <        f2 = new CompletableFuture<>();
1117 <        g = f.acceptEither(f2, r);
1118 <        checkCompletedNormally(g, null);
1119 <        assertEquals(r.value, 2);
1120 <    }
1121 <
1122 <    /**
1123 <     * acceptEither result completes exceptionally after exceptional
1124 <     * completion of either source
1125 <     */
1126 <    public void testAcceptEither2() {
1127 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1128 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1129 <        IncAction r = new IncAction();
1130 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
1131 <        f.completeExceptionally(new CFException());
1132 <        f2.complete(one);
1133 <        checkCompletedWithWrappedCFException(g);
1972 >    public void testRunAfterBoth_sourceCancelled1() {
1973 >        for (ExecutionMode m : ExecutionMode.values())
1974 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1975 >        for (Integer v1 : new Integer[] { 1, null })
1976 >    {
1977 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1978 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1979 >        final Noop r = new Noop();
1980 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1981  
1982 <        r = new IncAction();
1983 <        f = new CompletableFuture<>();
1984 <        f2 = new CompletableFuture<>();
1138 <        f2.completeExceptionally(new CFException());
1139 <        g = f.acceptEither(f2, r);
1140 <        checkCompletedWithWrappedCFException(g);
1141 <    }
1982 >        assertTrue(f.cancel(mayInterruptIfRunning));
1983 >        checkIncomplete(h);
1984 >        g.complete(v1);
1985  
1986 <    /**
1987 <     * acceptEither result completes exceptionally if action does
1988 <     */
1989 <    public void testAcceptEither3() {
1990 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1991 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1992 <        FailingConsumer r = new FailingConsumer();
1993 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
1994 <        f2.complete(two);
1995 <        checkCompletedWithWrappedCFException(g);
1996 <    }
1986 >        checkCompletedWithWrappedCancellationException(h);
1987 >        checkCancelled(f);
1988 >        assertEquals(0, r.invocationCount);
1989 >        checkCompletedNormally(g, v1);
1990 >    }}
1991 >
1992 >    public void testRunAfterBoth_sourceCancelled2() {
1993 >        for (ExecutionMode m : ExecutionMode.values())
1994 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1995 >        for (Integer v1 : new Integer[] { 1, null })
1996 >    {
1997 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1998 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1999 >        final Noop r = new Noop();
2000 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2001 >
2002 >        assertTrue(g.cancel(mayInterruptIfRunning));
2003 >        checkIncomplete(h);
2004 >        f.complete(v1);
2005 >
2006 >        checkCompletedWithWrappedCancellationException(h);
2007 >        checkCancelled(g);
2008 >        assertEquals(0, r.invocationCount);
2009 >        checkCompletedNormally(f, v1);
2010 >    }}
2011 >
2012 >    public void testRunAfterBoth_sourceCancelled3() {
2013 >        for (ExecutionMode m : ExecutionMode.values())
2014 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2015 >        for (Integer v1 : new Integer[] { 1, null })
2016 >    {
2017 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2018 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2019 >        final Noop r = new Noop();
2020 >
2021 >        assertTrue(g.cancel(mayInterruptIfRunning));
2022 >        f.complete(v1);
2023 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2024 >
2025 >        checkCompletedWithWrappedCancellationException(h);
2026 >        checkCancelled(g);
2027 >        assertEquals(0, r.invocationCount);
2028 >        checkCompletedNormally(f, v1);
2029 >    }}
2030 >
2031 >    public void testRunAfterBoth_sourceCancelled4() {
2032 >        for (ExecutionMode m : ExecutionMode.values())
2033 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2034 >        for (Integer v1 : new Integer[] { 1, null })
2035 >    {
2036 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2037 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2038 >        final Noop r = new Noop();
2039 >
2040 >        assertTrue(f.cancel(mayInterruptIfRunning));
2041 >        g.complete(v1);
2042 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2043  
2044 <    /**
2045 <     * acceptEither result completes exceptionally if either source cancelled
2046 <     */
2047 <    public void testAcceptEither4() {
2048 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1160 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1161 <        IncAction r = new IncAction();
1162 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
1163 <        assertTrue(f.cancel(true));
1164 <        checkCompletedWithWrappedCancellationException(g);
1165 <        f = new CompletableFuture<>();
1166 <        f2 = new CompletableFuture<>();
1167 <        assertTrue(f2.cancel(true));
1168 <        checkCompletedWithWrappedCancellationException(g);
1169 <    }
2044 >        checkCompletedWithWrappedCancellationException(h);
2045 >        checkCancelled(f);
2046 >        assertEquals(0, r.invocationCount);
2047 >        checkCompletedNormally(g, v1);
2048 >    }}
2049  
2050      /**
2051 <     * runAfterEither result completes normally after normal completion
2051 >     * applyToEither result completes normally after normal completion
2052       * of either source
2053       */
2054 <    public void testRunAfterEither() {
2055 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2056 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2057 <        Noop r = new Noop();
2058 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
2059 <        f.complete(one);
2060 <        checkCompletedNormally(g, null);
2061 <        f2.complete(one);
2062 <        checkCompletedNormally(g, null);
2063 <        assertTrue(r.ran);
2064 <
2065 <        r = new Noop();
2066 <        f = new CompletableFuture<>();
2067 <        f.complete(one);
2068 <        f2 = new CompletableFuture<>();
2069 <        g = f.runAfterEither(f2, r);
2070 <        checkCompletedNormally(g, null);
2071 <        assertTrue(r.ran);
2072 <    }
2054 >    public void testApplyToEither_normalCompletion1() {
2055 >        for (ExecutionMode m : ExecutionMode.values())
2056 >        for (Integer v1 : new Integer[] { 1, null })
2057 >        for (Integer v2 : new Integer[] { 2, null })
2058 >    {
2059 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2060 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2061 >        final IncFunction r = new IncFunction();
2062 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2063 >
2064 >        f.complete(v1);
2065 >        checkCompletedNormally(h, inc(v1));
2066 >        g.complete(v2);
2067 >
2068 >        checkCompletedNormally(f, v1);
2069 >        checkCompletedNormally(g, v2);
2070 >        checkCompletedNormally(h, inc(v1));
2071 >    }}
2072 >
2073 >    public void testApplyToEither_normalCompletion2() {
2074 >        for (ExecutionMode m : ExecutionMode.values())
2075 >        for (Integer v1 : new Integer[] { 1, null })
2076 >        for (Integer v2 : new Integer[] { 2, null })
2077 >    {
2078 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2079 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2080 >        final IncFunction r = new IncFunction();
2081 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2082 >
2083 >        g.complete(v2);
2084 >        checkCompletedNormally(h, inc(v2));
2085 >        f.complete(v1);
2086 >
2087 >        checkCompletedNormally(f, v1);
2088 >        checkCompletedNormally(g, v2);
2089 >        checkCompletedNormally(h, inc(v2));
2090 >        }}
2091 >
2092 >    public void testApplyToEither_normalCompletion3() {
2093 >        for (ExecutionMode m : ExecutionMode.values())
2094 >        for (Integer v1 : new Integer[] { 1, null })
2095 >        for (Integer v2 : new Integer[] { 2, null })
2096 >    {
2097 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2098 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2099 >        final IncFunction r = new IncFunction();
2100 >
2101 >        f.complete(v1);
2102 >        g.complete(v2);
2103 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2104 >
2105 >        checkCompletedNormally(f, v1);
2106 >        checkCompletedNormally(g, v2);
2107 >
2108 >        // unspecified behavior
2109 >        assertTrue(Objects.equals(h.join(), inc(v1)) ||
2110 >                   Objects.equals(h.join(), inc(v2)));
2111 >        assertEquals(1, r.invocationCount);
2112 >    }}
2113  
2114      /**
2115 <     * runAfterEither result completes exceptionally after exceptional
2115 >     * applyToEither result completes exceptionally after exceptional
2116       * completion of either source
2117       */
2118 <    public void testRunAfterEither2() {
2119 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2120 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2121 <        Noop r = new Noop();
2122 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
2123 <        f.completeExceptionally(new CFException());
2124 <        f2.complete(one);
2125 <        checkCompletedWithWrappedCFException(g);
2126 <
2127 <        r = new Noop();
2128 <        f = new CompletableFuture<>();
2129 <        f2 = new CompletableFuture<>();
2130 <        f2.completeExceptionally(new CFException());
2131 <        g = f.runAfterEither(f2, r);
2132 <        checkCompletedWithWrappedCFException(g);
2133 <    }
2134 <
2135 <    /**
2136 <     * runAfterEither result completes exceptionally if action does
2137 <     */
2138 <    public void testRunAfterEither3() {
2139 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2140 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2141 <        FailingNoop r = new FailingNoop();
2142 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
2143 <        f2.complete(two);
2144 <        checkCompletedWithWrappedCFException(g);
2145 <    }
2146 <
2147 <    /**
2148 <     * runAfterEither result completes exceptionally if either source cancelled
2149 <     */
2150 <    public void testRunAfterEither4() {
2151 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2152 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2153 <        Noop r = new Noop();
2154 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
2155 <        assertTrue(f.cancel(true));
2156 <        checkCompletedWithWrappedCancellationException(g);
2157 <        f = new CompletableFuture<>();
2158 <        f2 = new CompletableFuture<>();
2159 <        assertTrue(f2.cancel(true));
2160 <        checkCompletedWithWrappedCancellationException(g);
2161 <    }
2162 <
2163 <    /**
2164 <     * thenCompose result completes normally after normal completion of source
2165 <     */
2166 <    public void testThenCompose() {
2167 <        CompletableFuture<Integer> f, g;
2168 <        CompletableFutureInc r;
2169 <
1251 <        f = new CompletableFuture<>();
1252 <        g = f.thenCompose(r = new CompletableFutureInc());
1253 <        f.complete(one);
1254 <        checkCompletedNormally(g, two);
1255 <        assertTrue(r.ran);
1256 <
1257 <        f = new CompletableFuture<>();
1258 <        f.complete(one);
1259 <        g = f.thenCompose(r = new CompletableFutureInc());
1260 <        checkCompletedNormally(g, two);
1261 <        assertTrue(r.ran);
1262 <    }
1263 <
1264 <    /**
1265 <     * thenCompose result completes exceptionally after exceptional
1266 <     * completion of source
1267 <     */
1268 <    public void testThenCompose2() {
1269 <        CompletableFuture<Integer> f, g;
1270 <        CompletableFutureInc r;
1271 <
1272 <        f = new CompletableFuture<>();
1273 <        g = f.thenCompose(r = new CompletableFutureInc());
1274 <        f.completeExceptionally(new CFException());
1275 <        checkCompletedWithWrappedCFException(g);
1276 <
1277 <        f = new CompletableFuture<>();
1278 <        f.completeExceptionally(new CFException());
1279 <        g = f.thenCompose(r = new CompletableFutureInc());
1280 <        checkCompletedWithWrappedCFException(g);
1281 <    }
1282 <
1283 <    /**
1284 <     * thenCompose result completes exceptionally if action does
1285 <     */
1286 <    public void testThenCompose3() {
1287 <        CompletableFuture<Integer> f, g;
1288 <        FailingCompletableFutureFunction r;
2118 >    public void testApplyToEither_exceptionalCompletion1() {
2119 >        for (ExecutionMode m : ExecutionMode.values())
2120 >        for (Integer v1 : new Integer[] { 1, null })
2121 >    {
2122 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2123 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2124 >        final IncFunction r = new IncFunction();
2125 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2126 >        final CFException ex = new CFException();
2127 >
2128 >        f.completeExceptionally(ex);
2129 >        checkCompletedWithWrappedCFException(h, ex);
2130 >        g.complete(v1);
2131 >
2132 >        assertEquals(0, r.invocationCount);
2133 >        checkCompletedNormally(g, v1);
2134 >        checkCompletedWithWrappedCFException(f, ex);
2135 >        checkCompletedWithWrappedCFException(h, ex);
2136 >    }}
2137 >
2138 >    public void testApplyToEither_exceptionalCompletion2() {
2139 >        for (ExecutionMode m : ExecutionMode.values())
2140 >        for (Integer v1 : new Integer[] { 1, null })
2141 >    {
2142 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2143 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2144 >        final IncFunction r = new IncFunction();
2145 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2146 >        final CFException ex = new CFException();
2147 >
2148 >        g.completeExceptionally(ex);
2149 >        checkCompletedWithWrappedCFException(h, ex);
2150 >        f.complete(v1);
2151 >
2152 >        assertEquals(0, r.invocationCount);
2153 >        checkCompletedNormally(f, v1);
2154 >        checkCompletedWithWrappedCFException(g, ex);
2155 >        checkCompletedWithWrappedCFException(h, ex);
2156 >    }}
2157 >
2158 >    public void testApplyToEither_exceptionalCompletion3() {
2159 >        for (ExecutionMode m : ExecutionMode.values())
2160 >        for (Integer v1 : new Integer[] { 1, null })
2161 >    {
2162 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2163 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2164 >        final IncFunction r = new IncFunction();
2165 >        final CFException ex = new CFException();
2166 >
2167 >        g.completeExceptionally(ex);
2168 >        f.complete(v1);
2169 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2170  
2171 <        f = new CompletableFuture<>();
2172 <        g = f.thenCompose(r = new FailingCompletableFutureFunction());
1292 <        f.complete(one);
1293 <        checkCompletedWithWrappedCFException(g);
1294 <
1295 <        f = new CompletableFuture<>();
1296 <        f.complete(one);
1297 <        g = f.thenCompose(r = new FailingCompletableFutureFunction());
1298 <        checkCompletedWithWrappedCFException(g);
1299 <    }
1300 <
1301 <    /**
1302 <     * thenCompose result completes exceptionally if source cancelled
1303 <     */
1304 <    public void testThenCompose4() {
1305 <        CompletableFuture<Integer> f, g;
1306 <        CompletableFutureInc r;
1307 <
1308 <        f = new CompletableFuture<>();
1309 <        g = f.thenCompose(r = new CompletableFutureInc());
1310 <        assertTrue(f.cancel(true));
1311 <        checkCompletedWithWrappedCancellationException(g);
1312 <
1313 <        f = new CompletableFuture<>();
1314 <        assertTrue(f.cancel(true));
1315 <        g = f.thenCompose(r = new CompletableFutureInc());
1316 <        checkCompletedWithWrappedCancellationException(g);
1317 <    }
1318 <
1319 <    // asyncs
1320 <
1321 <    /**
1322 <     * thenRunAsync result completes normally after normal completion of source
1323 <     */
1324 <    public void testThenRunAsync() {
1325 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1326 <        Noop r = new Noop();
1327 <        CompletableFuture<Void> g = f.thenRunAsync(r);
1328 <        f.complete(null);
1329 <        checkCompletedNormally(g, null);
1330 <
1331 <        // reordered version
1332 <        f = new CompletableFuture<>();
1333 <        f.complete(null);
1334 <        r = new Noop();
1335 <        g = f.thenRunAsync(r);
1336 <        checkCompletedNormally(g, null);
1337 <    }
1338 <
1339 <    /**
1340 <     * thenRunAsync result completes exceptionally after exceptional
1341 <     * completion of source
1342 <     */
1343 <    public void testThenRunAsync2() {
1344 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1345 <        Noop r = new Noop();
1346 <        CompletableFuture<Void> g = f.thenRunAsync(r);
1347 <        f.completeExceptionally(new CFException());
2171 >        // unspecified behavior
2172 >        Integer v;
2173          try {
2174 <            g.join();
2175 <            shouldThrow();
2176 <        } catch (CompletionException success) {}
2177 <        checkCompletedWithWrappedCFException(g);
2178 <    }
2179 <
1355 <    /**
1356 <     * thenRunAsync result completes exceptionally if action does
1357 <     */
1358 <    public void testThenRunAsync3() {
1359 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1360 <        FailingNoop r = new FailingNoop();
1361 <        CompletableFuture<Void> g = f.thenRunAsync(r);
1362 <        f.complete(null);
1363 <        checkCompletedWithWrappedCFException(g);
1364 <    }
1365 <
1366 <    /**
1367 <     * thenRunAsync result completes exceptionally if source cancelled
1368 <     */
1369 <    public void testThenRunAsync4() {
1370 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1371 <        Noop r = new Noop();
1372 <        CompletableFuture<Void> g = f.thenRunAsync(r);
1373 <        assertTrue(f.cancel(true));
1374 <        checkCompletedWithWrappedCancellationException(g);
1375 <    }
1376 <
1377 <    /**
1378 <     * thenApplyAsync result completes normally after normal completion of source
1379 <     */
1380 <    public void testThenApplyAsync() {
1381 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1382 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
1383 <        f.complete(one);
1384 <        checkCompletedNormally(g, two);
1385 <    }
1386 <
1387 <    /**
1388 <     * thenApplyAsync result completes exceptionally after exceptional
1389 <     * completion of source
1390 <     */
1391 <    public void testThenApplyAsync2() {
1392 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1393 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
1394 <        f.completeExceptionally(new CFException());
1395 <        checkCompletedWithWrappedCFException(g);
1396 <    }
1397 <
1398 <    /**
1399 <     * thenApplyAsync result completes exceptionally if action does
1400 <     */
1401 <    public void testThenApplyAsync3() {
1402 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1403 <        FailingFunction r = new FailingFunction();
1404 <        CompletableFuture<Integer> g = f.thenApplyAsync(r);
1405 <        f.complete(null);
1406 <        checkCompletedWithWrappedCFException(g);
1407 <    }
1408 <
1409 <    /**
1410 <     * thenApplyAsync result completes exceptionally if source cancelled
1411 <     */
1412 <    public void testThenApplyAsync4() {
1413 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1414 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
1415 <        assertTrue(f.cancel(true));
1416 <        checkCompletedWithWrappedCancellationException(g);
1417 <    }
2174 >            assertEquals(inc(v1), h.join());
2175 >            assertEquals(1, r.invocationCount);
2176 >        } catch (CompletionException ok) {
2177 >            checkCompletedWithWrappedCFException(h, ex);
2178 >            assertEquals(0, r.invocationCount);
2179 >        }
2180  
2181 <    /**
2182 <     * thenAcceptAsync result completes normally after normal
2183 <     * completion of source
2184 <     */
2185 <    public void testThenAcceptAsync() {
2186 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2187 <        IncAction r = new IncAction();
2188 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2189 <        f.complete(one);
2190 <        checkCompletedNormally(g, null);
2191 <        assertEquals(r.value, 2);
2192 <    }
2181 >        checkCompletedWithWrappedCFException(g, ex);
2182 >        checkCompletedNormally(f, v1);
2183 >    }}
2184 >
2185 >    public void testApplyToEither_exceptionalCompletion4() {
2186 >        for (ExecutionMode m : ExecutionMode.values())
2187 >        for (Integer v1 : new Integer[] { 1, null })
2188 >    {
2189 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2190 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2191 >        final IncFunction r = new IncFunction();
2192 >        final CFException ex = new CFException();
2193 >
2194 >        f.completeExceptionally(ex);
2195 >        g.complete(v1);
2196 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2197  
2198 <    /**
2199 <     * thenAcceptAsync result completes exceptionally after exceptional
2200 <     * completion of source
2201 <     */
2202 <    public void testThenAcceptAsync2() {
2203 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2204 <        IncAction r = new IncAction();
2205 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2206 <        f.completeExceptionally(new CFException());
1441 <        checkCompletedWithWrappedCFException(g);
1442 <    }
2198 >        // unspecified behavior
2199 >        Integer v;
2200 >        try {
2201 >            assertEquals(inc(v1), h.join());
2202 >            assertEquals(1, r.invocationCount);
2203 >        } catch (CompletionException ok) {
2204 >            checkCompletedWithWrappedCFException(h, ex);
2205 >            assertEquals(0, r.invocationCount);
2206 >        }
2207  
2208 <    /**
2209 <     * thenAcceptAsync result completes exceptionally if action does
2210 <     */
1447 <    public void testThenAcceptAsync3() {
1448 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1449 <        FailingConsumer r = new FailingConsumer();
1450 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
1451 <        f.complete(null);
1452 <        checkCompletedWithWrappedCFException(g);
1453 <    }
2208 >        checkCompletedWithWrappedCFException(f, ex);
2209 >        checkCompletedNormally(g, v1);
2210 >    }}
2211  
2212      /**
2213 <     * thenAcceptAsync result completes exceptionally if source cancelled
2213 >     * applyToEither result completes exceptionally if action does
2214       */
2215 <    public void testThenAcceptAsync4() {
2216 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2217 <        IncAction r = new IncAction();
2218 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2219 <        assertTrue(f.cancel(true));
2220 <        checkCompletedWithWrappedCancellationException(g);
2221 <    }
2215 >    public void testApplyToEither_actionFailed1() {
2216 >        for (ExecutionMode m : ExecutionMode.values())
2217 >        for (Integer v1 : new Integer[] { 1, null })
2218 >        for (Integer v2 : new Integer[] { 2, null })
2219 >    {
2220 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2221 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2222 >        final FailingFunction r = new FailingFunction();
2223 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2224 >
2225 >        f.complete(v1);
2226 >        checkCompletedWithWrappedCFException(h);
2227 >        g.complete(v2);
2228 >        checkCompletedNormally(f, v1);
2229 >        checkCompletedNormally(g, v2);
2230 >    }}
2231 >
2232 >    public void testApplyToEither_actionFailed2() {
2233 >        for (ExecutionMode m : ExecutionMode.values())
2234 >        for (Integer v1 : new Integer[] { 1, null })
2235 >        for (Integer v2 : new Integer[] { 2, null })
2236 >    {
2237 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2238 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2239 >        final FailingFunction r = new FailingFunction();
2240 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2241 >
2242 >        g.complete(v2);
2243 >        checkCompletedWithWrappedCFException(h);
2244 >        f.complete(v1);
2245 >        checkCompletedNormally(f, v1);
2246 >        checkCompletedNormally(g, v2);
2247 >    }}
2248  
2249      /**
2250 <     * thenCombineAsync result completes normally after normal
1468 <     * completion of sources
2250 >     * applyToEither result completes exceptionally if either source cancelled
2251       */
2252 <    public void testThenCombineAsync() {
2253 <        CompletableFuture<Integer> f, g, h;
2254 <
2255 <        f = new CompletableFuture<>();
2256 <        g = new CompletableFuture<>();
2257 <        h = f.thenCombineAsync(g, subtract);
2258 <        f.complete(3);
2259 <        checkIncomplete(h);
2260 <        g.complete(1);
1479 <        checkCompletedNormally(h, 2);
2252 >    public void testApplyToEither_sourceCancelled1() {
2253 >        for (ExecutionMode m : ExecutionMode.values())
2254 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2255 >        for (Integer v1 : new Integer[] { 1, null })
2256 >    {
2257 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2258 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2259 >        final IncFunction r = new IncFunction();
2260 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2261  
2262 <        f = new CompletableFuture<>();
2263 <        g = new CompletableFuture<>();
2264 <        h = f.thenCombineAsync(g, subtract);
1484 <        g.complete(1);
1485 <        checkIncomplete(h);
1486 <        f.complete(3);
1487 <        checkCompletedNormally(h, 2);
2262 >        assertTrue(f.cancel(mayInterruptIfRunning));
2263 >        checkCompletedWithWrappedCancellationException(h);
2264 >        g.complete(v1);
2265  
2266 <        f = new CompletableFuture<>();
2267 <        g = new CompletableFuture<>();
2268 <        g.complete(1);
2269 <        f.complete(3);
2270 <        h = f.thenCombineAsync(g, subtract);
1494 <        checkCompletedNormally(h, 2);
1495 <    }
2266 >        checkCancelled(f);
2267 >        assertEquals(0, r.invocationCount);
2268 >        checkCompletedNormally(g, v1);
2269 >        checkCompletedWithWrappedCancellationException(h);
2270 >    }}
2271  
2272 <    /**
2273 <     * thenCombineAsync result completes exceptionally after exceptional
2274 <     * completion of either source
2275 <     */
2276 <    public void testThenCombineAsync2() {
2277 <        CompletableFuture<Integer> f, g, h;
2272 >    public void testApplyToEither_sourceCancelled2() {
2273 >        for (ExecutionMode m : ExecutionMode.values())
2274 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2275 >        for (Integer v1 : new Integer[] { 1, null })
2276 >    {
2277 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2278 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2279 >        final IncFunction r = new IncFunction();
2280 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2281 >
2282 >        assertTrue(g.cancel(mayInterruptIfRunning));
2283 >        checkCompletedWithWrappedCancellationException(h);
2284 >        f.complete(v1);
2285 >
2286 >        checkCancelled(g);
2287 >        assertEquals(0, r.invocationCount);
2288 >        checkCompletedNormally(f, v1);
2289 >        checkCompletedWithWrappedCancellationException(h);
2290 >    }}
2291 >
2292 >    public void testApplyToEither_sourceCancelled3() {
2293 >        for (ExecutionMode m : ExecutionMode.values())
2294 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2295 >        for (Integer v1 : new Integer[] { 1, null })
2296 >    {
2297 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2298 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2299 >        final IncFunction r = new IncFunction();
2300 >
2301 >        assertTrue(g.cancel(mayInterruptIfRunning));
2302 >        f.complete(v1);
2303 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2304  
2305 <        f = new CompletableFuture<>();
2306 <        g = new CompletableFuture<>();
2307 <        h = f.thenCombineAsync(g, subtract);
2308 <        f.completeExceptionally(new CFException());
2309 <        checkIncomplete(h);
2310 <        g.complete(1);
2311 <        checkCompletedWithWrappedCFException(h);
2305 >        // unspecified behavior
2306 >        Integer v;
2307 >        try {
2308 >            assertEquals(inc(v1), h.join());
2309 >            assertEquals(1, r.invocationCount);
2310 >        } catch (CompletionException ok) {
2311 >            checkCompletedWithWrappedCancellationException(h);
2312 >            assertEquals(0, r.invocationCount);
2313 >        }
2314  
2315 <        f = new CompletableFuture<>();
2316 <        g = new CompletableFuture<>();
2317 <        h = f.thenCombineAsync(g, subtract);
2318 <        g.completeExceptionally(new CFException());
2319 <        checkIncomplete(h);
2320 <        f.complete(3);
2321 <        checkCompletedWithWrappedCFException(h);
2315 >        checkCancelled(g);
2316 >        checkCompletedNormally(f, v1);
2317 >    }}
2318 >
2319 >    public void testApplyToEither_sourceCancelled4() {
2320 >        for (ExecutionMode m : ExecutionMode.values())
2321 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2322 >        for (Integer v1 : new Integer[] { 1, null })
2323 >    {
2324 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2325 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2326 >        final IncFunction r = new IncFunction();
2327 >
2328 >        assertTrue(f.cancel(mayInterruptIfRunning));
2329 >        g.complete(v1);
2330 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2331  
2332 <        f = new CompletableFuture<>();
2333 <        g = new CompletableFuture<>();
2334 <        g.completeExceptionally(new CFException());
2335 <        f.complete(3);
2336 <        h = f.thenCombineAsync(g, subtract);
2337 <        checkCompletedWithWrappedCFException(h);
2338 <    }
2332 >        // unspecified behavior
2333 >        Integer v;
2334 >        try {
2335 >            assertEquals(inc(v1), h.join());
2336 >            assertEquals(1, r.invocationCount);
2337 >        } catch (CompletionException ok) {
2338 >            checkCompletedWithWrappedCancellationException(h);
2339 >            assertEquals(0, r.invocationCount);
2340 >        }
2341  
2342 <    /**
2343 <     * thenCombineAsync result completes exceptionally if action does
2344 <     */
1531 <    public void testThenCombineAsync3() {
1532 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1533 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1534 <        FailingBiFunction r = new FailingBiFunction();
1535 <        CompletableFuture<Integer> g = f.thenCombineAsync(f2, r);
1536 <        f.complete(one);
1537 <        checkIncomplete(g);
1538 <        assertFalse(r.ran);
1539 <        f2.complete(two);
1540 <        checkCompletedWithWrappedCFException(g);
1541 <        assertTrue(r.ran);
1542 <    }
2342 >        checkCancelled(f);
2343 >        checkCompletedNormally(g, v1);
2344 >    }}
2345  
2346      /**
2347 <     * thenCombineAsync result completes exceptionally if either source cancelled
2347 >     * acceptEither result completes normally after normal completion
2348 >     * of either source
2349       */
2350 <    public void testThenCombineAsync4() {
2351 <        CompletableFuture<Integer> f, g, h;
2352 <
2353 <        f = new CompletableFuture<>();
2354 <        g = new CompletableFuture<>();
2355 <        h = f.thenCombineAsync(g, subtract);
2356 <        assertTrue(f.cancel(true));
2357 <        checkIncomplete(h);
2358 <        g.complete(1);
1556 <        checkCompletedWithWrappedCancellationException(h);
1557 <
1558 <        f = new CompletableFuture<>();
1559 <        g = new CompletableFuture<>();
1560 <        h = f.thenCombineAsync(g, subtract);
1561 <        assertTrue(g.cancel(true));
1562 <        checkIncomplete(h);
1563 <        f.complete(3);
1564 <        checkCompletedWithWrappedCancellationException(h);
2350 >    public void testAcceptEither_normalCompletion1() {
2351 >        for (ExecutionMode m : ExecutionMode.values())
2352 >        for (Integer v1 : new Integer[] { 1, null })
2353 >        for (Integer v2 : new Integer[] { 2, null })
2354 >    {
2355 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2356 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2357 >        final IncAction r = new IncAction();
2358 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2359  
2360 <        f = new CompletableFuture<>();
2361 <        g = new CompletableFuture<>();
2362 <        g.complete(3);
2363 <        assertTrue(f.cancel(true));
1570 <        h = f.thenCombineAsync(g, subtract);
1571 <        checkCompletedWithWrappedCancellationException(h);
2360 >        f.complete(v1);
2361 >        checkCompletedNormally(h, null);
2362 >        assertEquals(inc(v1), r.value);
2363 >        g.complete(v2);
2364  
2365 <        f = new CompletableFuture<>();
2366 <        g = new CompletableFuture<>();
2367 <        f.complete(3);
2368 <        assertTrue(g.cancel(true));
1577 <        h = f.thenCombineAsync(g, subtract);
1578 <        checkCompletedWithWrappedCancellationException(h);
1579 <    }
2365 >        checkCompletedNormally(f, v1);
2366 >        checkCompletedNormally(g, v2);
2367 >        checkCompletedNormally(h, null);
2368 >    }}
2369  
2370 <    /**
2371 <     * thenAcceptBothAsync result completes normally after normal
2372 <     * completion of sources
2373 <     */
2374 <    public void testThenAcceptBothAsync() {
2375 <        CompletableFuture<Integer> f, g;
2376 <        CompletableFuture<Void> h;
2377 <        SubtractAction r;
2370 >    public void testAcceptEither_normalCompletion2() {
2371 >        for (ExecutionMode m : ExecutionMode.values())
2372 >        for (Integer v1 : new Integer[] { 1, null })
2373 >        for (Integer v2 : new Integer[] { 2, null })
2374 >    {
2375 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2376 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2377 >        final IncAction r = new IncAction();
2378 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2379  
2380 <        f = new CompletableFuture<>();
1591 <        g = new CompletableFuture<>();
1592 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1593 <        f.complete(3);
1594 <        checkIncomplete(h);
1595 <        g.complete(1);
2380 >        g.complete(v2);
2381          checkCompletedNormally(h, null);
2382 <        assertEquals(r.value, 2);
2382 >        assertEquals(inc(v2), r.value);
2383 >        f.complete(v1);
2384  
2385 <        f = new CompletableFuture<>();
2386 <        g = new CompletableFuture<>();
1601 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1602 <        g.complete(1);
1603 <        checkIncomplete(h);
1604 <        f.complete(3);
2385 >        checkCompletedNormally(f, v1);
2386 >        checkCompletedNormally(g, v2);
2387          checkCompletedNormally(h, null);
2388 <        assertEquals(r.value, 2);
2388 >    }}
2389 >
2390 >    public void testAcceptEither_normalCompletion3() {
2391 >        for (ExecutionMode m : ExecutionMode.values())
2392 >        for (Integer v1 : new Integer[] { 1, null })
2393 >        for (Integer v2 : new Integer[] { 2, null })
2394 >    {
2395 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2396 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2397 >        final IncAction r = new IncAction();
2398 >
2399 >        f.complete(v1);
2400 >        g.complete(v2);
2401 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2402  
1608        f = new CompletableFuture<>();
1609        g = new CompletableFuture<>();
1610        g.complete(1);
1611        f.complete(3);
1612        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
2403          checkCompletedNormally(h, null);
2404 <        assertEquals(r.value, 2);
2405 <    }
2404 >        checkCompletedNormally(f, v1);
2405 >        checkCompletedNormally(g, v2);
2406 >
2407 >        // unspecified behavior
2408 >        assertTrue(Objects.equals(r.value, inc(v1)) ||
2409 >                   Objects.equals(r.value, inc(v2)));
2410 >    }}
2411  
2412      /**
2413 <     * thenAcceptBothAsync result completes exceptionally after exceptional
2414 <     * completion of source
2413 >     * acceptEither result completes exceptionally after exceptional
2414 >     * completion of either source
2415       */
2416 <    public void testThenAcceptBothAsync2() {
2417 <        CompletableFuture<Integer> f, g;
2418 <        CompletableFuture<Void> h;
2419 <        SubtractAction r;
2416 >    public void testAcceptEither_exceptionalCompletion1() {
2417 >        for (ExecutionMode m : ExecutionMode.values())
2418 >        for (Integer v1 : new Integer[] { 1, null })
2419 >    {
2420 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2421 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2422 >        final IncAction r = new IncAction();
2423 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2424 >        final CFException ex = new CFException();
2425 >
2426 >        f.completeExceptionally(ex);
2427 >        checkCompletedWithWrappedCFException(h, ex);
2428 >        g.complete(v1);
2429 >
2430 >        assertEquals(0, r.invocationCount);
2431 >        checkCompletedNormally(g, v1);
2432 >        checkCompletedWithWrappedCFException(f, ex);
2433 >        checkCompletedWithWrappedCFException(h, ex);
2434 >    }}
2435 >
2436 >    public void testAcceptEither_exceptionalCompletion2() {
2437 >        for (ExecutionMode m : ExecutionMode.values())
2438 >        for (Integer v1 : new Integer[] { 1, null })
2439 >    {
2440 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2441 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2442 >        final IncAction r = new IncAction();
2443 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2444 >        final CFException ex = new CFException();
2445 >
2446 >        g.completeExceptionally(ex);
2447 >        checkCompletedWithWrappedCFException(h, ex);
2448 >        f.complete(v1);
2449 >
2450 >        assertEquals(0, r.invocationCount);
2451 >        checkCompletedNormally(f, v1);
2452 >        checkCompletedWithWrappedCFException(g, ex);
2453 >        checkCompletedWithWrappedCFException(h, ex);
2454 >    }}
2455 >
2456 >    public void testAcceptEither_exceptionalCompletion3() {
2457 >        for (ExecutionMode m : ExecutionMode.values())
2458 >        for (Integer v1 : new Integer[] { 1, null })
2459 >    {
2460 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2461 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2462 >        final IncAction r = new IncAction();
2463 >        final CFException ex = new CFException();
2464 >
2465 >        g.completeExceptionally(ex);
2466 >        f.complete(v1);
2467 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2468  
2469 <        f = new CompletableFuture<>();
2470 <        g = new CompletableFuture<>();
2471 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
2472 <        f.completeExceptionally(new CFException());
2473 <        checkIncomplete(h);
2474 <        g.complete(1);
2475 <        checkCompletedWithWrappedCFException(h);
2469 >        // unspecified behavior
2470 >        Integer v;
2471 >        try {
2472 >            assertNull(h.join());
2473 >            assertEquals(1, r.invocationCount);
2474 >            assertEquals(inc(v1), r.value);
2475 >        } catch (CompletionException ok) {
2476 >            checkCompletedWithWrappedCFException(h, ex);
2477 >            assertEquals(0, r.invocationCount);
2478 >        }
2479  
2480 <        f = new CompletableFuture<>();
2481 <        g = new CompletableFuture<>();
2482 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
2483 <        g.completeExceptionally(new CFException());
2484 <        checkIncomplete(h);
2485 <        f.complete(3);
2486 <        checkCompletedWithWrappedCFException(h);
2480 >        checkCompletedWithWrappedCFException(g, ex);
2481 >        checkCompletedNormally(f, v1);
2482 >    }}
2483 >
2484 >    public void testAcceptEither_exceptionalCompletion4() {
2485 >        for (ExecutionMode m : ExecutionMode.values())
2486 >        for (Integer v1 : new Integer[] { 1, null })
2487 >    {
2488 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2489 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2490 >        final IncAction r = new IncAction();
2491 >        final CFException ex = new CFException();
2492 >
2493 >        f.completeExceptionally(ex);
2494 >        g.complete(v1);
2495 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2496  
2497 <        f = new CompletableFuture<>();
2498 <        g = new CompletableFuture<>();
2499 <        f.complete(3);
2500 <        g.completeExceptionally(new CFException());
2501 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
2502 <        checkCompletedWithWrappedCFException(h);
2497 >        // unspecified behavior
2498 >        Integer v;
2499 >        try {
2500 >            assertNull(h.join());
2501 >            assertEquals(1, r.invocationCount);
2502 >            assertEquals(inc(v1), r.value);
2503 >        } catch (CompletionException ok) {
2504 >            checkCompletedWithWrappedCFException(h, ex);
2505 >            assertEquals(0, r.invocationCount);
2506 >        }
2507  
2508 <        f = new CompletableFuture<>();
2509 <        g = new CompletableFuture<>();
2510 <        f.completeExceptionally(new CFException());
1652 <        g.complete(3);
1653 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1654 <        checkCompletedWithWrappedCFException(h);
1655 <    }
2508 >        checkCompletedWithWrappedCFException(f, ex);
2509 >        checkCompletedNormally(g, v1);
2510 >    }}
2511  
2512      /**
2513 <     * thenAcceptBothAsync result completes exceptionally if action does
2513 >     * acceptEither result completes exceptionally if action does
2514       */
2515 <    public void testThenAcceptBothAsync3() {
2516 <        CompletableFuture<Integer> f, g;
2517 <        CompletableFuture<Void> h;
2518 <        FailingBiConsumer r;
2519 <
2520 <        f = new CompletableFuture<>();
2521 <        g = new CompletableFuture<>();
2522 <        h = f.thenAcceptBothAsync(g, r = new FailingBiConsumer());
2523 <        f.complete(3);
2524 <        checkIncomplete(h);
2525 <        g.complete(1);
2526 <        checkCompletedWithWrappedCFException(h);
2527 <
2528 <        f = new CompletableFuture<>();
2529 <        g = new CompletableFuture<>();
2530 <        f.complete(3);
2531 <        g.complete(1);
2532 <        h = f.thenAcceptBothAsync(g, r = new FailingBiConsumer());
2533 <        checkCompletedWithWrappedCFException(h);
2534 <    }
2515 >    public void testAcceptEither_actionFailed1() {
2516 >        for (ExecutionMode m : ExecutionMode.values())
2517 >        for (Integer v1 : new Integer[] { 1, null })
2518 >        for (Integer v2 : new Integer[] { 2, null })
2519 >    {
2520 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2521 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2522 >        final FailingConsumer r = new FailingConsumer();
2523 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2524 >
2525 >        f.complete(v1);
2526 >        checkCompletedWithWrappedCFException(h);
2527 >        g.complete(v2);
2528 >        checkCompletedNormally(f, v1);
2529 >        checkCompletedNormally(g, v2);
2530 >    }}
2531 >
2532 >    public void testAcceptEither_actionFailed2() {
2533 >        for (ExecutionMode m : ExecutionMode.values())
2534 >        for (Integer v1 : new Integer[] { 1, null })
2535 >        for (Integer v2 : new Integer[] { 2, null })
2536 >    {
2537 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2538 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2539 >        final FailingConsumer r = new FailingConsumer();
2540 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2541 >
2542 >        g.complete(v2);
2543 >        checkCompletedWithWrappedCFException(h);
2544 >        f.complete(v1);
2545 >        checkCompletedNormally(f, v1);
2546 >        checkCompletedNormally(g, v2);
2547 >    }}
2548  
2549      /**
2550 <     * thenAcceptBothAsync result completes exceptionally if either source cancelled
2550 >     * acceptEither result completes exceptionally if either source cancelled
2551       */
2552 <    public void testThenAcceptBothAsync4() {
2553 <        CompletableFuture<Integer> f, g;
2554 <        CompletableFuture<Void> h;
2555 <        SubtractAction r;
2556 <
2557 <        f = new CompletableFuture<>();
2558 <        g = new CompletableFuture<>();
2559 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
2560 <        assertTrue(f.cancel(true));
1693 <        checkIncomplete(h);
1694 <        g.complete(1);
1695 <        checkCompletedWithWrappedCancellationException(h);
2552 >    public void testAcceptEither_sourceCancelled1() {
2553 >        for (ExecutionMode m : ExecutionMode.values())
2554 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2555 >        for (Integer v1 : new Integer[] { 1, null })
2556 >    {
2557 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2558 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2559 >        final IncAction r = new IncAction();
2560 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2561  
2562 <        f = new CompletableFuture<>();
1698 <        g = new CompletableFuture<>();
1699 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1700 <        assertTrue(g.cancel(true));
1701 <        checkIncomplete(h);
1702 <        f.complete(3);
2562 >        assertTrue(f.cancel(mayInterruptIfRunning));
2563          checkCompletedWithWrappedCancellationException(h);
2564 +        g.complete(v1);
2565  
2566 <        f = new CompletableFuture<>();
2567 <        g = new CompletableFuture<>();
2568 <        f.complete(3);
1708 <        assertTrue(g.cancel(true));
1709 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1710 <        checkCompletedWithWrappedCancellationException(h);
1711 <
1712 <        f = new CompletableFuture<>();
1713 <        g = new CompletableFuture<>();
1714 <        assertTrue(f.cancel(true));
1715 <        g.complete(3);
1716 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
2566 >        checkCancelled(f);
2567 >        assertEquals(0, r.invocationCount);
2568 >        checkCompletedNormally(g, v1);
2569          checkCompletedWithWrappedCancellationException(h);
2570 <    }
2570 >    }}
2571  
2572 <    /**
2573 <     * runAfterBothAsync result completes normally after normal
2574 <     * completion of sources
2575 <     */
2576 <    public void testRunAfterBothAsync() {
2577 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2578 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2579 <        Noop r = new Noop();
2580 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r);
2581 <        f.complete(one);
2582 <        checkIncomplete(g);
2583 <        f2.complete(two);
2584 <        checkCompletedNormally(g, null);
2585 <        assertTrue(r.ran);
2586 <    }
2587 <
2588 <    /**
2589 <     * runAfterBothAsync result completes exceptionally after exceptional
2590 <     * completion of source
2591 <     */
2592 <    public void testRunAfterBothAsync2() {
2593 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2594 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2595 <        Noop r = new Noop();
2596 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r);
2597 <        f.completeExceptionally(new CFException());
2598 <        f2.complete(two);
2599 <        checkCompletedWithWrappedCFException(g);
2600 <
2601 <        r = new Noop();
2602 <        f = new CompletableFuture<>();
2603 <        f2 = new CompletableFuture<>();
1752 <        g = f.runAfterBothAsync(f2, r);
1753 <        f.complete(one);
1754 <        f2.completeExceptionally(new CFException());
1755 <        checkCompletedWithWrappedCFException(g);
1756 <    }
1757 <
1758 <    /**
1759 <     * runAfterBothAsync result completes exceptionally if action does
1760 <     */
1761 <    public void testRunAfterBothAsync3() {
1762 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1763 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1764 <        FailingNoop r = new FailingNoop();
1765 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r);
1766 <        f.complete(one);
1767 <        checkIncomplete(g);
1768 <        f2.complete(two);
1769 <        checkCompletedWithWrappedCFException(g);
1770 <    }
1771 <
1772 <    /**
1773 <     * runAfterBothAsync result completes exceptionally if either source cancelled
1774 <     */
1775 <    public void testRunAfterBothAsync4() {
1776 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1777 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1778 <        Noop r = new Noop();
1779 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r);
1780 <        assertTrue(f.cancel(true));
1781 <        f2.complete(two);
1782 <        checkCompletedWithWrappedCancellationException(g);
1783 <
1784 <        r = new Noop();
1785 <        f = new CompletableFuture<>();
1786 <        f2 = new CompletableFuture<>();
1787 <        g = f.runAfterBothAsync(f2, r);
1788 <        f.complete(one);
1789 <        assertTrue(f2.cancel(true));
1790 <        checkCompletedWithWrappedCancellationException(g);
1791 <    }
1792 <
1793 <    /**
1794 <     * applyToEitherAsync result completes normally after normal
1795 <     * completion of sources
1796 <     */
1797 <    public void testApplyToEitherAsync() {
1798 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1799 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1800 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
1801 <        f.complete(one);
1802 <        checkCompletedNormally(g, two);
1803 <
1804 <        f = new CompletableFuture<>();
1805 <        f.complete(one);
1806 <        f2 = new CompletableFuture<>();
1807 <        g = f.applyToEitherAsync(f2, inc);
1808 <        checkCompletedNormally(g, two);
1809 <    }
1810 <
1811 <    /**
1812 <     * applyToEitherAsync result completes exceptionally after exceptional
1813 <     * completion of source
1814 <     */
1815 <    public void testApplyToEitherAsync2() {
1816 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1817 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1818 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
1819 <        f.completeExceptionally(new CFException());
1820 <        checkCompletedWithWrappedCFException(g);
1821 <
1822 <        f = new CompletableFuture<>();
1823 <        f2 = new CompletableFuture<>();
1824 <        f2.completeExceptionally(new CFException());
1825 <        g = f.applyToEitherAsync(f2, inc);
1826 <        f.complete(one);
1827 <        checkCompletedWithWrappedCFException(g);
1828 <    }
1829 <
1830 <    /**
1831 <     * applyToEitherAsync result completes exceptionally if action does
1832 <     */
1833 <    public void testApplyToEitherAsync3() {
1834 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1835 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1836 <        FailingFunction r = new FailingFunction();
1837 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, r);
1838 <        f.complete(one);
1839 <        checkCompletedWithWrappedCFException(g);
1840 <    }
1841 <
1842 <    /**
1843 <     * applyToEitherAsync result completes exceptionally if either source cancelled
1844 <     */
1845 <    public void testApplyToEitherAsync4() {
1846 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1847 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1848 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
1849 <        assertTrue(f.cancel(true));
1850 <        checkCompletedWithWrappedCancellationException(g);
1851 <
1852 <        f = new CompletableFuture<>();
1853 <        f2 = new CompletableFuture<>();
1854 <        assertTrue(f2.cancel(true));
1855 <        g = f.applyToEitherAsync(f2, inc);
1856 <        checkCompletedWithWrappedCancellationException(g);
1857 <    }
1858 <
1859 <    /**
1860 <     * acceptEitherAsync result completes normally after normal
1861 <     * completion of sources
1862 <     */
1863 <    public void testAcceptEitherAsync() {
1864 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1865 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1866 <        IncAction r = new IncAction();
1867 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
1868 <        f.complete(one);
1869 <        checkCompletedNormally(g, null);
1870 <        assertEquals(r.value, 2);
1871 <
1872 <        r = new IncAction();
1873 <        f = new CompletableFuture<>();
1874 <        f.complete(one);
1875 <        f2 = new CompletableFuture<>();
1876 <        g = f.acceptEitherAsync(f2, r);
1877 <        checkCompletedNormally(g, null);
1878 <        assertEquals(r.value, 2);
1879 <    }
1880 <
1881 <    /**
1882 <     * acceptEitherAsync result completes exceptionally after exceptional
1883 <     * completion of source
1884 <     */
1885 <    public void testAcceptEitherAsync2() {
1886 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1887 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1888 <        IncAction r = new IncAction();
1889 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
1890 <        f.completeExceptionally(new CFException());
1891 <        checkCompletedWithWrappedCFException(g);
1892 <
1893 <        r = new IncAction();
1894 <        f = new CompletableFuture<>();
1895 <        f2 = new CompletableFuture<>();
1896 <        f2.completeExceptionally(new CFException());
1897 <        g = f.acceptEitherAsync(f2, r);
1898 <        f.complete(one);
1899 <        checkCompletedWithWrappedCFException(g);
1900 <    }
1901 <
1902 <    /**
1903 <     * acceptEitherAsync result completes exceptionally if action does
1904 <     */
1905 <    public void testAcceptEitherAsync3() {
1906 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1907 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1908 <        FailingConsumer r = new FailingConsumer();
1909 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
1910 <        f.complete(one);
1911 <        checkCompletedWithWrappedCFException(g);
1912 <    }
1913 <
1914 <    /**
1915 <     * acceptEitherAsync result completes exceptionally if either
1916 <     * source cancelled
1917 <     */
1918 <    public void testAcceptEitherAsync4() {
1919 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1920 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1921 <        IncAction r = new IncAction();
1922 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
1923 <        assertTrue(f.cancel(true));
1924 <        checkCompletedWithWrappedCancellationException(g);
1925 <
1926 <        r = new IncAction();
1927 <        f = new CompletableFuture<>();
1928 <        f2 = new CompletableFuture<>();
1929 <        assertTrue(f2.cancel(true));
1930 <        g = f.acceptEitherAsync(f2, r);
1931 <        checkCompletedWithWrappedCancellationException(g);
1932 <    }
1933 <
1934 <    /**
1935 <     * runAfterEitherAsync result completes normally after normal
1936 <     * completion of sources
1937 <     */
1938 <    public void testRunAfterEitherAsync() {
1939 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1940 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1941 <        Noop r = new Noop();
1942 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
1943 <        f.complete(one);
1944 <        checkCompletedNormally(g, null);
1945 <        assertTrue(r.ran);
1946 <
1947 <        r = new Noop();
1948 <        f = new CompletableFuture<>();
1949 <        f.complete(one);
1950 <        f2 = new CompletableFuture<>();
1951 <        g = f.runAfterEitherAsync(f2, r);
1952 <        checkCompletedNormally(g, null);
1953 <        assertTrue(r.ran);
1954 <    }
1955 <
1956 <    /**
1957 <     * runAfterEitherAsync result completes exceptionally after exceptional
1958 <     * completion of source
1959 <     */
1960 <    public void testRunAfterEitherAsync2() {
1961 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1962 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1963 <        Noop r = new Noop();
1964 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
1965 <        f.completeExceptionally(new CFException());
1966 <        checkCompletedWithWrappedCFException(g);
1967 <
1968 <        r = new Noop();
1969 <        f = new CompletableFuture<>();
1970 <        f2 = new CompletableFuture<>();
1971 <        f2.completeExceptionally(new CFException());
1972 <        g = f.runAfterEitherAsync(f2, r);
1973 <        f.complete(one);
1974 <        checkCompletedWithWrappedCFException(g);
1975 <    }
1976 <
1977 <    /**
1978 <     * runAfterEitherAsync result completes exceptionally if action does
1979 <     */
1980 <    public void testRunAfterEitherAsync3() {
1981 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1982 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1983 <        FailingNoop r = new FailingNoop();
1984 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
1985 <        f.complete(one);
1986 <        checkCompletedWithWrappedCFException(g);
1987 <    }
1988 <
1989 <    /**
1990 <     * runAfterEitherAsync result completes exceptionally if either
1991 <     * source cancelled
1992 <     */
1993 <    public void testRunAfterEitherAsync4() {
1994 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1995 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1996 <        Noop r = new Noop();
1997 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
1998 <        assertTrue(f.cancel(true));
1999 <        checkCompletedWithWrappedCancellationException(g);
2000 <
2001 <        r = new Noop();
2002 <        f = new CompletableFuture<>();
2003 <        f2 = new CompletableFuture<>();
2004 <        assertTrue(f2.cancel(true));
2005 <        g = f.runAfterEitherAsync(f2, r);
2006 <        checkCompletedWithWrappedCancellationException(g);
2007 <    }
2008 <
2009 <    /**
2010 <     * thenComposeAsync result completes normally after normal
2011 <     * completion of source
2012 <     */
2013 <    public void testThenComposeAsync() {
2014 <        CompletableFuture<Integer> f, g;
2015 <        CompletableFutureInc r;
2016 <
2017 <        f = new CompletableFuture<>();
2018 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2019 <        f.complete(one);
2020 <        checkCompletedNormally(g, two);
2021 <
2022 <        f = new CompletableFuture<>();
2023 <        f.complete(one);
2024 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2025 <        checkCompletedNormally(g, two);
2026 <    }
2027 <
2028 <    /**
2029 <     * thenComposeAsync result completes exceptionally after
2030 <     * exceptional completion of source
2031 <     */
2032 <    public void testThenComposeAsync2() {
2033 <        CompletableFuture<Integer> f, g;
2034 <        CompletableFutureInc r;
2035 <
2036 <        f = new CompletableFuture<>();
2037 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2038 <        f.completeExceptionally(new CFException());
2039 <        checkCompletedWithWrappedCFException(g);
2040 <        assertFalse(r.ran);
2041 <
2042 <        f = new CompletableFuture<>();
2043 <        f.completeExceptionally(new CFException());
2044 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2045 <        checkCompletedWithWrappedCFException(g);
2046 <        assertFalse(r.ran);
2047 <    }
2048 <
2049 <    /**
2050 <     * thenComposeAsync result completes exceptionally if action does
2051 <     */
2052 <    public void testThenComposeAsync3() {
2053 <        CompletableFuture<Integer> f, g;
2054 <        FailingCompletableFutureFunction r;
2055 <
2056 <        f = new CompletableFuture<>();
2057 <        g = f.thenComposeAsync(r = new FailingCompletableFutureFunction());
2058 <        f.complete(one);
2059 <        checkCompletedWithWrappedCFException(g);
2060 <
2061 <        f = new CompletableFuture<>();
2062 <        f.complete(one);
2063 <        g = f.thenComposeAsync(r = new FailingCompletableFutureFunction());
2064 <        checkCompletedWithWrappedCFException(g);
2065 <    }
2066 <
2067 <    /**
2068 <     * thenComposeAsync result completes exceptionally if source cancelled
2069 <     */
2070 <    public void testThenComposeAsync4() {
2071 <        CompletableFuture<Integer> f, g;
2072 <        CompletableFutureInc r;
2073 <
2074 <        f = new CompletableFuture<>();
2075 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2076 <        assertTrue(f.cancel(true));
2077 <        checkCompletedWithWrappedCancellationException(g);
2078 <
2079 <        f = new CompletableFuture<>();
2080 <        assertTrue(f.cancel(true));
2081 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2082 <        checkCompletedWithWrappedCancellationException(g);
2083 <    }
2084 <
2085 <    // async with explicit executors
2086 <
2087 <    /**
2088 <     * thenRunAsync result completes normally after normal completion of source
2089 <     */
2090 <    public void testThenRunAsyncE() {
2091 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2092 <        Noop r = new Noop();
2093 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2094 <        f.complete(null);
2095 <        checkCompletedNormally(g, null);
2096 <
2097 <        // reordered version
2098 <        f = new CompletableFuture<>();
2099 <        f.complete(null);
2100 <        r = new Noop();
2101 <        g = f.thenRunAsync(r, new ThreadExecutor());
2102 <        checkCompletedNormally(g, null);
2103 <    }
2572 >    public void testAcceptEither_sourceCancelled2() {
2573 >        for (ExecutionMode m : ExecutionMode.values())
2574 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2575 >        for (Integer v1 : new Integer[] { 1, null })
2576 >    {
2577 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2578 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2579 >        final IncAction r = new IncAction();
2580 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2581 >
2582 >        assertTrue(g.cancel(mayInterruptIfRunning));
2583 >        checkCompletedWithWrappedCancellationException(h);
2584 >        f.complete(v1);
2585 >
2586 >        checkCancelled(g);
2587 >        assertEquals(0, r.invocationCount);
2588 >        checkCompletedNormally(f, v1);
2589 >        checkCompletedWithWrappedCancellationException(h);
2590 >    }}
2591 >
2592 >    public void testAcceptEither_sourceCancelled3() {
2593 >        for (ExecutionMode m : ExecutionMode.values())
2594 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2595 >        for (Integer v1 : new Integer[] { 1, null })
2596 >    {
2597 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2598 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2599 >        final IncAction r = new IncAction();
2600 >
2601 >        assertTrue(g.cancel(mayInterruptIfRunning));
2602 >        f.complete(v1);
2603 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2604  
2605 <    /**
2606 <     * thenRunAsync result completes exceptionally after exceptional
2107 <     * completion of source
2108 <     */
2109 <    public void testThenRunAsync2E() {
2110 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2111 <        Noop r = new Noop();
2112 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2113 <        f.completeExceptionally(new CFException());
2605 >        // unspecified behavior
2606 >        Integer v;
2607          try {
2608 <            g.join();
2609 <            shouldThrow();
2610 <        } catch (CompletionException success) {}
2611 <        checkCompletedWithWrappedCFException(g);
2612 <    }
2613 <
2614 <    /**
2122 <     * thenRunAsync result completes exceptionally if action does
2123 <     */
2124 <    public void testThenRunAsync3E() {
2125 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2126 <        FailingNoop r = new FailingNoop();
2127 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2128 <        f.complete(null);
2129 <        checkCompletedWithWrappedCFException(g);
2130 <    }
2131 <
2132 <    /**
2133 <     * thenRunAsync result completes exceptionally if source cancelled
2134 <     */
2135 <    public void testThenRunAsync4E() {
2136 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2137 <        Noop r = new Noop();
2138 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2139 <        assertTrue(f.cancel(true));
2140 <        checkCompletedWithWrappedCancellationException(g);
2141 <    }
2142 <
2143 <    /**
2144 <     * thenApplyAsync result completes normally after normal completion of source
2145 <     */
2146 <    public void testThenApplyAsyncE() {
2147 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2148 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
2149 <        f.complete(one);
2150 <        checkCompletedNormally(g, two);
2151 <    }
2152 <
2153 <    /**
2154 <     * thenApplyAsync result completes exceptionally after exceptional
2155 <     * completion of source
2156 <     */
2157 <    public void testThenApplyAsync2E() {
2158 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2159 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
2160 <        f.completeExceptionally(new CFException());
2161 <        checkCompletedWithWrappedCFException(g);
2162 <    }
2163 <
2164 <    /**
2165 <     * thenApplyAsync result completes exceptionally if action does
2166 <     */
2167 <    public void testThenApplyAsync3E() {
2168 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2169 <        FailingFunction r = new FailingFunction();
2170 <        CompletableFuture<Integer> g = f.thenApplyAsync(r, new ThreadExecutor());
2171 <        f.complete(null);
2172 <        checkCompletedWithWrappedCFException(g);
2173 <    }
2174 <
2175 <    /**
2176 <     * thenApplyAsync result completes exceptionally if source cancelled
2177 <     */
2178 <    public void testThenApplyAsync4E() {
2179 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2180 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
2181 <        assertTrue(f.cancel(true));
2182 <        checkCompletedWithWrappedCancellationException(g);
2183 <    }
2184 <
2185 <    /**
2186 <     * thenAcceptAsync result completes normally after normal
2187 <     * completion of source
2188 <     */
2189 <    public void testThenAcceptAsyncE() {
2190 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2191 <        IncAction r = new IncAction();
2192 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2193 <        f.complete(one);
2194 <        checkCompletedNormally(g, null);
2195 <        assertEquals(r.value, 2);
2196 <    }
2197 <
2198 <    /**
2199 <     * thenAcceptAsync result completes exceptionally after exceptional
2200 <     * completion of source
2201 <     */
2202 <    public void testThenAcceptAsync2E() {
2203 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2204 <        IncAction r = new IncAction();
2205 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2206 <        f.completeExceptionally(new CFException());
2207 <        checkCompletedWithWrappedCFException(g);
2208 <    }
2209 <
2210 <    /**
2211 <     * thenAcceptAsync result completes exceptionally if action does
2212 <     */
2213 <    public void testThenAcceptAsync3E() {
2214 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2215 <        FailingConsumer r = new FailingConsumer();
2216 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2217 <        f.complete(null);
2218 <        checkCompletedWithWrappedCFException(g);
2219 <    }
2220 <
2221 <    /**
2222 <     * thenAcceptAsync result completes exceptionally if source cancelled
2223 <     */
2224 <    public void testThenAcceptAsync4E() {
2225 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2226 <        IncAction r = new IncAction();
2227 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2228 <        assertTrue(f.cancel(true));
2229 <        checkCompletedWithWrappedCancellationException(g);
2230 <    }
2231 <
2232 <    /**
2233 <     * thenCombineAsync result completes normally after normal
2234 <     * completion of sources
2235 <     */
2236 <    public void testThenCombineAsyncE() {
2237 <        CompletableFuture<Integer> f, g, h;
2238 <        ThreadExecutor e = new ThreadExecutor();
2239 <        int count = 0;
2240 <
2241 <        f = new CompletableFuture<>();
2242 <        g = new CompletableFuture<>();
2243 <        h = f.thenCombineAsync(g, subtract, e);
2244 <        f.complete(3);
2245 <        checkIncomplete(h);
2246 <        g.complete(1);
2247 <        checkCompletedNormally(h, 2);
2248 <        assertEquals(++count, e.count.get());
2249 <
2250 <        f = new CompletableFuture<>();
2251 <        g = new CompletableFuture<>();
2252 <        h = f.thenCombineAsync(g, subtract, e);
2253 <        g.complete(1);
2254 <        checkIncomplete(h);
2255 <        f.complete(3);
2256 <        checkCompletedNormally(h, 2);
2257 <        assertEquals(++count, e.count.get());
2258 <
2259 <        f = new CompletableFuture<>();
2260 <        g = new CompletableFuture<>();
2261 <        g.complete(1);
2262 <        f.complete(3);
2263 <        h = f.thenCombineAsync(g, subtract, e);
2264 <        checkCompletedNormally(h, 2);
2265 <        assertEquals(++count, e.count.get());
2266 <    }
2267 <
2268 <    /**
2269 <     * thenCombineAsync result completes exceptionally after exceptional
2270 <     * completion of either source
2271 <     */
2272 <    public void testThenCombineAsync2E() {
2273 <        CompletableFuture<Integer> f, g, h;
2274 <        ThreadExecutor e = new ThreadExecutor();
2275 <        int count = 0;
2276 <
2277 <        f = new CompletableFuture<>();
2278 <        g = new CompletableFuture<>();
2279 <        h = f.thenCombineAsync(g, subtract, e);
2280 <        f.completeExceptionally(new CFException());
2281 <        checkIncomplete(h);
2282 <        g.complete(1);
2283 <        checkCompletedWithWrappedCFException(h);
2284 <
2285 <        f = new CompletableFuture<>();
2286 <        g = new CompletableFuture<>();
2287 <        h = f.thenCombineAsync(g, subtract, e);
2288 <        g.completeExceptionally(new CFException());
2289 <        checkIncomplete(h);
2290 <        f.complete(3);
2291 <        checkCompletedWithWrappedCFException(h);
2608 >            assertNull(h.join());
2609 >            assertEquals(1, r.invocationCount);
2610 >            assertEquals(inc(v1), r.value);
2611 >        } catch (CompletionException ok) {
2612 >            checkCompletedWithWrappedCancellationException(h);
2613 >            assertEquals(0, r.invocationCount);
2614 >        }
2615  
2616 <        f = new CompletableFuture<>();
2617 <        g = new CompletableFuture<>();
2618 <        g.completeExceptionally(new CFException());
2619 <        h = f.thenCombineAsync(g, subtract, e);
2620 <        checkIncomplete(h);
2621 <        f.complete(3);
2622 <        checkCompletedWithWrappedCFException(h);
2616 >        checkCancelled(g);
2617 >        checkCompletedNormally(f, v1);
2618 >    }}
2619 >
2620 >    public void testAcceptEither_sourceCancelled4() {
2621 >        for (ExecutionMode m : ExecutionMode.values())
2622 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2623 >        for (Integer v1 : new Integer[] { 1, null })
2624 >    {
2625 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2626 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2627 >        final IncAction r = new IncAction();
2628 >
2629 >        assertTrue(f.cancel(mayInterruptIfRunning));
2630 >        g.complete(v1);
2631 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2632  
2633 <        assertEquals(0, e.count.get());
2634 <    }
2633 >        // unspecified behavior
2634 >        Integer v;
2635 >        try {
2636 >            assertNull(h.join());
2637 >            assertEquals(1, r.invocationCount);
2638 >            assertEquals(inc(v1), r.value);
2639 >        } catch (CompletionException ok) {
2640 >            checkCompletedWithWrappedCancellationException(h);
2641 >            assertEquals(0, r.invocationCount);
2642 >        }
2643  
2644 <    /**
2645 <     * thenCombineAsync result completes exceptionally if action does
2646 <     */
2307 <    public void testThenCombineAsync3E() {
2308 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2309 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2310 <        FailingBiFunction r = new FailingBiFunction();
2311 <        CompletableFuture<Integer> g = f.thenCombineAsync(f2, r, new ThreadExecutor());
2312 <        f.complete(one);
2313 <        checkIncomplete(g);
2314 <        assertFalse(r.ran);
2315 <        f2.complete(two);
2316 <        checkCompletedWithWrappedCFException(g);
2317 <        assertTrue(r.ran);
2318 <    }
2644 >        checkCancelled(f);
2645 >        checkCompletedNormally(g, v1);
2646 >    }}
2647  
2648      /**
2649 <     * thenCombineAsync result completes exceptionally if either source cancelled
2649 >     * runAfterEither result completes normally after normal completion
2650 >     * of either source
2651       */
2652 <    public void testThenCombineAsync4E() {
2653 <        CompletableFuture<Integer> f, g, h;
2654 <        ThreadExecutor e = new ThreadExecutor();
2655 <
2656 <        f = new CompletableFuture<>();
2657 <        g = new CompletableFuture<>();
2658 <        h = f.thenCombineAsync(g, subtract, e);
2659 <        assertTrue(f.cancel(true));
2660 <        checkIncomplete(h);
2332 <        g.complete(1);
2333 <        checkCompletedWithWrappedCancellationException(h);
2334 <
2335 <        f = new CompletableFuture<>();
2336 <        g = new CompletableFuture<>();
2337 <        h = f.thenCombineAsync(g, subtract, e);
2338 <        assertTrue(g.cancel(true));
2339 <        checkIncomplete(h);
2340 <        f.complete(3);
2341 <        checkCompletedWithWrappedCancellationException(h);
2342 <
2343 <        f = new CompletableFuture<>();
2344 <        g = new CompletableFuture<>();
2345 <        assertTrue(g.cancel(true));
2346 <        h = f.thenCombineAsync(g, subtract, e);
2347 <        checkIncomplete(h);
2348 <        f.complete(3);
2349 <        checkCompletedWithWrappedCancellationException(h);
2652 >    public void testRunAfterEither_normalCompletion1() {
2653 >        for (ExecutionMode m : ExecutionMode.values())
2654 >        for (Integer v1 : new Integer[] { 1, null })
2655 >        for (Integer v2 : new Integer[] { 2, null })
2656 >    {
2657 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2658 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2659 >        final Noop r = new Noop();
2660 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2661  
2662 <        f = new CompletableFuture<>();
2663 <        g = new CompletableFuture<>();
2664 <        assertTrue(f.cancel(true));
2665 <        assertTrue(g.cancel(true));
2355 <        h = f.thenCombineAsync(g, subtract, e);
2356 <        checkCompletedWithWrappedCancellationException(h);
2662 >        f.complete(v1);
2663 >        checkCompletedNormally(h, null);
2664 >        assertEquals(1, r.invocationCount);
2665 >        g.complete(v2);
2666  
2667 <        assertEquals(0, e.count.get());
2668 <    }
2667 >        checkCompletedNormally(f, v1);
2668 >        checkCompletedNormally(g, v2);
2669 >        checkCompletedNormally(h, null);
2670 >        assertEquals(1, r.invocationCount);
2671 >    }}
2672  
2673 <    /**
2674 <     * thenAcceptBothAsync result completes normally after normal
2675 <     * completion of sources
2676 <     */
2677 <    public void testThenAcceptBothAsyncE() {
2678 <        CompletableFuture<Integer> f, g;
2679 <        CompletableFuture<Void> h;
2680 <        SubtractAction r;
2681 <        ThreadExecutor e = new ThreadExecutor();
2673 >    public void testRunAfterEither_normalCompletion2() {
2674 >        for (ExecutionMode m : ExecutionMode.values())
2675 >        for (Integer v1 : new Integer[] { 1, null })
2676 >        for (Integer v2 : new Integer[] { 2, null })
2677 >    {
2678 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2679 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2680 >        final Noop r = new Noop();
2681 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2682  
2683 <        f = new CompletableFuture<>();
2372 <        g = new CompletableFuture<>();
2373 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2374 <        f.complete(3);
2375 <        checkIncomplete(h);
2376 <        g.complete(1);
2683 >        g.complete(v2);
2684          checkCompletedNormally(h, null);
2685 <        assertEquals(r.value, 2);
2685 >        assertEquals(1, r.invocationCount);
2686 >        f.complete(v1);
2687  
2688 <        f = new CompletableFuture<>();
2689 <        g = new CompletableFuture<>();
2382 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2383 <        g.complete(1);
2384 <        checkIncomplete(h);
2385 <        f.complete(3);
2688 >        checkCompletedNormally(f, v1);
2689 >        checkCompletedNormally(g, v2);
2690          checkCompletedNormally(h, null);
2691 <        assertEquals(r.value, 2);
2691 >        assertEquals(1, r.invocationCount);
2692 >        }}
2693  
2694 <        f = new CompletableFuture<>();
2695 <        g = new CompletableFuture<>();
2696 <        g.complete(1);
2697 <        f.complete(3);
2698 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2699 <        checkCompletedNormally(h, null);
2700 <        assertEquals(r.value, 2);
2694 >    public void testRunAfterEither_normalCompletion3() {
2695 >        for (ExecutionMode m : ExecutionMode.values())
2696 >        for (Integer v1 : new Integer[] { 1, null })
2697 >        for (Integer v2 : new Integer[] { 2, null })
2698 >    {
2699 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2700 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2701 >        final Noop r = new Noop();
2702 >
2703 >        f.complete(v1);
2704 >        g.complete(v2);
2705 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2706  
2707 <        assertEquals(3, e.count.get());
2708 <    }
2707 >        checkCompletedNormally(h, null);
2708 >        checkCompletedNormally(f, v1);
2709 >        checkCompletedNormally(g, v2);
2710 >        assertEquals(1, r.invocationCount);
2711 >    }}
2712  
2713      /**
2714 <     * thenAcceptBothAsync result completes exceptionally after exceptional
2715 <     * completion of source
2714 >     * runAfterEither result completes exceptionally after exceptional
2715 >     * completion of either source
2716       */
2717 <    public void testThenAcceptBothAsync2E() {
2718 <        CompletableFuture<Integer> f, g;
2719 <        CompletableFuture<Void> h;
2720 <        SubtractAction r;
2721 <        ThreadExecutor e = new ThreadExecutor();
2722 <
2723 <        f = new CompletableFuture<>();
2724 <        g = new CompletableFuture<>();
2725 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2726 <        f.completeExceptionally(new CFException());
2727 <        checkIncomplete(h);
2728 <        g.complete(1);
2729 <        checkCompletedWithWrappedCFException(h);
2717 >    public void testRunAfterEither_exceptionalCompletion1() {
2718 >        for (ExecutionMode m : ExecutionMode.values())
2719 >        for (Integer v1 : new Integer[] { 1, null })
2720 >    {
2721 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2722 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2723 >        final Noop r = new Noop();
2724 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2725 >        final CFException ex = new CFException();
2726 >
2727 >        f.completeExceptionally(ex);
2728 >        checkCompletedWithWrappedCFException(h, ex);
2729 >        g.complete(v1);
2730 >
2731 >        assertEquals(0, r.invocationCount);
2732 >        checkCompletedNormally(g, v1);
2733 >        checkCompletedWithWrappedCFException(f, ex);
2734 >        checkCompletedWithWrappedCFException(h, ex);
2735 >    }}
2736 >
2737 >    public void testRunAfterEither_exceptionalCompletion2() {
2738 >        for (ExecutionMode m : ExecutionMode.values())
2739 >        for (Integer v1 : new Integer[] { 1, null })
2740 >    {
2741 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2742 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2743 >        final Noop r = new Noop();
2744 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2745 >        final CFException ex = new CFException();
2746 >
2747 >        g.completeExceptionally(ex);
2748 >        checkCompletedWithWrappedCFException(h, ex);
2749 >        f.complete(v1);
2750 >
2751 >        assertEquals(0, r.invocationCount);
2752 >        checkCompletedNormally(f, v1);
2753 >        checkCompletedWithWrappedCFException(g, ex);
2754 >        checkCompletedWithWrappedCFException(h, ex);
2755 >    }}
2756 >
2757 >    public void testRunAfterEither_exceptionalCompletion3() {
2758 >        for (ExecutionMode m : ExecutionMode.values())
2759 >        for (Integer v1 : new Integer[] { 1, null })
2760 >    {
2761 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2762 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2763 >        final Noop r = new Noop();
2764 >        final CFException ex = new CFException();
2765 >
2766 >        g.completeExceptionally(ex);
2767 >        f.complete(v1);
2768 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2769  
2770 <        f = new CompletableFuture<>();
2771 <        g = new CompletableFuture<>();
2772 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2773 <        g.completeExceptionally(new CFException());
2774 <        checkIncomplete(h);
2775 <        f.complete(3);
2776 <        checkCompletedWithWrappedCFException(h);
2770 >        // unspecified behavior
2771 >        Integer v;
2772 >        try {
2773 >            assertNull(h.join());
2774 >            assertEquals(1, r.invocationCount);
2775 >        } catch (CompletionException ok) {
2776 >            checkCompletedWithWrappedCFException(h, ex);
2777 >            assertEquals(0, r.invocationCount);
2778 >        }
2779  
2780 <        f = new CompletableFuture<>();
2781 <        g = new CompletableFuture<>();
2782 <        f.complete(3);
2783 <        g.completeExceptionally(new CFException());
2784 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2785 <        checkCompletedWithWrappedCFException(h);
2780 >        checkCompletedWithWrappedCFException(g, ex);
2781 >        checkCompletedNormally(f, v1);
2782 >    }}
2783 >
2784 >    public void testRunAfterEither_exceptionalCompletion4() {
2785 >        for (ExecutionMode m : ExecutionMode.values())
2786 >        for (Integer v1 : new Integer[] { 1, null })
2787 >    {
2788 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2789 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2790 >        final Noop r = new Noop();
2791 >        final CFException ex = new CFException();
2792 >
2793 >        f.completeExceptionally(ex);
2794 >        g.complete(v1);
2795 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2796  
2797 <        f = new CompletableFuture<>();
2798 <        g = new CompletableFuture<>();
2799 <        f.completeExceptionally(new CFException());
2800 <        g.complete(3);
2801 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2802 <        checkCompletedWithWrappedCFException(h);
2797 >        // unspecified behavior
2798 >        Integer v;
2799 >        try {
2800 >            assertNull(h.join());
2801 >            assertEquals(1, r.invocationCount);
2802 >        } catch (CompletionException ok) {
2803 >            checkCompletedWithWrappedCFException(h, ex);
2804 >            assertEquals(0, r.invocationCount);
2805 >        }
2806  
2807 <        assertEquals(0, e.count.get());
2808 <    }
2807 >        checkCompletedWithWrappedCFException(f, ex);
2808 >        checkCompletedNormally(g, v1);
2809 >    }}
2810  
2811      /**
2812 <     * thenAcceptBothAsync result completes exceptionally if action does
2812 >     * runAfterEither result completes exceptionally if action does
2813       */
2814 <    public void testThenAcceptBothAsync3E() {
2815 <        CompletableFuture<Integer> f, g;
2816 <        CompletableFuture<Void> h;
2817 <        FailingBiConsumer r;
2818 <        ThreadExecutor e = new ThreadExecutor();
2819 <
2820 <        f = new CompletableFuture<>();
2821 <        g = new CompletableFuture<>();
2822 <        h = f.thenAcceptBothAsync(g, r = new FailingBiConsumer(), e);
2823 <        f.complete(3);
2824 <        checkIncomplete(h);
2825 <        g.complete(1);
2826 <        checkCompletedWithWrappedCFException(h);
2827 <
2828 <        f = new CompletableFuture<>();
2829 <        g = new CompletableFuture<>();
2830 <        f.complete(3);
2831 <        g.complete(1);
2832 <        h = f.thenAcceptBothAsync(g, r = new FailingBiConsumer(), e);
2833 <        checkCompletedWithWrappedCFException(h);
2834 <
2835 <        assertEquals(2, e.count.get());
2836 <    }
2814 >    public void testRunAfterEither_actionFailed1() {
2815 >        for (ExecutionMode m : ExecutionMode.values())
2816 >        for (Integer v1 : new Integer[] { 1, null })
2817 >        for (Integer v2 : new Integer[] { 2, null })
2818 >    {
2819 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2820 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2821 >        final FailingRunnable r = new FailingRunnable();
2822 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2823 >
2824 >        f.complete(v1);
2825 >        checkCompletedWithWrappedCFException(h);
2826 >        g.complete(v2);
2827 >        checkCompletedNormally(f, v1);
2828 >        checkCompletedNormally(g, v2);
2829 >    }}
2830 >
2831 >    public void testRunAfterEither_actionFailed2() {
2832 >        for (ExecutionMode m : ExecutionMode.values())
2833 >        for (Integer v1 : new Integer[] { 1, null })
2834 >        for (Integer v2 : new Integer[] { 2, null })
2835 >    {
2836 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2837 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2838 >        final FailingRunnable r = new FailingRunnable();
2839 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2840 >
2841 >        g.complete(v2);
2842 >        checkCompletedWithWrappedCFException(h);
2843 >        f.complete(v1);
2844 >        checkCompletedNormally(f, v1);
2845 >        checkCompletedNormally(g, v2);
2846 >    }}
2847  
2848      /**
2849 <     * thenAcceptBothAsync result completes exceptionally if either source cancelled
2849 >     * runAfterEither result completes exceptionally if either source cancelled
2850       */
2851 <    public void testThenAcceptBothAsync4E() {
2852 <        CompletableFuture<Integer> f, g;
2853 <        CompletableFuture<Void> h;
2854 <        SubtractAction r;
2855 <        ThreadExecutor e = new ThreadExecutor();
2856 <
2857 <        f = new CompletableFuture<>();
2858 <        g = new CompletableFuture<>();
2859 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2482 <        assertTrue(f.cancel(true));
2483 <        checkIncomplete(h);
2484 <        g.complete(1);
2485 <        checkCompletedWithWrappedCancellationException(h);
2851 >    public void testRunAfterEither_sourceCancelled1() {
2852 >        for (ExecutionMode m : ExecutionMode.values())
2853 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2854 >        for (Integer v1 : new Integer[] { 1, null })
2855 >    {
2856 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2857 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2858 >        final Noop r = new Noop();
2859 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2860  
2861 <        f = new CompletableFuture<>();
2488 <        g = new CompletableFuture<>();
2489 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2490 <        assertTrue(g.cancel(true));
2491 <        checkIncomplete(h);
2492 <        f.complete(3);
2861 >        assertTrue(f.cancel(mayInterruptIfRunning));
2862          checkCompletedWithWrappedCancellationException(h);
2863 +        g.complete(v1);
2864  
2865 <        f = new CompletableFuture<>();
2866 <        g = new CompletableFuture<>();
2867 <        f.complete(3);
2498 <        assertTrue(g.cancel(true));
2499 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2500 <        checkCompletedWithWrappedCancellationException(h);
2501 <
2502 <        f = new CompletableFuture<>();
2503 <        g = new CompletableFuture<>();
2504 <        assertTrue(f.cancel(true));
2505 <        g.complete(3);
2506 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2865 >        checkCancelled(f);
2866 >        assertEquals(0, r.invocationCount);
2867 >        checkCompletedNormally(g, v1);
2868          checkCompletedWithWrappedCancellationException(h);
2869 +    }}
2870  
2871 <        assertEquals(0, e.count.get());
2872 <    }
2873 <
2874 <    /**
2875 <     * runAfterBothAsync result completes normally after normal
2876 <     * completion of sources
2877 <     */
2878 <    public void testRunAfterBothAsyncE() {
2879 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2880 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2881 <        Noop r = new Noop();
2882 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2883 <        f.complete(one);
2884 <        checkIncomplete(g);
2885 <        f2.complete(two);
2886 <        checkCompletedNormally(g, null);
2887 <        assertTrue(r.ran);
2888 <    }
2889 <
2890 <    /**
2891 <     * runAfterBothAsync result completes exceptionally after exceptional
2892 <     * completion of source
2893 <     */
2894 <    public void testRunAfterBothAsync2E() {
2895 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2896 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2897 <        Noop r = new Noop();
2898 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2899 <        f.completeExceptionally(new CFException());
2900 <        f2.complete(two);
2901 <        checkCompletedWithWrappedCFException(g);
2902 <
2541 <        r = new Noop();
2542 <        f = new CompletableFuture<>();
2543 <        f2 = new CompletableFuture<>();
2544 <        g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2545 <        f.complete(one);
2546 <        f2.completeExceptionally(new CFException());
2547 <        checkCompletedWithWrappedCFException(g);
2548 <    }
2549 <
2550 <    /**
2551 <     * runAfterBothAsync result completes exceptionally if action does
2552 <     */
2553 <    public void testRunAfterBothAsync3E() {
2554 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2555 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2556 <        FailingNoop r = new FailingNoop();
2557 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2558 <        f.complete(one);
2559 <        checkIncomplete(g);
2560 <        f2.complete(two);
2561 <        checkCompletedWithWrappedCFException(g);
2562 <    }
2563 <
2564 <    /**
2565 <     * runAfterBothAsync result completes exceptionally if either source cancelled
2566 <     */
2567 <    public void testRunAfterBothAsync4E() {
2568 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2569 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2570 <        Noop r = new Noop();
2571 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2572 <        assertTrue(f.cancel(true));
2573 <        f2.complete(two);
2574 <        checkCompletedWithWrappedCancellationException(g);
2575 <
2576 <        r = new Noop();
2577 <        f = new CompletableFuture<>();
2578 <        f2 = new CompletableFuture<>();
2579 <        g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2580 <        f.complete(one);
2581 <        assertTrue(f2.cancel(true));
2582 <        checkCompletedWithWrappedCancellationException(g);
2583 <    }
2584 <
2585 <    /**
2586 <     * applyToEitherAsync result completes normally after normal
2587 <     * completion of sources
2588 <     */
2589 <    public void testApplyToEitherAsyncE() {
2590 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2591 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2592 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2593 <        f.complete(one);
2594 <        checkCompletedNormally(g, two);
2595 <
2596 <        f = new CompletableFuture<>();
2597 <        f.complete(one);
2598 <        f2 = new CompletableFuture<>();
2599 <        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2600 <        checkCompletedNormally(g, two);
2601 <    }
2602 <
2603 <    /**
2604 <     * applyToEitherAsync result completes exceptionally after exceptional
2605 <     * completion of source
2606 <     */
2607 <    public void testApplyToEitherAsync2E() {
2608 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2609 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2610 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2611 <        f.completeExceptionally(new CFException());
2612 <        checkCompletedWithWrappedCFException(g);
2613 <
2614 <        f = new CompletableFuture<>();
2615 <        f2 = new CompletableFuture<>();
2616 <        f2.completeExceptionally(new CFException());
2617 <        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2618 <        f.complete(one);
2619 <        checkCompletedWithWrappedCFException(g);
2620 <    }
2621 <
2622 <    /**
2623 <     * applyToEitherAsync result completes exceptionally if action does
2624 <     */
2625 <    public void testApplyToEitherAsync3E() {
2626 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2627 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2628 <        FailingFunction r = new FailingFunction();
2629 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, r, new ThreadExecutor());
2630 <        f.complete(one);
2631 <        checkCompletedWithWrappedCFException(g);
2632 <    }
2633 <
2634 <    /**
2635 <     * applyToEitherAsync result completes exceptionally if either source cancelled
2636 <     */
2637 <    public void testApplyToEitherAsync4E() {
2638 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2639 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2640 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2641 <        assertTrue(f.cancel(true));
2642 <        checkCompletedWithWrappedCancellationException(g);
2643 <
2644 <        f = new CompletableFuture<>();
2645 <        f2 = new CompletableFuture<>();
2646 <        assertTrue(f2.cancel(true));
2647 <        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2648 <        checkCompletedWithWrappedCancellationException(g);
2649 <    }
2650 <
2651 <    /**
2652 <     * acceptEitherAsync result completes normally after normal
2653 <     * completion of sources
2654 <     */
2655 <    public void testAcceptEitherAsyncE() {
2656 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2657 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2658 <        IncAction r = new IncAction();
2659 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2660 <        f.complete(one);
2661 <        checkCompletedNormally(g, null);
2662 <        assertEquals(r.value, 2);
2663 <
2664 <        r = new IncAction();
2665 <        f = new CompletableFuture<>();
2666 <        f.complete(one);
2667 <        f2 = new CompletableFuture<>();
2668 <        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2669 <        checkCompletedNormally(g, null);
2670 <        assertEquals(r.value, 2);
2671 <    }
2672 <
2673 <    /**
2674 <     * acceptEitherAsync result completes exceptionally after exceptional
2675 <     * completion of source
2676 <     */
2677 <    public void testAcceptEitherAsync2E() {
2678 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2679 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2680 <        IncAction r = new IncAction();
2681 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2682 <        f.completeExceptionally(new CFException());
2683 <        checkCompletedWithWrappedCFException(g);
2871 >    public void testRunAfterEither_sourceCancelled2() {
2872 >        for (ExecutionMode m : ExecutionMode.values())
2873 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2874 >        for (Integer v1 : new Integer[] { 1, null })
2875 >    {
2876 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2877 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2878 >        final Noop r = new Noop();
2879 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2880 >
2881 >        assertTrue(g.cancel(mayInterruptIfRunning));
2882 >        checkCompletedWithWrappedCancellationException(h);
2883 >        f.complete(v1);
2884 >
2885 >        checkCancelled(g);
2886 >        assertEquals(0, r.invocationCount);
2887 >        checkCompletedNormally(f, v1);
2888 >        checkCompletedWithWrappedCancellationException(h);
2889 >    }}
2890 >
2891 >    public void testRunAfterEither_sourceCancelled3() {
2892 >        for (ExecutionMode m : ExecutionMode.values())
2893 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2894 >        for (Integer v1 : new Integer[] { 1, null })
2895 >    {
2896 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2897 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2898 >        final Noop r = new Noop();
2899 >
2900 >        assertTrue(g.cancel(mayInterruptIfRunning));
2901 >        f.complete(v1);
2902 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2903  
2904 <        r = new IncAction();
2905 <        f = new CompletableFuture<>();
2906 <        f2 = new CompletableFuture<>();
2907 <        f2.completeExceptionally(new CFException());
2908 <        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2909 <        f.complete(one);
2910 <        checkCompletedWithWrappedCFException(g);
2911 <    }
2904 >        // unspecified behavior
2905 >        Integer v;
2906 >        try {
2907 >            assertNull(h.join());
2908 >            assertEquals(1, r.invocationCount);
2909 >        } catch (CompletionException ok) {
2910 >            checkCompletedWithWrappedCancellationException(h);
2911 >            assertEquals(0, r.invocationCount);
2912 >        }
2913  
2914 <    /**
2915 <     * acceptEitherAsync result completes exceptionally if action does
2916 <     */
2917 <    public void testAcceptEitherAsync3E() {
2918 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2919 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2920 <        FailingConsumer r = new FailingConsumer();
2921 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2922 <        f.complete(one);
2923 <        checkCompletedWithWrappedCFException(g);
2924 <    }
2914 >        checkCancelled(g);
2915 >        checkCompletedNormally(f, v1);
2916 >    }}
2917 >
2918 >    public void testRunAfterEither_sourceCancelled4() {
2919 >        for (ExecutionMode m : ExecutionMode.values())
2920 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2921 >        for (Integer v1 : new Integer[] { 1, null })
2922 >    {
2923 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2924 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2925 >        final Noop r = new Noop();
2926 >
2927 >        assertTrue(f.cancel(mayInterruptIfRunning));
2928 >        g.complete(v1);
2929 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2930  
2931 <    /**
2932 <     * acceptEitherAsync result completes exceptionally if either
2933 <     * source cancelled
2934 <     */
2935 <    public void testAcceptEitherAsync4E() {
2936 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2937 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2938 <        IncAction r = new IncAction();
2939 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2715 <        assertTrue(f.cancel(true));
2716 <        checkCompletedWithWrappedCancellationException(g);
2931 >        // unspecified behavior
2932 >        Integer v;
2933 >        try {
2934 >            assertNull(h.join());
2935 >            assertEquals(1, r.invocationCount);
2936 >        } catch (CompletionException ok) {
2937 >            checkCompletedWithWrappedCancellationException(h);
2938 >            assertEquals(0, r.invocationCount);
2939 >        }
2940  
2941 <        r = new IncAction();
2942 <        f = new CompletableFuture<>();
2943 <        f2 = new CompletableFuture<>();
2721 <        assertTrue(f2.cancel(true));
2722 <        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2723 <        checkCompletedWithWrappedCancellationException(g);
2724 <    }
2941 >        checkCancelled(f);
2942 >        checkCompletedNormally(g, v1);
2943 >    }}
2944  
2945      /**
2946 <     * runAfterEitherAsync result completes normally after normal
2728 <     * completion of sources
2946 >     * thenCompose result completes normally after normal completion of source
2947       */
2948 <    public void testRunAfterEitherAsyncE() {
2949 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2950 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2951 <        Noop r = new Noop();
2952 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2953 <        f.complete(one);
2954 <        checkCompletedNormally(g, null);
2955 <        assertTrue(r.ran);
2956 <
2957 <        r = new Noop();
2958 <        f = new CompletableFuture<>();
2959 <        f.complete(one);
2960 <        f2 = new CompletableFuture<>();
2961 <        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2962 <        checkCompletedNormally(g, null);
2745 <        assertTrue(r.ran);
2746 <    }
2948 >    public void testThenCompose_normalCompletion() {
2949 >        for (ExecutionMode m : ExecutionMode.values())
2950 >        for (boolean createIncomplete : new boolean[] { true, false })
2951 >        for (Integer v1 : new Integer[] { 1, null })
2952 >    {
2953 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2954 >        final CompletableFutureInc r = new CompletableFutureInc();
2955 >        if (!createIncomplete) f.complete(v1);
2956 >        final CompletableFuture<Integer> g = f.thenCompose(r);
2957 >        if (createIncomplete) f.complete(v1);
2958 >
2959 >        checkCompletedNormally(g, inc(v1));
2960 >        checkCompletedNormally(f, v1);
2961 >        assertEquals(1, r.invocationCount);
2962 >    }}
2963  
2964      /**
2965 <     * runAfterEitherAsync result completes exceptionally after exceptional
2965 >     * thenCompose result completes exceptionally after exceptional
2966       * completion of source
2967       */
2968 <    public void testRunAfterEitherAsync2E() {
2969 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2970 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2971 <        Noop r = new Noop();
2972 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2973 <        f.completeExceptionally(new CFException());
2974 <        checkCompletedWithWrappedCFException(g);
2975 <
2976 <        r = new Noop();
2977 <        f = new CompletableFuture<>();
2978 <        f2 = new CompletableFuture<>();
2979 <        f2.completeExceptionally(new CFException());
2980 <        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2981 <        f.complete(one);
2982 <        checkCompletedWithWrappedCFException(g);
2767 <    }
2768 <
2769 <    /**
2770 <     * runAfterEitherAsync result completes exceptionally if action does
2771 <     */
2772 <    public void testRunAfterEitherAsync3E() {
2773 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2774 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2775 <        FailingNoop r = new FailingNoop();
2776 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2777 <        f.complete(one);
2778 <        checkCompletedWithWrappedCFException(g);
2779 <    }
2780 <
2781 <    /**
2782 <     * runAfterEitherAsync result completes exceptionally if either
2783 <     * source cancelled
2784 <     */
2785 <    public void testRunAfterEitherAsync4E() {
2786 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2787 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2788 <        Noop r = new Noop();
2789 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2790 <        assertTrue(f.cancel(true));
2791 <        checkCompletedWithWrappedCancellationException(g);
2792 <
2793 <        r = new Noop();
2794 <        f = new CompletableFuture<>();
2795 <        f2 = new CompletableFuture<>();
2796 <        assertTrue(f2.cancel(true));
2797 <        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2798 <        checkCompletedWithWrappedCancellationException(g);
2799 <    }
2968 >    public void testThenCompose_exceptionalCompletion() {
2969 >        for (ExecutionMode m : ExecutionMode.values())
2970 >        for (boolean createIncomplete : new boolean[] { true, false })
2971 >    {
2972 >        final CFException ex = new CFException();
2973 >        final CompletableFutureInc r = new CompletableFutureInc();
2974 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2975 >        if (!createIncomplete) f.completeExceptionally(ex);
2976 >        final CompletableFuture<Integer> g = f.thenCompose(r);
2977 >        if (createIncomplete) f.completeExceptionally(ex);
2978 >
2979 >        checkCompletedWithWrappedCFException(g, ex);
2980 >        checkCompletedWithWrappedCFException(f, ex);
2981 >        assertEquals(0, r.invocationCount);
2982 >    }}
2983  
2984      /**
2985 <     * thenComposeAsync result completes normally after normal
2803 <     * completion of source
2985 >     * thenCompose result completes exceptionally if action does
2986       */
2987 <    public void testThenComposeAsyncE() {
2988 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2989 <        CompletableFutureInc r = new CompletableFutureInc();
2990 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2991 <        f.complete(one);
2992 <        checkCompletedNormally(g, two);
2993 <    }
2987 >    public void testThenCompose_actionFailed() {
2988 >        for (ExecutionMode m : ExecutionMode.values())
2989 >        for (boolean createIncomplete : new boolean[] { true, false })
2990 >        for (Integer v1 : new Integer[] { 1, null })
2991 >    {
2992 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2993 >        final FailingCompletableFutureFunction r
2994 >            = new FailingCompletableFutureFunction();
2995 >        if (!createIncomplete) f.complete(v1);
2996 >        final CompletableFuture<Integer> g = f.thenCompose(r);
2997 >        if (createIncomplete) f.complete(v1);
2998  
2813    /**
2814     * thenComposeAsync result completes exceptionally after
2815     * exceptional completion of source
2816     */
2817    public void testThenComposeAsync2E() {
2818        CompletableFuture<Integer> f = new CompletableFuture<>();
2819        CompletableFutureInc r = new CompletableFutureInc();
2820        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2821        f.completeExceptionally(new CFException());
2999          checkCompletedWithWrappedCFException(g);
3000 <    }
3000 >        checkCompletedNormally(f, v1);
3001 >    }}
3002  
3003      /**
3004 <     * thenComposeAsync result completes exceptionally if action does
3004 >     * thenCompose result completes exceptionally if source cancelled
3005       */
3006 <    public void testThenComposeAsync3E() {
3007 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3008 <        FailingCompletableFutureFunction r = new FailingCompletableFutureFunction();
3009 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
3010 <        f.complete(one);
3011 <        checkCompletedWithWrappedCFException(g);
3012 <    }
3006 >    public void testThenCompose_sourceCancelled() {
3007 >        for (ExecutionMode m : ExecutionMode.values())
3008 >        for (boolean createIncomplete : new boolean[] { true, false })
3009 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3010 >    {
3011 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
3012 >        final CompletableFutureInc r = new CompletableFutureInc();
3013 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
3014 >        final CompletableFuture<Integer> g = f.thenCompose(r);
3015 >        if (createIncomplete) {
3016 >            checkIncomplete(g);
3017 >            assertTrue(f.cancel(mayInterruptIfRunning));
3018 >        }
3019  
2836    /**
2837     * thenComposeAsync result completes exceptionally if source cancelled
2838     */
2839    public void testThenComposeAsync4E() {
2840        CompletableFuture<Integer> f = new CompletableFuture<>();
2841        CompletableFutureInc r = new CompletableFutureInc();
2842        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2843        assertTrue(f.cancel(true));
3020          checkCompletedWithWrappedCancellationException(g);
3021 <    }
3021 >        checkCancelled(f);
3022 >    }}
3023  
3024      // other static methods
3025  
# Line 3042 | Line 3219 | public class CompletableFutureTest exten
3219       * whenComplete action executes on normal completion, propagating
3220       * source result.
3221       */
3222 <    public void testWhenComplete1() {
3223 <        final AtomicInteger a = new AtomicInteger();
3224 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3225 <        CompletableFuture<Integer> g =
3226 <            f.whenComplete((Integer x, Throwable t) -> a.getAndIncrement());
3227 <        f.complete(three);
3228 <        checkCompletedNormally(f, three);
3229 <        checkCompletedNormally(g, three);
3230 <        assertEquals(a.get(), 1);
3231 <    }
3222 >    public void testWhenComplete_normalCompletion1() {
3223 >        for (ExecutionMode m : ExecutionMode.values())
3224 >        for (boolean createIncomplete : new boolean[] { true, false })
3225 >        for (Integer v1 : new Integer[] { 1, null })
3226 >    {
3227 >        final AtomicInteger a = new AtomicInteger(0);
3228 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
3229 >        if (!createIncomplete) f.complete(v1);
3230 >        final CompletableFuture<Integer> g = m.whenComplete
3231 >            (f,
3232 >             (Integer x, Throwable t) -> {
3233 >                threadAssertSame(x, v1);
3234 >                threadAssertNull(t);
3235 >                a.getAndIncrement();
3236 >            });
3237 >        if (createIncomplete) f.complete(v1);
3238 >
3239 >        checkCompletedNormally(g, v1);
3240 >        checkCompletedNormally(f, v1);
3241 >        assertEquals(1, a.get());
3242 >    }}
3243  
3244      /**
3245       * whenComplete action executes on exceptional completion, propagating
3246       * source result.
3247       */
3248 <    public void testWhenComplete2() {
3249 <        final AtomicInteger a = new AtomicInteger();
3250 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3251 <        CompletableFuture<Integer> g =
3252 <            f.whenComplete((Integer x, Throwable t) -> a.getAndIncrement());
3253 <        f.completeExceptionally(new CFException());
3254 <        assertTrue(f.isCompletedExceptionally());
3255 <        assertTrue(g.isCompletedExceptionally());
3256 <        assertEquals(a.get(), 1);
3257 <    }
3248 >    public void testWhenComplete_exceptionalCompletion() {
3249 >        for (ExecutionMode m : ExecutionMode.values())
3250 >        for (boolean createIncomplete : new boolean[] { true, false })
3251 >        for (Integer v1 : new Integer[] { 1, null })
3252 >    {
3253 >        final AtomicInteger a = new AtomicInteger(0);
3254 >        final CFException ex = new CFException();
3255 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
3256 >        if (!createIncomplete) f.completeExceptionally(ex);
3257 >        final CompletableFuture<Integer> g = m.whenComplete
3258 >            (f,
3259 >             (Integer x, Throwable t) -> {
3260 >                threadAssertNull(x);
3261 >                threadAssertSame(t, ex);
3262 >                a.getAndIncrement();
3263 >            });
3264 >        if (createIncomplete) f.completeExceptionally(ex);
3265 >        checkCompletedWithWrappedCFException(f, ex);
3266 >        checkCompletedWithWrappedCFException(g, ex);
3267 >        assertEquals(1, a.get());
3268 >    }}
3269 >
3270 >    /**
3271 >     * whenComplete action executes on cancelled source, propagating
3272 >     * CancellationException.
3273 >     */
3274 >    public void testWhenComplete_sourceCancelled() {
3275 >        for (ExecutionMode m : ExecutionMode.values())
3276 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3277 >        for (boolean createIncomplete : new boolean[] { true, false })
3278 >    {
3279 >        final AtomicInteger a = new AtomicInteger(0);
3280 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
3281 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
3282 >        final CompletableFuture<Integer> g = m.whenComplete
3283 >            (f,
3284 >             (Integer x, Throwable t) -> {
3285 >                threadAssertNull(x);
3286 >                threadAssertTrue(t instanceof CancellationException);
3287 >                a.getAndIncrement();
3288 >            });
3289 >        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
3290 >
3291 >        //try { g.join(); } catch (Throwable t) { throw new Error(t); }
3292 >        checkCompletedWithWrappedCancellationException(g);
3293 >        checkCancelled(f);
3294 >        assertEquals(1, a.get());
3295 >    }}
3296  
3297      /**
3298       * If a whenComplete action throws an exception when triggered by
3299       * a normal completion, it completes exceptionally
3300       */
3301 <    public void testWhenComplete3() {
3302 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3303 <        CompletableFuture<Integer> g =
3304 <            f.whenComplete((Integer x, Throwable t) ->
3305 <                           { throw new CFException(); } );
3306 <        f.complete(three);
3307 <        checkCompletedNormally(f, three);
3308 <        assertTrue(g.isCompletedExceptionally());
3309 <        checkCompletedWithWrappedCFException(g);
3310 <    }
3311 <
3312 <    /**
3313 <     * whenCompleteAsync action executes on normal completion, propagating
3314 <     * source result.
3315 <     */
3316 <    public void testWhenCompleteAsync1() {
3317 <        final AtomicInteger a = new AtomicInteger();
3318 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3319 <        CompletableFuture<Integer> g =
3320 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement());
3321 <        f.complete(three);
3322 <        checkCompletedNormally(f, three);
3097 <        checkCompletedNormally(g, three);
3098 <        assertEquals(a.get(), 1);
3099 <    }
3100 <
3101 <    /**
3102 <     * whenCompleteAsync action executes on exceptional completion, propagating
3103 <     * source result.
3104 <     */
3105 <    public void testWhenCompleteAsync2() {
3106 <        final AtomicInteger a = new AtomicInteger();
3107 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3108 <        CompletableFuture<Integer> g =
3109 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement());
3110 <        f.completeExceptionally(new CFException());
3111 <        checkCompletedWithWrappedCFException(f);
3112 <        checkCompletedWithWrappedCFException(g);
3113 <    }
3114 <
3115 <    /**
3116 <     * If a whenCompleteAsync action throws an exception when
3117 <     * triggered by a normal completion, it completes exceptionally
3118 <     */
3119 <    public void testWhenCompleteAsync3() {
3120 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3121 <        CompletableFuture<Integer> g =
3122 <            f.whenCompleteAsync((Integer x, Throwable t) ->
3123 <                           { throw new CFException(); } );
3124 <        f.complete(three);
3125 <        checkCompletedNormally(f, three);
3126 <        checkCompletedWithWrappedCFException(g);
3127 <    }
3128 <
3129 <    /**
3130 <     * whenCompleteAsync action executes on normal completion, propagating
3131 <     * source result.
3132 <     */
3133 <    public void testWhenCompleteAsync1e() {
3134 <        final AtomicInteger a = new AtomicInteger();
3135 <        ThreadExecutor exec = new ThreadExecutor();
3136 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3137 <        CompletableFuture<Integer> g =
3138 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement(),
3139 <                                exec);
3140 <        f.complete(three);
3141 <        checkCompletedNormally(f, three);
3142 <        checkCompletedNormally(g, three);
3143 <        assertEquals(a.get(), 1);
3144 <    }
3145 <
3146 <    /**
3147 <     * whenCompleteAsync action executes on exceptional completion, propagating
3148 <     * source result.
3149 <     */
3150 <    public void testWhenCompleteAsync2e() {
3151 <        final AtomicInteger a = new AtomicInteger();
3152 <        ThreadExecutor exec = new ThreadExecutor();
3153 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3154 <        CompletableFuture<Integer> g =
3155 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement(),
3156 <                                exec);
3157 <        f.completeExceptionally(new CFException());
3158 <        checkCompletedWithWrappedCFException(f);
3159 <        checkCompletedWithWrappedCFException(g);
3160 <    }
3161 <
3162 <    /**
3163 <     * If a whenCompleteAsync action throws an exception when triggered
3164 <     * by a normal completion, it completes exceptionally
3165 <     */
3166 <    public void testWhenCompleteAsync3e() {
3167 <        ThreadExecutor exec = new ThreadExecutor();
3168 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3169 <        CompletableFuture<Integer> g =
3170 <            f.whenCompleteAsync((Integer x, Throwable t) ->
3171 <                                { throw new CFException(); },
3172 <                                exec);
3173 <        f.complete(three);
3174 <        checkCompletedNormally(f, three);
3175 <        checkCompletedWithWrappedCFException(g);
3176 <    }
3177 <
3178 <    /**
3179 <     * handleAsync action completes normally with function value on
3180 <     * either normal or exceptional completion of source
3181 <     */
3182 <    public void testHandleAsync() {
3183 <        CompletableFuture<Integer> f, g;
3184 <        IntegerHandler r;
3185 <
3186 <        f = new CompletableFuture<>();
3187 <        g = f.handleAsync(r = new IntegerHandler());
3188 <        assertFalse(r.ran);
3189 <        f.completeExceptionally(new CFException());
3190 <        checkCompletedWithWrappedCFException(f);
3191 <        checkCompletedNormally(g, three);
3192 <        assertTrue(r.ran);
3193 <
3194 <        f = new CompletableFuture<>();
3195 <        g = f.handleAsync(r = new IntegerHandler());
3196 <        assertFalse(r.ran);
3197 <        f.completeExceptionally(new CFException());
3198 <        checkCompletedWithWrappedCFException(f);
3199 <        checkCompletedNormally(g, three);
3200 <        assertTrue(r.ran);
3201 <
3202 <        f = new CompletableFuture<>();
3203 <        g = f.handleAsync(r = new IntegerHandler());
3204 <        assertFalse(r.ran);
3205 <        f.complete(one);
3206 <        checkCompletedNormally(f, one);
3207 <        checkCompletedNormally(g, two);
3208 <        assertTrue(r.ran);
3209 <
3210 <        f = new CompletableFuture<>();
3211 <        g = f.handleAsync(r = new IntegerHandler());
3212 <        assertFalse(r.ran);
3213 <        f.complete(one);
3214 <        checkCompletedNormally(f, one);
3215 <        checkCompletedNormally(g, two);
3216 <        assertTrue(r.ran);
3217 <    }
3301 >    public void testWhenComplete_actionFailed() {
3302 >        for (boolean createIncomplete : new boolean[] { true, false })
3303 >        for (ExecutionMode m : ExecutionMode.values())
3304 >        for (Integer v1 : new Integer[] { 1, null })
3305 >    {
3306 >        final AtomicInteger a = new AtomicInteger(0);
3307 >        final CFException ex = new CFException();
3308 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
3309 >        if (!createIncomplete) f.complete(v1);
3310 >        final CompletableFuture<Integer> g = m.whenComplete
3311 >            (f,
3312 >             (Integer x, Throwable t) -> {
3313 >                threadAssertSame(x, v1);
3314 >                threadAssertNull(t);
3315 >                a.getAndIncrement();
3316 >                throw ex;
3317 >            });
3318 >        if (createIncomplete) f.complete(v1);
3319 >        checkCompletedNormally(f, v1);
3320 >        checkCompletedWithWrappedCFException(g, ex);
3321 >        assertEquals(1, a.get());
3322 >    }}
3323  
3324      /**
3325 <     * handleAsync action with Executor completes normally with
3326 <     * function value on either normal or exceptional completion of
3327 <     * source
3325 >     * If a whenComplete action throws an exception when triggered by
3326 >     * a source completion that also throws an exception, the source
3327 >     * exception takes precedence.
3328       */
3329 <    public void testHandleAsync2() {
3330 <        CompletableFuture<Integer> f, g;
3331 <        ThreadExecutor exec = new ThreadExecutor();
3332 <        IntegerHandler r;
3333 <
3334 <        f = new CompletableFuture<>();
3335 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3336 <        assertFalse(r.ran);
3337 <        f.completeExceptionally(new CFException());
3338 <        checkCompletedWithWrappedCFException(f);
3339 <        checkCompletedNormally(g, three);
3340 <        assertTrue(r.ran);
3341 <
3342 <        f = new CompletableFuture<>();
3343 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3344 <        assertFalse(r.ran);
3345 <        f.completeExceptionally(new CFException());
3346 <        checkCompletedWithWrappedCFException(f);
3347 <        checkCompletedNormally(g, three);
3348 <        assertTrue(r.ran);
3349 <
3350 <        f = new CompletableFuture<>();
3351 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3352 <        assertFalse(r.ran);
3353 <        f.complete(one);
3249 <        checkCompletedNormally(f, one);
3250 <        checkCompletedNormally(g, two);
3251 <        assertTrue(r.ran);
3252 <
3253 <        f = new CompletableFuture<>();
3254 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3255 <        assertFalse(r.ran);
3256 <        f.complete(one);
3257 <        checkCompletedNormally(f, one);
3258 <        checkCompletedNormally(g, two);
3259 <        assertTrue(r.ran);
3260 <    }
3329 >    public void testWhenComplete_actionFailedSourceFailed() {
3330 >        for (boolean createIncomplete : new boolean[] { true, false })
3331 >        for (ExecutionMode m : ExecutionMode.values())
3332 >        for (Integer v1 : new Integer[] { 1, null })
3333 >    {
3334 >        final AtomicInteger a = new AtomicInteger(0);
3335 >        final CFException ex1 = new CFException();
3336 >        final CFException ex2 = new CFException();
3337 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
3338 >
3339 >        if (!createIncomplete) f.completeExceptionally(ex1);
3340 >        final CompletableFuture<Integer> g = m.whenComplete
3341 >            (f,
3342 >             (Integer x, Throwable t) -> {
3343 >                threadAssertSame(t, ex1);
3344 >                threadAssertNull(x);
3345 >                a.getAndIncrement();
3346 >                throw ex2;
3347 >            });
3348 >        if (createIncomplete) f.completeExceptionally(ex1);
3349 >
3350 >        checkCompletedWithWrappedCFException(f, ex1);
3351 >        checkCompletedWithWrappedCFException(g, ex1);
3352 >        assertEquals(1, a.get());
3353 >    }}
3354  
3355   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines