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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines