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.32 by jsr166, Mon May 26 17:25:36 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 102 | Line 105 | public class CompletableFutureTest exten
105          assertTrue(f.toString().contains("[Completed exceptionally]"));
106      }
107  
108 +    void checkCompletedWithWrappedCFException(CompletableFuture<?> f,
109 +                                              CFException ex) {
110 +        try {
111 +            f.get(LONG_DELAY_MS, MILLISECONDS);
112 +            shouldThrow();
113 +        } catch (ExecutionException success) {
114 +            assertSame(ex, success.getCause());
115 +        } catch (Throwable fail) { threadUnexpectedException(fail); }
116 +        try {
117 +            f.join();
118 +            shouldThrow();
119 +        } catch (CompletionException success) {
120 +            assertSame(ex, success.getCause());
121 +        }
122 +        try {
123 +            f.getNow(null);
124 +            shouldThrow();
125 +        } catch (CompletionException success) {
126 +            assertSame(ex, success.getCause());
127 +        }
128 +        try {
129 +            f.get();
130 +            shouldThrow();
131 +        } catch (ExecutionException success) {
132 +            assertSame(ex, success.getCause());
133 +        } catch (Throwable fail) { threadUnexpectedException(fail); }
134 +        assertTrue(f.isDone());
135 +        assertFalse(f.isCancelled());
136 +        assertTrue(f.toString().contains("[Completed exceptionally]"));
137 +    }
138 +
139      void checkCancelled(CompletableFuture<?> f) {
140          try {
141              f.get(LONG_DELAY_MS, MILLISECONDS);
# Line 215 | 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 247 | 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 286 | 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(); }
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 FailingNoop implements Runnable {
447 <        boolean ran;
448 <        public void run() { ran = true; throw new CFException(); }
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 completes with function value on source
746 <     * exception; otherwise with source value
747 <     */
748 <    public void testExceptionally() {
749 <        CompletableFuture<Integer> f = new CompletableFuture<>();
750 <        ExceptionToInteger r = new ExceptionToInteger();
751 <        CompletableFuture<Integer> g = f.exceptionally(r);
752 <        f.completeExceptionally(new CFException());
753 <        checkCompletedNormally(g, three);
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  
387        f = new CompletableFuture<>();
388        r = new ExceptionToInteger();
389        g = f.exceptionally(r);
390        f.complete(one);
391        checkCompletedNormally(g, one);
392    }
768  
769      /**
770 <     * handle action completes normally with function value on either
771 <     * normal or exceptional completion of source
770 >     * exceptionally action completes with function value on source
771 >     * exception
772       */
773 <    public void testHandle() {
774 <        CompletableFuture<Integer> f, g;
775 <        IntegerHandler r;
776 <
777 <        f = new CompletableFuture<>();
778 <        f.completeExceptionally(new CFException());
779 <        g = f.handle(r = new IntegerHandler());
780 <        assertTrue(r.ran);
781 <        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 >        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 <        f = new CompletableFuture<>();
842 <        g = f.handle(r = new IntegerHandler());
843 <        assertFalse(r.ran);
844 <        f.completeExceptionally(new CFException());
845 <        checkCompletedNormally(g, three);
846 <        assertTrue(r.ran);
841 >    /**
842 >     * handle action completes normally with function value on
843 >     * exceptional completion of source
844 >     */
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 >        checkCompletedNormally(g, v1);
865 >        checkCompletedWithWrappedCFException(f, ex);
866 >        assertEquals(1, a.get());
867 >    }}
868 >
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);
419 <        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 441 | 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 454 | 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 484 | 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 495 | 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  
509        f = new CompletableFuture<>();
510        f.complete(null);
511        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;
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 <        g = f.thenRun(r = new Noop());
1056 <        f.completeExceptionally(new CFException());
1057 <        checkCompletedWithWrappedCFException(g);
529 <        assertFalse(r.ran);
530 <
531 <        f = new CompletableFuture<>();
532 <        f.completeExceptionally(new CFException());
533 <        g = f.thenRun(r = new Noop());
534 <        checkCompletedWithWrappedCFException(g);
535 <        assertFalse(r.ran);
536 <    }
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);
555 <    }
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());
573 <        checkCompletedWithWrappedCancellationException(g);
574 <    }
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() {
601 <        CompletableFuture<Integer> f = new CompletableFuture<>();
602 <        CompletableFuture<Integer> g = f.thenApply(new FailingFunction());
603 <        f.complete(one);
604 <        checkCompletedWithWrappedCFException(g);
605 <    }
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;
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 >        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 <        h = f.thenCombine(g, subtract);
1307 <        f.complete(3);
1308 <        checkIncomplete(h);
676 <        g.complete(1);
677 <        checkCompletedNormally(h, 2);
678 <
679 <        f = new CompletableFuture<>();
680 <        g = new CompletableFuture<>();
681 <        h = f.thenCombine(g, subtract);
682 <        g.complete(1);
683 <        checkIncomplete(h);
684 <        f.complete(3);
685 <        checkCompletedNormally(h, 2);
686 <
687 <        f = new CompletableFuture<>();
688 <        g = new CompletableFuture<>();
689 <        g.complete(1);
690 <        f.complete(3);
691 <        h = f.thenCombine(g, subtract);
692 <        checkCompletedNormally(h, 2);
693 <    }
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);
1324 <
1325 <        f = new CompletableFuture<>();
1326 <        g = new CompletableFuture<>();
1327 <        h = f.thenCombine(g, subtract);
1328 <        g.completeExceptionally(new CFException());
1329 <        checkIncomplete(h);
1330 <        f.complete(3);
1331 <        checkCompletedWithWrappedCFException(h);
1332 <
718 <        f = new CompletableFuture<>();
719 <        g = new CompletableFuture<>();
720 <        f.complete(3);
721 <        g.completeExceptionally(new CFException());
722 <        h = f.thenCombine(g, subtract);
723 <        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 >        (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);
730 <        checkCompletedWithWrappedCFException(h);
731 <    }
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 >        (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  
763        f = new CompletableFuture<>();
764        g = new CompletableFuture<>();
765        h = f.thenCombine(g, subtract);
766        assertTrue(g.cancel(true));
767        checkIncomplete(h);
768        f.complete(3);
1390          checkCompletedWithWrappedCancellationException(h);
1391 <
1392 <        f = new CompletableFuture<>();
1393 <        g = new CompletableFuture<>();
1394 <        assertTrue(f.cancel(true));
774 <        assertTrue(g.cancel(true));
775 <        h = f.thenCombine(g, subtract);
776 <        checkCompletedWithWrappedCancellationException(h);
777 <    }
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);
1410 <        g.complete(1);
1411 <        checkCompletedNormally(h, null);
1412 <        assertEquals(r.value, 2);
1413 <
1414 <        f = new CompletableFuture<>();
1415 <        g = new CompletableFuture<>();
1416 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
1417 <        g.complete(1);
1418 <        checkIncomplete(h);
1419 <        f.complete(3);
803 <        checkCompletedNormally(h, null);
804 <        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 >        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  
806        f = new CompletableFuture<>();
807        g = new CompletableFuture<>();
808        g.complete(1);
809        f.complete(3);
810        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);
1441 <        g.complete(1);
1442 <        checkCompletedWithWrappedCFException(h);
1443 <
1444 <        f = new CompletableFuture<>();
1445 <        g = new CompletableFuture<>();
1446 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
1447 <        g.completeExceptionally(new CFException());
1448 <        checkIncomplete(h);
1449 <        f.complete(3);
838 <        checkCompletedWithWrappedCFException(h);
839 <
840 <        f = new CompletableFuture<>();
841 <        g = new CompletableFuture<>();
842 <        f.complete(3);
843 <        g.completeExceptionally(new CFException());
844 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
845 <        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 >        (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());
852 <        checkCompletedWithWrappedCFException(h);
853 <    }
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 >        if (fFirst) {
1472 >            f.complete(v1);
1473 >            g.complete(v2);
1474 >        } else {
1475 >            g.complete(v2);
1476 >            f.complete(v1);
1477 >        }
1478  
863        f = new CompletableFuture<>();
864        g = new CompletableFuture<>();
865        h = f.thenAcceptBoth(g, r = new FailingBiConsumer());
866        f.complete(3);
867        checkIncomplete(h);
868        g.complete(1);
1479          checkCompletedWithWrappedCFException(h);
1480 <
1481 <        f = new CompletableFuture<>();
1482 <        g = new CompletableFuture<>();
873 <        f.complete(3);
874 <        g.complete(1);
875 <        h = f.thenAcceptBoth(g, r = new FailingBiConsumer());
876 <        checkCompletedWithWrappedCFException(h);
877 <    }
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);
1497 <        g.complete(1);
1498 <        checkCompletedWithWrappedCancellationException(h);
1499 <
1500 <        f = new CompletableFuture<>();
1501 <        g = new CompletableFuture<>();
1502 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
1503 <        assertTrue(g.cancel(true));
1504 <        checkIncomplete(h);
1505 <        f.complete(3);
901 <        checkCompletedWithWrappedCancellationException(h);
902 <
903 <        f = new CompletableFuture<>();
904 <        g = new CompletableFuture<>();
905 <        f.complete(3);
906 <        assertTrue(g.cancel(true));
907 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
908 <        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 >        (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  
910        f = new CompletableFuture<>();
911        g = new CompletableFuture<>();
912        assertTrue(f.cancel(true));
913        g.complete(3);
914        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() {
1518 <        CompletableFuture<Integer> f, g;
1519 <        CompletableFuture<Void> h;
1520 <        Noop r;
1521 <
1522 <        f = new CompletableFuture<>();
1523 <        g = new CompletableFuture<>();
1524 <        h = f.runAfterBoth(g, r = new Noop());
1525 <        f.complete(3);
1526 <        checkIncomplete(h);
1527 <        g.complete(1);
1528 <        checkCompletedNormally(h, null);
1529 <        assertTrue(r.ran);
1530 <
1531 <        f = new CompletableFuture<>();
1532 <        g = new CompletableFuture<>();
1533 <        h = f.runAfterBoth(g, r = new Noop());
1534 <        g.complete(1);
1535 <        checkIncomplete(h);
1536 <        f.complete(3);
942 <        checkCompletedNormally(h, null);
943 <        assertTrue(r.ran);
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 >    {
1524 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1525 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1526 >        final Noop r = new Noop(m);
1527 >
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  
945        f = new CompletableFuture<>();
946        g = new CompletableFuture<>();
947        g.complete(1);
948        f.complete(3);
949        h = f.runAfterBoth(g, r = new Noop());
1538          checkCompletedNormally(h, null);
1539 <        assertTrue(r.ran);
1540 <    }
1539 >        assertEquals(1, r.invocationCount);
1540 >        checkCompletedNormally(f, v1);
1541 >        checkCompletedNormally(g, v2);
1542 >    }}
1543  
1544      /**
1545       * runAfterBoth result completes exceptionally after exceptional
1546       * completion of either source
1547       */
1548 <    public void testRunAfterBoth2() {
1549 <        CompletableFuture<Integer> f, g;
1550 <        CompletableFuture<Void> h;
1551 <        Noop r;
1552 <
1553 <        f = new CompletableFuture<>();
1554 <        g = new CompletableFuture<>();
1555 <        h = f.runAfterBoth(g, r = new Noop());
1556 <        f.completeExceptionally(new CFException());
1557 <        checkIncomplete(h);
1558 <        g.complete(1);
1559 <        checkCompletedWithWrappedCFException(h);
1560 <        assertFalse(r.ran);
1561 <
1562 <        f = new CompletableFuture<>();
1563 <        g = new CompletableFuture<>();
1564 <        h = f.runAfterBoth(g, r = new Noop());
1565 <        g.completeExceptionally(new CFException());
1566 <        checkIncomplete(h);
977 <        f.complete(3);
978 <        checkCompletedWithWrappedCFException(h);
979 <        assertFalse(r.ran);
980 <
981 <        f = new CompletableFuture<>();
982 <        g = new CompletableFuture<>();
983 <        g.completeExceptionally(new CFException());
984 <        f.complete(3);
985 <        h = f.runAfterBoth(g, r = new Noop());
986 <        checkCompletedWithWrappedCFException(h);
987 <        assertFalse(r.ran);
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 >    {
1554 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1555 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1556 >        final CFException ex = new CFException();
1557 >        final Noop r = new Noop(m);
1558 >
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 >        }
1567  
1568 <        f = new CompletableFuture<>();
1569 <        g = new CompletableFuture<>();
1570 <        f.completeExceptionally(new CFException());
1571 <        g.complete(1);
1572 <        h = f.runAfterBoth(g, r = new Noop());
994 <        checkCompletedWithWrappedCFException(h);
995 <        assertFalse(r.ran);
996 <    }
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 testRunAfterBoth3() {
1578 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1579 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1580 <        FailingNoop r = new FailingNoop();
1581 <        CompletableFuture<Void> g = f.runAfterBoth(f2, r);
1582 <        f.complete(one);
1583 <        checkIncomplete(g);
1584 <        f2.complete(two);
1585 <        checkCompletedWithWrappedCFException(g);
1586 <    }
1587 <
1588 <    /**
1589 <     * runAfterBoth result completes exceptionally if either source cancelled
1590 <     */
1591 <    public void testRunAfterBoth4() {
1592 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1593 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1594 <        Noop r = new Noop();
1595 <        CompletableFuture<Void> g = f.runAfterBoth(f2, r);
1020 <        assertTrue(f.cancel(true));
1021 <        f2.complete(two);
1022 <        checkCompletedWithWrappedCancellationException(g);
1023 <        f = new CompletableFuture<>();
1024 <        f2 = new CompletableFuture<>();
1025 <        r = new Noop();
1026 <        g = f.runAfterBoth(f2, r);
1027 <        f.complete(one);
1028 <        assertTrue(f2.cancel(true));
1029 <        checkCompletedWithWrappedCancellationException(g);
1030 <    }
1031 <
1032 <    /**
1033 <     * applyToEither result completes normally after normal completion
1034 <     * of either source
1035 <     */
1036 <    public void testApplyToEither() {
1037 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1038 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1039 <        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
1040 <        f.complete(one);
1041 <        checkCompletedNormally(g, two);
1042 <        f2.complete(one);
1043 <        checkCompletedNormally(g, two);
1044 <
1045 <        f = new CompletableFuture<>();
1046 <        f.complete(one);
1047 <        f2 = new CompletableFuture<>();
1048 <        g = f.applyToEither(f2, inc);
1049 <        checkCompletedNormally(g, two);
1050 <    }
1051 <
1052 <    /**
1053 <     * applyToEither result completes exceptionally after exceptional
1054 <     * completion of either source
1055 <     */
1056 <    public void testApplyToEither2() {
1057 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1058 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1059 <        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
1060 <        f.completeExceptionally(new CFException());
1061 <        f2.complete(one);
1062 <        checkCompletedWithWrappedCFException(g);
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 FailingRunnable r = new FailingRunnable(m);
1586 >
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 <        f = new CompletableFuture<>();
1598 <        f2 = new CompletableFuture<>();
1599 <        f2.completeExceptionally(new CFException());
1600 <        g = f.applyToEither(f2, inc);
1601 <        checkCompletedWithWrappedCFException(g);
1069 <    }
1597 >        checkCompletedWithWrappedCFException(h1);
1598 >        checkCompletedWithWrappedCFException(h2);
1599 >        checkCompletedNormally(f, v1);
1600 >        checkCompletedNormally(g, v2);
1601 >    }}
1602  
1603      /**
1604 <     * applyToEither result completes exceptionally if action does
1604 >     * runAfterBoth result completes exceptionally if either source cancelled
1605       */
1606 <    public void testApplyToEither3() {
1607 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1608 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1609 <        FailingFunction r = new FailingFunction();
1610 <        CompletableFuture<Integer> g = f.applyToEither(f2, r);
1611 <        f2.complete(two);
1612 <        checkCompletedWithWrappedCFException(g);
1613 <    }
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 >    {
1613 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1614 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1615 >        final Noop r = new Noop(m);
1616 >
1617 >
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  
1627 <    /**
1628 <     * applyToEither result completes exceptionally if either source cancelled
1629 <     */
1630 <    public void testApplyToEither4() {
1631 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1088 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1089 <        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
1090 <        assertTrue(f.cancel(true));
1091 <        checkCompletedWithWrappedCancellationException(g);
1092 <        f = new CompletableFuture<>();
1093 <        f2 = new CompletableFuture<>();
1094 <        assertTrue(f2.cancel(true));
1095 <        checkCompletedWithWrappedCancellationException(g);
1096 <    }
1627 >        checkCompletedWithWrappedCancellationException(h);
1628 >        checkCancelled(!fFirst ? f : g);
1629 >        assertEquals(0, r.invocationCount);
1630 >        checkCompletedNormally(fFirst ? f : g, v1);
1631 >    }}
1632  
1633      /**
1634 <     * acceptEither result completes normally after normal completion
1634 >     * applyToEither result completes normally after normal completion
1635       * of either source
1636       */
1637 <    public void testAcceptEither() {
1638 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1639 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1640 <        IncAction r = new IncAction();
1641 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
1642 <        f.complete(one);
1643 <        checkCompletedNormally(g, null);
1644 <        f2.complete(one);
1645 <        checkCompletedNormally(g, null);
1646 <        assertEquals(r.value, 2);
1647 <
1648 <        r = new IncAction();
1649 <        f = new CompletableFuture<>();
1650 <        f.complete(one);
1651 <        f2 = new CompletableFuture<>();
1652 <        g = f.acceptEither(f2, r);
1653 <        checkCompletedNormally(g, null);
1654 <        assertEquals(r.value, 2);
1655 <    }
1656 <
1657 <    /**
1123 <     * acceptEither result completes exceptionally after exceptional
1124 <     * completion of either source
1125 <     */
1126 <    public void testAcceptEither2() {
1127 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1128 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1129 <        IncAction r = new IncAction();
1130 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
1131 <        f.completeExceptionally(new CFException());
1132 <        f2.complete(one);
1133 <        checkCompletedWithWrappedCFException(g);
1134 <
1135 <        r = new IncAction();
1136 <        f = new CompletableFuture<>();
1137 <        f2 = new CompletableFuture<>();
1138 <        f2.completeExceptionally(new CFException());
1139 <        g = f.acceptEither(f2, r);
1140 <        checkCompletedWithWrappedCFException(g);
1141 <    }
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 IncFunction r = new IncFunction(m);
1647 >
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 >        checkCompletedNormally(h, inc(fFirst ? v1 : v2));
1657 >        if (!fFirst) f.complete(v1); else g.complete(v2);
1658  
1659 <    /**
1660 <     * acceptEither result completes exceptionally if action does
1661 <     */
1662 <    public void testAcceptEither3() {
1663 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1664 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1665 <        FailingConsumer r = new FailingConsumer();
1666 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
1667 <        f2.complete(two);
1668 <        checkCompletedWithWrappedCFException(g);
1669 <    }
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 IncFunction r = new IncFunction(m);
1673 >
1674 >        if (fFirst) {
1675 >            f.complete(v1);
1676 >            g.complete(v2);
1677 >        } else {
1678 >            g.complete(v2);
1679 >            f.complete(v1);
1680 >        }
1681  
1682 <    /**
1156 <     * acceptEither result completes exceptionally if either source cancelled
1157 <     */
1158 <    public void testAcceptEither4() {
1159 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1160 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1161 <        IncAction r = new IncAction();
1162 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
1163 <        assertTrue(f.cancel(true));
1164 <        checkCompletedWithWrappedCancellationException(g);
1165 <        f = new CompletableFuture<>();
1166 <        f2 = new CompletableFuture<>();
1167 <        assertTrue(f2.cancel(true));
1168 <        checkCompletedWithWrappedCancellationException(g);
1169 <    }
1682 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1683  
1684 <    /**
1685 <     * runAfterEither result completes normally after normal completion
1173 <     * of either source
1174 <     */
1175 <    public void testRunAfterEither() {
1176 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1177 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1178 <        Noop r = new Noop();
1179 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
1180 <        f.complete(one);
1181 <        checkCompletedNormally(g, null);
1182 <        f2.complete(one);
1183 <        checkCompletedNormally(g, null);
1184 <        assertTrue(r.ran);
1684 >        checkCompletedNormally(f, v1);
1685 >        checkCompletedNormally(g, v2);
1686  
1687 <        r = new Noop();
1688 <        f = new CompletableFuture<>();
1689 <        f.complete(one);
1690 <        f2 = new CompletableFuture<>();
1691 <        g = f.runAfterEither(f2, r);
1191 <        checkCompletedNormally(g, null);
1192 <        assertTrue(r.ran);
1193 <    }
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 <     * runAfterEither result completes exceptionally after exceptional
1694 >     * applyToEither result completes exceptionally after exceptional
1695       * completion of either source
1696       */
1697 <    public void testRunAfterEither2() {
1698 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1699 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1700 <        Noop r = new Noop();
1701 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
1702 <        f.completeExceptionally(new CFException());
1703 <        f2.complete(one);
1704 <        checkCompletedWithWrappedCFException(g);
1705 <
1706 <        r = new Noop();
1707 <        f = new CompletableFuture<>();
1708 <        f2 = new CompletableFuture<>();
1709 <        f2.completeExceptionally(new CFException());
1710 <        g = f.runAfterEither(f2, r);
1711 <        checkCompletedWithWrappedCFException(g);
1712 <    }
1713 <
1714 <    /**
1217 <     * runAfterEither result completes exceptionally if action does
1218 <     */
1219 <    public void testRunAfterEither3() {
1220 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1221 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1222 <        FailingNoop r = new FailingNoop();
1223 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
1224 <        f2.complete(two);
1225 <        checkCompletedWithWrappedCFException(g);
1226 <    }
1227 <
1228 <    /**
1229 <     * runAfterEither result completes exceptionally if either source cancelled
1230 <     */
1231 <    public void testRunAfterEither4() {
1232 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1233 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1234 <        Noop r = new Noop();
1235 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
1236 <        assertTrue(f.cancel(true));
1237 <        checkCompletedWithWrappedCancellationException(g);
1238 <        f = new CompletableFuture<>();
1239 <        f2 = new CompletableFuture<>();
1240 <        assertTrue(f2.cancel(true));
1241 <        checkCompletedWithWrappedCancellationException(g);
1242 <    }
1243 <
1244 <    /**
1245 <     * thenCompose result completes normally after normal completion of source
1246 <     */
1247 <    public void testThenCompose() {
1248 <        CompletableFuture<Integer> f, g;
1249 <        CompletableFutureInc r;
1250 <
1251 <        f = new CompletableFuture<>();
1252 <        g = f.thenCompose(r = new CompletableFutureInc());
1253 <        f.complete(one);
1254 <        checkCompletedNormally(g, two);
1255 <        assertTrue(r.ran);
1256 <
1257 <        f = new CompletableFuture<>();
1258 <        f.complete(one);
1259 <        g = f.thenCompose(r = new CompletableFutureInc());
1260 <        checkCompletedNormally(g, two);
1261 <        assertTrue(r.ran);
1262 <    }
1263 <
1264 <    /**
1265 <     * thenCompose result completes exceptionally after exceptional
1266 <     * completion of source
1267 <     */
1268 <    public void testThenCompose2() {
1269 <        CompletableFuture<Integer> f, g;
1270 <        CompletableFutureInc r;
1271 <
1272 <        f = new CompletableFuture<>();
1273 <        g = f.thenCompose(r = new CompletableFutureInc());
1274 <        f.completeExceptionally(new CFException());
1275 <        checkCompletedWithWrappedCFException(g);
1276 <
1277 <        f = new CompletableFuture<>();
1278 <        f.completeExceptionally(new CFException());
1279 <        g = f.thenCompose(r = new CompletableFutureInc());
1280 <        checkCompletedWithWrappedCFException(g);
1281 <    }
1282 <
1283 <    /**
1284 <     * thenCompose result completes exceptionally if action does
1285 <     */
1286 <    public void testThenCompose3() {
1287 <        CompletableFuture<Integer> f, g;
1288 <        FailingCompletableFutureFunction r;
1289 <
1290 <        f = new CompletableFuture<>();
1291 <        g = f.thenCompose(r = new FailingCompletableFutureFunction());
1292 <        f.complete(one);
1293 <        checkCompletedWithWrappedCFException(g);
1294 <
1295 <        f = new CompletableFuture<>();
1296 <        f.complete(one);
1297 <        g = f.thenCompose(r = new FailingCompletableFutureFunction());
1298 <        checkCompletedWithWrappedCFException(g);
1299 <    }
1300 <
1301 <    /**
1302 <     * thenCompose result completes exceptionally if source cancelled
1303 <     */
1304 <    public void testThenCompose4() {
1305 <        CompletableFuture<Integer> f, g;
1306 <        CompletableFutureInc r;
1307 <
1308 <        f = new CompletableFuture<>();
1309 <        g = f.thenCompose(r = new CompletableFutureInc());
1310 <        assertTrue(f.cancel(true));
1311 <        checkCompletedWithWrappedCancellationException(g);
1312 <
1313 <        f = new CompletableFuture<>();
1314 <        assertTrue(f.cancel(true));
1315 <        g = f.thenCompose(r = new CompletableFutureInc());
1316 <        checkCompletedWithWrappedCancellationException(g);
1317 <    }
1318 <
1319 <    // asyncs
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<>();
1705 >        final CFException ex = new CFException();
1706 >        final IncFunction r = new IncFunction(m);
1707 >
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 <    /**
1717 <     * thenRunAsync result completes normally after normal completion of source
1323 <     */
1324 <    public void testThenRunAsync() {
1325 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1326 <        Noop r = new Noop();
1327 <        CompletableFuture<Void> g = f.thenRunAsync(r);
1328 <        f.complete(null);
1329 <        checkCompletedNormally(g, null);
1716 >        checkCompletedWithWrappedCFException(h, ex);
1717 >        (!fFirst ? f : g).complete(v1);
1718  
1719 <        // reordered version
1720 <        f = new CompletableFuture<>();
1721 <        f.complete(null);
1722 <        r = new Noop();
1723 <        g = f.thenRunAsync(r);
1724 <        checkCompletedNormally(g, null);
1725 <    }
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 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 <    /**
1340 <     * thenRunAsync result completes exceptionally after exceptional
1341 <     * completion of source
1342 <     */
1343 <    public void testThenRunAsync2() {
1344 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1345 <        Noop r = new Noop();
1346 <        CompletableFuture<Void> g = f.thenRunAsync(r);
1347 <        f.completeExceptionally(new CFException());
1748 >        // unspecified behavior
1749          try {
1750 <            g.join();
1751 <            shouldThrow();
1752 <        } catch (CompletionException success) {}
1753 <        checkCompletedWithWrappedCFException(g);
1754 <    }
1755 <
1355 <    /**
1356 <     * thenRunAsync result completes exceptionally if action does
1357 <     */
1358 <    public void testThenRunAsync3() {
1359 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1360 <        FailingNoop r = new FailingNoop();
1361 <        CompletableFuture<Void> g = f.thenRunAsync(r);
1362 <        f.complete(null);
1363 <        checkCompletedWithWrappedCFException(g);
1364 <    }
1365 <
1366 <    /**
1367 <     * thenRunAsync result completes exceptionally if source cancelled
1368 <     */
1369 <    public void testThenRunAsync4() {
1370 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1371 <        Noop r = new Noop();
1372 <        CompletableFuture<Void> g = f.thenRunAsync(r);
1373 <        assertTrue(f.cancel(true));
1374 <        checkCompletedWithWrappedCancellationException(g);
1375 <    }
1376 <
1377 <    /**
1378 <     * thenApplyAsync result completes normally after normal completion of source
1379 <     */
1380 <    public void testThenApplyAsync() {
1381 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1382 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
1383 <        f.complete(one);
1384 <        checkCompletedNormally(g, two);
1385 <    }
1386 <
1387 <    /**
1388 <     * thenApplyAsync result completes exceptionally after exceptional
1389 <     * completion of source
1390 <     */
1391 <    public void testThenApplyAsync2() {
1392 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1393 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
1394 <        f.completeExceptionally(new CFException());
1395 <        checkCompletedWithWrappedCFException(g);
1396 <    }
1397 <
1398 <    /**
1399 <     * thenApplyAsync result completes exceptionally if action does
1400 <     */
1401 <    public void testThenApplyAsync3() {
1402 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1403 <        FailingFunction r = new FailingFunction();
1404 <        CompletableFuture<Integer> g = f.thenApplyAsync(r);
1405 <        f.complete(null);
1406 <        checkCompletedWithWrappedCFException(g);
1407 <    }
1408 <
1409 <    /**
1410 <     * thenApplyAsync result completes exceptionally if source cancelled
1411 <     */
1412 <    public void testThenApplyAsync4() {
1413 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1414 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
1415 <        assertTrue(f.cancel(true));
1416 <        checkCompletedWithWrappedCancellationException(g);
1417 <    }
1418 <
1419 <    /**
1420 <     * thenAcceptAsync result completes normally after normal
1421 <     * completion of source
1422 <     */
1423 <    public void testThenAcceptAsync() {
1424 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1425 <        IncAction r = new IncAction();
1426 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
1427 <        f.complete(one);
1428 <        checkCompletedNormally(g, null);
1429 <        assertEquals(r.value, 2);
1430 <    }
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 <    /**
1758 <     * thenAcceptAsync result completes exceptionally after exceptional
1759 <     * completion of source
1760 <     */
1761 <    public void testThenAcceptAsync2() {
1762 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1763 <        IncAction r = new IncAction();
1439 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
1440 <        f.completeExceptionally(new CFException());
1441 <        checkCompletedWithWrappedCFException(g);
1442 <    }
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  
1765 <    /**
1766 <     * thenAcceptAsync result completes exceptionally if action does
1767 <     */
1447 <    public void testThenAcceptAsync3() {
1448 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1449 <        FailingConsumer r = new FailingConsumer();
1450 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
1451 <        f.complete(null);
1452 <        checkCompletedWithWrappedCFException(g);
1453 <    }
1765 >        checkCompletedWithWrappedCFException(g, ex);
1766 >        checkCompletedNormally(f, v1);
1767 >    }}
1768  
1769      /**
1770 <     * thenAcceptAsync result completes exceptionally if source cancelled
1770 >     * applyToEither result completes exceptionally if action does
1771       */
1772 <    public void testThenAcceptAsync4() {
1773 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1774 <        IncAction r = new IncAction();
1775 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
1776 <        assertTrue(f.cancel(true));
1777 <        checkCompletedWithWrappedCancellationException(g);
1778 <    }
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 >    {
1777 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1778 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1779 >        final FailingFunction r = new FailingFunction(m);
1780 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1781 >
1782 >        f.complete(v1);
1783 >        checkCompletedWithWrappedCFException(h);
1784 >        g.complete(v2);
1785 >        checkCompletedNormally(f, v1);
1786 >        checkCompletedNormally(g, v2);
1787 >    }}
1788 >
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 >    {
1794 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1795 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1796 >        final FailingFunction r = new FailingFunction(m);
1797 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1798 >
1799 >        g.complete(v2);
1800 >        checkCompletedWithWrappedCFException(h);
1801 >        f.complete(v1);
1802 >        checkCompletedNormally(f, v1);
1803 >        checkCompletedNormally(g, v2);
1804 >    }}
1805  
1806      /**
1807 <     * thenCombineAsync result completes normally after normal
1468 <     * completion of sources
1807 >     * applyToEither result completes exceptionally if either source cancelled
1808       */
1809 <    public void testThenCombineAsync() {
1810 <        CompletableFuture<Integer> f, g, h;
1811 <
1812 <        f = new CompletableFuture<>();
1813 <        g = new CompletableFuture<>();
1814 <        h = f.thenCombineAsync(g, subtract);
1815 <        f.complete(3);
1816 <        checkIncomplete(h);
1817 <        g.complete(1);
1818 <        checkCompletedNormally(h, 2);
1819 <
1820 <        f = new CompletableFuture<>();
1821 <        g = new CompletableFuture<>();
1822 <        h = f.thenCombineAsync(g, subtract);
1823 <        g.complete(1);
1824 <        checkIncomplete(h);
1825 <        f.complete(3);
1826 <        checkCompletedNormally(h, 2);
1488 <
1489 <        f = new CompletableFuture<>();
1490 <        g = new CompletableFuture<>();
1491 <        g.complete(1);
1492 <        f.complete(3);
1493 <        h = f.thenCombineAsync(g, subtract);
1494 <        checkCompletedNormally(h, 2);
1495 <    }
1809 >    public void testApplyToEither_sourceCancelled1() {
1810 >        for (ExecutionMode m : ExecutionMode.values())
1811 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
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 IncFunction r = new IncFunction(m);
1819 >
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 <    /**
1829 <     * thenCombineAsync result completes exceptionally after exceptional
1499 <     * completion of either source
1500 <     */
1501 <    public void testThenCombineAsync2() {
1502 <        CompletableFuture<Integer> f, g, h;
1828 >        checkCompletedWithWrappedCancellationException(h);
1829 >        (!fFirst ? f : g).complete(v1);
1830  
1831 <        f = new CompletableFuture<>();
1832 <        g = new CompletableFuture<>();
1833 <        h = f.thenCombineAsync(g, subtract);
1834 <        f.completeExceptionally(new CFException());
1835 <        checkIncomplete(h);
1836 <        g.complete(1);
1837 <        checkCompletedWithWrappedCFException(h);
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 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 >        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 <        f = new CompletableFuture<>();
1863 <        g = new CompletableFuture<>();
1864 <        h = f.thenCombineAsync(g, subtract);
1865 <        g.completeExceptionally(new CFException());
1866 <        checkIncomplete(h);
1867 <        f.complete(3);
1868 <        checkCompletedWithWrappedCFException(h);
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 <        f = new CompletableFuture<>();
1872 <        g = new CompletableFuture<>();
1873 <        g.completeExceptionally(new CFException());
1874 <        f.complete(3);
1875 <        h = f.thenCombineAsync(g, subtract);
1876 <        checkCompletedWithWrappedCFException(h);
1877 <    }
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 >        }
1878  
1879 <    /**
1880 <     * thenCombineAsync result completes exceptionally if action does
1881 <     */
1531 <    public void testThenCombineAsync3() {
1532 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1533 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1534 <        FailingBiFunction r = new FailingBiFunction();
1535 <        CompletableFuture<Integer> g = f.thenCombineAsync(f2, r);
1536 <        f.complete(one);
1537 <        checkIncomplete(g);
1538 <        assertFalse(r.ran);
1539 <        f2.complete(two);
1540 <        checkCompletedWithWrappedCFException(g);
1541 <        assertTrue(r.ran);
1542 <    }
1879 >        checkCancelled(g);
1880 >        checkCompletedNormally(f, v1);
1881 >    }}
1882  
1883      /**
1884 <     * thenCombineAsync result completes exceptionally if either source cancelled
1884 >     * acceptEither result completes normally after normal completion
1885 >     * of either source
1886       */
1887 <    public void testThenCombineAsync4() {
1888 <        CompletableFuture<Integer> f, g, h;
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 IncAction r = new IncAction();
1895 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
1896  
1897 <        f = new CompletableFuture<>();
1898 <        g = new CompletableFuture<>();
1899 <        h = f.thenCombineAsync(g, subtract);
1900 <        assertTrue(f.cancel(true));
1554 <        checkIncomplete(h);
1555 <        g.complete(1);
1556 <        checkCompletedWithWrappedCancellationException(h);
1557 <
1558 <        f = new CompletableFuture<>();
1559 <        g = new CompletableFuture<>();
1560 <        h = f.thenCombineAsync(g, subtract);
1561 <        assertTrue(g.cancel(true));
1562 <        checkIncomplete(h);
1563 <        f.complete(3);
1564 <        checkCompletedWithWrappedCancellationException(h);
1565 <
1566 <        f = new CompletableFuture<>();
1567 <        g = new CompletableFuture<>();
1568 <        g.complete(3);
1569 <        assertTrue(f.cancel(true));
1570 <        h = f.thenCombineAsync(g, subtract);
1571 <        checkCompletedWithWrappedCancellationException(h);
1897 >        f.complete(v1);
1898 >        checkCompletedNormally(h, null);
1899 >        assertEquals(inc(v1), r.value);
1900 >        g.complete(v2);
1901  
1902 <        f = new CompletableFuture<>();
1903 <        g = new CompletableFuture<>();
1904 <        f.complete(3);
1905 <        assertTrue(g.cancel(true));
1577 <        h = f.thenCombineAsync(g, subtract);
1578 <        checkCompletedWithWrappedCancellationException(h);
1579 <    }
1902 >        checkCompletedNormally(f, v1);
1903 >        checkCompletedNormally(g, v2);
1904 >        checkCompletedNormally(h, null);
1905 >    }}
1906  
1907 <    /**
1908 <     * thenAcceptBothAsync result completes normally after normal
1909 <     * completion of sources
1910 <     */
1911 <    public void testThenAcceptBothAsync() {
1912 <        CompletableFuture<Integer> f, g;
1913 <        CompletableFuture<Void> h;
1914 <        SubtractAction r;
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 IncAction r = new IncAction();
1915 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
1916  
1917 <        f = new CompletableFuture<>();
1591 <        g = new CompletableFuture<>();
1592 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1593 <        f.complete(3);
1594 <        checkIncomplete(h);
1595 <        g.complete(1);
1917 >        g.complete(v2);
1918          checkCompletedNormally(h, null);
1919 <        assertEquals(r.value, 2);
1919 >        assertEquals(inc(v2), r.value);
1920 >        f.complete(v1);
1921  
1922 <        f = new CompletableFuture<>();
1923 <        g = new CompletableFuture<>();
1601 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1602 <        g.complete(1);
1603 <        checkIncomplete(h);
1604 <        f.complete(3);
1922 >        checkCompletedNormally(f, v1);
1923 >        checkCompletedNormally(g, v2);
1924          checkCompletedNormally(h, null);
1925 <        assertEquals(r.value, 2);
1925 >    }}
1926 >
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 >        f.complete(v1);
1937 >        g.complete(v2);
1938 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
1939  
1608        f = new CompletableFuture<>();
1609        g = new CompletableFuture<>();
1610        g.complete(1);
1611        f.complete(3);
1612        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1940          checkCompletedNormally(h, null);
1941 <        assertEquals(r.value, 2);
1942 <    }
1941 >        checkCompletedNormally(f, v1);
1942 >        checkCompletedNormally(g, v2);
1943 >
1944 >        // unspecified behavior
1945 >        assertTrue(Objects.equals(r.value, inc(v1)) ||
1946 >                   Objects.equals(r.value, inc(v2)));
1947 >    }}
1948  
1949      /**
1950 <     * thenAcceptBothAsync result completes exceptionally after exceptional
1951 <     * completion of source
1950 >     * acceptEither result completes exceptionally after exceptional
1951 >     * completion of either source
1952       */
1953 <    public void testThenAcceptBothAsync2() {
1954 <        CompletableFuture<Integer> f, g;
1955 <        CompletableFuture<Void> h;
1956 <        SubtractAction r;
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.completeExceptionally(ex);
1964 >        checkCompletedWithWrappedCFException(h, ex);
1965 >        g.complete(v1);
1966 >
1967 >        assertEquals(0, r.invocationCount);
1968 >        checkCompletedNormally(g, v1);
1969 >        checkCompletedWithWrappedCFException(f, ex);
1970 >        checkCompletedWithWrappedCFException(h, ex);
1971 >    }}
1972 >
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 >        g.completeExceptionally(ex);
1984 >        checkCompletedWithWrappedCFException(h, ex);
1985 >        f.complete(v1);
1986 >
1987 >        assertEquals(0, r.invocationCount);
1988 >        checkCompletedNormally(f, v1);
1989 >        checkCompletedWithWrappedCFException(g, ex);
1990 >        checkCompletedWithWrappedCFException(h, ex);
1991 >    }}
1992 >
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 >        g.completeExceptionally(ex);
2003 >        f.complete(v1);
2004 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2005  
2006 <        f = new CompletableFuture<>();
2007 <        g = new CompletableFuture<>();
2008 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
2009 <        f.completeExceptionally(new CFException());
2010 <        checkIncomplete(h);
2011 <        g.complete(1);
2012 <        checkCompletedWithWrappedCFException(h);
2006 >        // unspecified behavior
2007 >        Integer v;
2008 >        try {
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 <        f = new CompletableFuture<>();
2018 <        g = new CompletableFuture<>();
2019 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
2020 <        g.completeExceptionally(new CFException());
2021 <        checkIncomplete(h);
2022 <        f.complete(3);
2023 <        checkCompletedWithWrappedCFException(h);
2017 >        checkCompletedWithWrappedCFException(g, ex);
2018 >        checkCompletedNormally(f, v1);
2019 >    }}
2020 >
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.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 <        f.complete(3);
2037 <        g.completeExceptionally(new CFException());
2038 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
2039 <        checkCompletedWithWrappedCFException(h);
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 <        f.completeExceptionally(new CFException());
1652 <        g.complete(3);
1653 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1654 <        checkCompletedWithWrappedCFException(h);
1655 <    }
2045 >        checkCompletedWithWrappedCFException(f, ex);
2046 >        checkCompletedNormally(g, v1);
2047 >    }}
2048  
2049      /**
2050 <     * thenAcceptBothAsync result completes exceptionally if action does
2050 >     * acceptEither result completes exceptionally if action does
2051       */
2052 <    public void testThenAcceptBothAsync3() {
2053 <        CompletableFuture<Integer> f, g;
2054 <        CompletableFuture<Void> h;
2055 <        FailingBiConsumer r;
2056 <
2057 <        f = new CompletableFuture<>();
2058 <        g = new CompletableFuture<>();
2059 <        h = f.thenAcceptBothAsync(g, r = new FailingBiConsumer());
2060 <        f.complete(3);
2061 <        checkIncomplete(h);
2062 <        g.complete(1);
2063 <        checkCompletedWithWrappedCFException(h);
2064 <
2065 <        f = new CompletableFuture<>();
2066 <        g = new CompletableFuture<>();
2067 <        f.complete(3);
2068 <        g.complete(1);
2069 <        h = f.thenAcceptBothAsync(g, r = new FailingBiConsumer());
2070 <        checkCompletedWithWrappedCFException(h);
2071 <    }
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.complete(v1);
2063 >        checkCompletedWithWrappedCFException(h);
2064 >        g.complete(v2);
2065 >        checkCompletedNormally(f, v1);
2066 >        checkCompletedNormally(g, v2);
2067 >    }}
2068 >
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 >        g.complete(v2);
2080 >        checkCompletedWithWrappedCFException(h);
2081 >        f.complete(v1);
2082 >        checkCompletedNormally(f, v1);
2083 >        checkCompletedNormally(g, v2);
2084 >    }}
2085  
2086      /**
2087 <     * thenAcceptBothAsync result completes exceptionally if either source cancelled
2087 >     * acceptEither result completes exceptionally if either source cancelled
2088       */
2089 <    public void testThenAcceptBothAsync4() {
2090 <        CompletableFuture<Integer> f, g;
2091 <        CompletableFuture<Void> h;
2092 <        SubtractAction r;
2093 <
2094 <        f = new CompletableFuture<>();
2095 <        g = new CompletableFuture<>();
2096 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
2097 <        assertTrue(f.cancel(true));
1693 <        checkIncomplete(h);
1694 <        g.complete(1);
1695 <        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<>();
1698 <        g = new CompletableFuture<>();
1699 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1700 <        assertTrue(g.cancel(true));
1701 <        checkIncomplete(h);
1702 <        f.complete(3);
2099 >        assertTrue(f.cancel(mayInterruptIfRunning));
2100          checkCompletedWithWrappedCancellationException(h);
2101 +        g.complete(v1);
2102  
2103 <        f = new CompletableFuture<>();
2104 <        g = new CompletableFuture<>();
2105 <        f.complete(3);
1708 <        assertTrue(g.cancel(true));
1709 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1710 <        checkCompletedWithWrappedCancellationException(h);
1711 <
1712 <        f = new CompletableFuture<>();
1713 <        g = new CompletableFuture<>();
1714 <        assertTrue(f.cancel(true));
1715 <        g.complete(3);
1716 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
2103 >        checkCancelled(f);
2104 >        assertEquals(0, r.invocationCount);
2105 >        checkCompletedNormally(g, v1);
2106          checkCompletedWithWrappedCancellationException(h);
2107 <    }
1719 <
1720 <    /**
1721 <     * runAfterBothAsync result completes normally after normal
1722 <     * completion of sources
1723 <     */
1724 <    public void testRunAfterBothAsync() {
1725 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1726 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1727 <        Noop r = new Noop();
1728 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r);
1729 <        f.complete(one);
1730 <        checkIncomplete(g);
1731 <        f2.complete(two);
1732 <        checkCompletedNormally(g, null);
1733 <        assertTrue(r.ran);
1734 <    }
1735 <
1736 <    /**
1737 <     * runAfterBothAsync result completes exceptionally after exceptional
1738 <     * completion of source
1739 <     */
1740 <    public void testRunAfterBothAsync2() {
1741 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1742 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1743 <        Noop r = new Noop();
1744 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r);
1745 <        f.completeExceptionally(new CFException());
1746 <        f2.complete(two);
1747 <        checkCompletedWithWrappedCFException(g);
1748 <
1749 <        r = new Noop();
1750 <        f = new CompletableFuture<>();
1751 <        f2 = new CompletableFuture<>();
1752 <        g = f.runAfterBothAsync(f2, r);
1753 <        f.complete(one);
1754 <        f2.completeExceptionally(new CFException());
1755 <        checkCompletedWithWrappedCFException(g);
1756 <    }
1757 <
1758 <    /**
1759 <     * runAfterBothAsync result completes exceptionally if action does
1760 <     */
1761 <    public void testRunAfterBothAsync3() {
1762 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1763 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1764 <        FailingNoop r = new FailingNoop();
1765 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r);
1766 <        f.complete(one);
1767 <        checkIncomplete(g);
1768 <        f2.complete(two);
1769 <        checkCompletedWithWrappedCFException(g);
1770 <    }
1771 <
1772 <    /**
1773 <     * runAfterBothAsync result completes exceptionally if either source cancelled
1774 <     */
1775 <    public void testRunAfterBothAsync4() {
1776 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1777 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1778 <        Noop r = new Noop();
1779 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r);
1780 <        assertTrue(f.cancel(true));
1781 <        f2.complete(two);
1782 <        checkCompletedWithWrappedCancellationException(g);
1783 <
1784 <        r = new Noop();
1785 <        f = new CompletableFuture<>();
1786 <        f2 = new CompletableFuture<>();
1787 <        g = f.runAfterBothAsync(f2, r);
1788 <        f.complete(one);
1789 <        assertTrue(f2.cancel(true));
1790 <        checkCompletedWithWrappedCancellationException(g);
1791 <    }
1792 <
1793 <    /**
1794 <     * applyToEitherAsync result completes normally after normal
1795 <     * completion of sources
1796 <     */
1797 <    public void testApplyToEitherAsync() {
1798 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1799 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1800 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
1801 <        f.complete(one);
1802 <        checkCompletedNormally(g, two);
1803 <
1804 <        f = new CompletableFuture<>();
1805 <        f.complete(one);
1806 <        f2 = new CompletableFuture<>();
1807 <        g = f.applyToEitherAsync(f2, inc);
1808 <        checkCompletedNormally(g, two);
1809 <    }
1810 <
1811 <    /**
1812 <     * applyToEitherAsync result completes exceptionally after exceptional
1813 <     * completion of source
1814 <     */
1815 <    public void testApplyToEitherAsync2() {
1816 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1817 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1818 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
1819 <        f.completeExceptionally(new CFException());
1820 <        checkCompletedWithWrappedCFException(g);
1821 <
1822 <        f = new CompletableFuture<>();
1823 <        f2 = new CompletableFuture<>();
1824 <        f2.completeExceptionally(new CFException());
1825 <        g = f.applyToEitherAsync(f2, inc);
1826 <        f.complete(one);
1827 <        checkCompletedWithWrappedCFException(g);
1828 <    }
1829 <
1830 <    /**
1831 <     * applyToEitherAsync result completes exceptionally if action does
1832 <     */
1833 <    public void testApplyToEitherAsync3() {
1834 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1835 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1836 <        FailingFunction r = new FailingFunction();
1837 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, r);
1838 <        f.complete(one);
1839 <        checkCompletedWithWrappedCFException(g);
1840 <    }
1841 <
1842 <    /**
1843 <     * applyToEitherAsync result completes exceptionally if either source cancelled
1844 <     */
1845 <    public void testApplyToEitherAsync4() {
1846 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1847 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1848 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
1849 <        assertTrue(f.cancel(true));
1850 <        checkCompletedWithWrappedCancellationException(g);
1851 <
1852 <        f = new CompletableFuture<>();
1853 <        f2 = new CompletableFuture<>();
1854 <        assertTrue(f2.cancel(true));
1855 <        g = f.applyToEitherAsync(f2, inc);
1856 <        checkCompletedWithWrappedCancellationException(g);
1857 <    }
1858 <
1859 <    /**
1860 <     * acceptEitherAsync result completes normally after normal
1861 <     * completion of sources
1862 <     */
1863 <    public void testAcceptEitherAsync() {
1864 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1865 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1866 <        IncAction r = new IncAction();
1867 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
1868 <        f.complete(one);
1869 <        checkCompletedNormally(g, null);
1870 <        assertEquals(r.value, 2);
1871 <
1872 <        r = new IncAction();
1873 <        f = new CompletableFuture<>();
1874 <        f.complete(one);
1875 <        f2 = new CompletableFuture<>();
1876 <        g = f.acceptEitherAsync(f2, r);
1877 <        checkCompletedNormally(g, null);
1878 <        assertEquals(r.value, 2);
1879 <    }
1880 <
1881 <    /**
1882 <     * acceptEitherAsync result completes exceptionally after exceptional
1883 <     * completion of source
1884 <     */
1885 <    public void testAcceptEitherAsync2() {
1886 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1887 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1888 <        IncAction r = new IncAction();
1889 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
1890 <        f.completeExceptionally(new CFException());
1891 <        checkCompletedWithWrappedCFException(g);
1892 <
1893 <        r = new IncAction();
1894 <        f = new CompletableFuture<>();
1895 <        f2 = new CompletableFuture<>();
1896 <        f2.completeExceptionally(new CFException());
1897 <        g = f.acceptEitherAsync(f2, r);
1898 <        f.complete(one);
1899 <        checkCompletedWithWrappedCFException(g);
1900 <    }
1901 <
1902 <    /**
1903 <     * acceptEitherAsync result completes exceptionally if action does
1904 <     */
1905 <    public void testAcceptEitherAsync3() {
1906 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1907 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1908 <        FailingConsumer r = new FailingConsumer();
1909 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
1910 <        f.complete(one);
1911 <        checkCompletedWithWrappedCFException(g);
1912 <    }
1913 <
1914 <    /**
1915 <     * acceptEitherAsync result completes exceptionally if either
1916 <     * source cancelled
1917 <     */
1918 <    public void testAcceptEitherAsync4() {
1919 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1920 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1921 <        IncAction r = new IncAction();
1922 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
1923 <        assertTrue(f.cancel(true));
1924 <        checkCompletedWithWrappedCancellationException(g);
1925 <
1926 <        r = new IncAction();
1927 <        f = new CompletableFuture<>();
1928 <        f2 = new CompletableFuture<>();
1929 <        assertTrue(f2.cancel(true));
1930 <        g = f.acceptEitherAsync(f2, r);
1931 <        checkCompletedWithWrappedCancellationException(g);
1932 <    }
1933 <
1934 <    /**
1935 <     * runAfterEitherAsync result completes normally after normal
1936 <     * completion of sources
1937 <     */
1938 <    public void testRunAfterEitherAsync() {
1939 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1940 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1941 <        Noop r = new Noop();
1942 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
1943 <        f.complete(one);
1944 <        checkCompletedNormally(g, null);
1945 <        assertTrue(r.ran);
1946 <
1947 <        r = new Noop();
1948 <        f = new CompletableFuture<>();
1949 <        f.complete(one);
1950 <        f2 = new CompletableFuture<>();
1951 <        g = f.runAfterEitherAsync(f2, r);
1952 <        checkCompletedNormally(g, null);
1953 <        assertTrue(r.ran);
1954 <    }
1955 <
1956 <    /**
1957 <     * runAfterEitherAsync result completes exceptionally after exceptional
1958 <     * completion of source
1959 <     */
1960 <    public void testRunAfterEitherAsync2() {
1961 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1962 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1963 <        Noop r = new Noop();
1964 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
1965 <        f.completeExceptionally(new CFException());
1966 <        checkCompletedWithWrappedCFException(g);
1967 <
1968 <        r = new Noop();
1969 <        f = new CompletableFuture<>();
1970 <        f2 = new CompletableFuture<>();
1971 <        f2.completeExceptionally(new CFException());
1972 <        g = f.runAfterEitherAsync(f2, r);
1973 <        f.complete(one);
1974 <        checkCompletedWithWrappedCFException(g);
1975 <    }
1976 <
1977 <    /**
1978 <     * runAfterEitherAsync result completes exceptionally if action does
1979 <     */
1980 <    public void testRunAfterEitherAsync3() {
1981 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1982 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1983 <        FailingNoop r = new FailingNoop();
1984 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
1985 <        f.complete(one);
1986 <        checkCompletedWithWrappedCFException(g);
1987 <    }
1988 <
1989 <    /**
1990 <     * runAfterEitherAsync result completes exceptionally if either
1991 <     * source cancelled
1992 <     */
1993 <    public void testRunAfterEitherAsync4() {
1994 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1995 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1996 <        Noop r = new Noop();
1997 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
1998 <        assertTrue(f.cancel(true));
1999 <        checkCompletedWithWrappedCancellationException(g);
2000 <
2001 <        r = new Noop();
2002 <        f = new CompletableFuture<>();
2003 <        f2 = new CompletableFuture<>();
2004 <        assertTrue(f2.cancel(true));
2005 <        g = f.runAfterEitherAsync(f2, r);
2006 <        checkCompletedWithWrappedCancellationException(g);
2007 <    }
2008 <
2009 <    /**
2010 <     * thenComposeAsync result completes normally after normal
2011 <     * completion of source
2012 <     */
2013 <    public void testThenComposeAsync() {
2014 <        CompletableFuture<Integer> f, g;
2015 <        CompletableFutureInc r;
2016 <
2017 <        f = new CompletableFuture<>();
2018 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2019 <        f.complete(one);
2020 <        checkCompletedNormally(g, two);
2021 <
2022 <        f = new CompletableFuture<>();
2023 <        f.complete(one);
2024 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2025 <        checkCompletedNormally(g, two);
2026 <    }
2027 <
2028 <    /**
2029 <     * thenComposeAsync result completes exceptionally after
2030 <     * exceptional completion of source
2031 <     */
2032 <    public void testThenComposeAsync2() {
2033 <        CompletableFuture<Integer> f, g;
2034 <        CompletableFutureInc r;
2035 <
2036 <        f = new CompletableFuture<>();
2037 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2038 <        f.completeExceptionally(new CFException());
2039 <        checkCompletedWithWrappedCFException(g);
2040 <        assertFalse(r.ran);
2107 >    }}
2108  
2109 <        f = new CompletableFuture<>();
2110 <        f.completeExceptionally(new CFException());
2111 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2112 <        checkCompletedWithWrappedCFException(g);
2113 <        assertFalse(r.ran);
2114 <    }
2115 <
2116 <    /**
2117 <     * thenComposeAsync result completes exceptionally if action does
2118 <     */
2119 <    public void testThenComposeAsync3() {
2120 <        CompletableFuture<Integer> f, g;
2121 <        FailingCompletableFutureFunction r;
2122 <
2123 <        f = new CompletableFuture<>();
2124 <        g = f.thenComposeAsync(r = new FailingCompletableFutureFunction());
2125 <        f.complete(one);
2126 <        checkCompletedWithWrappedCFException(g);
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 >        assertTrue(g.cancel(mayInterruptIfRunning));
2120 >        checkCompletedWithWrappedCancellationException(h);
2121 >        f.complete(v1);
2122 >
2123 >        checkCancelled(g);
2124 >        assertEquals(0, r.invocationCount);
2125 >        checkCompletedNormally(f, v1);
2126 >        checkCompletedWithWrappedCancellationException(h);
2127 >    }}
2128 >
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 >        assertTrue(g.cancel(mayInterruptIfRunning));
2139 >        f.complete(v1);
2140 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2141  
2142 <        f = new CompletableFuture<>();
2143 <        f.complete(one);
2063 <        g = f.thenComposeAsync(r = new FailingCompletableFutureFunction());
2064 <        checkCompletedWithWrappedCFException(g);
2065 <    }
2066 <
2067 <    /**
2068 <     * thenComposeAsync result completes exceptionally if source cancelled
2069 <     */
2070 <    public void testThenComposeAsync4() {
2071 <        CompletableFuture<Integer> f, g;
2072 <        CompletableFutureInc r;
2073 <
2074 <        f = new CompletableFuture<>();
2075 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2076 <        assertTrue(f.cancel(true));
2077 <        checkCompletedWithWrappedCancellationException(g);
2078 <
2079 <        f = new CompletableFuture<>();
2080 <        assertTrue(f.cancel(true));
2081 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2082 <        checkCompletedWithWrappedCancellationException(g);
2083 <    }
2084 <
2085 <    // async with explicit executors
2086 <
2087 <    /**
2088 <     * thenRunAsync result completes normally after normal completion of source
2089 <     */
2090 <    public void testThenRunAsyncE() {
2091 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2092 <        Noop r = new Noop();
2093 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2094 <        f.complete(null);
2095 <        checkCompletedNormally(g, null);
2096 <
2097 <        // reordered version
2098 <        f = new CompletableFuture<>();
2099 <        f.complete(null);
2100 <        r = new Noop();
2101 <        g = f.thenRunAsync(r, new ThreadExecutor());
2102 <        checkCompletedNormally(g, null);
2103 <    }
2104 <
2105 <    /**
2106 <     * thenRunAsync result completes exceptionally after exceptional
2107 <     * completion of source
2108 <     */
2109 <    public void testThenRunAsync2E() {
2110 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2111 <        Noop r = new Noop();
2112 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2113 <        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 <    }
2150 <
2151 <    /**
2122 <     * thenRunAsync result completes exceptionally if action does
2123 <     */
2124 <    public void testThenRunAsync3E() {
2125 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2126 <        FailingNoop r = new FailingNoop();
2127 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2128 <        f.complete(null);
2129 <        checkCompletedWithWrappedCFException(g);
2130 <    }
2131 <
2132 <    /**
2133 <     * thenRunAsync result completes exceptionally if source cancelled
2134 <     */
2135 <    public void testThenRunAsync4E() {
2136 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2137 <        Noop r = new Noop();
2138 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2139 <        assertTrue(f.cancel(true));
2140 <        checkCompletedWithWrappedCancellationException(g);
2141 <    }
2142 <
2143 <    /**
2144 <     * thenApplyAsync result completes normally after normal completion of source
2145 <     */
2146 <    public void testThenApplyAsyncE() {
2147 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2148 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
2149 <        f.complete(one);
2150 <        checkCompletedNormally(g, two);
2151 <    }
2152 <
2153 <    /**
2154 <     * thenApplyAsync result completes exceptionally after exceptional
2155 <     * completion of source
2156 <     */
2157 <    public void testThenApplyAsync2E() {
2158 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2159 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
2160 <        f.completeExceptionally(new CFException());
2161 <        checkCompletedWithWrappedCFException(g);
2162 <    }
2163 <
2164 <    /**
2165 <     * thenApplyAsync result completes exceptionally if action does
2166 <     */
2167 <    public void testThenApplyAsync3E() {
2168 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2169 <        FailingFunction r = new FailingFunction();
2170 <        CompletableFuture<Integer> g = f.thenApplyAsync(r, new ThreadExecutor());
2171 <        f.complete(null);
2172 <        checkCompletedWithWrappedCFException(g);
2173 <    }
2174 <
2175 <    /**
2176 <     * thenApplyAsync result completes exceptionally if source cancelled
2177 <     */
2178 <    public void testThenApplyAsync4E() {
2179 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2180 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
2181 <        assertTrue(f.cancel(true));
2182 <        checkCompletedWithWrappedCancellationException(g);
2183 <    }
2184 <
2185 <    /**
2186 <     * thenAcceptAsync result completes normally after normal
2187 <     * completion of source
2188 <     */
2189 <    public void testThenAcceptAsyncE() {
2190 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2191 <        IncAction r = new IncAction();
2192 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2193 <        f.complete(one);
2194 <        checkCompletedNormally(g, null);
2195 <        assertEquals(r.value, 2);
2196 <    }
2197 <
2198 <    /**
2199 <     * thenAcceptAsync result completes exceptionally after exceptional
2200 <     * completion of source
2201 <     */
2202 <    public void testThenAcceptAsync2E() {
2203 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2204 <        IncAction r = new IncAction();
2205 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2206 <        f.completeExceptionally(new CFException());
2207 <        checkCompletedWithWrappedCFException(g);
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);
2219 <    }
2220 <
2221 <    /**
2222 <     * thenAcceptAsync result completes exceptionally if source cancelled
2223 <     */
2224 <    public void testThenAcceptAsync4E() {
2225 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2226 <        IncAction r = new IncAction();
2227 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2228 <        assertTrue(f.cancel(true));
2229 <        checkCompletedWithWrappedCancellationException(g);
2230 <    }
2231 <
2232 <    /**
2233 <     * thenCombineAsync result completes normally after normal
2234 <     * completion of sources
2235 <     */
2236 <    public void testThenCombineAsyncE() {
2237 <        CompletableFuture<Integer> f, g, h;
2238 <        ThreadExecutor e = new ThreadExecutor();
2239 <        int count = 0;
2240 <
2241 <        f = new CompletableFuture<>();
2242 <        g = new CompletableFuture<>();
2243 <        h = f.thenCombineAsync(g, subtract, e);
2244 <        f.complete(3);
2245 <        checkIncomplete(h);
2246 <        g.complete(1);
2247 <        checkCompletedNormally(h, 2);
2248 <        assertEquals(++count, e.count.get());
2249 <
2250 <        f = new CompletableFuture<>();
2251 <        g = new CompletableFuture<>();
2252 <        h = f.thenCombineAsync(g, subtract, e);
2253 <        g.complete(1);
2254 <        checkIncomplete(h);
2255 <        f.complete(3);
2256 <        checkCompletedNormally(h, 2);
2257 <        assertEquals(++count, e.count.get());
2258 <
2259 <        f = new CompletableFuture<>();
2260 <        g = new CompletableFuture<>();
2261 <        g.complete(1);
2262 <        f.complete(3);
2263 <        h = f.thenCombineAsync(g, subtract, e);
2264 <        checkCompletedNormally(h, 2);
2265 <        assertEquals(++count, e.count.get());
2266 <    }
2267 <
2268 <    /**
2269 <     * thenCombineAsync result completes exceptionally after exceptional
2270 <     * completion of either source
2271 <     */
2272 <    public void testThenCombineAsync2E() {
2273 <        CompletableFuture<Integer> f, g, h;
2274 <        ThreadExecutor e = new ThreadExecutor();
2275 <        int count = 0;
2276 <
2277 <        f = new CompletableFuture<>();
2278 <        g = new CompletableFuture<>();
2279 <        h = f.thenCombineAsync(g, subtract, e);
2280 <        f.completeExceptionally(new CFException());
2281 <        checkIncomplete(h);
2282 <        g.complete(1);
2283 <        checkCompletedWithWrappedCFException(h);
2284 <
2285 <        f = new CompletableFuture<>();
2286 <        g = new CompletableFuture<>();
2287 <        h = f.thenCombineAsync(g, subtract, e);
2288 <        g.completeExceptionally(new CFException());
2289 <        checkIncomplete(h);
2290 <        f.complete(3);
2291 <        checkCompletedWithWrappedCFException(h);
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 <        f = new CompletableFuture<>();
2154 <        g = new CompletableFuture<>();
2155 <        g.completeExceptionally(new CFException());
2156 <        h = f.thenCombineAsync(g, subtract, e);
2157 <        checkIncomplete(h);
2158 <        f.complete(3);
2159 <        checkCompletedWithWrappedCFException(h);
2153 >        checkCancelled(g);
2154 >        checkCompletedNormally(f, v1);
2155 >    }}
2156 >
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 >        assertTrue(f.cancel(mayInterruptIfRunning));
2167 >        g.complete(v1);
2168 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2169  
2170 <        assertEquals(0, e.count.get());
2171 <    }
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 <     * thenCombineAsync result completes exceptionally if action does
2183 <     */
2307 <    public void testThenCombineAsync3E() {
2308 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2309 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2310 <        FailingBiFunction r = new FailingBiFunction();
2311 <        CompletableFuture<Integer> g = f.thenCombineAsync(f2, r, new ThreadExecutor());
2312 <        f.complete(one);
2313 <        checkIncomplete(g);
2314 <        assertFalse(r.ran);
2315 <        f2.complete(two);
2316 <        checkCompletedWithWrappedCFException(g);
2317 <        assertTrue(r.ran);
2318 <    }
2181 >        checkCancelled(f);
2182 >        checkCompletedNormally(g, v1);
2183 >    }}
2184  
2185      /**
2186 <     * thenCombineAsync result completes exceptionally if either source cancelled
2186 >     * runAfterEither result completes normally after normal completion
2187 >     * of either source
2188       */
2189 <    public void testThenCombineAsync4E() {
2190 <        CompletableFuture<Integer> f, g, h;
2191 <        ThreadExecutor e = new ThreadExecutor();
2192 <
2193 <        f = new CompletableFuture<>();
2194 <        g = new CompletableFuture<>();
2195 <        h = f.thenCombineAsync(g, subtract, e);
2196 <        assertTrue(f.cancel(true));
2197 <        checkIncomplete(h);
2332 <        g.complete(1);
2333 <        checkCompletedWithWrappedCancellationException(h);
2334 <
2335 <        f = new CompletableFuture<>();
2336 <        g = new CompletableFuture<>();
2337 <        h = f.thenCombineAsync(g, subtract, e);
2338 <        assertTrue(g.cancel(true));
2339 <        checkIncomplete(h);
2340 <        f.complete(3);
2341 <        checkCompletedWithWrappedCancellationException(h);
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 <        f = new CompletableFuture<>();
2200 <        g = new CompletableFuture<>();
2201 <        assertTrue(g.cancel(true));
2202 <        h = f.thenCombineAsync(g, subtract, e);
2347 <        checkIncomplete(h);
2348 <        f.complete(3);
2349 <        checkCompletedWithWrappedCancellationException(h);
2350 <
2351 <        f = new CompletableFuture<>();
2352 <        g = new CompletableFuture<>();
2353 <        assertTrue(f.cancel(true));
2354 <        assertTrue(g.cancel(true));
2355 <        h = f.thenCombineAsync(g, subtract, e);
2356 <        checkCompletedWithWrappedCancellationException(h);
2199 >        f.complete(v1);
2200 >        checkCompletedNormally(h, null);
2201 >        assertEquals(1, r.invocationCount);
2202 >        g.complete(v2);
2203  
2204 <        assertEquals(0, e.count.get());
2205 <    }
2204 >        checkCompletedNormally(f, v1);
2205 >        checkCompletedNormally(g, v2);
2206 >        checkCompletedNormally(h, null);
2207 >        assertEquals(1, r.invocationCount);
2208 >    }}
2209  
2210 <    /**
2211 <     * thenAcceptBothAsync result completes normally after normal
2212 <     * completion of sources
2213 <     */
2214 <    public void testThenAcceptBothAsyncE() {
2215 <        CompletableFuture<Integer> f, g;
2216 <        CompletableFuture<Void> h;
2217 <        SubtractAction r;
2218 <        ThreadExecutor e = new ThreadExecutor();
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 <        f = new CompletableFuture<>();
2372 <        g = new CompletableFuture<>();
2373 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2374 <        f.complete(3);
2375 <        checkIncomplete(h);
2376 <        g.complete(1);
2220 >        g.complete(v2);
2221          checkCompletedNormally(h, null);
2222 <        assertEquals(r.value, 2);
2222 >        assertEquals(1, r.invocationCount);
2223 >        f.complete(v1);
2224  
2225 <        f = new CompletableFuture<>();
2226 <        g = new CompletableFuture<>();
2382 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2383 <        g.complete(1);
2384 <        checkIncomplete(h);
2385 <        f.complete(3);
2225 >        checkCompletedNormally(f, v1);
2226 >        checkCompletedNormally(g, v2);
2227          checkCompletedNormally(h, null);
2228 <        assertEquals(r.value, 2);
2228 >        assertEquals(1, r.invocationCount);
2229 >        }}
2230  
2231 <        f = new CompletableFuture<>();
2232 <        g = new CompletableFuture<>();
2233 <        g.complete(1);
2234 <        f.complete(3);
2235 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2236 <        checkCompletedNormally(h, null);
2237 <        assertEquals(r.value, 2);
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.complete(v1);
2241 >        g.complete(v2);
2242 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2243  
2244 <        assertEquals(3, e.count.get());
2245 <    }
2244 >        checkCompletedNormally(h, null);
2245 >        checkCompletedNormally(f, v1);
2246 >        checkCompletedNormally(g, v2);
2247 >        assertEquals(1, r.invocationCount);
2248 >    }}
2249  
2250      /**
2251 <     * thenAcceptBothAsync result completes exceptionally after exceptional
2252 <     * completion of source
2251 >     * runAfterEither result completes exceptionally after exceptional
2252 >     * completion of either source
2253       */
2254 <    public void testThenAcceptBothAsync2E() {
2255 <        CompletableFuture<Integer> f, g;
2256 <        CompletableFuture<Void> h;
2257 <        SubtractAction r;
2258 <        ThreadExecutor e = new ThreadExecutor();
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 >        f.completeExceptionally(ex);
2265 >        checkCompletedWithWrappedCFException(h, ex);
2266 >        g.complete(v1);
2267 >
2268 >        assertEquals(0, r.invocationCount);
2269 >        checkCompletedNormally(g, v1);
2270 >        checkCompletedWithWrappedCFException(f, ex);
2271 >        checkCompletedWithWrappedCFException(h, ex);
2272 >    }}
2273 >
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 >        g.completeExceptionally(ex);
2285 >        checkCompletedWithWrappedCFException(h, ex);
2286 >        f.complete(v1);
2287 >
2288 >        assertEquals(0, r.invocationCount);
2289 >        checkCompletedNormally(f, v1);
2290 >        checkCompletedWithWrappedCFException(g, ex);
2291 >        checkCompletedWithWrappedCFException(h, ex);
2292 >    }}
2293 >
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 >        g.completeExceptionally(ex);
2304 >        f.complete(v1);
2305 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2306  
2307 <        f = new CompletableFuture<>();
2308 <        g = new CompletableFuture<>();
2309 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2310 <        f.completeExceptionally(new CFException());
2311 <        checkIncomplete(h);
2312 <        g.complete(1);
2313 <        checkCompletedWithWrappedCFException(h);
2314 <
2315 <        f = new CompletableFuture<>();
2419 <        g = new CompletableFuture<>();
2420 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2421 <        g.completeExceptionally(new CFException());
2422 <        checkIncomplete(h);
2423 <        f.complete(3);
2424 <        checkCompletedWithWrappedCFException(h);
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 <        f = new CompletableFuture<>();
2318 <        g = new CompletableFuture<>();
2319 <        f.complete(3);
2320 <        g.completeExceptionally(new CFException());
2321 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2322 <        checkCompletedWithWrappedCFException(h);
2317 >        checkCompletedWithWrappedCFException(g, ex);
2318 >        checkCompletedNormally(f, v1);
2319 >    }}
2320 >
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.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 <        f.completeExceptionally(new CFException());
2337 <        g.complete(3);
2338 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2339 <        checkCompletedWithWrappedCFException(h);
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(0, e.count.get());
2345 <    }
2344 >        checkCompletedWithWrappedCFException(f, ex);
2345 >        checkCompletedNormally(g, v1);
2346 >    }}
2347  
2348      /**
2349 <     * thenAcceptBothAsync result completes exceptionally if action does
2349 >     * runAfterEither result completes exceptionally if action does
2350       */
2351 <    public void testThenAcceptBothAsync3E() {
2352 <        CompletableFuture<Integer> f, g;
2353 <        CompletableFuture<Void> h;
2354 <        FailingBiConsumer r;
2355 <        ThreadExecutor e = new ThreadExecutor();
2356 <
2357 <        f = new CompletableFuture<>();
2358 <        g = new CompletableFuture<>();
2359 <        h = f.thenAcceptBothAsync(g, r = new FailingBiConsumer(), e);
2360 <        f.complete(3);
2361 <        checkIncomplete(h);
2362 <        g.complete(1);
2363 <        checkCompletedWithWrappedCFException(h);
2364 <
2365 <        f = new CompletableFuture<>();
2366 <        g = new CompletableFuture<>();
2367 <        f.complete(3);
2368 <        g.complete(1);
2369 <        h = f.thenAcceptBothAsync(g, r = new FailingBiConsumer(), e);
2370 <        checkCompletedWithWrappedCFException(h);
2371 <
2372 <        assertEquals(2, e.count.get());
2373 <    }
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.complete(v1);
2362 >        checkCompletedWithWrappedCFException(h);
2363 >        g.complete(v2);
2364 >        checkCompletedNormally(f, v1);
2365 >        checkCompletedNormally(g, v2);
2366 >    }}
2367 >
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 >        g.complete(v2);
2379 >        checkCompletedWithWrappedCFException(h);
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<>();
2480 <        g = new CompletableFuture<>();
2481 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2482 <        assertTrue(f.cancel(true));
2483 <        checkIncomplete(h);
2484 <        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);
2490 <        assertTrue(g.cancel(true));
2491 <        checkIncomplete(h);
2492 <        f.complete(3);
2493 <        checkCompletedWithWrappedCancellationException(h);
2494 <
2495 <        f = new CompletableFuture<>();
2496 <        g = new CompletableFuture<>();
2497 <        f.complete(3);
2498 <        assertTrue(g.cancel(true));
2499 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2500 <        checkCompletedWithWrappedCancellationException(h);
2501 <
2502 <        f = new CompletableFuture<>();
2503 <        g = new CompletableFuture<>();
2504 <        assertTrue(f.cancel(true));
2505 <        g.complete(3);
2506 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2402 >        checkCancelled(f);
2403 >        assertEquals(0, r.invocationCount);
2404 >        checkCompletedNormally(g, v1);
2405          checkCompletedWithWrappedCancellationException(h);
2406 +    }}
2407  
2408 <        assertEquals(0, e.count.get());
2409 <    }
2410 <
2411 <    /**
2412 <     * runAfterBothAsync result completes normally after normal
2413 <     * completion of sources
2414 <     */
2415 <    public void testRunAfterBothAsyncE() {
2416 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2417 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2418 <        Noop r = new Noop();
2419 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2420 <        f.complete(one);
2421 <        checkIncomplete(g);
2422 <        f2.complete(two);
2423 <        checkCompletedNormally(g, null);
2424 <        assertTrue(r.ran);
2425 <    }
2426 <
2427 <    /**
2428 <     * runAfterBothAsync result completes exceptionally after exceptional
2429 <     * completion of source
2430 <     */
2431 <    public void testRunAfterBothAsync2E() {
2432 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2433 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2434 <        Noop r = new Noop();
2435 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2436 <        f.completeExceptionally(new CFException());
2437 <        f2.complete(two);
2438 <        checkCompletedWithWrappedCFException(g);
2439 <
2541 <        r = new Noop();
2542 <        f = new CompletableFuture<>();
2543 <        f2 = new CompletableFuture<>();
2544 <        g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2545 <        f.complete(one);
2546 <        f2.completeExceptionally(new CFException());
2547 <        checkCompletedWithWrappedCFException(g);
2548 <    }
2549 <
2550 <    /**
2551 <     * runAfterBothAsync result completes exceptionally if action does
2552 <     */
2553 <    public void testRunAfterBothAsync3E() {
2554 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2555 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2556 <        FailingNoop r = new FailingNoop();
2557 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2558 <        f.complete(one);
2559 <        checkIncomplete(g);
2560 <        f2.complete(two);
2561 <        checkCompletedWithWrappedCFException(g);
2562 <    }
2563 <
2564 <    /**
2565 <     * runAfterBothAsync result completes exceptionally if either source cancelled
2566 <     */
2567 <    public void testRunAfterBothAsync4E() {
2568 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2569 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2570 <        Noop r = new Noop();
2571 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2572 <        assertTrue(f.cancel(true));
2573 <        f2.complete(two);
2574 <        checkCompletedWithWrappedCancellationException(g);
2575 <
2576 <        r = new Noop();
2577 <        f = new CompletableFuture<>();
2578 <        f2 = new CompletableFuture<>();
2579 <        g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2580 <        f.complete(one);
2581 <        assertTrue(f2.cancel(true));
2582 <        checkCompletedWithWrappedCancellationException(g);
2583 <    }
2584 <
2585 <    /**
2586 <     * applyToEitherAsync result completes normally after normal
2587 <     * completion of sources
2588 <     */
2589 <    public void testApplyToEitherAsyncE() {
2590 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2591 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2592 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2593 <        f.complete(one);
2594 <        checkCompletedNormally(g, two);
2595 <
2596 <        f = new CompletableFuture<>();
2597 <        f.complete(one);
2598 <        f2 = new CompletableFuture<>();
2599 <        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2600 <        checkCompletedNormally(g, two);
2601 <    }
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 >        assertTrue(g.cancel(mayInterruptIfRunning));
2419 >        checkCompletedWithWrappedCancellationException(h);
2420 >        f.complete(v1);
2421 >
2422 >        checkCancelled(g);
2423 >        assertEquals(0, r.invocationCount);
2424 >        checkCompletedNormally(f, v1);
2425 >        checkCompletedWithWrappedCancellationException(h);
2426 >    }}
2427 >
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 >        assertTrue(g.cancel(mayInterruptIfRunning));
2438 >        f.complete(v1);
2439 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2440  
2441 <    /**
2442 <     * applyToEitherAsync result completes exceptionally after exceptional
2443 <     * completion of source
2444 <     */
2445 <    public void testApplyToEitherAsync2E() {
2446 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2447 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2448 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2449 <        f.completeExceptionally(new CFException());
2612 <        checkCompletedWithWrappedCFException(g);
2613 <
2614 <        f = new CompletableFuture<>();
2615 <        f2 = new CompletableFuture<>();
2616 <        f2.completeExceptionally(new CFException());
2617 <        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2618 <        f.complete(one);
2619 <        checkCompletedWithWrappedCFException(g);
2620 <    }
2621 <
2622 <    /**
2623 <     * applyToEitherAsync result completes exceptionally if action does
2624 <     */
2625 <    public void testApplyToEitherAsync3E() {
2626 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2627 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2628 <        FailingFunction r = new FailingFunction();
2629 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, r, new ThreadExecutor());
2630 <        f.complete(one);
2631 <        checkCompletedWithWrappedCFException(g);
2632 <    }
2633 <
2634 <    /**
2635 <     * applyToEitherAsync result completes exceptionally if either source cancelled
2636 <     */
2637 <    public void testApplyToEitherAsync4E() {
2638 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2639 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2640 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2641 <        assertTrue(f.cancel(true));
2642 <        checkCompletedWithWrappedCancellationException(g);
2643 <
2644 <        f = new CompletableFuture<>();
2645 <        f2 = new CompletableFuture<>();
2646 <        assertTrue(f2.cancel(true));
2647 <        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2648 <        checkCompletedWithWrappedCancellationException(g);
2649 <    }
2650 <
2651 <    /**
2652 <     * acceptEitherAsync result completes normally after normal
2653 <     * completion of sources
2654 <     */
2655 <    public void testAcceptEitherAsyncE() {
2656 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2657 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2658 <        IncAction r = new IncAction();
2659 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2660 <        f.complete(one);
2661 <        checkCompletedNormally(g, null);
2662 <        assertEquals(r.value, 2);
2663 <
2664 <        r = new IncAction();
2665 <        f = new CompletableFuture<>();
2666 <        f.complete(one);
2667 <        f2 = new CompletableFuture<>();
2668 <        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2669 <        checkCompletedNormally(g, null);
2670 <        assertEquals(r.value, 2);
2671 <    }
2672 <
2673 <    /**
2674 <     * acceptEitherAsync result completes exceptionally after exceptional
2675 <     * completion of source
2676 <     */
2677 <    public void testAcceptEitherAsync2E() {
2678 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2679 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2680 <        IncAction r = new IncAction();
2681 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2682 <        f.completeExceptionally(new CFException());
2683 <        checkCompletedWithWrappedCFException(g);
2684 <
2685 <        r = new IncAction();
2686 <        f = new CompletableFuture<>();
2687 <        f2 = new CompletableFuture<>();
2688 <        f2.completeExceptionally(new CFException());
2689 <        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2690 <        f.complete(one);
2691 <        checkCompletedWithWrappedCFException(g);
2692 <    }
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 if action does
2453 <     */
2454 <    public void testAcceptEitherAsync3E() {
2455 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2456 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2457 <        FailingConsumer r = new FailingConsumer();
2458 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2459 <        f.complete(one);
2460 <        checkCompletedWithWrappedCFException(g);
2461 <    }
2451 >        checkCancelled(g);
2452 >        checkCompletedNormally(f, v1);
2453 >    }}
2454 >
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 >        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());
2715 <        assertTrue(f.cancel(true));
2716 <        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<>();
2721 <        assertTrue(f2.cancel(true));
2722 <        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2723 <        checkCompletedWithWrappedCancellationException(g);
2724 <    }
2478 >        checkCancelled(f);
2479 >        checkCompletedNormally(g, v1);
2480 >    }}
2481  
2482      /**
2483 <     * runAfterEitherAsync result completes normally after normal
2728 <     * 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);
2493 <
2494 <        r = new Noop();
2495 <        f = new CompletableFuture<>();
2496 <        f.complete(one);
2497 <        f2 = new CompletableFuture<>();
2498 <        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2499 <        checkCompletedNormally(g, null);
2745 <        assertTrue(r.ran);
2746 <    }
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 >        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<>();
2515 <        f2 = new CompletableFuture<>();
2516 <        f2.completeExceptionally(new CFException());
2517 <        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2518 <        f.complete(one);
2519 <        checkCompletedWithWrappedCFException(g);
2767 <    }
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 >        checkCompletedWithWrappedCFException(g, ex);
2517 >        checkCompletedWithWrappedCFException(f, ex);
2518 >        assertEquals(0, r.invocationCount);
2519 >    }}
2520  
2521      /**
2522 <     * runAfterEitherAsync result completes exceptionally if action does
2771 <     */
2772 <    public void testRunAfterEitherAsync3E() {
2773 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2774 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2775 <        FailingNoop r = new FailingNoop();
2776 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2777 <        f.complete(one);
2778 <        checkCompletedWithWrappedCFException(g);
2779 <    }
2780 <
2781 <    /**
2782 <     * runAfterEitherAsync result completes exceptionally if either
2783 <     * source cancelled
2784 <     */
2785 <    public void testRunAfterEitherAsync4E() {
2786 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2787 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2788 <        Noop r = new Noop();
2789 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2790 <        assertTrue(f.cancel(true));
2791 <        checkCompletedWithWrappedCancellationException(g);
2792 <
2793 <        r = new Noop();
2794 <        f = new CompletableFuture<>();
2795 <        f2 = new CompletableFuture<>();
2796 <        assertTrue(f2.cancel(true));
2797 <        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2798 <        checkCompletedWithWrappedCancellationException(g);
2799 <    }
2800 <
2801 <    /**
2802 <     * thenComposeAsync result completes normally after normal
2803 <     * 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  
2813    /**
2814     * thenComposeAsync result completes exceptionally after
2815     * exceptional completion of source
2816     */
2817    public void testThenComposeAsync2E() {
2818        CompletableFuture<Integer> f = new CompletableFuture<>();
2819        CompletableFutureInc r = new CompletableFutureInc();
2820        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2821        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  
2836    /**
2837     * thenComposeAsync result completes exceptionally if source cancelled
2838     */
2839    public void testThenComposeAsync4E() {
2840        CompletableFuture<Integer> f = new CompletableFuture<>();
2841        CompletableFutureInc r = new CompletableFutureInc();
2842        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2843        assertTrue(f.cancel(true));
2557          checkCompletedWithWrappedCancellationException(g);
2558 <    }
2558 >        checkCancelled(f);
2559 >    }}
2560  
2561      // other static methods
2562  
# Line 3006 | 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 3042 | 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 <    }
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 >        checkCompletedNormally(g, v1);
2777 >        checkCompletedNormally(f, v1);
2778 >        assertEquals(1, a.get());
2779 >    }}
2780  
2781      /**
2782       * whenComplete action executes on exceptional completion, propagating
2783       * source result.
2784       */
2785 <    public void testWhenComplete2() {
2786 <        final AtomicInteger a = new AtomicInteger();
2787 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2788 <        CompletableFuture<Integer> g =
2789 <            f.whenComplete((Integer x, Throwable t) -> a.getAndIncrement());
2790 <        f.completeExceptionally(new CFException());
2791 <        assertTrue(f.isCompletedExceptionally());
2792 <        assertTrue(g.isCompletedExceptionally());
2793 <        assertEquals(a.get(), 1);
2794 <    }
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 >     * whenComplete action executes on cancelled source, propagating
2809 >     * CancellationException.
2810 >     */
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 >        //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       * If a whenComplete action throws an exception when triggered by
2836       * a normal completion, it completes exceptionally
2837       */
2838 <    public void testWhenComplete3() {
2839 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2840 <        CompletableFuture<Integer> g =
2841 <            f.whenComplete((Integer x, Throwable t) ->
2842 <                           { throw new CFException(); } );
2843 <        f.complete(three);
2844 <        checkCompletedNormally(f, three);
2845 <        assertTrue(g.isCompletedExceptionally());
2846 <        checkCompletedWithWrappedCFException(g);
2847 <    }
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 <     * whenCompleteAsync action executes on normal completion, propagating
2863 <     * source result.
2864 <     */
3090 <    public void testWhenCompleteAsync1() {
3091 <        final AtomicInteger a = new AtomicInteger();
3092 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3093 <        CompletableFuture<Integer> g =
3094 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement());
3095 <        f.complete(three);
3096 <        checkCompletedNormally(f, three);
3097 <        checkCompletedNormally(g, three);
3098 <        assertEquals(a.get(), 1);
3099 <    }
3100 <
3101 <    /**
3102 <     * whenCompleteAsync action executes on exceptional completion, propagating
3103 <     * source result.
3104 <     */
3105 <    public void testWhenCompleteAsync2() {
3106 <        final AtomicInteger a = new AtomicInteger();
3107 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3108 <        CompletableFuture<Integer> g =
3109 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement());
3110 <        f.completeExceptionally(new CFException());
3111 <        checkCompletedWithWrappedCFException(f);
3112 <        checkCompletedWithWrappedCFException(g);
3113 <    }
3114 <
3115 <    /**
3116 <     * If a whenCompleteAsync action throws an exception when
3117 <     * triggered by a normal completion, it completes exceptionally
3118 <     */
3119 <    public void testWhenCompleteAsync3() {
3120 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3121 <        CompletableFuture<Integer> g =
3122 <            f.whenCompleteAsync((Integer x, Throwable t) ->
3123 <                           { throw new CFException(); } );
3124 <        f.complete(three);
3125 <        checkCompletedNormally(f, three);
3126 <        checkCompletedWithWrappedCFException(g);
3127 <    }
3128 <
3129 <    /**
3130 <     * whenCompleteAsync action executes on normal completion, propagating
3131 <     * source result.
3132 <     */
3133 <    public void testWhenCompleteAsync1e() {
3134 <        final AtomicInteger a = new AtomicInteger();
3135 <        ThreadExecutor exec = new ThreadExecutor();
3136 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3137 <        CompletableFuture<Integer> g =
3138 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement(),
3139 <                                exec);
3140 <        f.complete(three);
3141 <        checkCompletedNormally(f, three);
3142 <        checkCompletedNormally(g, three);
3143 <        assertEquals(a.get(), 1);
3144 <    }
3145 <
3146 <    /**
3147 <     * whenCompleteAsync action executes on exceptional completion, propagating
3148 <     * source result.
3149 <     */
3150 <    public void testWhenCompleteAsync2e() {
3151 <        final AtomicInteger a = new AtomicInteger();
3152 <        ThreadExecutor exec = new ThreadExecutor();
3153 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3154 <        CompletableFuture<Integer> g =
3155 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement(),
3156 <                                exec);
3157 <        f.completeExceptionally(new CFException());
3158 <        checkCompletedWithWrappedCFException(f);
3159 <        checkCompletedWithWrappedCFException(g);
3160 <    }
3161 <
3162 <    /**
3163 <     * If a whenCompleteAsync action throws an exception when triggered
3164 <     * by a normal completion, it completes exceptionally
3165 <     */
3166 <    public void testWhenCompleteAsync3e() {
3167 <        ThreadExecutor exec = new ThreadExecutor();
3168 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3169 <        CompletableFuture<Integer> g =
3170 <            f.whenCompleteAsync((Integer x, Throwable t) ->
3171 <                                { throw new CFException(); },
3172 <                                exec);
3173 <        f.complete(three);
3174 <        checkCompletedNormally(f, three);
3175 <        checkCompletedWithWrappedCFException(g);
3176 <    }
3177 <
3178 <    /**
3179 <     * handleAsync action completes normally with function value on
3180 <     * either normal or exceptional completion of source
3181 <     */
3182 <    public void testHandleAsync() {
3183 <        CompletableFuture<Integer> f, g;
3184 <        IntegerHandler r;
3185 <
3186 <        f = new CompletableFuture<>();
3187 <        g = f.handleAsync(r = new IntegerHandler());
3188 <        assertFalse(r.ran);
3189 <        f.completeExceptionally(new CFException());
3190 <        checkCompletedWithWrappedCFException(f);
3191 <        checkCompletedNormally(g, three);
3192 <        assertTrue(r.ran);
3193 <
3194 <        f = new CompletableFuture<>();
3195 <        g = f.handleAsync(r = new IntegerHandler());
3196 <        assertFalse(r.ran);
3197 <        f.completeExceptionally(new CFException());
3198 <        checkCompletedWithWrappedCFException(f);
3199 <        checkCompletedNormally(g, three);
3200 <        assertTrue(r.ran);
3201 <
3202 <        f = new CompletableFuture<>();
3203 <        g = f.handleAsync(r = new IntegerHandler());
3204 <        assertFalse(r.ran);
3205 <        f.complete(one);
3206 <        checkCompletedNormally(f, one);
3207 <        checkCompletedNormally(g, two);
3208 <        assertTrue(r.ran);
3209 <
3210 <        f = new CompletableFuture<>();
3211 <        g = f.handleAsync(r = new IntegerHandler());
3212 <        assertFalse(r.ran);
3213 <        f.complete(one);
3214 <        checkCompletedNormally(f, one);
3215 <        checkCompletedNormally(g, two);
3216 <        assertTrue(r.ran);
3217 <    }
3218 <
3219 <    /**
3220 <     * handleAsync action with Executor completes normally with
3221 <     * function value on either normal or exceptional completion of
3222 <     * 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());
2875 <        checkCompletedWithWrappedCFException(f);
2876 <        checkCompletedNormally(g, three);
2877 <        assertTrue(r.ran);
2878 <
2879 <        f = new CompletableFuture<>();
2880 <        g = f.handleAsync(r = new IntegerHandler(), exec);
2881 <        assertFalse(r.ran);
2882 <        f.completeExceptionally(new CFException());
2883 <        checkCompletedWithWrappedCFException(f);
2884 <        checkCompletedNormally(g, three);
2885 <        assertTrue(r.ran);
2886 <
2887 <        f = new CompletableFuture<>();
2888 <        g = f.handleAsync(r = new IntegerHandler(), exec);
2889 <        assertFalse(r.ran);
2890 <        f.complete(one);
3249 <        checkCompletedNormally(f, one);
3250 <        checkCompletedNormally(g, two);
3251 <        assertTrue(r.ran);
3252 <
3253 <        f = new CompletableFuture<>();
3254 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3255 <        assertFalse(r.ran);
3256 <        f.complete(one);
3257 <        checkCompletedNormally(f, one);
3258 <        checkCompletedNormally(g, two);
3259 <        assertTrue(r.ran);
3260 <    }
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 >        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