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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines