ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/test/tck/CompletableFutureTest.java
(Generate patch)

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines