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.34 by jsr166, Sun Jun 1 21:17:05 2014 UTC vs.
Revision 1.62 by jsr166, Fri Jun 6 01:19:22 2014 UTC

# Line 16 | Line 16 | import java.util.concurrent.ExecutionExc
16   import java.util.concurrent.Future;
17   import java.util.concurrent.CompletableFuture;
18   import java.util.concurrent.CompletionException;
19 + import java.util.concurrent.CompletionStage;
20 + import java.util.concurrent.ForkJoinPool;
21 + import java.util.concurrent.ForkJoinTask;
22   import java.util.concurrent.TimeoutException;
23   import java.util.concurrent.atomic.AtomicInteger;
24   import static java.util.concurrent.TimeUnit.MILLISECONDS;
# Line 246 | Line 249 | public class CompletableFutureTest exten
249          f = new CompletableFuture<>();
250          f.obtrudeValue(three);
251          checkCompletedNormally(f, three);
252 +        f.obtrudeValue(null);
253 +        checkCompletedNormally(f, null);
254          f = new CompletableFuture<>();
255          f.completeExceptionally(new CFException());
256          f.obtrudeValue(four);
# Line 278 | Line 283 | public class CompletableFutureTest exten
283       */
284      public void testGetNumberOfDependents() {
285          CompletableFuture<Integer> f = new CompletableFuture<>();
286 <        assertEquals(f.getNumberOfDependents(), 0);
287 <        CompletableFuture g = f.thenRun(new Noop());
288 <        assertEquals(f.getNumberOfDependents(), 1);
289 <        assertEquals(g.getNumberOfDependents(), 0);
290 <        CompletableFuture h = f.thenRun(new Noop());
291 <        assertEquals(f.getNumberOfDependents(), 2);
286 >        assertEquals(0, f.getNumberOfDependents());
287 >        CompletableFuture g = f.thenRun(new Noop(ExecutionMode.DEFAULT));
288 >        assertEquals(1, f.getNumberOfDependents());
289 >        assertEquals(0, g.getNumberOfDependents());
290 >        CompletableFuture h = f.thenRun(new Noop(ExecutionMode.DEFAULT));
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 315 | Line 320 | public class CompletableFutureTest exten
320          checkCompletedNormally(f, "test");
321      }
322  
323 <    // Choose non-commutative actions for better coverage
323 >    abstract class CheckedAction {
324 >        int invocationCount = 0;
325 >        final ExecutionMode m;
326 >        CheckedAction(ExecutionMode m) { this.m = m; }
327 >        void invoked() {
328 >            m.checkExecutionMode();
329 >            assertEquals(0, invocationCount++);
330 >        }
331 >        void assertNotInvoked() { assertEquals(0, invocationCount); }
332 >        void assertInvoked() { assertEquals(1, invocationCount); }
333 >    }
334  
335 <    static final Supplier<Integer> supplyOne =
336 <        () -> Integer.valueOf(1);
337 <    static final Function<Integer, Integer> inc =
338 <        (Integer x) -> Integer.valueOf(x.intValue() + 1);
339 <    static final BiFunction<Integer, Integer, Integer> subtract =
340 <        (Integer x, Integer y) -> Integer.valueOf(x.intValue() - y.intValue());
341 <    static final class IncAction implements Consumer<Integer> {
327 <        int value;
328 <        public void accept(Integer x) { value = x.intValue() + 1; }
335 >    abstract class CheckedIntegerAction extends CheckedAction {
336 >        Integer value;
337 >        CheckedIntegerAction(ExecutionMode m) { super(m); }
338 >        void assertValue(Integer expected) {
339 >            assertInvoked();
340 >            assertEquals(expected, value);
341 >        }
342      }
343 <    static final class SubtractAction implements BiConsumer<Integer, Integer> {
344 <        int value;
343 >
344 >    class IntegerSupplier extends CheckedAction
345 >        implements Supplier<Integer>
346 >    {
347 >        final Integer value;
348 >        IntegerSupplier(ExecutionMode m, Integer value) {
349 >            super(m);
350 >            this.value = value;
351 >        }
352 >        public Integer get() {
353 >            invoked();
354 >            return value;
355 >        }
356 >    }
357 >
358 >    // A function that handles and produces null values as well.
359 >    static Integer inc(Integer x) {
360 >        return (x == null) ? null : x + 1;
361 >    }
362 >
363 >    class IncAction extends CheckedIntegerAction
364 >        implements Consumer<Integer>
365 >    {
366 >        IncAction(ExecutionMode m) { super(m); }
367 >        public void accept(Integer x) {
368 >            invoked();
369 >            value = inc(x);
370 >        }
371 >    }
372 >
373 >    class IncFunction extends CheckedIntegerAction
374 >        implements Function<Integer,Integer>
375 >    {
376 >        IncFunction(ExecutionMode m) { super(m); }
377 >        public Integer apply(Integer x) {
378 >            invoked();
379 >            return value = inc(x);
380 >        }
381 >    }
382 >
383 >    // Choose non-commutative actions for better coverage
384 >    // A non-commutative function that handles and produces null values as well.
385 >    static Integer subtract(Integer x, Integer y) {
386 >        return (x == null && y == null) ? null :
387 >            ((x == null) ? 42 : x.intValue())
388 >            - ((y == null) ? 99 : y.intValue());
389 >    }
390 >
391 >    class SubtractAction extends CheckedIntegerAction
392 >        implements BiConsumer<Integer, Integer>
393 >    {
394 >        SubtractAction(ExecutionMode m) { super(m); }
395          public void accept(Integer x, Integer y) {
396 <            value = x.intValue() - y.intValue();
396 >            invoked();
397 >            value = subtract(x, y);
398          }
399      }
400 <    static final class Noop implements Runnable {
401 <        boolean ran;
402 <        public void run() { ran = true; }
400 >
401 >    class SubtractFunction extends CheckedIntegerAction
402 >        implements BiFunction<Integer, Integer, Integer>
403 >    {
404 >        SubtractFunction(ExecutionMode m) { super(m); }
405 >        public Integer apply(Integer x, Integer y) {
406 >            invoked();
407 >            return value = subtract(x, y);
408 >        }
409      }
410  
411 <    static final class FailingSupplier implements Supplier<Integer> {
412 <        boolean ran;
413 <        public Integer get() { ran = true; throw new CFException(); }
411 >    class Noop extends CheckedAction implements Runnable {
412 >        Noop(ExecutionMode m) { super(m); }
413 >        public void run() {
414 >            invoked();
415 >        }
416      }
417 <    static final class FailingConsumer implements Consumer<Integer> {
418 <        boolean ran;
419 <        public void accept(Integer x) { ran = true; throw new CFException(); }
417 >
418 >    class FailingSupplier extends CheckedAction implements Supplier<Integer>
419 >    {
420 >        FailingSupplier(ExecutionMode m) { super(m); }
421 >        public Integer get() {
422 >            invoked();
423 >            throw new CFException();
424 >        }
425      }
426 <    static final class FailingBiConsumer implements BiConsumer<Integer, Integer> {
427 <        boolean ran;
428 <        public void accept(Integer x, Integer y) { ran = true; throw new CFException(); }
426 >
427 >    class FailingConsumer extends CheckedAction implements Consumer<Integer> {
428 >        FailingConsumer(ExecutionMode m) { super(m); }
429 >        public void accept(Integer x) {
430 >            invoked();
431 >            throw new CFException();
432 >        }
433      }
434 <    static final class FailingFunction implements Function<Integer, Integer> {
435 <        boolean ran;
436 <        public Integer apply(Integer x) { ran = true; throw new CFException(); }
434 >
435 >    class FailingBiConsumer extends CheckedAction
436 >        implements BiConsumer<Integer, Integer>
437 >    {
438 >        FailingBiConsumer(ExecutionMode m) { super(m); }
439 >        public void accept(Integer x, Integer y) {
440 >            invoked();
441 >            throw new CFException();
442 >        }
443      }
444 <    static final class FailingBiFunction implements BiFunction<Integer, Integer, Integer> {
445 <        boolean ran;
446 <        public Integer apply(Integer x, Integer y) { ran = true; throw new CFException(); }
444 >
445 >    class FailingFunction extends CheckedAction
446 >        implements Function<Integer, Integer>
447 >    {
448 >        FailingFunction(ExecutionMode m) { super(m); }
449 >        public Integer apply(Integer x) {
450 >            invoked();
451 >            throw new CFException();
452 >        }
453 >    }
454 >
455 >    class FailingBiFunction extends CheckedAction
456 >        implements BiFunction<Integer, Integer, Integer>
457 >    {
458 >        FailingBiFunction(ExecutionMode m) { super(m); }
459 >        public Integer apply(Integer x, Integer y) {
460 >            invoked();
461 >            throw new CFException();
462 >        }
463      }
464 <    static final class FailingNoop implements Runnable {
465 <        boolean ran;
466 <        public void run() { ran = true; throw new CFException(); }
464 >
465 >    class FailingRunnable extends CheckedAction implements Runnable {
466 >        FailingRunnable(ExecutionMode m) { super(m); }
467 >        public void run() {
468 >            invoked();
469 >            throw new CFException();
470 >        }
471      }
472  
473 <    static final class CompletableFutureInc
474 <        implements Function<Integer, CompletableFuture<Integer>> {
475 <        boolean ran;
473 >
474 >    class CompletableFutureInc extends CheckedAction
475 >        implements Function<Integer, CompletableFuture<Integer>>
476 >    {
477 >        CompletableFutureInc(ExecutionMode m) { super(m); }
478          public CompletableFuture<Integer> apply(Integer x) {
479 <            ran = true;
479 >            invoked();
480              CompletableFuture<Integer> f = new CompletableFuture<>();
481 <            f.complete(Integer.valueOf(x.intValue() + 1));
481 >            f.complete(inc(x));
482              return f;
483          }
484      }
485  
486 <    static final class FailingCompletableFutureFunction
487 <        implements Function<Integer, CompletableFuture<Integer>> {
488 <        boolean ran;
486 >    class FailingCompletableFutureFunction extends CheckedAction
487 >        implements Function<Integer, CompletableFuture<Integer>>
488 >    {
489 >        FailingCompletableFutureFunction(ExecutionMode m) { super(m); }
490          public CompletableFuture<Integer> apply(Integer x) {
491 <            ran = true; throw new CFException();
491 >            invoked();
492 >            throw new CFException();
493          }
494      }
495  
496      // Used for explicit executor tests
497      static final class ThreadExecutor implements Executor {
498 <        AtomicInteger count = new AtomicInteger(0);
498 >        final AtomicInteger count = new AtomicInteger(0);
499 >        static final ThreadGroup tg = new ThreadGroup("ThreadExecutor");
500 >        static boolean startedCurrentThread() {
501 >            return Thread.currentThread().getThreadGroup() == tg;
502 >        }
503  
504          public void execute(Runnable r) {
505              count.getAndIncrement();
506 <            new Thread(r).start();
506 >            new Thread(tg, r).start();
507          }
508      }
509  
510 <    static final class ExceptionToInteger implements Function<Throwable, Integer> {
511 <        public Integer apply(Throwable x) { return Integer.valueOf(3); }
512 <    }
510 >    /**
511 >     * Permits the testing of parallel code for the 3 different
512 >     * execution modes without copy/pasting all the test methods.
513 >     */
514 >    enum ExecutionMode {
515 >        DEFAULT {
516 >            public void checkExecutionMode() {
517 >                assertFalse(ThreadExecutor.startedCurrentThread());
518 >                assertNull(ForkJoinTask.getPool());
519 >            }
520 >            public CompletableFuture<Void> runAsync(Runnable a) {
521 >                throw new UnsupportedOperationException();
522 >            }
523 >            public <U> CompletableFuture<U> supplyAsync(Supplier<U> a) {
524 >                throw new UnsupportedOperationException();
525 >            }
526 >            public <T> CompletableFuture<Void> thenRun
527 >                (CompletableFuture<T> f, Runnable a) {
528 >                return f.thenRun(a);
529 >            }
530 >            public <T> CompletableFuture<Void> thenAccept
531 >                (CompletableFuture<T> f, Consumer<? super T> a) {
532 >                return f.thenAccept(a);
533 >            }
534 >            public <T,U> CompletableFuture<U> thenApply
535 >                (CompletableFuture<T> f, Function<? super T,U> a) {
536 >                return f.thenApply(a);
537 >            }
538 >            public <T,U> CompletableFuture<U> thenCompose
539 >                (CompletableFuture<T> f,
540 >                 Function<? super T,? extends CompletionStage<U>> a) {
541 >                return f.thenCompose(a);
542 >            }
543 >            public <T,U> CompletableFuture<U> handle
544 >                (CompletableFuture<T> f,
545 >                 BiFunction<? super T,Throwable,? extends U> a) {
546 >                return f.handle(a);
547 >            }
548 >            public <T> CompletableFuture<T> whenComplete
549 >                (CompletableFuture<T> f,
550 >                 BiConsumer<? super T,? super Throwable> a) {
551 >                return f.whenComplete(a);
552 >            }
553 >            public <T,U> CompletableFuture<Void> runAfterBoth
554 >                (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
555 >                return f.runAfterBoth(g, a);
556 >            }
557 >            public <T,U> CompletableFuture<Void> thenAcceptBoth
558 >                (CompletableFuture<T> f,
559 >                 CompletionStage<? extends U> g,
560 >                 BiConsumer<? super T,? super U> a) {
561 >                return f.thenAcceptBoth(g, a);
562 >            }
563 >            public <T,U,V> CompletableFuture<V> thenCombine
564 >                (CompletableFuture<T> f,
565 >                 CompletionStage<? extends U> g,
566 >                 BiFunction<? super T,? super U,? extends V> a) {
567 >                return f.thenCombine(g, a);
568 >            }
569 >            public <T> CompletableFuture<Void> runAfterEither
570 >                (CompletableFuture<T> f,
571 >                 CompletionStage<?> g,
572 >                 java.lang.Runnable a) {
573 >                return f.runAfterEither(g, a);
574 >            }
575 >            public <T> CompletableFuture<Void> acceptEither
576 >                (CompletableFuture<T> f,
577 >                 CompletionStage<? extends T> g,
578 >                 Consumer<? super T> a) {
579 >                return f.acceptEither(g, a);
580 >            }
581 >            public <T,U> CompletableFuture<U> applyToEither
582 >                (CompletableFuture<T> f,
583 >                 CompletionStage<? extends T> g,
584 >                 Function<? super T,U> a) {
585 >                return f.applyToEither(g, a);
586 >            }
587 >        },
588  
589 <    static final class IntegerHandler implements BiFunction<Integer, Throwable, Integer> {
590 <        boolean ran;
591 <        public Integer apply(Integer x, Throwable t) {
592 <            ran = true;
593 <            return (t == null) ? two : three;
594 <        }
589 >        ASYNC {
590 >            public void checkExecutionMode() {
591 >                assertSame(ForkJoinPool.commonPool(),
592 >                           ForkJoinTask.getPool());
593 >            }
594 >            public CompletableFuture<Void> runAsync(Runnable a) {
595 >                return CompletableFuture.runAsync(a);
596 >            }
597 >            public <U> CompletableFuture<U> supplyAsync(Supplier<U> a) {
598 >                return CompletableFuture.supplyAsync(a);
599 >            }
600 >            public <T> CompletableFuture<Void> thenRun
601 >                (CompletableFuture<T> f, Runnable a) {
602 >                return f.thenRunAsync(a);
603 >            }
604 >            public <T> CompletableFuture<Void> thenAccept
605 >                (CompletableFuture<T> f, Consumer<? super T> a) {
606 >                return f.thenAcceptAsync(a);
607 >            }
608 >            public <T,U> CompletableFuture<U> thenApply
609 >                (CompletableFuture<T> f, Function<? super T,U> a) {
610 >                return f.thenApplyAsync(a);
611 >            }
612 >            public <T,U> CompletableFuture<U> thenCompose
613 >                (CompletableFuture<T> f,
614 >                 Function<? super T,? extends CompletionStage<U>> a) {
615 >                return f.thenComposeAsync(a);
616 >            }
617 >            public <T,U> CompletableFuture<U> handle
618 >                (CompletableFuture<T> f,
619 >                 BiFunction<? super T,Throwable,? extends U> a) {
620 >                return f.handleAsync(a);
621 >            }
622 >            public <T> CompletableFuture<T> whenComplete
623 >                (CompletableFuture<T> f,
624 >                 BiConsumer<? super T,? super Throwable> a) {
625 >                return f.whenCompleteAsync(a);
626 >            }
627 >            public <T,U> CompletableFuture<Void> runAfterBoth
628 >                (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
629 >                return f.runAfterBothAsync(g, a);
630 >            }
631 >            public <T,U> CompletableFuture<Void> thenAcceptBoth
632 >                (CompletableFuture<T> f,
633 >                 CompletionStage<? extends U> g,
634 >                 BiConsumer<? super T,? super U> a) {
635 >                return f.thenAcceptBothAsync(g, a);
636 >            }
637 >            public <T,U,V> CompletableFuture<V> thenCombine
638 >                (CompletableFuture<T> f,
639 >                 CompletionStage<? extends U> g,
640 >                 BiFunction<? super T,? super U,? extends V> a) {
641 >                return f.thenCombineAsync(g, a);
642 >            }
643 >            public <T> CompletableFuture<Void> runAfterEither
644 >                (CompletableFuture<T> f,
645 >                 CompletionStage<?> g,
646 >                 java.lang.Runnable a) {
647 >                return f.runAfterEitherAsync(g, a);
648 >            }
649 >            public <T> CompletableFuture<Void> acceptEither
650 >                (CompletableFuture<T> f,
651 >                 CompletionStage<? extends T> g,
652 >                 Consumer<? super T> a) {
653 >                return f.acceptEitherAsync(g, a);
654 >            }
655 >            public <T,U> CompletableFuture<U> applyToEither
656 >                (CompletableFuture<T> f,
657 >                 CompletionStage<? extends T> g,
658 >                 Function<? super T,U> a) {
659 >                return f.applyToEitherAsync(g, a);
660 >            }
661 >        },
662 >
663 >        EXECUTOR {
664 >            public void checkExecutionMode() {
665 >                assertTrue(ThreadExecutor.startedCurrentThread());
666 >            }
667 >            public CompletableFuture<Void> runAsync(Runnable a) {
668 >                return CompletableFuture.runAsync(a, new ThreadExecutor());
669 >            }
670 >            public <U> CompletableFuture<U> supplyAsync(Supplier<U> a) {
671 >                return CompletableFuture.supplyAsync(a, new ThreadExecutor());
672 >            }
673 >            public <T> CompletableFuture<Void> thenRun
674 >                (CompletableFuture<T> f, Runnable a) {
675 >                return f.thenRunAsync(a, new ThreadExecutor());
676 >            }
677 >            public <T> CompletableFuture<Void> thenAccept
678 >                (CompletableFuture<T> f, Consumer<? super T> a) {
679 >                return f.thenAcceptAsync(a, new ThreadExecutor());
680 >            }
681 >            public <T,U> CompletableFuture<U> thenApply
682 >                (CompletableFuture<T> f, Function<? super T,U> a) {
683 >                return f.thenApplyAsync(a, new ThreadExecutor());
684 >            }
685 >            public <T,U> CompletableFuture<U> thenCompose
686 >                (CompletableFuture<T> f,
687 >                 Function<? super T,? extends CompletionStage<U>> a) {
688 >                return f.thenComposeAsync(a, new ThreadExecutor());
689 >            }
690 >            public <T,U> CompletableFuture<U> handle
691 >                (CompletableFuture<T> f,
692 >                 BiFunction<? super T,Throwable,? extends U> a) {
693 >                return f.handleAsync(a, new ThreadExecutor());
694 >            }
695 >            public <T> CompletableFuture<T> whenComplete
696 >                (CompletableFuture<T> f,
697 >                 BiConsumer<? super T,? super Throwable> a) {
698 >                return f.whenCompleteAsync(a, new ThreadExecutor());
699 >            }
700 >            public <T,U> CompletableFuture<Void> runAfterBoth
701 >                (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
702 >                return f.runAfterBothAsync(g, a, new ThreadExecutor());
703 >            }
704 >            public <T,U> CompletableFuture<Void> thenAcceptBoth
705 >                (CompletableFuture<T> f,
706 >                 CompletionStage<? extends U> g,
707 >                 BiConsumer<? super T,? super U> a) {
708 >                return f.thenAcceptBothAsync(g, a, new ThreadExecutor());
709 >            }
710 >            public <T,U,V> CompletableFuture<V> thenCombine
711 >                (CompletableFuture<T> f,
712 >                 CompletionStage<? extends U> g,
713 >                 BiFunction<? super T,? super U,? extends V> a) {
714 >                return f.thenCombineAsync(g, a, new ThreadExecutor());
715 >            }
716 >            public <T> CompletableFuture<Void> runAfterEither
717 >                (CompletableFuture<T> f,
718 >                 CompletionStage<?> g,
719 >                 java.lang.Runnable a) {
720 >                return f.runAfterEitherAsync(g, a, new ThreadExecutor());
721 >            }
722 >            public <T> CompletableFuture<Void> acceptEither
723 >                (CompletableFuture<T> f,
724 >                 CompletionStage<? extends T> g,
725 >                 Consumer<? super T> a) {
726 >                return f.acceptEitherAsync(g, a, new ThreadExecutor());
727 >            }
728 >            public <T,U> CompletableFuture<U> applyToEither
729 >                (CompletableFuture<T> f,
730 >                 CompletionStage<? extends T> g,
731 >                 Function<? super T,U> a) {
732 >                return f.applyToEitherAsync(g, a, new ThreadExecutor());
733 >            }
734 >        };
735 >
736 >        public abstract void checkExecutionMode();
737 >        public abstract CompletableFuture<Void> runAsync(Runnable a);
738 >        public abstract <U> CompletableFuture<U> supplyAsync(Supplier<U> a);
739 >        public abstract <T> CompletableFuture<Void> thenRun
740 >            (CompletableFuture<T> f, Runnable a);
741 >        public abstract <T> CompletableFuture<Void> thenAccept
742 >            (CompletableFuture<T> f, Consumer<? super T> a);
743 >        public abstract <T,U> CompletableFuture<U> thenApply
744 >            (CompletableFuture<T> f, Function<? super T,U> a);
745 >        public abstract <T,U> CompletableFuture<U> thenCompose
746 >            (CompletableFuture<T> f,
747 >             Function<? super T,? extends CompletionStage<U>> a);
748 >        public abstract <T,U> CompletableFuture<U> handle
749 >            (CompletableFuture<T> f,
750 >             BiFunction<? super T,Throwable,? extends U> a);
751 >        public abstract <T> CompletableFuture<T> whenComplete
752 >            (CompletableFuture<T> f,
753 >             BiConsumer<? super T,? super Throwable> a);
754 >        public abstract <T,U> CompletableFuture<Void> runAfterBoth
755 >            (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a);
756 >        public abstract <T,U> CompletableFuture<Void> thenAcceptBoth
757 >            (CompletableFuture<T> f,
758 >             CompletionStage<? extends U> g,
759 >             BiConsumer<? super T,? super U> a);
760 >        public abstract <T,U,V> CompletableFuture<V> thenCombine
761 >            (CompletableFuture<T> f,
762 >             CompletionStage<? extends U> g,
763 >             BiFunction<? super T,? super U,? extends V> a);
764 >        public abstract <T> CompletableFuture<Void> runAfterEither
765 >            (CompletableFuture<T> f,
766 >             CompletionStage<?> g,
767 >             java.lang.Runnable a);
768 >        public abstract <T> CompletableFuture<Void> acceptEither
769 >            (CompletableFuture<T> f,
770 >             CompletionStage<? extends T> g,
771 >             Consumer<? super T> a);
772 >        public abstract <T,U> CompletableFuture<U> applyToEither
773 >            (CompletableFuture<T> f,
774 >             CompletionStage<? extends T> g,
775 >             Function<? super T,U> a);
776      }
777  
778      /**
779 +     * exceptionally action is not invoked when source completes
780 +     * normally, and source result is propagated
781 +     */
782 +    public void testExceptionally_normalCompletion() {
783 +        for (boolean createIncomplete : new boolean[] { true, false })
784 +        for (Integer v1 : new Integer[] { 1, null })
785 +    {
786 +        final AtomicInteger a = new AtomicInteger(0);
787 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
788 +        if (!createIncomplete) f.complete(v1);
789 +        final CompletableFuture<Integer> g = f.exceptionally
790 +            ((Throwable t) -> {
791 +                // Should not be called
792 +                a.getAndIncrement();
793 +                throw new AssertionError();
794 +            });
795 +        if (createIncomplete) f.complete(v1);
796 +
797 +        checkCompletedNormally(g, v1);
798 +        checkCompletedNormally(f, v1);
799 +        assertEquals(0, a.get());
800 +    }}
801 +
802 +
803 +    /**
804       * exceptionally action completes with function value on source
805 <     * exception; otherwise with source value
805 >     * exception
806       */
807 <    public void testExceptionally() {
808 <        CompletableFuture<Integer> f = new CompletableFuture<>();
809 <        ExceptionToInteger r = new ExceptionToInteger();
810 <        CompletableFuture<Integer> g = f.exceptionally(r);
811 <        f.completeExceptionally(new CFException());
812 <        checkCompletedNormally(g, three);
807 >    public void testExceptionally_exceptionalCompletion() {
808 >        for (boolean createIncomplete : new boolean[] { true, false })
809 >        for (Integer v1 : new Integer[] { 1, null })
810 >    {
811 >        final AtomicInteger a = new AtomicInteger(0);
812 >        final CFException ex = new CFException();
813 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
814 >        if (!createIncomplete) f.completeExceptionally(ex);
815 >        final CompletableFuture<Integer> g = f.exceptionally
816 >            ((Throwable t) -> {
817 >                ExecutionMode.DEFAULT.checkExecutionMode();
818 >                threadAssertSame(t, ex);
819 >                a.getAndIncrement();
820 >                return v1;
821 >            });
822 >        if (createIncomplete) f.completeExceptionally(ex);
823  
824 <        f = new CompletableFuture<>();
825 <        r = new ExceptionToInteger();
826 <        g = f.exceptionally(r);
827 <        f.complete(one);
828 <        checkCompletedNormally(g, one);
829 <    }
824 >        checkCompletedNormally(g, v1);
825 >        assertEquals(1, a.get());
826 >    }}
827 >
828 >    public void testExceptionally_exceptionalCompletionActionFailed() {
829 >        for (boolean createIncomplete : new boolean[] { true, false })
830 >        for (Integer v1 : new Integer[] { 1, null })
831 >    {
832 >        final AtomicInteger a = new AtomicInteger(0);
833 >        final CFException ex1 = new CFException();
834 >        final CFException ex2 = new CFException();
835 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
836 >        if (!createIncomplete) f.completeExceptionally(ex1);
837 >        final CompletableFuture<Integer> g = f.exceptionally
838 >            ((Throwable t) -> {
839 >                ExecutionMode.DEFAULT.checkExecutionMode();
840 >                threadAssertSame(t, ex1);
841 >                a.getAndIncrement();
842 >                throw ex2;
843 >            });
844 >        if (createIncomplete) f.completeExceptionally(ex1);
845 >
846 >        checkCompletedWithWrappedCFException(g, ex2);
847 >        assertEquals(1, a.get());
848 >    }}
849  
850      /**
851 <     * handle action completes normally with function value on either
852 <     * normal or exceptional completion of source
851 >     * handle action completes normally with function value on normal
852 >     * completion of source
853       */
854 <    public void testHandle() {
855 <        CompletableFuture<Integer> f, g;
856 <        IntegerHandler r;
854 >    public void testHandle_normalCompletion() {
855 >        for (ExecutionMode m : ExecutionMode.values())
856 >        for (boolean createIncomplete : new boolean[] { true, false })
857 >        for (Integer v1 : new Integer[] { 1, null })
858 >    {
859 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
860 >        final AtomicInteger a = new AtomicInteger(0);
861 >        if (!createIncomplete) f.complete(v1);
862 >        final CompletableFuture<Integer> g = m.handle
863 >            (f,
864 >             (Integer x, Throwable t) -> {
865 >                m.checkExecutionMode();
866 >                threadAssertSame(x, v1);
867 >                threadAssertNull(t);
868 >                a.getAndIncrement();
869 >                return inc(v1);
870 >            });
871 >        if (createIncomplete) f.complete(v1);
872  
873 <        f = new CompletableFuture<>();
874 <        f.completeExceptionally(new CFException());
875 <        g = f.handle(r = new IntegerHandler());
876 <        assertTrue(r.ran);
437 <        checkCompletedNormally(g, three);
873 >        checkCompletedNormally(g, inc(v1));
874 >        checkCompletedNormally(f, v1);
875 >        assertEquals(1, a.get());
876 >    }}
877  
878 <        f = new CompletableFuture<>();
879 <        g = f.handle(r = new IntegerHandler());
880 <        assertFalse(r.ran);
881 <        f.completeExceptionally(new CFException());
882 <        checkCompletedNormally(g, three);
883 <        assertTrue(r.ran);
878 >    /**
879 >     * handle action completes normally with function value on
880 >     * exceptional completion of source
881 >     */
882 >    public void testHandle_exceptionalCompletion() {
883 >        for (ExecutionMode m : ExecutionMode.values())
884 >        for (boolean createIncomplete : new boolean[] { true, false })
885 >        for (Integer v1 : new Integer[] { 1, null })
886 >    {
887 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
888 >        final AtomicInteger a = new AtomicInteger(0);
889 >        final CFException ex = new CFException();
890 >        if (!createIncomplete) f.completeExceptionally(ex);
891 >        final CompletableFuture<Integer> g = m.handle
892 >            (f,
893 >             (Integer x, Throwable t) -> {
894 >                m.checkExecutionMode();
895 >                threadAssertNull(x);
896 >                threadAssertSame(t, ex);
897 >                a.getAndIncrement();
898 >                return v1;
899 >            });
900 >        if (createIncomplete) f.completeExceptionally(ex);
901  
902 <        f = new CompletableFuture<>();
903 <        f.complete(one);
904 <        g = f.handle(r = new IntegerHandler());
905 <        assertTrue(r.ran);
450 <        checkCompletedNormally(g, two);
902 >        checkCompletedNormally(g, v1);
903 >        checkCompletedWithWrappedCFException(f, ex);
904 >        assertEquals(1, a.get());
905 >    }}
906  
907 <        f = new CompletableFuture<>();
908 <        g = f.handle(r = new IntegerHandler());
909 <        assertFalse(r.ran);
910 <        f.complete(one);
911 <        assertTrue(r.ran);
912 <        checkCompletedNormally(g, two);
913 <    }
907 >    /**
908 >     * handle action completes normally with function value on
909 >     * cancelled source
910 >     */
911 >    public void testHandle_sourceCancelled() {
912 >        for (ExecutionMode m : ExecutionMode.values())
913 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
914 >        for (boolean createIncomplete : new boolean[] { true, false })
915 >        for (Integer v1 : new Integer[] { 1, null })
916 >    {
917 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
918 >        final AtomicInteger a = new AtomicInteger(0);
919 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
920 >        final CompletableFuture<Integer> g = m.handle
921 >            (f,
922 >             (Integer x, Throwable t) -> {
923 >                m.checkExecutionMode();
924 >                threadAssertNull(x);
925 >                threadAssertTrue(t instanceof CancellationException);
926 >                a.getAndIncrement();
927 >                return v1;
928 >            });
929 >        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
930 >
931 >        checkCompletedNormally(g, v1);
932 >        checkCancelled(f);
933 >        assertEquals(1, a.get());
934 >    }}
935  
936      /**
937 <     * runAsync completes after running Runnable
937 >     * handle result completes exceptionally if action does
938       */
939 <    public void testRunAsync() {
940 <        Noop r = new Noop();
941 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r);
942 <        assertNull(f.join());
943 <        assertTrue(r.ran);
944 <        checkCompletedNormally(f, null);
945 <    }
939 >    public void testHandle_sourceFailedActionFailed() {
940 >        for (ExecutionMode m : ExecutionMode.values())
941 >        for (boolean createIncomplete : new boolean[] { true, false })
942 >    {
943 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
944 >        final AtomicInteger a = new AtomicInteger(0);
945 >        final CFException ex1 = new CFException();
946 >        final CFException ex2 = new CFException();
947 >        if (!createIncomplete) f.completeExceptionally(ex1);
948 >        final CompletableFuture<Integer> g = m.handle
949 >            (f,
950 >             (Integer x, Throwable t) -> {
951 >                m.checkExecutionMode();
952 >                threadAssertNull(x);
953 >                threadAssertSame(ex1, t);
954 >                a.getAndIncrement();
955 >                throw ex2;
956 >            });
957 >        if (createIncomplete) f.completeExceptionally(ex1);
958 >
959 >        checkCompletedWithWrappedCFException(g, ex2);
960 >        checkCompletedWithWrappedCFException(f, ex1);
961 >        assertEquals(1, a.get());
962 >    }}
963 >
964 >    public void testHandle_sourceCompletedNormallyActionFailed() {
965 >        for (ExecutionMode m : ExecutionMode.values())
966 >        for (boolean createIncomplete : new boolean[] { true, false })
967 >        for (Integer v1 : new Integer[] { 1, null })
968 >    {
969 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
970 >        final AtomicInteger a = new AtomicInteger(0);
971 >        final CFException ex = new CFException();
972 >        if (!createIncomplete) f.complete(v1);
973 >        final CompletableFuture<Integer> g = m.handle
974 >            (f,
975 >             (Integer x, Throwable t) -> {
976 >                m.checkExecutionMode();
977 >                threadAssertSame(x, v1);
978 >                threadAssertNull(t);
979 >                a.getAndIncrement();
980 >                throw ex;
981 >            });
982 >        if (createIncomplete) f.complete(v1);
983 >
984 >        checkCompletedWithWrappedCFException(g, ex);
985 >        checkCompletedNormally(f, v1);
986 >        assertEquals(1, a.get());
987 >    }}
988  
989      /**
990 <     * runAsync with executor completes after running Runnable
990 >     * runAsync completes after running Runnable
991       */
992 <    public void testRunAsync2() {
993 <        Noop r = new Noop();
994 <        ThreadExecutor exec = new ThreadExecutor();
995 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r, exec);
992 >    public void testRunAsync_normalCompletion() {
993 >        ExecutionMode[] executionModes = {
994 >            ExecutionMode.ASYNC,
995 >            ExecutionMode.EXECUTOR,
996 >        };
997 >        for (ExecutionMode m : executionModes)
998 >    {
999 >        final Noop r = new Noop(m);
1000 >        final CompletableFuture<Void> f = m.runAsync(r);
1001          assertNull(f.join());
479        assertTrue(r.ran);
1002          checkCompletedNormally(f, null);
1003 <        assertEquals(1, exec.count.get());
1004 <    }
1003 >        r.assertInvoked();
1004 >    }}
1005  
1006      /**
1007       * failing runAsync completes exceptionally after running Runnable
1008       */
1009 <    public void testRunAsync3() {
1010 <        FailingNoop r = new FailingNoop();
1011 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r);
1009 >    public void testRunAsync_exceptionalCompletion() {
1010 >        ExecutionMode[] executionModes = {
1011 >            ExecutionMode.ASYNC,
1012 >            ExecutionMode.EXECUTOR,
1013 >        };
1014 >        for (ExecutionMode m : executionModes)
1015 >    {
1016 >        final FailingRunnable r = new FailingRunnable(m);
1017 >        final CompletableFuture<Void> f = m.runAsync(r);
1018          checkCompletedWithWrappedCFException(f);
1019 <        assertTrue(r.ran);
1020 <    }
1019 >        r.assertInvoked();
1020 >    }}
1021  
1022      /**
1023       * supplyAsync completes with result of supplier
1024       */
1025 <    public void testSupplyAsync() {
1026 <        CompletableFuture<Integer> f;
1027 <        f = CompletableFuture.supplyAsync(supplyOne);
1028 <        assertEquals(f.join(), one);
1029 <        checkCompletedNormally(f, one);
1030 <    }
1031 <
1032 <    /**
1033 <     * supplyAsync with executor completes with result of supplier
1034 <     */
1035 <    public void testSupplyAsync2() {
1036 <        CompletableFuture<Integer> f;
1037 <        f = CompletableFuture.supplyAsync(supplyOne, new ThreadExecutor());
1038 <        assertEquals(f.join(), one);
511 <        checkCompletedNormally(f, one);
512 <    }
1025 >    public void testSupplyAsync_normalCompletion() {
1026 >        ExecutionMode[] executionModes = {
1027 >            ExecutionMode.ASYNC,
1028 >            ExecutionMode.EXECUTOR,
1029 >        };
1030 >        for (ExecutionMode m : executionModes)
1031 >        for (Integer v1 : new Integer[] { 1, null })
1032 >    {
1033 >        final IntegerSupplier r = new IntegerSupplier(m, v1);
1034 >        final CompletableFuture<Integer> f = m.supplyAsync(r);
1035 >        assertSame(v1, f.join());
1036 >        checkCompletedNormally(f, v1);
1037 >        r.assertInvoked();
1038 >    }}
1039  
1040      /**
1041       * Failing supplyAsync completes exceptionally
1042       */
1043 <    public void testSupplyAsync3() {
1044 <        FailingSupplier r = new FailingSupplier();
1045 <        CompletableFuture<Integer> f = CompletableFuture.supplyAsync(r);
1043 >    public void testSupplyAsync_exceptionalCompletion() {
1044 >        ExecutionMode[] executionModes = {
1045 >            ExecutionMode.ASYNC,
1046 >            ExecutionMode.EXECUTOR,
1047 >        };
1048 >        for (ExecutionMode m : executionModes)
1049 >    {
1050 >        FailingSupplier r = new FailingSupplier(m);
1051 >        CompletableFuture<Integer> f = m.supplyAsync(r);
1052          checkCompletedWithWrappedCFException(f);
1053 <        assertTrue(r.ran);
1054 <    }
1053 >        r.assertInvoked();
1054 >    }}
1055  
1056      // seq completion methods
1057  
1058      /**
1059       * thenRun result completes normally after normal completion of source
1060       */
1061 <    public void testThenRun() {
1062 <        CompletableFuture<Integer> f;
1063 <        CompletableFuture<Void> g;
1064 <        Noop r;
1065 <
1066 <        f = new CompletableFuture<>();
1067 <        g = f.thenRun(r = new Noop());
1068 <        f.complete(null);
1069 <        checkCompletedNormally(g, null);
1070 <        assertTrue(r.ran);
1061 >    public void testThenRun_normalCompletion() {
1062 >        for (ExecutionMode m : ExecutionMode.values())
1063 >        for (boolean createIncomplete : new boolean[] { true, false })
1064 >        for (Integer v1 : new Integer[] { 1, null })
1065 >    {
1066 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1067 >        final Noop r = new Noop(m);
1068 >        if (!createIncomplete) f.complete(v1);
1069 >        final CompletableFuture<Void> g = m.thenRun(f, r);
1070 >        if (createIncomplete) {
1071 >            checkIncomplete(g);
1072 >            f.complete(v1);
1073 >        }
1074  
540        f = new CompletableFuture<>();
541        f.complete(null);
542        g = f.thenRun(r = new Noop());
1075          checkCompletedNormally(g, null);
1076 <        assertTrue(r.ran);
1077 <    }
1076 >        checkCompletedNormally(f, v1);
1077 >        r.assertInvoked();
1078 >    }}
1079  
1080      /**
1081       * thenRun result completes exceptionally after exceptional
1082       * completion of source
1083       */
1084 <    public void testThenRun2() {
1085 <        CompletableFuture<Integer> f;
1086 <        CompletableFuture<Void> g;
1087 <        Noop r;
1088 <
1089 <        f = new CompletableFuture<>();
1090 <        g = f.thenRun(r = new Noop());
1091 <        f.completeExceptionally(new CFException());
1092 <        checkCompletedWithWrappedCFException(g);
1093 <        assertFalse(r.ran);
1084 >    public void testThenRun_exceptionalCompletion() {
1085 >        for (ExecutionMode m : ExecutionMode.values())
1086 >        for (boolean createIncomplete : new boolean[] { true, false })
1087 >    {
1088 >        final CFException ex = new CFException();
1089 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1090 >        final Noop r = new Noop(m);
1091 >        if (!createIncomplete) f.completeExceptionally(ex);
1092 >        final CompletableFuture<Void> g = m.thenRun(f, r);
1093 >        if (createIncomplete) {
1094 >            checkIncomplete(g);
1095 >            f.completeExceptionally(ex);
1096 >        }
1097  
1098 <        f = new CompletableFuture<>();
1099 <        f.completeExceptionally(new CFException());
1100 <        g = f.thenRun(r = new Noop());
1101 <        checkCompletedWithWrappedCFException(g);
566 <        assertFalse(r.ran);
567 <    }
1098 >        checkCompletedWithWrappedCFException(g, ex);
1099 >        checkCompletedWithWrappedCFException(f, ex);
1100 >        r.assertNotInvoked();
1101 >    }}
1102  
1103      /**
1104 <     * thenRun result completes exceptionally if action does
1104 >     * thenRun result completes exceptionally if source cancelled
1105       */
1106 <    public void testThenRun3() {
1107 <        CompletableFuture<Integer> f;
1108 <        CompletableFuture<Void> g;
1109 <        FailingNoop r;
1110 <
1111 <        f = new CompletableFuture<>();
1112 <        g = f.thenRun(r = new FailingNoop());
1113 <        f.complete(null);
1114 <        checkCompletedWithWrappedCFException(g);
1106 >    public void testThenRun_sourceCancelled() {
1107 >        for (ExecutionMode m : ExecutionMode.values())
1108 >        for (boolean createIncomplete : new boolean[] { true, false })
1109 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1110 >    {
1111 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1112 >        final Noop r = new Noop(m);
1113 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1114 >        final CompletableFuture<Void> g = m.thenRun(f, r);
1115 >        if (createIncomplete) {
1116 >            checkIncomplete(g);
1117 >            assertTrue(f.cancel(mayInterruptIfRunning));
1118 >        }
1119  
1120 <        f = new CompletableFuture<>();
1121 <        f.complete(null);
1122 <        g = f.thenRun(r = new FailingNoop());
1123 <        checkCompletedWithWrappedCFException(g);
586 <    }
1120 >        checkCompletedWithWrappedCancellationException(g);
1121 >        checkCancelled(f);
1122 >        r.assertNotInvoked();
1123 >    }}
1124  
1125      /**
1126 <     * thenRun result completes exceptionally if source cancelled
1126 >     * thenRun result completes exceptionally if action does
1127       */
1128 <    public void testThenRun4() {
1129 <        CompletableFuture<Integer> f;
1130 <        CompletableFuture<Void> g;
1131 <        Noop r;
1132 <
1133 <        f = new CompletableFuture<>();
1134 <        g = f.thenRun(r = new Noop());
1135 <        assertTrue(f.cancel(true));
1136 <        checkCompletedWithWrappedCancellationException(g);
1128 >    public void testThenRun_actionFailed() {
1129 >        for (ExecutionMode m : ExecutionMode.values())
1130 >        for (boolean createIncomplete : new boolean[] { true, false })
1131 >        for (Integer v1 : new Integer[] { 1, null })
1132 >    {
1133 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1134 >        final FailingRunnable r = new FailingRunnable(m);
1135 >        if (!createIncomplete) f.complete(v1);
1136 >        final CompletableFuture<Void> g = m.thenRun(f, r);
1137 >        if (createIncomplete) {
1138 >            checkIncomplete(g);
1139 >            f.complete(v1);
1140 >        }
1141  
1142 <        f = new CompletableFuture<>();
1143 <        assertTrue(f.cancel(true));
1144 <        g = f.thenRun(r = new Noop());
604 <        checkCompletedWithWrappedCancellationException(g);
605 <    }
1142 >        checkCompletedWithWrappedCFException(g);
1143 >        checkCompletedNormally(f, v1);
1144 >    }}
1145  
1146      /**
1147       * thenApply result completes normally after normal completion of source
1148       */
1149 <    public void testThenApply() {
1150 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1151 <        CompletableFuture<Integer> g = f.thenApply(inc);
1152 <        f.complete(one);
1153 <        checkCompletedNormally(g, two);
1154 <    }
1149 >    public void testThenApply_normalCompletion() {
1150 >        for (ExecutionMode m : ExecutionMode.values())
1151 >        for (boolean createIncomplete : new boolean[] { true, false })
1152 >        for (Integer v1 : new Integer[] { 1, null })
1153 >    {
1154 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1155 >        final IncFunction r = new IncFunction(m);
1156 >        if (!createIncomplete) f.complete(v1);
1157 >        final CompletableFuture<Integer> g = m.thenApply(f, r);
1158 >        if (createIncomplete) {
1159 >            checkIncomplete(g);
1160 >            f.complete(v1);
1161 >        }
1162 >
1163 >        checkCompletedNormally(g, inc(v1));
1164 >        checkCompletedNormally(f, v1);
1165 >        r.assertInvoked();
1166 >    }}
1167  
1168      /**
1169       * thenApply result completes exceptionally after exceptional
1170       * completion of source
1171       */
1172 <    public void testThenApply2() {
1173 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1174 <        CompletableFuture<Integer> g = f.thenApply(inc);
1175 <        f.completeExceptionally(new CFException());
1176 <        checkCompletedWithWrappedCFException(g);
1177 <    }
1172 >    public void testThenApply_exceptionalCompletion() {
1173 >        for (ExecutionMode m : ExecutionMode.values())
1174 >        for (boolean createIncomplete : new boolean[] { true, false })
1175 >    {
1176 >        final CFException ex = new CFException();
1177 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1178 >        final IncFunction r = new IncFunction(m);
1179 >        if (!createIncomplete) f.completeExceptionally(ex);
1180 >        final CompletableFuture<Integer> g = m.thenApply(f, r);
1181 >        if (createIncomplete) {
1182 >            checkIncomplete(g);
1183 >            f.completeExceptionally(ex);
1184 >        }
1185  
1186 <    /**
1187 <     * thenApply result completes exceptionally if action does
1188 <     */
1189 <    public void testThenApply3() {
632 <        CompletableFuture<Integer> f = new CompletableFuture<>();
633 <        CompletableFuture<Integer> g = f.thenApply(new FailingFunction());
634 <        f.complete(one);
635 <        checkCompletedWithWrappedCFException(g);
636 <    }
1186 >        checkCompletedWithWrappedCFException(g, ex);
1187 >        checkCompletedWithWrappedCFException(f, ex);
1188 >        r.assertNotInvoked();
1189 >    }}
1190  
1191      /**
1192       * thenApply result completes exceptionally if source cancelled
1193       */
1194 <    public void testThenApply4() {
1195 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1196 <        CompletableFuture<Integer> g = f.thenApply(inc);
1197 <        assertTrue(f.cancel(true));
1194 >    public void testThenApply_sourceCancelled() {
1195 >        for (ExecutionMode m : ExecutionMode.values())
1196 >        for (boolean createIncomplete : new boolean[] { true, false })
1197 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1198 >    {
1199 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1200 >        final IncFunction r = new IncFunction(m);
1201 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1202 >        final CompletableFuture<Integer> g = m.thenApply(f, r);
1203 >        if (createIncomplete) {
1204 >            checkIncomplete(g);
1205 >            assertTrue(f.cancel(mayInterruptIfRunning));
1206 >        }
1207 >
1208          checkCompletedWithWrappedCancellationException(g);
1209 <    }
1209 >        checkCancelled(f);
1210 >        r.assertNotInvoked();
1211 >    }}
1212 >
1213 >    /**
1214 >     * thenApply result completes exceptionally if action does
1215 >     */
1216 >    public void testThenApply_actionFailed() {
1217 >        for (ExecutionMode m : ExecutionMode.values())
1218 >        for (boolean createIncomplete : new boolean[] { true, false })
1219 >        for (Integer v1 : new Integer[] { 1, null })
1220 >    {
1221 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1222 >        final FailingFunction r = new FailingFunction(m);
1223 >        if (!createIncomplete) f.complete(v1);
1224 >        final CompletableFuture<Integer> g = m.thenApply(f, r);
1225 >        if (createIncomplete) {
1226 >            checkIncomplete(g);
1227 >            f.complete(v1);
1228 >        }
1229 >
1230 >        checkCompletedWithWrappedCFException(g);
1231 >        checkCompletedNormally(f, v1);
1232 >    }}
1233  
1234      /**
1235       * thenAccept result completes normally after normal completion of source
1236       */
1237 <    public void testThenAccept() {
1238 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1239 <        IncAction r = new IncAction();
1240 <        CompletableFuture<Void> g = f.thenAccept(r);
1241 <        f.complete(one);
1237 >    public void testThenAccept_normalCompletion() {
1238 >        for (ExecutionMode m : ExecutionMode.values())
1239 >        for (boolean createIncomplete : new boolean[] { true, false })
1240 >        for (Integer v1 : new Integer[] { 1, null })
1241 >    {
1242 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1243 >        final IncAction r = new IncAction(m);
1244 >        if (!createIncomplete) f.complete(v1);
1245 >        final CompletableFuture<Void> g = m.thenAccept(f, r);
1246 >        if (createIncomplete) {
1247 >            checkIncomplete(g);
1248 >            f.complete(v1);
1249 >        }
1250 >
1251          checkCompletedNormally(g, null);
1252 <        assertEquals(r.value, 2);
1253 <    }
1252 >        checkCompletedNormally(f, v1);
1253 >        r.assertInvoked();
1254 >        r.assertValue(inc(v1));
1255 >    }}
1256  
1257      /**
1258       * thenAccept result completes exceptionally after exceptional
1259       * completion of source
1260       */
1261 <    public void testThenAccept2() {
1262 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1263 <        IncAction r = new IncAction();
1264 <        CompletableFuture<Void> g = f.thenAccept(r);
1265 <        f.completeExceptionally(new CFException());
1266 <        checkCompletedWithWrappedCFException(g);
1267 <    }
1261 >    public void testThenAccept_exceptionalCompletion() {
1262 >        for (ExecutionMode m : ExecutionMode.values())
1263 >        for (boolean createIncomplete : new boolean[] { true, false })
1264 >    {
1265 >        final CFException ex = new CFException();
1266 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1267 >        final IncAction r = new IncAction(m);
1268 >        if (!createIncomplete) f.completeExceptionally(ex);
1269 >        final CompletableFuture<Void> g = m.thenAccept(f, r);
1270 >        if (createIncomplete) {
1271 >            checkIncomplete(g);
1272 >            f.completeExceptionally(ex);
1273 >        }
1274  
1275 <    /**
1276 <     * thenAccept result completes exceptionally if action does
1277 <     */
1278 <    public void testThenAccept3() {
676 <        CompletableFuture<Integer> f = new CompletableFuture<>();
677 <        FailingConsumer r = new FailingConsumer();
678 <        CompletableFuture<Void> g = f.thenAccept(r);
679 <        f.complete(one);
680 <        checkCompletedWithWrappedCFException(g);
681 <        assertTrue(r.ran);
682 <    }
1275 >        checkCompletedWithWrappedCFException(g, ex);
1276 >        checkCompletedWithWrappedCFException(f, ex);
1277 >        r.assertNotInvoked();
1278 >    }}
1279  
1280      /**
1281       * thenAccept result completes exceptionally if source cancelled
1282       */
1283 <    public void testThenAccept4() {
1284 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1285 <        IncAction r = new IncAction();
1286 <        CompletableFuture<Void> g = f.thenAccept(r);
1287 <        assertTrue(f.cancel(true));
1283 >    public void testThenAccept_sourceCancelled() {
1284 >        for (ExecutionMode m : ExecutionMode.values())
1285 >        for (boolean createIncomplete : new boolean[] { true, false })
1286 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1287 >    {
1288 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1289 >        final IncAction r = new IncAction(m);
1290 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1291 >        final CompletableFuture<Void> g = m.thenAccept(f, r);
1292 >        if (createIncomplete) {
1293 >            checkIncomplete(g);
1294 >            assertTrue(f.cancel(mayInterruptIfRunning));
1295 >        }
1296 >
1297          checkCompletedWithWrappedCancellationException(g);
1298 <    }
1298 >        checkCancelled(f);
1299 >        r.assertNotInvoked();
1300 >    }}
1301 >
1302 >    /**
1303 >     * thenAccept result completes exceptionally if action does
1304 >     */
1305 >    public void testThenAccept_actionFailed() {
1306 >        for (ExecutionMode m : ExecutionMode.values())
1307 >        for (boolean createIncomplete : new boolean[] { true, false })
1308 >        for (Integer v1 : new Integer[] { 1, null })
1309 >    {
1310 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1311 >        final FailingConsumer r = new FailingConsumer(m);
1312 >        if (!createIncomplete) f.complete(v1);
1313 >        final CompletableFuture<Void> g = m.thenAccept(f, r);
1314 >        if (createIncomplete) {
1315 >            checkIncomplete(g);
1316 >            f.complete(v1);
1317 >        }
1318 >
1319 >        checkCompletedWithWrappedCFException(g);
1320 >        checkCompletedNormally(f, v1);
1321 >    }}
1322  
1323      /**
1324       * thenCombine result completes normally after normal completion
1325       * of sources
1326       */
1327 <    public void testThenCombine() {
1328 <        CompletableFuture<Integer> f, g, h;
1329 <
1330 <        f = new CompletableFuture<>();
1331 <        g = new CompletableFuture<>();
1332 <        h = f.thenCombine(g, subtract);
1333 <        f.complete(3);
1334 <        checkIncomplete(h);
1335 <        g.complete(1);
1336 <        checkCompletedNormally(h, 2);
1327 >    public void testThenCombine_normalCompletion() {
1328 >        for (ExecutionMode m : ExecutionMode.values())
1329 >        for (boolean createIncomplete : new boolean[] { true, false })
1330 >        for (boolean fFirst : new boolean[] { true, false })
1331 >        for (Integer v1 : new Integer[] { 1, null })
1332 >        for (Integer v2 : new Integer[] { 2, null })
1333 >    {
1334 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1335 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1336 >        final SubtractFunction r = new SubtractFunction(m);
1337  
1338 <        f = new CompletableFuture<>();
1339 <        g = new CompletableFuture<>();
1340 <        h = f.thenCombine(g, subtract);
1341 <        g.complete(1);
1342 <        checkIncomplete(h);
1343 <        f.complete(3);
1344 <        checkCompletedNormally(h, 2);
1338 >        if (fFirst) f.complete(v1); else g.complete(v2);
1339 >        if (!createIncomplete)
1340 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1341 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1342 >        if (createIncomplete) {
1343 >            checkIncomplete(h);
1344 >            r.assertNotInvoked();
1345 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1346 >        }
1347  
1348 <        f = new CompletableFuture<>();
1349 <        g = new CompletableFuture<>();
1350 <        g.complete(1);
1351 <        f.complete(3);
1352 <        h = f.thenCombine(g, subtract);
723 <        checkCompletedNormally(h, 2);
724 <    }
1348 >        checkCompletedNormally(h, subtract(v1, v2));
1349 >        checkCompletedNormally(f, v1);
1350 >        checkCompletedNormally(g, v2);
1351 >        r.assertInvoked();
1352 >    }}
1353  
1354      /**
1355       * thenCombine result completes exceptionally after exceptional
1356       * completion of either source
1357       */
1358 <    public void testThenCombine2() {
1359 <        CompletableFuture<Integer> f, g, h;
1360 <
1361 <        f = new CompletableFuture<>();
1362 <        g = new CompletableFuture<>();
1363 <        h = f.thenCombine(g, subtract);
1364 <        f.completeExceptionally(new CFException());
1365 <        checkIncomplete(h);
1366 <        g.complete(1);
1367 <        checkCompletedWithWrappedCFException(h);
740 <
741 <        f = new CompletableFuture<>();
742 <        g = new CompletableFuture<>();
743 <        h = f.thenCombine(g, subtract);
744 <        g.completeExceptionally(new CFException());
745 <        checkIncomplete(h);
746 <        f.complete(3);
747 <        checkCompletedWithWrappedCFException(h);
748 <
749 <        f = new CompletableFuture<>();
750 <        g = new CompletableFuture<>();
751 <        f.complete(3);
752 <        g.completeExceptionally(new CFException());
753 <        h = f.thenCombine(g, subtract);
754 <        checkCompletedWithWrappedCFException(h);
1358 >    public void testThenCombine_exceptionalCompletion() {
1359 >        for (ExecutionMode m : ExecutionMode.values())
1360 >        for (boolean createIncomplete : new boolean[] { true, false })
1361 >        for (boolean fFirst : new boolean[] { true, false })
1362 >        for (Integer v1 : new Integer[] { 1, null })
1363 >    {
1364 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1365 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1366 >        final CFException ex = new CFException();
1367 >        final SubtractFunction r = new SubtractFunction(m);
1368  
1369 <        f = new CompletableFuture<>();
1370 <        g = new CompletableFuture<>();
1371 <        f.completeExceptionally(new CFException());
1372 <        g.complete(3);
1373 <        h = f.thenCombine(g, subtract);
1374 <        checkCompletedWithWrappedCFException(h);
1375 <    }
1369 >        (fFirst ? f : g).complete(v1);
1370 >        if (!createIncomplete)
1371 >            (!fFirst ? f : g).completeExceptionally(ex);
1372 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1373 >        if (createIncomplete) {
1374 >            checkIncomplete(h);
1375 >            (!fFirst ? f : g).completeExceptionally(ex);
1376 >        }
1377  
1378 <    /**
1379 <     * thenCombine result completes exceptionally if action does
1380 <     */
1381 <    public void testThenCombine3() {
1382 <        CompletableFuture<Integer> f = new CompletableFuture<>();
769 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
770 <        FailingBiFunction r = new FailingBiFunction();
771 <        CompletableFuture<Integer> g = f.thenCombine(f2, r);
772 <        f.complete(one);
773 <        checkIncomplete(g);
774 <        assertFalse(r.ran);
775 <        f2.complete(two);
776 <        checkCompletedWithWrappedCFException(g);
777 <        assertTrue(r.ran);
778 <    }
1378 >        checkCompletedWithWrappedCFException(h, ex);
1379 >        r.assertNotInvoked();
1380 >        checkCompletedNormally(fFirst ? f : g, v1);
1381 >        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1382 >    }}
1383  
1384      /**
1385       * thenCombine result completes exceptionally if either source cancelled
1386       */
1387 <    public void testThenCombine4() {
1388 <        CompletableFuture<Integer> f, g, h;
1387 >    public void testThenCombine_sourceCancelled() {
1388 >        for (ExecutionMode m : ExecutionMode.values())
1389 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1390 >        for (boolean createIncomplete : new boolean[] { true, false })
1391 >        for (boolean fFirst : new boolean[] { true, false })
1392 >        for (Integer v1 : new Integer[] { 1, null })
1393 >    {
1394 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1395 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1396 >        final SubtractFunction r = new SubtractFunction(m);
1397  
1398 <        f = new CompletableFuture<>();
1399 <        g = new CompletableFuture<>();
1400 <        h = f.thenCombine(g, subtract);
1401 <        assertTrue(f.cancel(true));
1402 <        checkIncomplete(h);
1403 <        g.complete(1);
1404 <        checkCompletedWithWrappedCancellationException(h);
1398 >        (fFirst ? f : g).complete(v1);
1399 >        if (!createIncomplete)
1400 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1401 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1402 >        if (createIncomplete) {
1403 >            checkIncomplete(h);
1404 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1405 >        }
1406  
794        f = new CompletableFuture<>();
795        g = new CompletableFuture<>();
796        h = f.thenCombine(g, subtract);
797        assertTrue(g.cancel(true));
798        checkIncomplete(h);
799        f.complete(3);
1407          checkCompletedWithWrappedCancellationException(h);
1408 +        checkCancelled(!fFirst ? f : g);
1409 +        r.assertNotInvoked();
1410 +        checkCompletedNormally(fFirst ? f : g, v1);
1411 +    }}
1412  
1413 <        f = new CompletableFuture<>();
1414 <        g = new CompletableFuture<>();
1415 <        assertTrue(f.cancel(true));
1416 <        assertTrue(g.cancel(true));
1417 <        h = f.thenCombine(g, subtract);
1418 <        checkCompletedWithWrappedCancellationException(h);
1419 <    }
1413 >    /**
1414 >     * thenCombine result completes exceptionally if action does
1415 >     */
1416 >    public void testThenCombine_actionFailed() {
1417 >        for (ExecutionMode m : ExecutionMode.values())
1418 >        for (boolean fFirst : new boolean[] { true, false })
1419 >        for (Integer v1 : new Integer[] { 1, null })
1420 >        for (Integer v2 : new Integer[] { 2, null })
1421 >    {
1422 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1423 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1424 >        final FailingBiFunction r = new FailingBiFunction(m);
1425 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1426 >
1427 >        if (fFirst) {
1428 >            f.complete(v1);
1429 >            g.complete(v2);
1430 >        } else {
1431 >            g.complete(v2);
1432 >            f.complete(v1);
1433 >        }
1434 >
1435 >        checkCompletedWithWrappedCFException(h);
1436 >        checkCompletedNormally(f, v1);
1437 >        checkCompletedNormally(g, v2);
1438 >    }}
1439  
1440      /**
1441       * thenAcceptBoth result completes normally after normal
1442       * completion of sources
1443       */
1444 <    public void testThenAcceptBoth() {
1445 <        CompletableFuture<Integer> f, g;
1446 <        CompletableFuture<Void> h;
1447 <        SubtractAction r;
1448 <
1449 <        f = new CompletableFuture<>();
1450 <        g = new CompletableFuture<>();
1451 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
1452 <        f.complete(3);
1453 <        checkIncomplete(h);
824 <        g.complete(1);
825 <        checkCompletedNormally(h, null);
826 <        assertEquals(r.value, 2);
1444 >    public void testThenAcceptBoth_normalCompletion() {
1445 >        for (ExecutionMode m : ExecutionMode.values())
1446 >        for (boolean createIncomplete : new boolean[] { true, false })
1447 >        for (boolean fFirst : new boolean[] { true, false })
1448 >        for (Integer v1 : new Integer[] { 1, null })
1449 >        for (Integer v2 : new Integer[] { 2, null })
1450 >    {
1451 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1452 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1453 >        final SubtractAction r = new SubtractAction(m);
1454  
1455 <        f = new CompletableFuture<>();
1456 <        g = new CompletableFuture<>();
1457 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
1458 <        g.complete(1);
1459 <        checkIncomplete(h);
1460 <        f.complete(3);
1461 <        checkCompletedNormally(h, null);
1462 <        assertEquals(r.value, 2);
1455 >        if (fFirst) f.complete(v1); else g.complete(v2);
1456 >        if (!createIncomplete)
1457 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1458 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1459 >        if (createIncomplete) {
1460 >            checkIncomplete(h);
1461 >            r.assertNotInvoked();
1462 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1463 >        }
1464  
837        f = new CompletableFuture<>();
838        g = new CompletableFuture<>();
839        g.complete(1);
840        f.complete(3);
841        h = f.thenAcceptBoth(g, r = new SubtractAction());
1465          checkCompletedNormally(h, null);
1466 <        assertEquals(r.value, 2);
1467 <    }
1466 >        r.assertValue(subtract(v1, v2));
1467 >        checkCompletedNormally(f, v1);
1468 >        checkCompletedNormally(g, v2);
1469 >    }}
1470  
1471      /**
1472       * thenAcceptBoth result completes exceptionally after exceptional
1473       * completion of either source
1474       */
1475 <    public void testThenAcceptBoth2() {
1476 <        CompletableFuture<Integer> f, g;
1477 <        CompletableFuture<Void> h;
1478 <        SubtractAction r;
1475 >    public void testThenAcceptBoth_exceptionalCompletion() {
1476 >        for (ExecutionMode m : ExecutionMode.values())
1477 >        for (boolean createIncomplete : new boolean[] { true, false })
1478 >        for (boolean fFirst : new boolean[] { true, false })
1479 >        for (Integer v1 : new Integer[] { 1, null })
1480 >    {
1481 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1482 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1483 >        final CFException ex = new CFException();
1484 >        final SubtractAction r = new SubtractAction(m);
1485  
1486 <        f = new CompletableFuture<>();
1487 <        g = new CompletableFuture<>();
1488 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
1489 <        f.completeExceptionally(new CFException());
1490 <        checkIncomplete(h);
1491 <        g.complete(1);
1492 <        checkCompletedWithWrappedCFException(h);
1486 >        (fFirst ? f : g).complete(v1);
1487 >        if (!createIncomplete)
1488 >            (!fFirst ? f : g).completeExceptionally(ex);
1489 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1490 >        if (createIncomplete) {
1491 >            checkIncomplete(h);
1492 >            (!fFirst ? f : g).completeExceptionally(ex);
1493 >        }
1494  
1495 <        f = new CompletableFuture<>();
1496 <        g = new CompletableFuture<>();
1497 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
1498 <        g.completeExceptionally(new CFException());
1499 <        checkIncomplete(h);
868 <        f.complete(3);
869 <        checkCompletedWithWrappedCFException(h);
1495 >        checkCompletedWithWrappedCFException(h, ex);
1496 >        r.assertNotInvoked();
1497 >        checkCompletedNormally(fFirst ? f : g, v1);
1498 >        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1499 >    }}
1500  
1501 <        f = new CompletableFuture<>();
1502 <        g = new CompletableFuture<>();
1503 <        f.complete(3);
1504 <        g.completeExceptionally(new CFException());
1505 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
1506 <        checkCompletedWithWrappedCFException(h);
1501 >    /**
1502 >     * thenAcceptBoth result completes exceptionally if either source cancelled
1503 >     */
1504 >    public void testThenAcceptBoth_sourceCancelled() {
1505 >        for (ExecutionMode m : ExecutionMode.values())
1506 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1507 >        for (boolean createIncomplete : new boolean[] { true, false })
1508 >        for (boolean fFirst : new boolean[] { true, false })
1509 >        for (Integer v1 : new Integer[] { 1, null })
1510 >    {
1511 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1512 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1513 >        final SubtractAction r = new SubtractAction(m);
1514  
1515 <        f = new CompletableFuture<>();
1516 <        g = new CompletableFuture<>();
1517 <        f.completeExceptionally(new CFException());
1518 <        g.complete(3);
1519 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
1520 <        checkCompletedWithWrappedCFException(h);
1521 <    }
1515 >        (fFirst ? f : g).complete(v1);
1516 >        if (!createIncomplete)
1517 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1518 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1519 >        if (createIncomplete) {
1520 >            checkIncomplete(h);
1521 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1522 >        }
1523 >
1524 >        checkCompletedWithWrappedCancellationException(h);
1525 >        checkCancelled(!fFirst ? f : g);
1526 >        r.assertNotInvoked();
1527 >        checkCompletedNormally(fFirst ? f : g, v1);
1528 >    }}
1529  
1530      /**
1531       * thenAcceptBoth result completes exceptionally if action does
1532       */
1533 <    public void testThenAcceptBoth3() {
1534 <        CompletableFuture<Integer> f, g;
1535 <        CompletableFuture<Void> h;
1536 <        FailingBiConsumer r;
1533 >    public void testThenAcceptBoth_actionFailed() {
1534 >        for (ExecutionMode m : ExecutionMode.values())
1535 >        for (boolean fFirst : new boolean[] { true, false })
1536 >        for (Integer v1 : new Integer[] { 1, null })
1537 >        for (Integer v2 : new Integer[] { 2, null })
1538 >    {
1539 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1540 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1541 >        final FailingBiConsumer r = new FailingBiConsumer(m);
1542 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1543  
1544 <        f = new CompletableFuture<>();
1545 <        g = new CompletableFuture<>();
1546 <        h = f.thenAcceptBoth(g, r = new FailingBiConsumer());
1547 <        f.complete(3);
1548 <        checkIncomplete(h);
1549 <        g.complete(1);
1550 <        checkCompletedWithWrappedCFException(h);
1544 >        if (fFirst) {
1545 >            f.complete(v1);
1546 >            g.complete(v2);
1547 >        } else {
1548 >            g.complete(v2);
1549 >            f.complete(v1);
1550 >        }
1551  
902        f = new CompletableFuture<>();
903        g = new CompletableFuture<>();
904        f.complete(3);
905        g.complete(1);
906        h = f.thenAcceptBoth(g, r = new FailingBiConsumer());
1552          checkCompletedWithWrappedCFException(h);
1553 <    }
1553 >        checkCompletedNormally(f, v1);
1554 >        checkCompletedNormally(g, v2);
1555 >    }}
1556  
1557      /**
1558 <     * thenAcceptBoth result completes exceptionally if either source cancelled
1558 >     * runAfterBoth result completes normally after normal
1559 >     * completion of sources
1560       */
1561 <    public void testThenAcceptBoth4() {
1562 <        CompletableFuture<Integer> f, g;
1563 <        CompletableFuture<Void> h;
1564 <        SubtractAction r;
1561 >    public void testRunAfterBoth_normalCompletion() {
1562 >        for (ExecutionMode m : ExecutionMode.values())
1563 >        for (boolean createIncomplete : new boolean[] { true, false })
1564 >        for (boolean fFirst : new boolean[] { true, false })
1565 >        for (Integer v1 : new Integer[] { 1, null })
1566 >        for (Integer v2 : new Integer[] { 2, null })
1567 >    {
1568 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1569 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1570 >        final Noop r = new Noop(m);
1571  
1572 <        f = new CompletableFuture<>();
1573 <        g = new CompletableFuture<>();
1574 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
1575 <        assertTrue(f.cancel(true));
1576 <        checkIncomplete(h);
1577 <        g.complete(1);
1578 <        checkCompletedWithWrappedCancellationException(h);
1572 >        if (fFirst) f.complete(v1); else g.complete(v2);
1573 >        if (!createIncomplete)
1574 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1575 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1576 >        if (createIncomplete) {
1577 >            checkIncomplete(h);
1578 >            r.assertNotInvoked();
1579 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1580 >        }
1581  
1582 <        f = new CompletableFuture<>();
1583 <        g = new CompletableFuture<>();
1584 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
1585 <        assertTrue(g.cancel(true));
1586 <        checkIncomplete(h);
931 <        f.complete(3);
932 <        checkCompletedWithWrappedCancellationException(h);
1582 >        checkCompletedNormally(h, null);
1583 >        r.assertInvoked();
1584 >        checkCompletedNormally(f, v1);
1585 >        checkCompletedNormally(g, v2);
1586 >    }}
1587  
1588 <        f = new CompletableFuture<>();
1589 <        g = new CompletableFuture<>();
1590 <        f.complete(3);
1591 <        assertTrue(g.cancel(true));
1592 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
1593 <        checkCompletedWithWrappedCancellationException(h);
1588 >    /**
1589 >     * runAfterBoth result completes exceptionally after exceptional
1590 >     * completion of either source
1591 >     */
1592 >    public void testRunAfterBoth_exceptionalCompletion() {
1593 >        for (ExecutionMode m : ExecutionMode.values())
1594 >        for (boolean createIncomplete : new boolean[] { true, false })
1595 >        for (boolean fFirst : new boolean[] { true, false })
1596 >        for (Integer v1 : new Integer[] { 1, null })
1597 >    {
1598 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1599 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1600 >        final CFException ex = new CFException();
1601 >        final Noop r = new Noop(m);
1602  
1603 <        f = new CompletableFuture<>();
1604 <        g = new CompletableFuture<>();
1605 <        assertTrue(f.cancel(true));
1606 <        g.complete(3);
1607 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
1608 <        checkCompletedWithWrappedCancellationException(h);
1609 <    }
1603 >        (fFirst ? f : g).complete(v1);
1604 >        if (!createIncomplete)
1605 >            (!fFirst ? f : g).completeExceptionally(ex);
1606 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1607 >        if (createIncomplete) {
1608 >            checkIncomplete(h);
1609 >            (!fFirst ? f : g).completeExceptionally(ex);
1610 >        }
1611 >
1612 >        checkCompletedWithWrappedCFException(h, ex);
1613 >        r.assertNotInvoked();
1614 >        checkCompletedNormally(fFirst ? f : g, v1);
1615 >        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1616 >    }}
1617  
1618      /**
1619 <     * Permits the testing of parallel code for the 3 different
951 <     * execution modes without repeating all the testing code.
1619 >     * runAfterBoth result completes exceptionally if either source cancelled
1620       */
1621 <    enum ExecutionMode {
1622 <        DEFAULT {
1623 <            public <T,U> CompletableFuture<Void> runAfterBoth
1624 <                (CompletableFuture<T> f, CompletableFuture<U> g, Runnable r) {
1625 <                return f.runAfterBoth(g, r);
1626 <            }
1627 <        },
1621 >    public void testRunAfterBoth_sourceCancelled() {
1622 >        for (ExecutionMode m : ExecutionMode.values())
1623 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1624 >        for (boolean createIncomplete : new boolean[] { true, false })
1625 >        for (boolean fFirst : new boolean[] { true, false })
1626 >        for (Integer v1 : new Integer[] { 1, null })
1627 >    {
1628 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1629 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1630 >        final Noop r = new Noop(m);
1631  
961        DEFAULT_ASYNC {
962            public <T,U> CompletableFuture<Void> runAfterBoth
963                (CompletableFuture<T> f, CompletableFuture<U> g, Runnable r) {
964                return f.runAfterBothAsync(g, r);
965            }
966        },
1632  
1633 <        EXECUTOR {
1634 <            public <T,U> CompletableFuture<Void> runAfterBoth
1635 <                (CompletableFuture<T> f, CompletableFuture<U> g, Runnable r) {
1636 <                return f.runAfterBothAsync(g, r, new ThreadExecutor());
1637 <            }
1638 <        };
1633 >        (fFirst ? f : g).complete(v1);
1634 >        if (!createIncomplete)
1635 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1636 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1637 >        if (createIncomplete) {
1638 >            checkIncomplete(h);
1639 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1640 >        }
1641  
1642 <        public abstract <T,U> CompletableFuture<Void> runAfterBoth
1643 <            (CompletableFuture<T> f, CompletableFuture<U> g, Runnable r);
1644 <    }
1642 >        checkCompletedWithWrappedCancellationException(h);
1643 >        checkCancelled(!fFirst ? f : g);
1644 >        r.assertNotInvoked();
1645 >        checkCompletedNormally(fFirst ? f : g, v1);
1646 >    }}
1647  
1648      /**
1649 <     * runAfterBoth result completes normally after normal
981 <     * completion of sources
1649 >     * runAfterBoth result completes exceptionally if action does
1650       */
1651 <    public void testRunAfterBoth_normalCompletion1() {
1651 >    public void testRunAfterBoth_actionFailed() {
1652          for (ExecutionMode m : ExecutionMode.values())
1653 +        for (boolean fFirst : new boolean[] { true, false })
1654          for (Integer v1 : new Integer[] { 1, null })
1655 <        for (Integer v2 : new Integer[] { 2, null }) {
1655 >        for (Integer v2 : new Integer[] { 2, null })
1656 >    {
1657 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1658 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1659 >        final FailingRunnable r1 = new FailingRunnable(m);
1660 >        final FailingRunnable r2 = new FailingRunnable(m);
1661 >
1662 >        CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
1663 >        if (fFirst) {
1664 >            f.complete(v1);
1665 >            g.complete(v2);
1666 >        } else {
1667 >            g.complete(v2);
1668 >            f.complete(v1);
1669 >        }
1670 >        CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
1671 >
1672 >        checkCompletedWithWrappedCFException(h1);
1673 >        checkCompletedWithWrappedCFException(h2);
1674 >        checkCompletedNormally(f, v1);
1675 >        checkCompletedNormally(g, v2);
1676 >    }}
1677  
1678 +    /**
1679 +     * applyToEither result completes normally after normal completion
1680 +     * of either source
1681 +     */
1682 +    public void testApplyToEither_normalCompletion() {
1683 +        for (ExecutionMode m : ExecutionMode.values())
1684 +        for (Integer v1 : new Integer[] { 1, null })
1685 +        for (Integer v2 : new Integer[] { 2, null })
1686 +    {
1687          final CompletableFuture<Integer> f = new CompletableFuture<>();
1688          final CompletableFuture<Integer> g = new CompletableFuture<>();
1689 <        final Noop r = new Noop();
1690 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1689 >        final IncFunction[] rs = new IncFunction[6];
1690 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1691  
1692 +        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
1693 +        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
1694 +        checkIncomplete(h0);
1695 +        checkIncomplete(h1);
1696 +        rs[0].assertNotInvoked();
1697 +        rs[1].assertNotInvoked();
1698          f.complete(v1);
1699 <        checkIncomplete(h);
1700 <        assertFalse(r.ran);
1699 >        checkCompletedNormally(h0, inc(v1));
1700 >        checkCompletedNormally(h1, inc(v1));
1701 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
1702 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
1703 >        checkCompletedNormally(h2, inc(v1));
1704 >        checkCompletedNormally(h3, inc(v1));
1705          g.complete(v2);
1706  
1707 <        checkCompletedNormally(h, null);
1708 <        assertTrue(r.ran);
1707 >        // unspecified behavior - both source completions available
1708 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
1709 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
1710 >        rs[4].assertValue(h4.join());
1711 >        rs[5].assertValue(h5.join());
1712 >        assertTrue(Objects.equals(inc(v1), h4.join()) ||
1713 >                   Objects.equals(inc(v2), h4.join()));
1714 >        assertTrue(Objects.equals(inc(v1), h5.join()) ||
1715 >                   Objects.equals(inc(v2), h5.join()));
1716 >
1717          checkCompletedNormally(f, v1);
1718          checkCompletedNormally(g, v2);
1719 +        checkCompletedNormally(h0, inc(v1));
1720 +        checkCompletedNormally(h1, inc(v1));
1721 +        checkCompletedNormally(h2, inc(v1));
1722 +        checkCompletedNormally(h3, inc(v1));
1723 +        for (int i = 0; i < 4; i++) rs[i].assertValue(inc(v1));
1724 +    }}
1725 +
1726 +    /**
1727 +     * applyToEither result completes exceptionally after exceptional
1728 +     * completion of either source
1729 +     */
1730 +    public void testApplyToEither_exceptionalCompletion() {
1731 +        for (ExecutionMode m : ExecutionMode.values())
1732 +        for (Integer v1 : new Integer[] { 1, null })
1733 +    {
1734 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
1735 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
1736 +        final CFException ex = new CFException();
1737 +        final IncFunction[] rs = new IncFunction[6];
1738 +        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1739 +
1740 +        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
1741 +        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
1742 +        checkIncomplete(h0);
1743 +        checkIncomplete(h1);
1744 +        rs[0].assertNotInvoked();
1745 +        rs[1].assertNotInvoked();
1746 +        f.completeExceptionally(ex);
1747 +        checkCompletedWithWrappedCFException(h0, ex);
1748 +        checkCompletedWithWrappedCFException(h1, ex);
1749 +        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
1750 +        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
1751 +        checkCompletedWithWrappedCFException(h2, ex);
1752 +        checkCompletedWithWrappedCFException(h3, ex);
1753 +        g.complete(v1);
1754 +
1755 +        // unspecified behavior - both source completions available
1756 +        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
1757 +        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
1758 +        try {
1759 +            assertEquals(inc(v1), h4.join());
1760 +            rs[4].assertInvoked();
1761 +        } catch (CompletionException ok) {
1762 +            checkCompletedWithWrappedCFException(h4, ex);
1763 +            rs[4].assertNotInvoked();
1764 +        }
1765 +        try {
1766 +            assertEquals(inc(v1), h5.join());
1767 +            rs[5].assertInvoked();
1768 +        } catch (CompletionException ok) {
1769 +            checkCompletedWithWrappedCFException(h5, ex);
1770 +            rs[5].assertNotInvoked();
1771          }
1003    }
1772  
1773 <    public void testRunAfterBoth_normalCompletion2() {
1773 >        checkCompletedWithWrappedCFException(f, ex);
1774 >        checkCompletedNormally(g, v1);
1775 >        checkCompletedWithWrappedCFException(h0, ex);
1776 >        checkCompletedWithWrappedCFException(h1, ex);
1777 >        checkCompletedWithWrappedCFException(h2, ex);
1778 >        checkCompletedWithWrappedCFException(h3, ex);
1779 >        checkCompletedWithWrappedCFException(h4, ex);
1780 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
1781 >    }}
1782 >
1783 >    /**
1784 >     * applyToEither result completes exceptionally if either source cancelled
1785 >     */
1786 >    public void testApplyToEither_sourceCancelled() {
1787          for (ExecutionMode m : ExecutionMode.values())
1788 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1789          for (Integer v1 : new Integer[] { 1, null })
1790 <        for (Integer v2 : new Integer[] { 2, null }) {
1790 >    {
1791 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1792 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1793 >        final IncFunction[] rs = new IncFunction[6];
1794 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1795 >
1796 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
1797 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
1798 >        checkIncomplete(h0);
1799 >        checkIncomplete(h1);
1800 >        rs[0].assertNotInvoked();
1801 >        rs[1].assertNotInvoked();
1802 >        f.cancel(mayInterruptIfRunning);
1803 >        checkCompletedWithWrappedCancellationException(h0);
1804 >        checkCompletedWithWrappedCancellationException(h1);
1805 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
1806 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
1807 >        checkCompletedWithWrappedCancellationException(h2);
1808 >        checkCompletedWithWrappedCancellationException(h3);
1809 >        g.complete(v1);
1810 >
1811 >        // unspecified behavior - both source completions available
1812 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
1813 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
1814 >        try {
1815 >            assertEquals(inc(v1), h4.join());
1816 >            rs[4].assertInvoked();
1817 >        } catch (CompletionException ok) {
1818 >            checkCompletedWithWrappedCancellationException(h4);
1819 >            rs[4].assertNotInvoked();
1820 >        }
1821 >        try {
1822 >            assertEquals(inc(v1), h5.join());
1823 >            rs[5].assertInvoked();
1824 >        } catch (CompletionException ok) {
1825 >            checkCompletedWithWrappedCancellationException(h5);
1826 >            rs[5].assertNotInvoked();
1827 >        }
1828 >
1829 >        checkCancelled(f);
1830 >        checkCompletedNormally(g, v1);
1831 >        checkCompletedWithWrappedCancellationException(h0);
1832 >        checkCompletedWithWrappedCancellationException(h1);
1833 >        checkCompletedWithWrappedCancellationException(h2);
1834 >        checkCompletedWithWrappedCancellationException(h3);
1835 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
1836 >    }}
1837  
1838 +    /**
1839 +     * applyToEither result completes exceptionally if action does
1840 +     */
1841 +    public void testApplyToEither_actionFailed() {
1842 +        for (ExecutionMode m : ExecutionMode.values())
1843 +        for (Integer v1 : new Integer[] { 1, null })
1844 +        for (Integer v2 : new Integer[] { 2, null })
1845 +    {
1846          final CompletableFuture<Integer> f = new CompletableFuture<>();
1847          final CompletableFuture<Integer> g = new CompletableFuture<>();
1848 <        final Noop r = new Noop();
1849 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1848 >        final FailingFunction[] rs = new FailingFunction[6];
1849 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingFunction(m);
1850  
1851 <        g.complete(v2);
1852 <        checkIncomplete(h);
1017 <        assertFalse(r.ran);
1851 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
1852 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
1853          f.complete(v1);
1854 +        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
1855 +        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
1856 +        g.complete(v2);
1857 +        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
1858 +        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
1859 +        
1860 +        checkCompletedNormally(f, v1);
1861 +        checkCompletedNormally(g, v2);
1862 +        checkCompletedWithWrappedCFException(h0);
1863 +        checkCompletedWithWrappedCFException(h1);
1864 +        checkCompletedWithWrappedCFException(h2);
1865 +        checkCompletedWithWrappedCFException(h3);
1866 +        checkCompletedWithWrappedCFException(h4);
1867 +        checkCompletedWithWrappedCFException(h5);
1868 +        for (int i = 0; i < rs.length; i++) rs[i].assertInvoked();
1869 +    }}
1870  
1871 +    /**
1872 +     * acceptEither result completes normally after normal completion
1873 +     * of either source
1874 +     */
1875 +    public void testAcceptEither_normalCompletion1() {
1876 +        for (ExecutionMode m : ExecutionMode.values())
1877 +        for (Integer v1 : new Integer[] { 1, null })
1878 +        for (Integer v2 : new Integer[] { 2, null })
1879 +    {
1880 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
1881 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
1882 +        final IncAction r = new IncAction(m);
1883 +        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
1884 +
1885 +        f.complete(v1);
1886          checkCompletedNormally(h, null);
1887 <        assertTrue(r.ran);
1887 >        assertEquals(inc(v1), r.value);
1888 >        g.complete(v2);
1889 >
1890          checkCompletedNormally(f, v1);
1891          checkCompletedNormally(g, v2);
1892 <        }
1893 <    }
1892 >        checkCompletedNormally(h, null);
1893 >    }}
1894  
1895 <    public void testRunAfterBoth_normalCompletion3() {
1895 >    public void testAcceptEither_normalCompletion2() {
1896          for (ExecutionMode m : ExecutionMode.values())
1897          for (Integer v1 : new Integer[] { 1, null })
1898 <        for (Integer v2 : new Integer[] { 2, null }) {
1899 <
1898 >        for (Integer v2 : new Integer[] { 2, null })
1899 >    {
1900          final CompletableFuture<Integer> f = new CompletableFuture<>();
1901          final CompletableFuture<Integer> g = new CompletableFuture<>();
1902 <        final Noop r = new Noop();
1902 >        final IncAction r = new IncAction(m);
1903 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
1904  
1905          g.complete(v2);
1906 +        checkCompletedNormally(h, null);
1907 +        assertEquals(inc(v2), r.value);
1908          f.complete(v1);
1038        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1909  
1040        checkCompletedNormally(h, null);
1041        assertTrue(r.ran);
1910          checkCompletedNormally(f, v1);
1911          checkCompletedNormally(g, v2);
1912 <        }
1913 <    }
1912 >        checkCompletedNormally(h, null);
1913 >    }}
1914  
1915 <    public void testRunAfterBoth_normalCompletion4() {
1915 >    public void testAcceptEither_normalCompletion3() {
1916          for (ExecutionMode m : ExecutionMode.values())
1917          for (Integer v1 : new Integer[] { 1, null })
1918 <        for (Integer v2 : new Integer[] { 2, null }) {
1919 <
1918 >        for (Integer v2 : new Integer[] { 2, null })
1919 >    {
1920          final CompletableFuture<Integer> f = new CompletableFuture<>();
1921          final CompletableFuture<Integer> g = new CompletableFuture<>();
1922 <        final Noop r = new Noop();
1922 >        final IncAction r = new IncAction(m);
1923  
1924          f.complete(v1);
1925          g.complete(v2);
1926 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1926 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
1927  
1928          checkCompletedNormally(h, null);
1061        assertTrue(r.ran);
1929          checkCompletedNormally(f, v1);
1930          checkCompletedNormally(g, v2);
1931 <        }
1932 <    }
1931 >
1932 >        // unspecified behavior
1933 >        assertTrue(Objects.equals(r.value, inc(v1)) ||
1934 >                   Objects.equals(r.value, inc(v2)));
1935 >    }}
1936  
1937      /**
1938 <     * runAfterBoth result completes exceptionally after exceptional
1938 >     * acceptEither result completes exceptionally after exceptional
1939       * completion of either source
1940       */
1941 <    public void testRunAfterBoth_exceptionalCompletion1() {
1941 >    public void testAcceptEither_exceptionalCompletion1() {
1942          for (ExecutionMode m : ExecutionMode.values())
1943 <        for (Integer v1 : new Integer[] { 1, null }) {
1944 <
1943 >        for (Integer v1 : new Integer[] { 1, null })
1944 >    {
1945          final CompletableFuture<Integer> f = new CompletableFuture<>();
1946          final CompletableFuture<Integer> g = new CompletableFuture<>();
1947 <        final Noop r = new Noop();
1948 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1947 >        final IncAction r = new IncAction(m);
1948 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
1949          final CFException ex = new CFException();
1950  
1951          f.completeExceptionally(ex);
1952 <        checkIncomplete(h);
1952 >        checkCompletedWithWrappedCFException(h, ex);
1953          g.complete(v1);
1954  
1955 <        checkCompletedWithWrappedCFException(h, ex);
1086 <        checkCompletedWithWrappedCFException(f, ex);
1087 <        assertFalse(r.ran);
1955 >        r.assertNotInvoked();
1956          checkCompletedNormally(g, v1);
1957 <        }
1958 <    }
1957 >        checkCompletedWithWrappedCFException(f, ex);
1958 >        checkCompletedWithWrappedCFException(h, ex);
1959 >    }}
1960  
1961 <    public void testRunAfterBoth_exceptionalCompletion2() {
1961 >    public void testAcceptEither_exceptionalCompletion2() {
1962          for (ExecutionMode m : ExecutionMode.values())
1963 <        for (Integer v1 : new Integer[] { 1, null }) {
1964 <
1963 >        for (Integer v1 : new Integer[] { 1, null })
1964 >    {
1965          final CompletableFuture<Integer> f = new CompletableFuture<>();
1966          final CompletableFuture<Integer> g = new CompletableFuture<>();
1967 <        final Noop r = new Noop();
1968 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1967 >        final IncAction r = new IncAction(m);
1968 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
1969          final CFException ex = new CFException();
1970  
1971          g.completeExceptionally(ex);
1972 <        checkIncomplete(h);
1972 >        checkCompletedWithWrappedCFException(h, ex);
1973          f.complete(v1);
1974  
1975 <        checkCompletedWithWrappedCFException(h, ex);
1107 <        checkCompletedWithWrappedCFException(g, ex);
1108 <        assertFalse(r.ran);
1975 >        r.assertNotInvoked();
1976          checkCompletedNormally(f, v1);
1977 <        }
1978 <    }
1977 >        checkCompletedWithWrappedCFException(g, ex);
1978 >        checkCompletedWithWrappedCFException(h, ex);
1979 >    }}
1980  
1981 <    public void testRunAfterBoth_exceptionalCompletion3() {
1981 >    public void testAcceptEither_exceptionalCompletion3() {
1982          for (ExecutionMode m : ExecutionMode.values())
1983 <        for (Integer v1 : new Integer[] { 1, null }) {
1984 <
1983 >        for (Integer v1 : new Integer[] { 1, null })
1984 >    {
1985          final CompletableFuture<Integer> f = new CompletableFuture<>();
1986          final CompletableFuture<Integer> g = new CompletableFuture<>();
1987 <        final Noop r = new Noop();
1987 >        final IncAction r = new IncAction(m);
1988          final CFException ex = new CFException();
1989  
1990          g.completeExceptionally(ex);
1991          f.complete(v1);
1992 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1992 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
1993 >
1994 >        // unspecified behavior
1995 >        Integer v;
1996 >        try {
1997 >            assertNull(h.join());
1998 >            r.assertInvoked();
1999 >            assertEquals(inc(v1), r.value);
2000 >        } catch (CompletionException ok) {
2001 >            checkCompletedWithWrappedCFException(h, ex);
2002 >            r.assertNotInvoked();
2003 >        }
2004  
1126        checkCompletedWithWrappedCFException(h, ex);
2005          checkCompletedWithWrappedCFException(g, ex);
1128        assertFalse(r.ran);
2006          checkCompletedNormally(f, v1);
2007 <        }
1131 <    }
2007 >    }}
2008  
2009 <    public void testRunAfterBoth_exceptionalCompletion4() {
2009 >    public void testAcceptEither_exceptionalCompletion4() {
2010          for (ExecutionMode m : ExecutionMode.values())
2011 <        for (Integer v1 : new Integer[] { 1, null }) {
2012 <
2011 >        for (Integer v1 : new Integer[] { 1, null })
2012 >    {
2013          final CompletableFuture<Integer> f = new CompletableFuture<>();
2014          final CompletableFuture<Integer> g = new CompletableFuture<>();
2015 <        final Noop r = new Noop();
2015 >        final IncAction r = new IncAction(m);
2016          final CFException ex = new CFException();
2017  
2018          f.completeExceptionally(ex);
2019          g.complete(v1);
2020 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2020 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2021 >
2022 >        // unspecified behavior
2023 >        Integer v;
2024 >        try {
2025 >            assertNull(h.join());
2026 >            r.assertInvoked();
2027 >            assertEquals(inc(v1), r.value);
2028 >        } catch (CompletionException ok) {
2029 >            checkCompletedWithWrappedCFException(h, ex);
2030 >            r.assertNotInvoked();
2031 >        }
2032  
1146        checkCompletedWithWrappedCFException(h, ex);
2033          checkCompletedWithWrappedCFException(f, ex);
1148        assertFalse(r.ran);
2034          checkCompletedNormally(g, v1);
2035 <        }
1151 <    }
2035 >    }}
2036  
2037      /**
2038 <     * runAfterBoth result completes exceptionally if action does
2038 >     * acceptEither result completes exceptionally if action does
2039       */
2040 <    public void testRunAfterBoth_actionFailed1() {
2040 >    public void testAcceptEither_actionFailed1() {
2041          for (ExecutionMode m : ExecutionMode.values())
2042          for (Integer v1 : new Integer[] { 1, null })
2043 <        for (Integer v2 : new Integer[] { 2, null }) {
2044 <
2043 >        for (Integer v2 : new Integer[] { 2, null })
2044 >    {
2045          final CompletableFuture<Integer> f = new CompletableFuture<>();
2046          final CompletableFuture<Integer> g = new CompletableFuture<>();
2047 <        final FailingNoop r = new FailingNoop();
2048 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2047 >        final FailingConsumer r = new FailingConsumer(m);
2048 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2049  
2050          f.complete(v1);
1167        checkIncomplete(h);
1168        g.complete(v2);
1169
2051          checkCompletedWithWrappedCFException(h);
2052 +        g.complete(v2);
2053          checkCompletedNormally(f, v1);
2054          checkCompletedNormally(g, v2);
2055 <        }
1174 <    }
2055 >    }}
2056  
2057 <    public void testRunAfterBoth_actionFailed2() {
2057 >    public void testAcceptEither_actionFailed2() {
2058          for (ExecutionMode m : ExecutionMode.values())
2059          for (Integer v1 : new Integer[] { 1, null })
2060 <        for (Integer v2 : new Integer[] { 2, null }) {
2061 <
2060 >        for (Integer v2 : new Integer[] { 2, null })
2061 >    {
2062          final CompletableFuture<Integer> f = new CompletableFuture<>();
2063          final CompletableFuture<Integer> g = new CompletableFuture<>();
2064 <        final FailingNoop r = new FailingNoop();
2065 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2064 >        final FailingConsumer r = new FailingConsumer(m);
2065 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2066  
2067          g.complete(v2);
1187        checkIncomplete(h);
1188        f.complete(v1);
1189
2068          checkCompletedWithWrappedCFException(h);
2069 +        f.complete(v1);
2070          checkCompletedNormally(f, v1);
2071          checkCompletedNormally(g, v2);
2072 <        }
1194 <    }
2072 >    }}
2073  
2074      /**
2075 <     * runAfterBoth result completes exceptionally if either source cancelled
2075 >     * acceptEither result completes exceptionally if either source cancelled
2076       */
2077 <    public void testRunAfterBoth_sourceCancelled1() {
2077 >    public void testAcceptEither_sourceCancelled1() {
2078          for (ExecutionMode m : ExecutionMode.values())
2079          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2080 <        for (Integer v1 : new Integer[] { 1, null }) {
2081 <
2080 >        for (Integer v1 : new Integer[] { 1, null })
2081 >    {
2082          final CompletableFuture<Integer> f = new CompletableFuture<>();
2083          final CompletableFuture<Integer> g = new CompletableFuture<>();
2084 <        final Noop r = new Noop();
2085 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2084 >        final IncAction r = new IncAction(m);
2085 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2086  
2087          assertTrue(f.cancel(mayInterruptIfRunning));
2088 <        checkIncomplete(h);
2088 >        checkCompletedWithWrappedCancellationException(h);
2089          g.complete(v1);
2090  
1213        checkCompletedWithWrappedCancellationException(h);
2091          checkCancelled(f);
2092 <        assertFalse(r.ran);
2092 >        r.assertNotInvoked();
2093          checkCompletedNormally(g, v1);
2094 <        }
2095 <    }
2094 >        checkCompletedWithWrappedCancellationException(h);
2095 >    }}
2096  
2097 <    public void testRunAfterBoth_sourceCancelled2() {
2097 >    public void testAcceptEither_sourceCancelled2() {
2098          for (ExecutionMode m : ExecutionMode.values())
2099          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2100 <        for (Integer v1 : new Integer[] { 1, null }) {
2101 <
2100 >        for (Integer v1 : new Integer[] { 1, null })
2101 >    {
2102          final CompletableFuture<Integer> f = new CompletableFuture<>();
2103          final CompletableFuture<Integer> g = new CompletableFuture<>();
2104 <        final Noop r = new Noop();
2105 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2104 >        final IncAction r = new IncAction(m);
2105 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2106  
2107          assertTrue(g.cancel(mayInterruptIfRunning));
2108 <        checkIncomplete(h);
2108 >        checkCompletedWithWrappedCancellationException(h);
2109          f.complete(v1);
2110  
1234        checkCompletedWithWrappedCancellationException(h);
2111          checkCancelled(g);
2112 <        assertFalse(r.ran);
2112 >        r.assertNotInvoked();
2113          checkCompletedNormally(f, v1);
2114 <        }
2115 <    }
2114 >        checkCompletedWithWrappedCancellationException(h);
2115 >    }}
2116  
2117 <    public void testRunAfterBoth_sourceCancelled3() {
2117 >    public void testAcceptEither_sourceCancelled3() {
2118          for (ExecutionMode m : ExecutionMode.values())
2119          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2120 <        for (Integer v1 : new Integer[] { 1, null }) {
2121 <
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 Noop r = new Noop();
2124 >        final IncAction r = new IncAction(m);
2125  
2126          assertTrue(g.cancel(mayInterruptIfRunning));
2127          f.complete(v1);
2128 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2128 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2129 >
2130 >        // unspecified behavior
2131 >        Integer v;
2132 >        try {
2133 >            assertNull(h.join());
2134 >            r.assertInvoked();
2135 >            assertEquals(inc(v1), r.value);
2136 >        } catch (CompletionException ok) {
2137 >            checkCompletedWithWrappedCancellationException(h);
2138 >            r.assertNotInvoked();
2139 >        }
2140  
1254        checkCompletedWithWrappedCancellationException(h);
2141          checkCancelled(g);
1256        assertFalse(r.ran);
2142          checkCompletedNormally(f, v1);
2143 <        }
1259 <    }
2143 >    }}
2144  
2145 <    public void testRunAfterBoth_sourceCancelled4() {
2145 >    public void testAcceptEither_sourceCancelled4() {
2146          for (ExecutionMode m : ExecutionMode.values())
2147          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2148 <        for (Integer v1 : new Integer[] { 1, null }) {
2149 <
2148 >        for (Integer v1 : new Integer[] { 1, null })
2149 >    {
2150          final CompletableFuture<Integer> f = new CompletableFuture<>();
2151          final CompletableFuture<Integer> g = new CompletableFuture<>();
2152 <        final Noop r = new Noop();
2152 >        final IncAction r = new IncAction(m);
2153  
2154          assertTrue(f.cancel(mayInterruptIfRunning));
2155          g.complete(v1);
2156 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2156 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2157  
2158 <        checkCompletedWithWrappedCancellationException(h);
2159 <        checkCancelled(f);
2160 <        assertFalse(r.ran);
2161 <        checkCompletedNormally(g, v1);
2158 >        // unspecified behavior
2159 >        Integer v;
2160 >        try {
2161 >            assertNull(h.join());
2162 >            r.assertInvoked();
2163 >            assertEquals(inc(v1), r.value);
2164 >        } catch (CompletionException ok) {
2165 >            checkCompletedWithWrappedCancellationException(h);
2166 >            r.assertNotInvoked();
2167          }
1279    }
2168  
2169 <    /**
2170 <     * applyToEither result completes normally after normal completion
2171 <     * of either source
1284 <     */
1285 <    public void testApplyToEither() {
1286 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1287 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1288 <        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
1289 <        f.complete(one);
1290 <        checkCompletedNormally(g, two);
1291 <        f2.complete(one);
1292 <        checkCompletedNormally(g, two);
1293 <
1294 <        f = new CompletableFuture<>();
1295 <        f.complete(one);
1296 <        f2 = new CompletableFuture<>();
1297 <        g = f.applyToEither(f2, inc);
1298 <        checkCompletedNormally(g, two);
1299 <    }
1300 <
1301 <    /**
1302 <     * applyToEither result completes exceptionally after exceptional
1303 <     * completion of either source
1304 <     */
1305 <    public void testApplyToEither2() {
1306 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1307 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1308 <        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
1309 <        f.completeExceptionally(new CFException());
1310 <        f2.complete(one);
1311 <        checkCompletedWithWrappedCFException(g);
1312 <
1313 <        f = new CompletableFuture<>();
1314 <        f2 = new CompletableFuture<>();
1315 <        f2.completeExceptionally(new CFException());
1316 <        g = f.applyToEither(f2, inc);
1317 <        checkCompletedWithWrappedCFException(g);
1318 <    }
1319 <
1320 <    /**
1321 <     * applyToEither result completes exceptionally if action does
1322 <     */
1323 <    public void testApplyToEither3() {
1324 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1325 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1326 <        FailingFunction r = new FailingFunction();
1327 <        CompletableFuture<Integer> g = f.applyToEither(f2, r);
1328 <        f2.complete(two);
1329 <        checkCompletedWithWrappedCFException(g);
1330 <    }
1331 <
1332 <    /**
1333 <     * applyToEither result completes exceptionally if either source cancelled
1334 <     */
1335 <    public void testApplyToEither4() {
1336 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1337 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1338 <        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
1339 <        assertTrue(f.cancel(true));
1340 <        checkCompletedWithWrappedCancellationException(g);
1341 <        f = new CompletableFuture<>();
1342 <        f2 = new CompletableFuture<>();
1343 <        assertTrue(f2.cancel(true));
1344 <        checkCompletedWithWrappedCancellationException(g);
1345 <    }
1346 <
1347 <    /**
1348 <     * acceptEither result completes normally after normal completion
1349 <     * of either source
1350 <     */
1351 <    public void testAcceptEither() {
1352 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1353 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1354 <        IncAction r = new IncAction();
1355 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
1356 <        f.complete(one);
1357 <        checkCompletedNormally(g, null);
1358 <        f2.complete(one);
1359 <        checkCompletedNormally(g, null);
1360 <        assertEquals(r.value, 2);
1361 <
1362 <        r = new IncAction();
1363 <        f = new CompletableFuture<>();
1364 <        f.complete(one);
1365 <        f2 = new CompletableFuture<>();
1366 <        g = f.acceptEither(f2, r);
1367 <        checkCompletedNormally(g, null);
1368 <        assertEquals(r.value, 2);
1369 <    }
1370 <
1371 <    /**
1372 <     * acceptEither result completes exceptionally after exceptional
1373 <     * completion of either source
1374 <     */
1375 <    public void testAcceptEither2() {
1376 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1377 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1378 <        IncAction r = new IncAction();
1379 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
1380 <        f.completeExceptionally(new CFException());
1381 <        f2.complete(one);
1382 <        checkCompletedWithWrappedCFException(g);
1383 <
1384 <        r = new IncAction();
1385 <        f = new CompletableFuture<>();
1386 <        f2 = new CompletableFuture<>();
1387 <        f2.completeExceptionally(new CFException());
1388 <        g = f.acceptEither(f2, r);
1389 <        checkCompletedWithWrappedCFException(g);
1390 <    }
1391 <
1392 <    /**
1393 <     * acceptEither result completes exceptionally if action does
1394 <     */
1395 <    public void testAcceptEither3() {
1396 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1397 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1398 <        FailingConsumer r = new FailingConsumer();
1399 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
1400 <        f2.complete(two);
1401 <        checkCompletedWithWrappedCFException(g);
1402 <    }
1403 <
1404 <    /**
1405 <     * acceptEither result completes exceptionally if either source cancelled
1406 <     */
1407 <    public void testAcceptEither4() {
1408 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1409 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1410 <        IncAction r = new IncAction();
1411 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
1412 <        assertTrue(f.cancel(true));
1413 <        checkCompletedWithWrappedCancellationException(g);
1414 <        f = new CompletableFuture<>();
1415 <        f2 = new CompletableFuture<>();
1416 <        assertTrue(f2.cancel(true));
1417 <        checkCompletedWithWrappedCancellationException(g);
1418 <    }
2169 >        checkCancelled(f);
2170 >        checkCompletedNormally(g, v1);
2171 >    }}
2172  
2173      /**
2174       * runAfterEither result completes normally after normal completion
2175       * of either source
2176       */
2177 <    public void testRunAfterEither() {
2178 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2179 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2180 <        Noop r = new Noop();
2181 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
2182 <        f.complete(one);
2183 <        checkCompletedNormally(g, null);
2184 <        f2.complete(one);
2185 <        checkCompletedNormally(g, null);
1433 <        assertTrue(r.ran);
1434 <
1435 <        r = new Noop();
1436 <        f = new CompletableFuture<>();
1437 <        f.complete(one);
1438 <        f2 = new CompletableFuture<>();
1439 <        g = f.runAfterEither(f2, r);
1440 <        checkCompletedNormally(g, null);
1441 <        assertTrue(r.ran);
1442 <    }
1443 <
1444 <    /**
1445 <     * runAfterEither result completes exceptionally after exceptional
1446 <     * completion of either source
1447 <     */
1448 <    public void testRunAfterEither2() {
1449 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1450 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1451 <        Noop r = new Noop();
1452 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
1453 <        f.completeExceptionally(new CFException());
1454 <        f2.complete(one);
1455 <        checkCompletedWithWrappedCFException(g);
1456 <
1457 <        r = new Noop();
1458 <        f = new CompletableFuture<>();
1459 <        f2 = new CompletableFuture<>();
1460 <        f2.completeExceptionally(new CFException());
1461 <        g = f.runAfterEither(f2, r);
1462 <        checkCompletedWithWrappedCFException(g);
1463 <    }
1464 <
1465 <    /**
1466 <     * runAfterEither result completes exceptionally if action does
1467 <     */
1468 <    public void testRunAfterEither3() {
1469 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1470 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1471 <        FailingNoop r = new FailingNoop();
1472 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
1473 <        f2.complete(two);
1474 <        checkCompletedWithWrappedCFException(g);
1475 <    }
1476 <
1477 <    /**
1478 <     * runAfterEither result completes exceptionally if either source cancelled
1479 <     */
1480 <    public void testRunAfterEither4() {
1481 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1482 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1483 <        Noop r = new Noop();
1484 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
1485 <        assertTrue(f.cancel(true));
1486 <        checkCompletedWithWrappedCancellationException(g);
1487 <        f = new CompletableFuture<>();
1488 <        f2 = new CompletableFuture<>();
1489 <        assertTrue(f2.cancel(true));
1490 <        checkCompletedWithWrappedCancellationException(g);
1491 <    }
1492 <
1493 <    /**
1494 <     * thenCompose result completes normally after normal completion of source
1495 <     */
1496 <    public void testThenCompose() {
1497 <        CompletableFuture<Integer> f, g;
1498 <        CompletableFutureInc r;
1499 <
1500 <        f = new CompletableFuture<>();
1501 <        g = f.thenCompose(r = new CompletableFutureInc());
1502 <        f.complete(one);
1503 <        checkCompletedNormally(g, two);
1504 <        assertTrue(r.ran);
1505 <
1506 <        f = new CompletableFuture<>();
1507 <        f.complete(one);
1508 <        g = f.thenCompose(r = new CompletableFutureInc());
1509 <        checkCompletedNormally(g, two);
1510 <        assertTrue(r.ran);
1511 <    }
1512 <
1513 <    /**
1514 <     * thenCompose result completes exceptionally after exceptional
1515 <     * completion of source
1516 <     */
1517 <    public void testThenCompose2() {
1518 <        CompletableFuture<Integer> f, g;
1519 <        CompletableFutureInc r;
1520 <
1521 <        f = new CompletableFuture<>();
1522 <        g = f.thenCompose(r = new CompletableFutureInc());
1523 <        f.completeExceptionally(new CFException());
1524 <        checkCompletedWithWrappedCFException(g);
1525 <
1526 <        f = new CompletableFuture<>();
1527 <        f.completeExceptionally(new CFException());
1528 <        g = f.thenCompose(r = new CompletableFutureInc());
1529 <        checkCompletedWithWrappedCFException(g);
1530 <    }
1531 <
1532 <    /**
1533 <     * thenCompose result completes exceptionally if action does
1534 <     */
1535 <    public void testThenCompose3() {
1536 <        CompletableFuture<Integer> f, g;
1537 <        FailingCompletableFutureFunction r;
1538 <
1539 <        f = new CompletableFuture<>();
1540 <        g = f.thenCompose(r = new FailingCompletableFutureFunction());
1541 <        f.complete(one);
1542 <        checkCompletedWithWrappedCFException(g);
1543 <
1544 <        f = new CompletableFuture<>();
1545 <        f.complete(one);
1546 <        g = f.thenCompose(r = new FailingCompletableFutureFunction());
1547 <        checkCompletedWithWrappedCFException(g);
1548 <    }
1549 <
1550 <    /**
1551 <     * thenCompose result completes exceptionally if source cancelled
1552 <     */
1553 <    public void testThenCompose4() {
1554 <        CompletableFuture<Integer> f, g;
1555 <        CompletableFutureInc r;
1556 <
1557 <        f = new CompletableFuture<>();
1558 <        g = f.thenCompose(r = new CompletableFutureInc());
1559 <        assertTrue(f.cancel(true));
1560 <        checkCompletedWithWrappedCancellationException(g);
1561 <
1562 <        f = new CompletableFuture<>();
1563 <        assertTrue(f.cancel(true));
1564 <        g = f.thenCompose(r = new CompletableFutureInc());
1565 <        checkCompletedWithWrappedCancellationException(g);
1566 <    }
1567 <
1568 <    // asyncs
1569 <
1570 <    /**
1571 <     * thenRunAsync result completes normally after normal completion of source
1572 <     */
1573 <    public void testThenRunAsync() {
1574 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1575 <        Noop r = new Noop();
1576 <        CompletableFuture<Void> g = f.thenRunAsync(r);
1577 <        f.complete(null);
1578 <        checkCompletedNormally(g, null);
1579 <
1580 <        // reordered version
1581 <        f = new CompletableFuture<>();
1582 <        f.complete(null);
1583 <        r = new Noop();
1584 <        g = f.thenRunAsync(r);
1585 <        checkCompletedNormally(g, null);
1586 <    }
1587 <
1588 <    /**
1589 <     * thenRunAsync result completes exceptionally after exceptional
1590 <     * completion of source
1591 <     */
1592 <    public void testThenRunAsync2() {
1593 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1594 <        Noop r = new Noop();
1595 <        CompletableFuture<Void> g = f.thenRunAsync(r);
1596 <        f.completeExceptionally(new CFException());
1597 <        try {
1598 <            g.join();
1599 <            shouldThrow();
1600 <        } catch (CompletionException success) {}
1601 <        checkCompletedWithWrappedCFException(g);
1602 <    }
1603 <
1604 <    /**
1605 <     * thenRunAsync result completes exceptionally if action does
1606 <     */
1607 <    public void testThenRunAsync3() {
1608 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1609 <        FailingNoop r = new FailingNoop();
1610 <        CompletableFuture<Void> g = f.thenRunAsync(r);
1611 <        f.complete(null);
1612 <        checkCompletedWithWrappedCFException(g);
1613 <    }
1614 <
1615 <    /**
1616 <     * thenRunAsync result completes exceptionally if source cancelled
1617 <     */
1618 <    public void testThenRunAsync4() {
1619 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1620 <        Noop r = new Noop();
1621 <        CompletableFuture<Void> g = f.thenRunAsync(r);
1622 <        assertTrue(f.cancel(true));
1623 <        checkCompletedWithWrappedCancellationException(g);
1624 <    }
1625 <
1626 <    /**
1627 <     * thenApplyAsync result completes normally after normal completion of source
1628 <     */
1629 <    public void testThenApplyAsync() {
1630 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1631 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
1632 <        f.complete(one);
1633 <        checkCompletedNormally(g, two);
1634 <    }
1635 <
1636 <    /**
1637 <     * thenApplyAsync result completes exceptionally after exceptional
1638 <     * completion of source
1639 <     */
1640 <    public void testThenApplyAsync2() {
1641 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1642 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
1643 <        f.completeExceptionally(new CFException());
1644 <        checkCompletedWithWrappedCFException(g);
1645 <    }
1646 <
1647 <    /**
1648 <     * thenApplyAsync result completes exceptionally if action does
1649 <     */
1650 <    public void testThenApplyAsync3() {
1651 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1652 <        FailingFunction r = new FailingFunction();
1653 <        CompletableFuture<Integer> g = f.thenApplyAsync(r);
1654 <        f.complete(null);
1655 <        checkCompletedWithWrappedCFException(g);
1656 <    }
1657 <
1658 <    /**
1659 <     * thenApplyAsync result completes exceptionally if source cancelled
1660 <     */
1661 <    public void testThenApplyAsync4() {
1662 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1663 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
1664 <        assertTrue(f.cancel(true));
1665 <        checkCompletedWithWrappedCancellationException(g);
1666 <    }
1667 <
1668 <    /**
1669 <     * thenAcceptAsync result completes normally after normal
1670 <     * completion of source
1671 <     */
1672 <    public void testThenAcceptAsync() {
1673 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1674 <        IncAction r = new IncAction();
1675 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
1676 <        f.complete(one);
1677 <        checkCompletedNormally(g, null);
1678 <        assertEquals(r.value, 2);
1679 <    }
1680 <
1681 <    /**
1682 <     * thenAcceptAsync result completes exceptionally after exceptional
1683 <     * completion of source
1684 <     */
1685 <    public void testThenAcceptAsync2() {
1686 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1687 <        IncAction r = new IncAction();
1688 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
1689 <        f.completeExceptionally(new CFException());
1690 <        checkCompletedWithWrappedCFException(g);
1691 <    }
1692 <
1693 <    /**
1694 <     * thenAcceptAsync result completes exceptionally if action does
1695 <     */
1696 <    public void testThenAcceptAsync3() {
1697 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1698 <        FailingConsumer r = new FailingConsumer();
1699 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
1700 <        f.complete(null);
1701 <        checkCompletedWithWrappedCFException(g);
1702 <    }
1703 <
1704 <    /**
1705 <     * thenAcceptAsync result completes exceptionally if source cancelled
1706 <     */
1707 <    public void testThenAcceptAsync4() {
1708 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1709 <        IncAction r = new IncAction();
1710 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
1711 <        assertTrue(f.cancel(true));
1712 <        checkCompletedWithWrappedCancellationException(g);
1713 <    }
1714 <
1715 <    /**
1716 <     * thenCombineAsync result completes normally after normal
1717 <     * completion of sources
1718 <     */
1719 <    public void testThenCombineAsync() {
1720 <        CompletableFuture<Integer> f, g, h;
1721 <
1722 <        f = new CompletableFuture<>();
1723 <        g = new CompletableFuture<>();
1724 <        h = f.thenCombineAsync(g, subtract);
1725 <        f.complete(3);
1726 <        checkIncomplete(h);
1727 <        g.complete(1);
1728 <        checkCompletedNormally(h, 2);
1729 <
1730 <        f = new CompletableFuture<>();
1731 <        g = new CompletableFuture<>();
1732 <        h = f.thenCombineAsync(g, subtract);
1733 <        g.complete(1);
1734 <        checkIncomplete(h);
1735 <        f.complete(3);
1736 <        checkCompletedNormally(h, 2);
1737 <
1738 <        f = new CompletableFuture<>();
1739 <        g = new CompletableFuture<>();
1740 <        g.complete(1);
1741 <        f.complete(3);
1742 <        h = f.thenCombineAsync(g, subtract);
1743 <        checkCompletedNormally(h, 2);
1744 <    }
1745 <
1746 <    /**
1747 <     * thenCombineAsync result completes exceptionally after exceptional
1748 <     * completion of either source
1749 <     */
1750 <    public void testThenCombineAsync2() {
1751 <        CompletableFuture<Integer> f, g, h;
1752 <
1753 <        f = new CompletableFuture<>();
1754 <        g = new CompletableFuture<>();
1755 <        h = f.thenCombineAsync(g, subtract);
1756 <        f.completeExceptionally(new CFException());
1757 <        checkIncomplete(h);
1758 <        g.complete(1);
1759 <        checkCompletedWithWrappedCFException(h);
1760 <
1761 <        f = new CompletableFuture<>();
1762 <        g = new CompletableFuture<>();
1763 <        h = f.thenCombineAsync(g, subtract);
1764 <        g.completeExceptionally(new CFException());
1765 <        checkIncomplete(h);
1766 <        f.complete(3);
1767 <        checkCompletedWithWrappedCFException(h);
1768 <
1769 <        f = new CompletableFuture<>();
1770 <        g = new CompletableFuture<>();
1771 <        g.completeExceptionally(new CFException());
1772 <        f.complete(3);
1773 <        h = f.thenCombineAsync(g, subtract);
1774 <        checkCompletedWithWrappedCFException(h);
1775 <    }
1776 <
1777 <    /**
1778 <     * thenCombineAsync result completes exceptionally if action does
1779 <     */
1780 <    public void testThenCombineAsync3() {
1781 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1782 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1783 <        FailingBiFunction r = new FailingBiFunction();
1784 <        CompletableFuture<Integer> g = f.thenCombineAsync(f2, r);
1785 <        f.complete(one);
1786 <        checkIncomplete(g);
1787 <        assertFalse(r.ran);
1788 <        f2.complete(two);
1789 <        checkCompletedWithWrappedCFException(g);
1790 <        assertTrue(r.ran);
1791 <    }
1792 <
1793 <    /**
1794 <     * thenCombineAsync result completes exceptionally if either source cancelled
1795 <     */
1796 <    public void testThenCombineAsync4() {
1797 <        CompletableFuture<Integer> f, g, h;
1798 <
1799 <        f = new CompletableFuture<>();
1800 <        g = new CompletableFuture<>();
1801 <        h = f.thenCombineAsync(g, subtract);
1802 <        assertTrue(f.cancel(true));
1803 <        checkIncomplete(h);
1804 <        g.complete(1);
1805 <        checkCompletedWithWrappedCancellationException(h);
1806 <
1807 <        f = new CompletableFuture<>();
1808 <        g = new CompletableFuture<>();
1809 <        h = f.thenCombineAsync(g, subtract);
1810 <        assertTrue(g.cancel(true));
1811 <        checkIncomplete(h);
1812 <        f.complete(3);
1813 <        checkCompletedWithWrappedCancellationException(h);
1814 <
1815 <        f = new CompletableFuture<>();
1816 <        g = new CompletableFuture<>();
1817 <        g.complete(3);
1818 <        assertTrue(f.cancel(true));
1819 <        h = f.thenCombineAsync(g, subtract);
1820 <        checkCompletedWithWrappedCancellationException(h);
1821 <
1822 <        f = new CompletableFuture<>();
1823 <        g = new CompletableFuture<>();
1824 <        f.complete(3);
1825 <        assertTrue(g.cancel(true));
1826 <        h = f.thenCombineAsync(g, subtract);
1827 <        checkCompletedWithWrappedCancellationException(h);
1828 <    }
1829 <
1830 <    /**
1831 <     * thenAcceptBothAsync result completes normally after normal
1832 <     * completion of sources
1833 <     */
1834 <    public void testThenAcceptBothAsync() {
1835 <        CompletableFuture<Integer> f, g;
1836 <        CompletableFuture<Void> h;
1837 <        SubtractAction r;
1838 <
1839 <        f = new CompletableFuture<>();
1840 <        g = new CompletableFuture<>();
1841 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1842 <        f.complete(3);
1843 <        checkIncomplete(h);
1844 <        g.complete(1);
1845 <        checkCompletedNormally(h, null);
1846 <        assertEquals(r.value, 2);
2177 >    public void testRunAfterEither_normalCompletion1() {
2178 >        for (ExecutionMode m : ExecutionMode.values())
2179 >        for (Integer v1 : new Integer[] { 1, null })
2180 >        for (Integer v2 : new Integer[] { 2, null })
2181 >    {
2182 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2183 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2184 >        final Noop r = new Noop(m);
2185 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2186  
2187 <        f = new CompletableFuture<>();
1849 <        g = new CompletableFuture<>();
1850 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1851 <        g.complete(1);
1852 <        checkIncomplete(h);
1853 <        f.complete(3);
2187 >        f.complete(v1);
2188          checkCompletedNormally(h, null);
2189 <        assertEquals(r.value, 2);
2189 >        r.assertInvoked();
2190 >        g.complete(v2);
2191  
2192 <        f = new CompletableFuture<>();
2193 <        g = new CompletableFuture<>();
1859 <        g.complete(1);
1860 <        f.complete(3);
1861 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
2192 >        checkCompletedNormally(f, v1);
2193 >        checkCompletedNormally(g, v2);
2194          checkCompletedNormally(h, null);
2195 <        assertEquals(r.value, 2);
2196 <    }
1865 <
1866 <    /**
1867 <     * thenAcceptBothAsync result completes exceptionally after exceptional
1868 <     * completion of source
1869 <     */
1870 <    public void testThenAcceptBothAsync2() {
1871 <        CompletableFuture<Integer> f, g;
1872 <        CompletableFuture<Void> h;
1873 <        SubtractAction r;
1874 <
1875 <        f = new CompletableFuture<>();
1876 <        g = new CompletableFuture<>();
1877 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1878 <        f.completeExceptionally(new CFException());
1879 <        checkIncomplete(h);
1880 <        g.complete(1);
1881 <        checkCompletedWithWrappedCFException(h);
1882 <
1883 <        f = new CompletableFuture<>();
1884 <        g = new CompletableFuture<>();
1885 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1886 <        g.completeExceptionally(new CFException());
1887 <        checkIncomplete(h);
1888 <        f.complete(3);
1889 <        checkCompletedWithWrappedCFException(h);
1890 <
1891 <        f = new CompletableFuture<>();
1892 <        g = new CompletableFuture<>();
1893 <        f.complete(3);
1894 <        g.completeExceptionally(new CFException());
1895 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1896 <        checkCompletedWithWrappedCFException(h);
1897 <
1898 <        f = new CompletableFuture<>();
1899 <        g = new CompletableFuture<>();
1900 <        f.completeExceptionally(new CFException());
1901 <        g.complete(3);
1902 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1903 <        checkCompletedWithWrappedCFException(h);
1904 <    }
1905 <
1906 <    /**
1907 <     * thenAcceptBothAsync result completes exceptionally if action does
1908 <     */
1909 <    public void testThenAcceptBothAsync3() {
1910 <        CompletableFuture<Integer> f, g;
1911 <        CompletableFuture<Void> h;
1912 <        FailingBiConsumer r;
1913 <
1914 <        f = new CompletableFuture<>();
1915 <        g = new CompletableFuture<>();
1916 <        h = f.thenAcceptBothAsync(g, r = new FailingBiConsumer());
1917 <        f.complete(3);
1918 <        checkIncomplete(h);
1919 <        g.complete(1);
1920 <        checkCompletedWithWrappedCFException(h);
1921 <
1922 <        f = new CompletableFuture<>();
1923 <        g = new CompletableFuture<>();
1924 <        f.complete(3);
1925 <        g.complete(1);
1926 <        h = f.thenAcceptBothAsync(g, r = new FailingBiConsumer());
1927 <        checkCompletedWithWrappedCFException(h);
1928 <    }
1929 <
1930 <    /**
1931 <     * thenAcceptBothAsync result completes exceptionally if either source cancelled
1932 <     */
1933 <    public void testThenAcceptBothAsync4() {
1934 <        CompletableFuture<Integer> f, g;
1935 <        CompletableFuture<Void> h;
1936 <        SubtractAction r;
1937 <
1938 <        f = new CompletableFuture<>();
1939 <        g = new CompletableFuture<>();
1940 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1941 <        assertTrue(f.cancel(true));
1942 <        checkIncomplete(h);
1943 <        g.complete(1);
1944 <        checkCompletedWithWrappedCancellationException(h);
1945 <
1946 <        f = new CompletableFuture<>();
1947 <        g = new CompletableFuture<>();
1948 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1949 <        assertTrue(g.cancel(true));
1950 <        checkIncomplete(h);
1951 <        f.complete(3);
1952 <        checkCompletedWithWrappedCancellationException(h);
1953 <
1954 <        f = new CompletableFuture<>();
1955 <        g = new CompletableFuture<>();
1956 <        f.complete(3);
1957 <        assertTrue(g.cancel(true));
1958 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1959 <        checkCompletedWithWrappedCancellationException(h);
1960 <
1961 <        f = new CompletableFuture<>();
1962 <        g = new CompletableFuture<>();
1963 <        assertTrue(f.cancel(true));
1964 <        g.complete(3);
1965 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1966 <        checkCompletedWithWrappedCancellationException(h);
1967 <    }
1968 <
1969 <    /**
1970 <     * applyToEitherAsync result completes normally after normal
1971 <     * completion of sources
1972 <     */
1973 <    public void testApplyToEitherAsync() {
1974 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1975 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1976 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
1977 <        f.complete(one);
1978 <        checkCompletedNormally(g, two);
1979 <
1980 <        f = new CompletableFuture<>();
1981 <        f.complete(one);
1982 <        f2 = new CompletableFuture<>();
1983 <        g = f.applyToEitherAsync(f2, inc);
1984 <        checkCompletedNormally(g, two);
1985 <    }
1986 <
1987 <    /**
1988 <     * applyToEitherAsync result completes exceptionally after exceptional
1989 <     * completion of source
1990 <     */
1991 <    public void testApplyToEitherAsync2() {
1992 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1993 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1994 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
1995 <        f.completeExceptionally(new CFException());
1996 <        checkCompletedWithWrappedCFException(g);
1997 <
1998 <        f = new CompletableFuture<>();
1999 <        f2 = new CompletableFuture<>();
2000 <        f2.completeExceptionally(new CFException());
2001 <        g = f.applyToEitherAsync(f2, inc);
2002 <        f.complete(one);
2003 <        checkCompletedWithWrappedCFException(g);
2004 <    }
2005 <
2006 <    /**
2007 <     * applyToEitherAsync result completes exceptionally if action does
2008 <     */
2009 <    public void testApplyToEitherAsync3() {
2010 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2011 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2012 <        FailingFunction r = new FailingFunction();
2013 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, r);
2014 <        f.complete(one);
2015 <        checkCompletedWithWrappedCFException(g);
2016 <    }
2017 <
2018 <    /**
2019 <     * applyToEitherAsync result completes exceptionally if either source cancelled
2020 <     */
2021 <    public void testApplyToEitherAsync4() {
2022 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2023 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2024 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
2025 <        assertTrue(f.cancel(true));
2026 <        checkCompletedWithWrappedCancellationException(g);
2027 <
2028 <        f = new CompletableFuture<>();
2029 <        f2 = new CompletableFuture<>();
2030 <        assertTrue(f2.cancel(true));
2031 <        g = f.applyToEitherAsync(f2, inc);
2032 <        checkCompletedWithWrappedCancellationException(g);
2033 <    }
2034 <
2035 <    /**
2036 <     * acceptEitherAsync result completes normally after normal
2037 <     * completion of sources
2038 <     */
2039 <    public void testAcceptEitherAsync() {
2040 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2041 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2042 <        IncAction r = new IncAction();
2043 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
2044 <        f.complete(one);
2045 <        checkCompletedNormally(g, null);
2046 <        assertEquals(r.value, 2);
2047 <
2048 <        r = new IncAction();
2049 <        f = new CompletableFuture<>();
2050 <        f.complete(one);
2051 <        f2 = new CompletableFuture<>();
2052 <        g = f.acceptEitherAsync(f2, r);
2053 <        checkCompletedNormally(g, null);
2054 <        assertEquals(r.value, 2);
2055 <    }
2056 <
2057 <    /**
2058 <     * acceptEitherAsync result completes exceptionally after exceptional
2059 <     * completion of source
2060 <     */
2061 <    public void testAcceptEitherAsync2() {
2062 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2063 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2064 <        IncAction r = new IncAction();
2065 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
2066 <        f.completeExceptionally(new CFException());
2067 <        checkCompletedWithWrappedCFException(g);
2068 <
2069 <        r = new IncAction();
2070 <        f = new CompletableFuture<>();
2071 <        f2 = new CompletableFuture<>();
2072 <        f2.completeExceptionally(new CFException());
2073 <        g = f.acceptEitherAsync(f2, r);
2074 <        f.complete(one);
2075 <        checkCompletedWithWrappedCFException(g);
2076 <    }
2195 >        r.assertInvoked();
2196 >    }}
2197  
2198 <    /**
2199 <     * acceptEitherAsync result completes exceptionally if action does
2200 <     */
2201 <    public void testAcceptEitherAsync3() {
2202 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2203 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2204 <        FailingConsumer r = new FailingConsumer();
2205 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
2206 <        f.complete(one);
2087 <        checkCompletedWithWrappedCFException(g);
2088 <    }
2089 <
2090 <    /**
2091 <     * acceptEitherAsync result completes exceptionally if either
2092 <     * source cancelled
2093 <     */
2094 <    public void testAcceptEitherAsync4() {
2095 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2096 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2097 <        IncAction r = new IncAction();
2098 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
2099 <        assertTrue(f.cancel(true));
2100 <        checkCompletedWithWrappedCancellationException(g);
2101 <
2102 <        r = new IncAction();
2103 <        f = new CompletableFuture<>();
2104 <        f2 = new CompletableFuture<>();
2105 <        assertTrue(f2.cancel(true));
2106 <        g = f.acceptEitherAsync(f2, r);
2107 <        checkCompletedWithWrappedCancellationException(g);
2108 <    }
2109 <
2110 <    /**
2111 <     * runAfterEitherAsync result completes normally after normal
2112 <     * completion of sources
2113 <     */
2114 <    public void testRunAfterEitherAsync() {
2115 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2116 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2117 <        Noop r = new Noop();
2118 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
2119 <        f.complete(one);
2120 <        checkCompletedNormally(g, null);
2121 <        assertTrue(r.ran);
2122 <
2123 <        r = new Noop();
2124 <        f = new CompletableFuture<>();
2125 <        f.complete(one);
2126 <        f2 = new CompletableFuture<>();
2127 <        g = f.runAfterEitherAsync(f2, r);
2128 <        checkCompletedNormally(g, null);
2129 <        assertTrue(r.ran);
2130 <    }
2131 <
2132 <    /**
2133 <     * runAfterEitherAsync result completes exceptionally after exceptional
2134 <     * completion of source
2135 <     */
2136 <    public void testRunAfterEitherAsync2() {
2137 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2138 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2139 <        Noop r = new Noop();
2140 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
2141 <        f.completeExceptionally(new CFException());
2142 <        checkCompletedWithWrappedCFException(g);
2143 <
2144 <        r = new Noop();
2145 <        f = new CompletableFuture<>();
2146 <        f2 = new CompletableFuture<>();
2147 <        f2.completeExceptionally(new CFException());
2148 <        g = f.runAfterEitherAsync(f2, r);
2149 <        f.complete(one);
2150 <        checkCompletedWithWrappedCFException(g);
2151 <    }
2152 <
2153 <    /**
2154 <     * runAfterEitherAsync result completes exceptionally if action does
2155 <     */
2156 <    public void testRunAfterEitherAsync3() {
2157 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2158 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2159 <        FailingNoop r = new FailingNoop();
2160 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
2161 <        f.complete(one);
2162 <        checkCompletedWithWrappedCFException(g);
2163 <    }
2164 <
2165 <    /**
2166 <     * runAfterEitherAsync result completes exceptionally if either
2167 <     * source cancelled
2168 <     */
2169 <    public void testRunAfterEitherAsync4() {
2170 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2171 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2172 <        Noop r = new Noop();
2173 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
2174 <        assertTrue(f.cancel(true));
2175 <        checkCompletedWithWrappedCancellationException(g);
2176 <
2177 <        r = new Noop();
2178 <        f = new CompletableFuture<>();
2179 <        f2 = new CompletableFuture<>();
2180 <        assertTrue(f2.cancel(true));
2181 <        g = f.runAfterEitherAsync(f2, r);
2182 <        checkCompletedWithWrappedCancellationException(g);
2183 <    }
2184 <
2185 <    /**
2186 <     * thenComposeAsync result completes normally after normal
2187 <     * completion of source
2188 <     */
2189 <    public void testThenComposeAsync() {
2190 <        CompletableFuture<Integer> f, g;
2191 <        CompletableFutureInc r;
2198 >    public void testRunAfterEither_normalCompletion2() {
2199 >        for (ExecutionMode m : ExecutionMode.values())
2200 >        for (Integer v1 : new Integer[] { 1, null })
2201 >        for (Integer v2 : new Integer[] { 2, null })
2202 >    {
2203 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2204 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2205 >        final Noop r = new Noop(m);
2206 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2207  
2208 <        f = new CompletableFuture<>();
2209 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2210 <        f.complete(one);
2211 <        checkCompletedNormally(g, two);
2208 >        g.complete(v2);
2209 >        checkCompletedNormally(h, null);
2210 >        r.assertInvoked();
2211 >        f.complete(v1);
2212  
2213 <        f = new CompletableFuture<>();
2214 <        f.complete(one);
2215 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2216 <        checkCompletedNormally(g, two);
2217 <    }
2213 >        checkCompletedNormally(f, v1);
2214 >        checkCompletedNormally(g, v2);
2215 >        checkCompletedNormally(h, null);
2216 >        r.assertInvoked();
2217 >        }}
2218  
2219 <    /**
2220 <     * thenComposeAsync result completes exceptionally after
2221 <     * exceptional completion of source
2222 <     */
2223 <    public void testThenComposeAsync2() {
2224 <        CompletableFuture<Integer> f, g;
2225 <        CompletableFutureInc r;
2219 >    public void testRunAfterEither_normalCompletion3() {
2220 >        for (ExecutionMode m : ExecutionMode.values())
2221 >        for (Integer v1 : new Integer[] { 1, null })
2222 >        for (Integer v2 : new Integer[] { 2, null })
2223 >    {
2224 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2225 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2226 >        final Noop r = new Noop(m);
2227  
2228 <        f = new CompletableFuture<>();
2229 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2230 <        f.completeExceptionally(new CFException());
2215 <        checkCompletedWithWrappedCFException(g);
2216 <        assertFalse(r.ran);
2228 >        f.complete(v1);
2229 >        g.complete(v2);
2230 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2231  
2232 <        f = new CompletableFuture<>();
2233 <        f.completeExceptionally(new CFException());
2234 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2235 <        checkCompletedWithWrappedCFException(g);
2236 <        assertFalse(r.ran);
2223 <    }
2232 >        checkCompletedNormally(h, null);
2233 >        checkCompletedNormally(f, v1);
2234 >        checkCompletedNormally(g, v2);
2235 >        r.assertInvoked();
2236 >    }}
2237  
2238      /**
2239 <     * thenComposeAsync result completes exceptionally if action does
2239 >     * runAfterEither result completes exceptionally after exceptional
2240 >     * completion of either source
2241       */
2242 <    public void testThenComposeAsync3() {
2243 <        CompletableFuture<Integer> f, g;
2244 <        FailingCompletableFutureFunction r;
2245 <
2246 <        f = new CompletableFuture<>();
2247 <        g = f.thenComposeAsync(r = new FailingCompletableFutureFunction());
2248 <        f.complete(one);
2249 <        checkCompletedWithWrappedCFException(g);
2242 >    public void testRunAfterEither_exceptionalCompletion1() {
2243 >        for (ExecutionMode m : ExecutionMode.values())
2244 >        for (Integer v1 : new Integer[] { 1, null })
2245 >    {
2246 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2247 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2248 >        final Noop r = new Noop(m);
2249 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2250 >        final CFException ex = new CFException();
2251  
2252 <        f = new CompletableFuture<>();
2253 <        f.complete(one);
2254 <        g = f.thenComposeAsync(r = new FailingCompletableFutureFunction());
2240 <        checkCompletedWithWrappedCFException(g);
2241 <    }
2252 >        f.completeExceptionally(ex);
2253 >        checkCompletedWithWrappedCFException(h, ex);
2254 >        g.complete(v1);
2255  
2256 <    /**
2257 <     * thenComposeAsync result completes exceptionally if source cancelled
2258 <     */
2259 <    public void testThenComposeAsync4() {
2260 <        CompletableFuture<Integer> f, g;
2248 <        CompletableFutureInc r;
2256 >        r.assertNotInvoked();
2257 >        checkCompletedNormally(g, v1);
2258 >        checkCompletedWithWrappedCFException(f, ex);
2259 >        checkCompletedWithWrappedCFException(h, ex);
2260 >    }}
2261  
2262 <        f = new CompletableFuture<>();
2263 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2264 <        assertTrue(f.cancel(true));
2265 <        checkCompletedWithWrappedCancellationException(g);
2262 >    public void testRunAfterEither_exceptionalCompletion2() {
2263 >        for (ExecutionMode m : ExecutionMode.values())
2264 >        for (Integer v1 : new Integer[] { 1, null })
2265 >    {
2266 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2267 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2268 >        final Noop r = new Noop(m);
2269 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2270 >        final CFException ex = new CFException();
2271  
2272 <        f = new CompletableFuture<>();
2273 <        assertTrue(f.cancel(true));
2274 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2258 <        checkCompletedWithWrappedCancellationException(g);
2259 <    }
2272 >        g.completeExceptionally(ex);
2273 >        checkCompletedWithWrappedCFException(h, ex);
2274 >        f.complete(v1);
2275  
2276 <    // async with explicit executors
2276 >        r.assertNotInvoked();
2277 >        checkCompletedNormally(f, v1);
2278 >        checkCompletedWithWrappedCFException(g, ex);
2279 >        checkCompletedWithWrappedCFException(h, ex);
2280 >    }}
2281  
2282 <    /**
2283 <     * thenRunAsync result completes normally after normal completion of source
2284 <     */
2285 <    public void testThenRunAsyncE() {
2286 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2287 <        Noop r = new Noop();
2288 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2289 <        f.complete(null);
2271 <        checkCompletedNormally(g, null);
2282 >    public void testRunAfterEither_exceptionalCompletion3() {
2283 >        for (ExecutionMode m : ExecutionMode.values())
2284 >        for (Integer v1 : new Integer[] { 1, null })
2285 >    {
2286 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2287 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2288 >        final Noop r = new Noop(m);
2289 >        final CFException ex = new CFException();
2290  
2291 <        // reordered version
2292 <        f = new CompletableFuture<>();
2293 <        f.complete(null);
2276 <        r = new Noop();
2277 <        g = f.thenRunAsync(r, new ThreadExecutor());
2278 <        checkCompletedNormally(g, null);
2279 <    }
2291 >        g.completeExceptionally(ex);
2292 >        f.complete(v1);
2293 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2294  
2295 <    /**
2296 <     * thenRunAsync result completes exceptionally after exceptional
2283 <     * completion of source
2284 <     */
2285 <    public void testThenRunAsync2E() {
2286 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2287 <        Noop r = new Noop();
2288 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2289 <        f.completeExceptionally(new CFException());
2295 >        // unspecified behavior
2296 >        Integer v;
2297          try {
2298 <            g.join();
2299 <            shouldThrow();
2300 <        } catch (CompletionException success) {}
2301 <        checkCompletedWithWrappedCFException(g);
2302 <    }
2303 <
2297 <    /**
2298 <     * thenRunAsync result completes exceptionally if action does
2299 <     */
2300 <    public void testThenRunAsync3E() {
2301 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2302 <        FailingNoop r = new FailingNoop();
2303 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2304 <        f.complete(null);
2305 <        checkCompletedWithWrappedCFException(g);
2306 <    }
2307 <
2308 <    /**
2309 <     * thenRunAsync result completes exceptionally if source cancelled
2310 <     */
2311 <    public void testThenRunAsync4E() {
2312 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2313 <        Noop r = new Noop();
2314 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2315 <        assertTrue(f.cancel(true));
2316 <        checkCompletedWithWrappedCancellationException(g);
2317 <    }
2318 <
2319 <    /**
2320 <     * thenApplyAsync result completes normally after normal completion of source
2321 <     */
2322 <    public void testThenApplyAsyncE() {
2323 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2324 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
2325 <        f.complete(one);
2326 <        checkCompletedNormally(g, two);
2327 <    }
2328 <
2329 <    /**
2330 <     * thenApplyAsync result completes exceptionally after exceptional
2331 <     * completion of source
2332 <     */
2333 <    public void testThenApplyAsync2E() {
2334 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2335 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
2336 <        f.completeExceptionally(new CFException());
2337 <        checkCompletedWithWrappedCFException(g);
2338 <    }
2339 <
2340 <    /**
2341 <     * thenApplyAsync result completes exceptionally if action does
2342 <     */
2343 <    public void testThenApplyAsync3E() {
2344 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2345 <        FailingFunction r = new FailingFunction();
2346 <        CompletableFuture<Integer> g = f.thenApplyAsync(r, new ThreadExecutor());
2347 <        f.complete(null);
2348 <        checkCompletedWithWrappedCFException(g);
2349 <    }
2350 <
2351 <    /**
2352 <     * thenApplyAsync result completes exceptionally if source cancelled
2353 <     */
2354 <    public void testThenApplyAsync4E() {
2355 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2356 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
2357 <        assertTrue(f.cancel(true));
2358 <        checkCompletedWithWrappedCancellationException(g);
2359 <    }
2360 <
2361 <    /**
2362 <     * thenAcceptAsync result completes normally after normal
2363 <     * completion of source
2364 <     */
2365 <    public void testThenAcceptAsyncE() {
2366 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2367 <        IncAction r = new IncAction();
2368 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2369 <        f.complete(one);
2370 <        checkCompletedNormally(g, null);
2371 <        assertEquals(r.value, 2);
2372 <    }
2373 <
2374 <    /**
2375 <     * thenAcceptAsync result completes exceptionally after exceptional
2376 <     * completion of source
2377 <     */
2378 <    public void testThenAcceptAsync2E() {
2379 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2380 <        IncAction r = new IncAction();
2381 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2382 <        f.completeExceptionally(new CFException());
2383 <        checkCompletedWithWrappedCFException(g);
2384 <    }
2385 <
2386 <    /**
2387 <     * thenAcceptAsync result completes exceptionally if action does
2388 <     */
2389 <    public void testThenAcceptAsync3E() {
2390 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2391 <        FailingConsumer r = new FailingConsumer();
2392 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2393 <        f.complete(null);
2394 <        checkCompletedWithWrappedCFException(g);
2395 <    }
2298 >            assertNull(h.join());
2299 >            r.assertInvoked();
2300 >        } catch (CompletionException ok) {
2301 >            checkCompletedWithWrappedCFException(h, ex);
2302 >            r.assertNotInvoked();
2303 >        }
2304  
2305 <    /**
2306 <     * thenAcceptAsync result completes exceptionally if source cancelled
2307 <     */
2400 <    public void testThenAcceptAsync4E() {
2401 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2402 <        IncAction r = new IncAction();
2403 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2404 <        assertTrue(f.cancel(true));
2405 <        checkCompletedWithWrappedCancellationException(g);
2406 <    }
2305 >        checkCompletedWithWrappedCFException(g, ex);
2306 >        checkCompletedNormally(f, v1);
2307 >    }}
2308  
2309 <    /**
2310 <     * thenCombineAsync result completes normally after normal
2311 <     * completion of sources
2312 <     */
2313 <    public void testThenCombineAsyncE() {
2314 <        CompletableFuture<Integer> f, g, h;
2315 <        ThreadExecutor e = new ThreadExecutor();
2316 <        int count = 0;
2309 >    public void testRunAfterEither_exceptionalCompletion4() {
2310 >        for (ExecutionMode m : ExecutionMode.values())
2311 >        for (Integer v1 : new Integer[] { 1, null })
2312 >    {
2313 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2314 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2315 >        final Noop r = new Noop(m);
2316 >        final CFException ex = new CFException();
2317  
2318 <        f = new CompletableFuture<>();
2319 <        g = new CompletableFuture<>();
2320 <        h = f.thenCombineAsync(g, subtract, e);
2420 <        f.complete(3);
2421 <        checkIncomplete(h);
2422 <        g.complete(1);
2423 <        checkCompletedNormally(h, 2);
2424 <        assertEquals(++count, e.count.get());
2318 >        f.completeExceptionally(ex);
2319 >        g.complete(v1);
2320 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2321  
2322 <        f = new CompletableFuture<>();
2323 <        g = new CompletableFuture<>();
2324 <        h = f.thenCombineAsync(g, subtract, e);
2325 <        g.complete(1);
2326 <        checkIncomplete(h);
2327 <        f.complete(3);
2328 <        checkCompletedNormally(h, 2);
2329 <        assertEquals(++count, e.count.get());
2322 >        // unspecified behavior
2323 >        Integer v;
2324 >        try {
2325 >            assertNull(h.join());
2326 >            r.assertInvoked();
2327 >        } catch (CompletionException ok) {
2328 >            checkCompletedWithWrappedCFException(h, ex);
2329 >            r.assertNotInvoked();
2330 >        }
2331  
2332 <        f = new CompletableFuture<>();
2333 <        g = new CompletableFuture<>();
2334 <        g.complete(1);
2438 <        f.complete(3);
2439 <        h = f.thenCombineAsync(g, subtract, e);
2440 <        checkCompletedNormally(h, 2);
2441 <        assertEquals(++count, e.count.get());
2442 <    }
2332 >        checkCompletedWithWrappedCFException(f, ex);
2333 >        checkCompletedNormally(g, v1);
2334 >    }}
2335  
2336      /**
2337 <     * thenCombineAsync result completes exceptionally after exceptional
2446 <     * completion of either source
2337 >     * runAfterEither result completes exceptionally if action does
2338       */
2339 <    public void testThenCombineAsync2E() {
2340 <        CompletableFuture<Integer> f, g, h;
2341 <        ThreadExecutor e = new ThreadExecutor();
2342 <        int count = 0;
2339 >    public void testRunAfterEither_actionFailed1() {
2340 >        for (ExecutionMode m : ExecutionMode.values())
2341 >        for (Integer v1 : new Integer[] { 1, null })
2342 >        for (Integer v2 : new Integer[] { 2, null })
2343 >    {
2344 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2345 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2346 >        final FailingRunnable r = new FailingRunnable(m);
2347 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2348  
2349 <        f = new CompletableFuture<>();
2454 <        g = new CompletableFuture<>();
2455 <        h = f.thenCombineAsync(g, subtract, e);
2456 <        f.completeExceptionally(new CFException());
2457 <        checkIncomplete(h);
2458 <        g.complete(1);
2349 >        f.complete(v1);
2350          checkCompletedWithWrappedCFException(h);
2351 +        g.complete(v2);
2352 +        checkCompletedNormally(f, v1);
2353 +        checkCompletedNormally(g, v2);
2354 +    }}
2355  
2356 <        f = new CompletableFuture<>();
2357 <        g = new CompletableFuture<>();
2358 <        h = f.thenCombineAsync(g, subtract, e);
2359 <        g.completeExceptionally(new CFException());
2360 <        checkIncomplete(h);
2361 <        f.complete(3);
2362 <        checkCompletedWithWrappedCFException(h);
2356 >    public void testRunAfterEither_actionFailed2() {
2357 >        for (ExecutionMode m : ExecutionMode.values())
2358 >        for (Integer v1 : new Integer[] { 1, null })
2359 >        for (Integer v2 : new Integer[] { 2, null })
2360 >    {
2361 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2362 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2363 >        final FailingRunnable r = new FailingRunnable(m);
2364 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2365  
2366 <        f = new CompletableFuture<>();
2470 <        g = new CompletableFuture<>();
2471 <        g.completeExceptionally(new CFException());
2472 <        h = f.thenCombineAsync(g, subtract, e);
2473 <        checkIncomplete(h);
2474 <        f.complete(3);
2366 >        g.complete(v2);
2367          checkCompletedWithWrappedCFException(h);
2368 <
2369 <        assertEquals(0, e.count.get());
2370 <    }
2371 <
2480 <    /**
2481 <     * thenCombineAsync result completes exceptionally if action does
2482 <     */
2483 <    public void testThenCombineAsync3E() {
2484 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2485 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2486 <        FailingBiFunction r = new FailingBiFunction();
2487 <        CompletableFuture<Integer> g = f.thenCombineAsync(f2, r, new ThreadExecutor());
2488 <        f.complete(one);
2489 <        checkIncomplete(g);
2490 <        assertFalse(r.ran);
2491 <        f2.complete(two);
2492 <        checkCompletedWithWrappedCFException(g);
2493 <        assertTrue(r.ran);
2494 <    }
2368 >        f.complete(v1);
2369 >        checkCompletedNormally(f, v1);
2370 >        checkCompletedNormally(g, v2);
2371 >    }}
2372  
2373      /**
2374 <     * thenCombineAsync result completes exceptionally if either source cancelled
2374 >     * runAfterEither result completes exceptionally if either source cancelled
2375       */
2376 <    public void testThenCombineAsync4E() {
2377 <        CompletableFuture<Integer> f, g, h;
2378 <        ThreadExecutor e = new ThreadExecutor();
2379 <
2380 <        f = new CompletableFuture<>();
2381 <        g = new CompletableFuture<>();
2382 <        h = f.thenCombineAsync(g, subtract, e);
2383 <        assertTrue(f.cancel(true));
2384 <        checkIncomplete(h);
2508 <        g.complete(1);
2509 <        checkCompletedWithWrappedCancellationException(h);
2510 <
2511 <        f = new CompletableFuture<>();
2512 <        g = new CompletableFuture<>();
2513 <        h = f.thenCombineAsync(g, subtract, e);
2514 <        assertTrue(g.cancel(true));
2515 <        checkIncomplete(h);
2516 <        f.complete(3);
2517 <        checkCompletedWithWrappedCancellationException(h);
2518 <
2519 <        f = new CompletableFuture<>();
2520 <        g = new CompletableFuture<>();
2521 <        assertTrue(g.cancel(true));
2522 <        h = f.thenCombineAsync(g, subtract, e);
2523 <        checkIncomplete(h);
2524 <        f.complete(3);
2525 <        checkCompletedWithWrappedCancellationException(h);
2376 >    public void testRunAfterEither_sourceCancelled1() {
2377 >        for (ExecutionMode m : ExecutionMode.values())
2378 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2379 >        for (Integer v1 : new Integer[] { 1, null })
2380 >    {
2381 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2382 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2383 >        final Noop r = new Noop(m);
2384 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2385  
2386 <        f = new CompletableFuture<>();
2528 <        g = new CompletableFuture<>();
2529 <        assertTrue(f.cancel(true));
2530 <        assertTrue(g.cancel(true));
2531 <        h = f.thenCombineAsync(g, subtract, e);
2386 >        assertTrue(f.cancel(mayInterruptIfRunning));
2387          checkCompletedWithWrappedCancellationException(h);
2388 +        g.complete(v1);
2389  
2390 <        assertEquals(0, e.count.get());
2391 <    }
2392 <
2537 <    /**
2538 <     * thenAcceptBothAsync result completes normally after normal
2539 <     * completion of sources
2540 <     */
2541 <    public void testThenAcceptBothAsyncE() {
2542 <        CompletableFuture<Integer> f, g;
2543 <        CompletableFuture<Void> h;
2544 <        SubtractAction r;
2545 <        ThreadExecutor e = new ThreadExecutor();
2546 <
2547 <        f = new CompletableFuture<>();
2548 <        g = new CompletableFuture<>();
2549 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2550 <        f.complete(3);
2551 <        checkIncomplete(h);
2552 <        g.complete(1);
2553 <        checkCompletedNormally(h, null);
2554 <        assertEquals(r.value, 2);
2555 <
2556 <        f = new CompletableFuture<>();
2557 <        g = new CompletableFuture<>();
2558 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2559 <        g.complete(1);
2560 <        checkIncomplete(h);
2561 <        f.complete(3);
2562 <        checkCompletedNormally(h, null);
2563 <        assertEquals(r.value, 2);
2564 <
2565 <        f = new CompletableFuture<>();
2566 <        g = new CompletableFuture<>();
2567 <        g.complete(1);
2568 <        f.complete(3);
2569 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2570 <        checkCompletedNormally(h, null);
2571 <        assertEquals(r.value, 2);
2572 <
2573 <        assertEquals(3, e.count.get());
2574 <    }
2575 <
2576 <    /**
2577 <     * thenAcceptBothAsync result completes exceptionally after exceptional
2578 <     * completion of source
2579 <     */
2580 <    public void testThenAcceptBothAsync2E() {
2581 <        CompletableFuture<Integer> f, g;
2582 <        CompletableFuture<Void> h;
2583 <        SubtractAction r;
2584 <        ThreadExecutor e = new ThreadExecutor();
2585 <
2586 <        f = new CompletableFuture<>();
2587 <        g = new CompletableFuture<>();
2588 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2589 <        f.completeExceptionally(new CFException());
2590 <        checkIncomplete(h);
2591 <        g.complete(1);
2592 <        checkCompletedWithWrappedCFException(h);
2593 <
2594 <        f = new CompletableFuture<>();
2595 <        g = new CompletableFuture<>();
2596 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2597 <        g.completeExceptionally(new CFException());
2598 <        checkIncomplete(h);
2599 <        f.complete(3);
2600 <        checkCompletedWithWrappedCFException(h);
2601 <
2602 <        f = new CompletableFuture<>();
2603 <        g = new CompletableFuture<>();
2604 <        f.complete(3);
2605 <        g.completeExceptionally(new CFException());
2606 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2607 <        checkCompletedWithWrappedCFException(h);
2608 <
2609 <        f = new CompletableFuture<>();
2610 <        g = new CompletableFuture<>();
2611 <        f.completeExceptionally(new CFException());
2612 <        g.complete(3);
2613 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2614 <        checkCompletedWithWrappedCFException(h);
2615 <
2616 <        assertEquals(0, e.count.get());
2617 <    }
2618 <
2619 <    /**
2620 <     * thenAcceptBothAsync result completes exceptionally if action does
2621 <     */
2622 <    public void testThenAcceptBothAsync3E() {
2623 <        CompletableFuture<Integer> f, g;
2624 <        CompletableFuture<Void> h;
2625 <        FailingBiConsumer r;
2626 <        ThreadExecutor e = new ThreadExecutor();
2627 <
2628 <        f = new CompletableFuture<>();
2629 <        g = new CompletableFuture<>();
2630 <        h = f.thenAcceptBothAsync(g, r = new FailingBiConsumer(), e);
2631 <        f.complete(3);
2632 <        checkIncomplete(h);
2633 <        g.complete(1);
2634 <        checkCompletedWithWrappedCFException(h);
2635 <
2636 <        f = new CompletableFuture<>();
2637 <        g = new CompletableFuture<>();
2638 <        f.complete(3);
2639 <        g.complete(1);
2640 <        h = f.thenAcceptBothAsync(g, r = new FailingBiConsumer(), e);
2641 <        checkCompletedWithWrappedCFException(h);
2642 <
2643 <        assertEquals(2, e.count.get());
2644 <    }
2645 <
2646 <    /**
2647 <     * thenAcceptBothAsync result completes exceptionally if either source cancelled
2648 <     */
2649 <    public void testThenAcceptBothAsync4E() {
2650 <        CompletableFuture<Integer> f, g;
2651 <        CompletableFuture<Void> h;
2652 <        SubtractAction r;
2653 <        ThreadExecutor e = new ThreadExecutor();
2654 <
2655 <        f = new CompletableFuture<>();
2656 <        g = new CompletableFuture<>();
2657 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2658 <        assertTrue(f.cancel(true));
2659 <        checkIncomplete(h);
2660 <        g.complete(1);
2390 >        checkCancelled(f);
2391 >        r.assertNotInvoked();
2392 >        checkCompletedNormally(g, v1);
2393          checkCompletedWithWrappedCancellationException(h);
2394 +    }}
2395  
2396 <        f = new CompletableFuture<>();
2397 <        g = new CompletableFuture<>();
2398 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2399 <        assertTrue(g.cancel(true));
2400 <        checkIncomplete(h);
2401 <        f.complete(3);
2402 <        checkCompletedWithWrappedCancellationException(h);
2396 >    public void testRunAfterEither_sourceCancelled2() {
2397 >        for (ExecutionMode m : ExecutionMode.values())
2398 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2399 >        for (Integer v1 : new Integer[] { 1, null })
2400 >    {
2401 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2402 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2403 >        final Noop r = new Noop(m);
2404 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2405  
2406 <        f = new CompletableFuture<>();
2672 <        g = new CompletableFuture<>();
2673 <        f.complete(3);
2674 <        assertTrue(g.cancel(true));
2675 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2406 >        assertTrue(g.cancel(mayInterruptIfRunning));
2407          checkCompletedWithWrappedCancellationException(h);
2408 +        f.complete(v1);
2409  
2410 <        f = new CompletableFuture<>();
2411 <        g = new CompletableFuture<>();
2412 <        assertTrue(f.cancel(true));
2681 <        g.complete(3);
2682 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2410 >        checkCancelled(g);
2411 >        r.assertNotInvoked();
2412 >        checkCompletedNormally(f, v1);
2413          checkCompletedWithWrappedCancellationException(h);
2414 +    }}
2415  
2416 <        assertEquals(0, e.count.get());
2417 <    }
2418 <
2419 <    /**
2420 <     * applyToEitherAsync result completes normally after normal
2421 <     * completion of sources
2422 <     */
2423 <    public void testApplyToEitherAsyncE() {
2693 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2694 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2695 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2696 <        f.complete(one);
2697 <        checkCompletedNormally(g, two);
2698 <
2699 <        f = new CompletableFuture<>();
2700 <        f.complete(one);
2701 <        f2 = new CompletableFuture<>();
2702 <        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2703 <        checkCompletedNormally(g, two);
2704 <    }
2705 <
2706 <    /**
2707 <     * applyToEitherAsync result completes exceptionally after exceptional
2708 <     * completion of source
2709 <     */
2710 <    public void testApplyToEitherAsync2E() {
2711 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2712 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2713 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2714 <        f.completeExceptionally(new CFException());
2715 <        checkCompletedWithWrappedCFException(g);
2716 <
2717 <        f = new CompletableFuture<>();
2718 <        f2 = new CompletableFuture<>();
2719 <        f2.completeExceptionally(new CFException());
2720 <        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2721 <        f.complete(one);
2722 <        checkCompletedWithWrappedCFException(g);
2723 <    }
2724 <
2725 <    /**
2726 <     * applyToEitherAsync result completes exceptionally if action does
2727 <     */
2728 <    public void testApplyToEitherAsync3E() {
2729 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2730 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2731 <        FailingFunction r = new FailingFunction();
2732 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, r, new ThreadExecutor());
2733 <        f.complete(one);
2734 <        checkCompletedWithWrappedCFException(g);
2735 <    }
2736 <
2737 <    /**
2738 <     * applyToEitherAsync result completes exceptionally if either source cancelled
2739 <     */
2740 <    public void testApplyToEitherAsync4E() {
2741 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2742 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2743 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2744 <        assertTrue(f.cancel(true));
2745 <        checkCompletedWithWrappedCancellationException(g);
2746 <
2747 <        f = new CompletableFuture<>();
2748 <        f2 = new CompletableFuture<>();
2749 <        assertTrue(f2.cancel(true));
2750 <        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2751 <        checkCompletedWithWrappedCancellationException(g);
2752 <    }
2416 >    public void testRunAfterEither_sourceCancelled3() {
2417 >        for (ExecutionMode m : ExecutionMode.values())
2418 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2419 >        for (Integer v1 : new Integer[] { 1, null })
2420 >    {
2421 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2422 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2423 >        final Noop r = new Noop(m);
2424  
2425 <    /**
2426 <     * acceptEitherAsync result completes normally after normal
2427 <     * completion of sources
2757 <     */
2758 <    public void testAcceptEitherAsyncE() {
2759 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2760 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2761 <        IncAction r = new IncAction();
2762 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2763 <        f.complete(one);
2764 <        checkCompletedNormally(g, null);
2765 <        assertEquals(r.value, 2);
2425 >        assertTrue(g.cancel(mayInterruptIfRunning));
2426 >        f.complete(v1);
2427 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2428  
2429 <        r = new IncAction();
2430 <        f = new CompletableFuture<>();
2431 <        f.complete(one);
2432 <        f2 = new CompletableFuture<>();
2433 <        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2434 <        checkCompletedNormally(g, null);
2435 <        assertEquals(r.value, 2);
2436 <    }
2429 >        // unspecified behavior
2430 >        Integer v;
2431 >        try {
2432 >            assertNull(h.join());
2433 >            r.assertInvoked();
2434 >        } catch (CompletionException ok) {
2435 >            checkCompletedWithWrappedCancellationException(h);
2436 >            r.assertNotInvoked();
2437 >        }
2438  
2439 <    /**
2440 <     * acceptEitherAsync result completes exceptionally after exceptional
2441 <     * completion of source
2779 <     */
2780 <    public void testAcceptEitherAsync2E() {
2781 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2782 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2783 <        IncAction r = new IncAction();
2784 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2785 <        f.completeExceptionally(new CFException());
2786 <        checkCompletedWithWrappedCFException(g);
2439 >        checkCancelled(g);
2440 >        checkCompletedNormally(f, v1);
2441 >    }}
2442  
2443 <        r = new IncAction();
2444 <        f = new CompletableFuture<>();
2445 <        f2 = new CompletableFuture<>();
2446 <        f2.completeExceptionally(new CFException());
2447 <        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2448 <        f.complete(one);
2449 <        checkCompletedWithWrappedCFException(g);
2450 <    }
2443 >    public void testRunAfterEither_sourceCancelled4() {
2444 >        for (ExecutionMode m : ExecutionMode.values())
2445 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2446 >        for (Integer v1 : new Integer[] { 1, null })
2447 >    {
2448 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2449 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2450 >        final Noop r = new Noop(m);
2451  
2452 <    /**
2453 <     * acceptEitherAsync result completes exceptionally if action does
2454 <     */
2800 <    public void testAcceptEitherAsync3E() {
2801 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2802 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2803 <        FailingConsumer r = new FailingConsumer();
2804 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2805 <        f.complete(one);
2806 <        checkCompletedWithWrappedCFException(g);
2807 <    }
2452 >        assertTrue(f.cancel(mayInterruptIfRunning));
2453 >        g.complete(v1);
2454 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2455  
2456 <    /**
2457 <     * acceptEitherAsync result completes exceptionally if either
2458 <     * source cancelled
2459 <     */
2460 <    public void testAcceptEitherAsync4E() {
2461 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2462 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2463 <        IncAction r = new IncAction();
2464 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2818 <        assertTrue(f.cancel(true));
2819 <        checkCompletedWithWrappedCancellationException(g);
2456 >        // unspecified behavior
2457 >        Integer v;
2458 >        try {
2459 >            assertNull(h.join());
2460 >            r.assertInvoked();
2461 >        } catch (CompletionException ok) {
2462 >            checkCompletedWithWrappedCancellationException(h);
2463 >            r.assertNotInvoked();
2464 >        }
2465  
2466 <        r = new IncAction();
2467 <        f = new CompletableFuture<>();
2468 <        f2 = new CompletableFuture<>();
2824 <        assertTrue(f2.cancel(true));
2825 <        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2826 <        checkCompletedWithWrappedCancellationException(g);
2827 <    }
2466 >        checkCancelled(f);
2467 >        checkCompletedNormally(g, v1);
2468 >    }}
2469  
2470      /**
2471 <     * runAfterEitherAsync result completes normally after normal
2831 <     * completion of sources
2471 >     * thenCompose result completes normally after normal completion of source
2472       */
2473 <    public void testRunAfterEitherAsyncE() {
2474 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2475 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2476 <        Noop r = new Noop();
2477 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2478 <        f.complete(one);
2479 <        checkCompletedNormally(g, null);
2480 <        assertTrue(r.ran);
2473 >    public void testThenCompose_normalCompletion() {
2474 >        for (ExecutionMode m : ExecutionMode.values())
2475 >        for (boolean createIncomplete : new boolean[] { true, false })
2476 >        for (Integer v1 : new Integer[] { 1, null })
2477 >    {
2478 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2479 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2480 >        if (!createIncomplete) f.complete(v1);
2481 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2482 >        if (createIncomplete) f.complete(v1);
2483  
2484 <        r = new Noop();
2485 <        f = new CompletableFuture<>();
2486 <        f.complete(one);
2487 <        f2 = new CompletableFuture<>();
2846 <        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2847 <        checkCompletedNormally(g, null);
2848 <        assertTrue(r.ran);
2849 <    }
2484 >        checkCompletedNormally(g, inc(v1));
2485 >        checkCompletedNormally(f, v1);
2486 >        r.assertInvoked();
2487 >    }}
2488  
2489      /**
2490 <     * runAfterEitherAsync result completes exceptionally after exceptional
2490 >     * thenCompose result completes exceptionally after exceptional
2491       * completion of source
2492       */
2493 <    public void testRunAfterEitherAsync2E() {
2494 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2495 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2496 <        Noop r = new Noop();
2497 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2498 <        f.completeExceptionally(new CFException());
2499 <        checkCompletedWithWrappedCFException(g);
2500 <
2501 <        r = new Noop();
2502 <        f = new CompletableFuture<>();
2865 <        f2 = new CompletableFuture<>();
2866 <        f2.completeExceptionally(new CFException());
2867 <        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2868 <        f.complete(one);
2869 <        checkCompletedWithWrappedCFException(g);
2870 <    }
2871 <
2872 <    /**
2873 <     * runAfterEitherAsync result completes exceptionally if action does
2874 <     */
2875 <    public void testRunAfterEitherAsync3E() {
2876 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2877 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2878 <        FailingNoop r = new FailingNoop();
2879 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2880 <        f.complete(one);
2881 <        checkCompletedWithWrappedCFException(g);
2882 <    }
2883 <
2884 <    /**
2885 <     * runAfterEitherAsync result completes exceptionally if either
2886 <     * source cancelled
2887 <     */
2888 <    public void testRunAfterEitherAsync4E() {
2889 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2890 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2891 <        Noop r = new Noop();
2892 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2893 <        assertTrue(f.cancel(true));
2894 <        checkCompletedWithWrappedCancellationException(g);
2493 >    public void testThenCompose_exceptionalCompletion() {
2494 >        for (ExecutionMode m : ExecutionMode.values())
2495 >        for (boolean createIncomplete : new boolean[] { true, false })
2496 >    {
2497 >        final CFException ex = new CFException();
2498 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2499 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2500 >        if (!createIncomplete) f.completeExceptionally(ex);
2501 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2502 >        if (createIncomplete) f.completeExceptionally(ex);
2503  
2504 <        r = new Noop();
2505 <        f = new CompletableFuture<>();
2506 <        f2 = new CompletableFuture<>();
2507 <        assertTrue(f2.cancel(true));
2900 <        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2901 <        checkCompletedWithWrappedCancellationException(g);
2902 <    }
2504 >        checkCompletedWithWrappedCFException(g, ex);
2505 >        checkCompletedWithWrappedCFException(f, ex);
2506 >        r.assertNotInvoked();
2507 >    }}
2508  
2509      /**
2510 <     * thenComposeAsync result completes normally after normal
2906 <     * completion of source
2510 >     * thenCompose result completes exceptionally if action does
2511       */
2512 <    public void testThenComposeAsyncE() {
2513 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2514 <        CompletableFutureInc r = new CompletableFutureInc();
2515 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2516 <        f.complete(one);
2517 <        checkCompletedNormally(g, two);
2518 <    }
2512 >    public void testThenCompose_actionFailed() {
2513 >        for (ExecutionMode m : ExecutionMode.values())
2514 >        for (boolean createIncomplete : new boolean[] { true, false })
2515 >        for (Integer v1 : new Integer[] { 1, null })
2516 >    {
2517 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2518 >        final FailingCompletableFutureFunction r
2519 >            = new FailingCompletableFutureFunction(m);
2520 >        if (!createIncomplete) f.complete(v1);
2521 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2522 >        if (createIncomplete) f.complete(v1);
2523  
2916    /**
2917     * thenComposeAsync result completes exceptionally after
2918     * exceptional completion of source
2919     */
2920    public void testThenComposeAsync2E() {
2921        CompletableFuture<Integer> f = new CompletableFuture<>();
2922        CompletableFutureInc r = new CompletableFutureInc();
2923        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2924        f.completeExceptionally(new CFException());
2524          checkCompletedWithWrappedCFException(g);
2525 <    }
2525 >        checkCompletedNormally(f, v1);
2526 >    }}
2527  
2528      /**
2529 <     * thenComposeAsync result completes exceptionally if action does
2529 >     * thenCompose result completes exceptionally if source cancelled
2530       */
2531 <    public void testThenComposeAsync3E() {
2532 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2533 <        FailingCompletableFutureFunction r = new FailingCompletableFutureFunction();
2534 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2535 <        f.complete(one);
2536 <        checkCompletedWithWrappedCFException(g);
2537 <    }
2531 >    public void testThenCompose_sourceCancelled() {
2532 >        for (ExecutionMode m : ExecutionMode.values())
2533 >        for (boolean createIncomplete : new boolean[] { true, false })
2534 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2535 >    {
2536 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2537 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2538 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2539 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2540 >        if (createIncomplete) {
2541 >            checkIncomplete(g);
2542 >            assertTrue(f.cancel(mayInterruptIfRunning));
2543 >        }
2544  
2939    /**
2940     * thenComposeAsync result completes exceptionally if source cancelled
2941     */
2942    public void testThenComposeAsync4E() {
2943        CompletableFuture<Integer> f = new CompletableFuture<>();
2944        CompletableFutureInc r = new CompletableFutureInc();
2945        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2946        assertTrue(f.cancel(true));
2545          checkCompletedWithWrappedCancellationException(g);
2546 <    }
2546 >        checkCancelled(f);
2547 >    }}
2548  
2549      // other static methods
2550  
# Line 2964 | Line 2563 | public class CompletableFutureTest exten
2563       */
2564      public void testAllOf_normal() throws Exception {
2565          for (int k = 1; k < 20; ++k) {
2566 <            CompletableFuture<Integer>[] fs = (CompletableFuture<Integer>[]) new CompletableFuture[k];
2566 >            CompletableFuture<Integer>[] fs
2567 >                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
2568              for (int i = 0; i < k; ++i)
2569                  fs[i] = new CompletableFuture<>();
2570              CompletableFuture<Void> f = CompletableFuture.allOf(fs);
# Line 2978 | Line 2578 | public class CompletableFutureTest exten
2578          }
2579      }
2580  
2581 +    public void testAllOf_backwards() throws Exception {
2582 +        for (int k = 1; k < 20; ++k) {
2583 +            CompletableFuture<Integer>[] fs
2584 +                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
2585 +            for (int i = 0; i < k; ++i)
2586 +                fs[i] = new CompletableFuture<>();
2587 +            CompletableFuture<Void> f = CompletableFuture.allOf(fs);
2588 +            for (int i = k - 1; i >= 0; i--) {
2589 +                checkIncomplete(f);
2590 +                checkIncomplete(CompletableFuture.allOf(fs));
2591 +                fs[i].complete(one);
2592 +            }
2593 +            checkCompletedNormally(f, null);
2594 +            checkCompletedNormally(CompletableFuture.allOf(fs), null);
2595 +        }
2596 +    }
2597 +
2598      /**
2599       * anyOf(no component futures) returns an incomplete future
2600       */
# Line 3036 | Line 2653 | public class CompletableFutureTest exten
2653          Runnable[] throwingActions = {
2654              () -> CompletableFuture.supplyAsync(null),
2655              () -> CompletableFuture.supplyAsync(null, exec),
2656 <            () -> CompletableFuture.supplyAsync(supplyOne, null),
2656 >            () -> CompletableFuture.supplyAsync(new IntegerSupplier(ExecutionMode.DEFAULT, 42), null),
2657  
2658              () -> CompletableFuture.runAsync(null),
2659              () -> CompletableFuture.runAsync(null, exec),
# Line 3109 | Line 2726 | public class CompletableFutureTest exten
2726  
2727              () -> f.thenCompose(null),
2728              () -> f.thenComposeAsync(null),
2729 <            () -> f.thenComposeAsync(new CompletableFutureInc(), null),
2729 >            () -> f.thenComposeAsync(new CompletableFutureInc(ExecutionMode.EXECUTOR), null),
2730              () -> f.thenComposeAsync(null, exec),
2731  
2732              () -> f.exceptionally(null),
# Line 3145 | Line 2762 | public class CompletableFutureTest exten
2762       * whenComplete action executes on normal completion, propagating
2763       * source result.
2764       */
2765 <    public void testWhenComplete1() {
2766 <        final AtomicInteger a = new AtomicInteger();
2767 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2768 <        CompletableFuture<Integer> g =
2769 <            f.whenComplete((Integer x, Throwable t) -> a.getAndIncrement());
2770 <        f.complete(three);
2771 <        checkCompletedNormally(f, three);
2772 <        checkCompletedNormally(g, three);
2773 <        assertEquals(a.get(), 1);
2774 <    }
2775 <
2776 <    /**
2777 <     * whenComplete action executes on exceptional completion, propagating
2778 <     * source result.
2779 <     */
2780 <    public void testWhenComplete2() {
3164 <        final AtomicInteger a = new AtomicInteger();
3165 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3166 <        CompletableFuture<Integer> g =
3167 <            f.whenComplete((Integer x, Throwable t) -> a.getAndIncrement());
3168 <        f.completeExceptionally(new CFException());
3169 <        assertTrue(f.isCompletedExceptionally());
3170 <        assertTrue(g.isCompletedExceptionally());
3171 <        assertEquals(a.get(), 1);
3172 <    }
3173 <
3174 <    /**
3175 <     * If a whenComplete action throws an exception when triggered by
3176 <     * a normal completion, it completes exceptionally
3177 <     */
3178 <    public void testWhenComplete3() {
3179 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3180 <        CompletableFuture<Integer> g =
3181 <            f.whenComplete((Integer x, Throwable t) ->
3182 <                           { throw new CFException(); } );
3183 <        f.complete(three);
3184 <        checkCompletedNormally(f, three);
3185 <        assertTrue(g.isCompletedExceptionally());
3186 <        checkCompletedWithWrappedCFException(g);
3187 <    }
3188 <
3189 <    /**
3190 <     * whenCompleteAsync action executes on normal completion, propagating
3191 <     * source result.
3192 <     */
3193 <    public void testWhenCompleteAsync1() {
3194 <        final AtomicInteger a = new AtomicInteger();
3195 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3196 <        CompletableFuture<Integer> g =
3197 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement());
3198 <        f.complete(three);
3199 <        checkCompletedNormally(f, three);
3200 <        checkCompletedNormally(g, three);
3201 <        assertEquals(a.get(), 1);
3202 <    }
3203 <
3204 <    /**
3205 <     * whenCompleteAsync action executes on exceptional completion, propagating
3206 <     * source result.
3207 <     */
3208 <    public void testWhenCompleteAsync2() {
3209 <        final AtomicInteger a = new AtomicInteger();
3210 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3211 <        CompletableFuture<Integer> g =
3212 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement());
3213 <        f.completeExceptionally(new CFException());
3214 <        checkCompletedWithWrappedCFException(f);
3215 <        checkCompletedWithWrappedCFException(g);
3216 <    }
2765 >    public void testWhenComplete_normalCompletion1() {
2766 >        for (ExecutionMode m : ExecutionMode.values())
2767 >        for (boolean createIncomplete : new boolean[] { true, false })
2768 >        for (Integer v1 : new Integer[] { 1, null })
2769 >    {
2770 >        final AtomicInteger a = new AtomicInteger(0);
2771 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2772 >        if (!createIncomplete) f.complete(v1);
2773 >        final CompletableFuture<Integer> g = m.whenComplete
2774 >            (f,
2775 >             (Integer x, Throwable t) -> {
2776 >                threadAssertSame(x, v1);
2777 >                threadAssertNull(t);
2778 >                a.getAndIncrement();
2779 >            });
2780 >        if (createIncomplete) f.complete(v1);
2781  
2782 <    /**
2783 <     * If a whenCompleteAsync action throws an exception when
2784 <     * triggered by a normal completion, it completes exceptionally
2785 <     */
3222 <    public void testWhenCompleteAsync3() {
3223 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3224 <        CompletableFuture<Integer> g =
3225 <            f.whenCompleteAsync((Integer x, Throwable t) ->
3226 <                           { throw new CFException(); } );
3227 <        f.complete(three);
3228 <        checkCompletedNormally(f, three);
3229 <        checkCompletedWithWrappedCFException(g);
3230 <    }
2782 >        checkCompletedNormally(g, v1);
2783 >        checkCompletedNormally(f, v1);
2784 >        assertEquals(1, a.get());
2785 >    }}
2786  
2787      /**
2788 <     * whenCompleteAsync action executes on normal completion, propagating
2788 >     * whenComplete action executes on exceptional completion, propagating
2789       * source result.
2790       */
2791 <    public void testWhenCompleteAsync1e() {
2792 <        final AtomicInteger a = new AtomicInteger();
2793 <        ThreadExecutor exec = new ThreadExecutor();
2794 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2795 <        CompletableFuture<Integer> g =
2796 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement(),
2797 <                                exec);
2798 <        f.complete(three);
2799 <        checkCompletedNormally(f, three);
2800 <        checkCompletedNormally(g, three);
2801 <        assertEquals(a.get(), 1);
2802 <    }
2791 >    public void testWhenComplete_exceptionalCompletion() {
2792 >        for (ExecutionMode m : ExecutionMode.values())
2793 >        for (boolean createIncomplete : new boolean[] { true, false })
2794 >        for (Integer v1 : new Integer[] { 1, null })
2795 >    {
2796 >        final AtomicInteger a = new AtomicInteger(0);
2797 >        final CFException ex = new CFException();
2798 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2799 >        if (!createIncomplete) f.completeExceptionally(ex);
2800 >        final CompletableFuture<Integer> g = m.whenComplete
2801 >            (f,
2802 >             (Integer x, Throwable t) -> {
2803 >                threadAssertNull(x);
2804 >                threadAssertSame(t, ex);
2805 >                a.getAndIncrement();
2806 >            });
2807 >        if (createIncomplete) f.completeExceptionally(ex);
2808 >        checkCompletedWithWrappedCFException(f, ex);
2809 >        checkCompletedWithWrappedCFException(g, ex);
2810 >        assertEquals(1, a.get());
2811 >    }}
2812  
2813      /**
2814 <     * whenCompleteAsync action executes on exceptional completion, propagating
2815 <     * source result.
2814 >     * whenComplete action executes on cancelled source, propagating
2815 >     * CancellationException.
2816       */
2817 <    public void testWhenCompleteAsync2e() {
2818 <        final AtomicInteger a = new AtomicInteger();
2819 <        ThreadExecutor exec = new ThreadExecutor();
2820 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2821 <        CompletableFuture<Integer> g =
2822 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement(),
2823 <                                exec);
2824 <        f.completeExceptionally(new CFException());
2825 <        checkCompletedWithWrappedCFException(f);
2826 <        checkCompletedWithWrappedCFException(g);
2827 <    }
2817 >    public void testWhenComplete_sourceCancelled() {
2818 >        for (ExecutionMode m : ExecutionMode.values())
2819 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2820 >        for (boolean createIncomplete : new boolean[] { true, false })
2821 >    {
2822 >        final AtomicInteger a = new AtomicInteger(0);
2823 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2824 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2825 >        final CompletableFuture<Integer> g = m.whenComplete
2826 >            (f,
2827 >             (Integer x, Throwable t) -> {
2828 >                threadAssertNull(x);
2829 >                threadAssertTrue(t instanceof CancellationException);
2830 >                a.getAndIncrement();
2831 >            });
2832 >        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2833  
2834 <    /**
2835 <     * If a whenCompleteAsync action throws an exception when triggered
2836 <     * by a normal completion, it completes exceptionally
2837 <     */
2838 <    public void testWhenCompleteAsync3e() {
3270 <        ThreadExecutor exec = new ThreadExecutor();
3271 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3272 <        CompletableFuture<Integer> g =
3273 <            f.whenCompleteAsync((Integer x, Throwable t) ->
3274 <                                { throw new CFException(); },
3275 <                                exec);
3276 <        f.complete(three);
3277 <        checkCompletedNormally(f, three);
3278 <        checkCompletedWithWrappedCFException(g);
3279 <    }
2834 >        //try { g.join(); } catch (Throwable t) { throw new Error(t); }
2835 >        checkCompletedWithWrappedCancellationException(g);
2836 >        checkCancelled(f);
2837 >        assertEquals(1, a.get());
2838 >    }}
2839  
2840      /**
2841 <     * handleAsync action completes normally with function value on
2842 <     * either normal or exceptional completion of source
2841 >     * If a whenComplete action throws an exception when triggered by
2842 >     * a normal completion, it completes exceptionally
2843       */
2844 <    public void testHandleAsync() {
2845 <        CompletableFuture<Integer> f, g;
2846 <        IntegerHandler r;
2847 <
2848 <        f = new CompletableFuture<>();
2849 <        g = f.handleAsync(r = new IntegerHandler());
2850 <        assertFalse(r.ran);
2851 <        f.completeExceptionally(new CFException());
2852 <        checkCompletedWithWrappedCFException(f);
2853 <        checkCompletedNormally(g, three);
2854 <        assertTrue(r.ran);
2855 <
2856 <        f = new CompletableFuture<>();
2857 <        g = f.handleAsync(r = new IntegerHandler());
2858 <        assertFalse(r.ran);
2859 <        f.completeExceptionally(new CFException());
2860 <        checkCompletedWithWrappedCFException(f);
2861 <        checkCompletedNormally(g, three);
2862 <        assertTrue(r.ran);
2863 <
2864 <        f = new CompletableFuture<>();
2865 <        g = f.handleAsync(r = new IntegerHandler());
3307 <        assertFalse(r.ran);
3308 <        f.complete(one);
3309 <        checkCompletedNormally(f, one);
3310 <        checkCompletedNormally(g, two);
3311 <        assertTrue(r.ran);
3312 <
3313 <        f = new CompletableFuture<>();
3314 <        g = f.handleAsync(r = new IntegerHandler());
3315 <        assertFalse(r.ran);
3316 <        f.complete(one);
3317 <        checkCompletedNormally(f, one);
3318 <        checkCompletedNormally(g, two);
3319 <        assertTrue(r.ran);
3320 <    }
2844 >    public void testWhenComplete_actionFailed() {
2845 >        for (boolean createIncomplete : new boolean[] { true, false })
2846 >        for (ExecutionMode m : ExecutionMode.values())
2847 >        for (Integer v1 : new Integer[] { 1, null })
2848 >    {
2849 >        final AtomicInteger a = new AtomicInteger(0);
2850 >        final CFException ex = new CFException();
2851 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2852 >        if (!createIncomplete) f.complete(v1);
2853 >        final CompletableFuture<Integer> g = m.whenComplete
2854 >            (f,
2855 >             (Integer x, Throwable t) -> {
2856 >                threadAssertSame(x, v1);
2857 >                threadAssertNull(t);
2858 >                a.getAndIncrement();
2859 >                throw ex;
2860 >            });
2861 >        if (createIncomplete) f.complete(v1);
2862 >        checkCompletedNormally(f, v1);
2863 >        checkCompletedWithWrappedCFException(g, ex);
2864 >        assertEquals(1, a.get());
2865 >    }}
2866  
2867      /**
2868 <     * handleAsync action with Executor completes normally with
2869 <     * function value on either normal or exceptional completion of
2870 <     * source
2868 >     * If a whenComplete action throws an exception when triggered by
2869 >     * a source completion that also throws an exception, the source
2870 >     * exception takes precedence.
2871       */
2872 <    public void testHandleAsync2() {
2873 <        CompletableFuture<Integer> f, g;
2874 <        ThreadExecutor exec = new ThreadExecutor();
2875 <        IntegerHandler r;
2876 <
2877 <        f = new CompletableFuture<>();
2878 <        g = f.handleAsync(r = new IntegerHandler(), exec);
2879 <        assertFalse(r.ran);
2880 <        f.completeExceptionally(new CFException());
3336 <        checkCompletedWithWrappedCFException(f);
3337 <        checkCompletedNormally(g, three);
3338 <        assertTrue(r.ran);
3339 <
3340 <        f = new CompletableFuture<>();
3341 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3342 <        assertFalse(r.ran);
3343 <        f.completeExceptionally(new CFException());
3344 <        checkCompletedWithWrappedCFException(f);
3345 <        checkCompletedNormally(g, three);
3346 <        assertTrue(r.ran);
3347 <
3348 <        f = new CompletableFuture<>();
3349 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3350 <        assertFalse(r.ran);
3351 <        f.complete(one);
3352 <        checkCompletedNormally(f, one);
3353 <        checkCompletedNormally(g, two);
3354 <        assertTrue(r.ran);
2872 >    public void testWhenComplete_actionFailedSourceFailed() {
2873 >        for (boolean createIncomplete : new boolean[] { true, false })
2874 >        for (ExecutionMode m : ExecutionMode.values())
2875 >        for (Integer v1 : new Integer[] { 1, null })
2876 >    {
2877 >        final AtomicInteger a = new AtomicInteger(0);
2878 >        final CFException ex1 = new CFException();
2879 >        final CFException ex2 = new CFException();
2880 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2881  
2882 <        f = new CompletableFuture<>();
2883 <        g = f.handleAsync(r = new IntegerHandler(), exec);
2884 <        assertFalse(r.ran);
2885 <        f.complete(one);
2886 <        checkCompletedNormally(f, one);
2887 <        checkCompletedNormally(g, two);
2888 <        assertTrue(r.ran);
2889 <    }
2882 >        if (!createIncomplete) f.completeExceptionally(ex1);
2883 >        final CompletableFuture<Integer> g = m.whenComplete
2884 >            (f,
2885 >             (Integer x, Throwable t) -> {
2886 >                threadAssertSame(t, ex1);
2887 >                threadAssertNull(x);
2888 >                a.getAndIncrement();
2889 >                throw ex2;
2890 >            });
2891 >        if (createIncomplete) f.completeExceptionally(ex1);
2892 >
2893 >        checkCompletedWithWrappedCFException(f, ex1);
2894 >        checkCompletedWithWrappedCFException(g, ex1);
2895 >        assertEquals(1, a.get());
2896 >    }}
2897  
2898   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines