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.35 by jsr166, Sun Jun 1 22:22:49 2014 UTC vs.
Revision 1.53 by jsr166, Mon Jun 2 20:20:47 2014 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines