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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines