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

Comparing jsr166/src/test/tck/CompletableFutureTest.java (file contents):
Revision 1.34 by jsr166, Sun Jun 1 21:17:05 2014 UTC vs.
Revision 1.60 by jsr166, Tue Jun 3 06:16:41 2014 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines