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.51 by jsr166, Mon Jun 2 19:49:28 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;
1274 >    public void testThenCombine_exceptionalCompletion1() {
1275 >        for (ExecutionMode m : ExecutionMode.values())
1276 >        for (Integer v1 : new Integer[] { 1, null })
1277 >    {
1278 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1279 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1280 >        final SubtractFunction r = new SubtractFunction();
1281 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1282 >        final CFException ex = new CFException();
1283  
1284 <        f = new CompletableFuture<>();
820 <        g = new CompletableFuture<>();
821 <        h = f.thenCombine(g, subtract);
822 <        f.completeExceptionally(new CFException());
1284 >        f.completeExceptionally(ex);
1285          checkIncomplete(h);
1286 <        g.complete(1);
825 <        checkCompletedWithWrappedCFException(h);
1286 >        g.complete(v1);
1287  
1288 <        f = new CompletableFuture<>();
1289 <        g = new CompletableFuture<>();
1290 <        h = f.thenCombine(g, subtract);
1291 <        g.completeExceptionally(new CFException());
1288 >        checkCompletedWithWrappedCFException(h, ex);
1289 >        checkCompletedWithWrappedCFException(f, ex);
1290 >        assertEquals(0, r.invocationCount);
1291 >        checkCompletedNormally(g, v1);
1292 >    }}
1293 >
1294 >    public void testThenCombine_exceptionalCompletion2() {
1295 >        for (ExecutionMode m : ExecutionMode.values())
1296 >        for (Integer v1 : new Integer[] { 1, null })
1297 >    {
1298 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1299 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1300 >        final SubtractFunction r = new SubtractFunction();
1301 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1302 >        final CFException ex = new CFException();
1303 >
1304 >        g.completeExceptionally(ex);
1305          checkIncomplete(h);
1306 <        f.complete(3);
833 <        checkCompletedWithWrappedCFException(h);
1306 >        f.complete(v1);
1307  
1308 <        f = new CompletableFuture<>();
1309 <        g = new CompletableFuture<>();
1310 <        f.complete(3);
1311 <        g.completeExceptionally(new CFException());
1312 <        h = f.thenCombine(g, subtract);
840 <        checkCompletedWithWrappedCFException(h);
1308 >        checkCompletedWithWrappedCFException(h, ex);
1309 >        checkCompletedWithWrappedCFException(g, ex);
1310 >        assertEquals(0, r.invocationCount);
1311 >        checkCompletedNormally(f, v1);
1312 >    }}
1313  
1314 <        f = new CompletableFuture<>();
1315 <        g = new CompletableFuture<>();
1316 <        f.completeExceptionally(new CFException());
1317 <        g.complete(3);
1318 <        h = f.thenCombine(g, subtract);
1319 <        checkCompletedWithWrappedCFException(h);
1320 <    }
1314 >    public void testThenCombine_exceptionalCompletion3() {
1315 >        for (ExecutionMode m : ExecutionMode.values())
1316 >        for (Integer v1 : new Integer[] { 1, null })
1317 >    {
1318 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1319 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1320 >        final SubtractFunction r = new SubtractFunction();
1321 >        final CFException ex = new CFException();
1322 >
1323 >        g.completeExceptionally(ex);
1324 >        f.complete(v1);
1325 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1326 >
1327 >        checkCompletedWithWrappedCFException(h, ex);
1328 >        checkCompletedWithWrappedCFException(g, ex);
1329 >        assertEquals(0, r.invocationCount);
1330 >        checkCompletedNormally(f, v1);
1331 >    }}
1332 >
1333 >    public void testThenCombine_exceptionalCompletion4() {
1334 >        for (ExecutionMode m : ExecutionMode.values())
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 >        final CFException ex = new CFException();
1341 >
1342 >        f.completeExceptionally(ex);
1343 >        g.complete(v1);
1344 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1345 >
1346 >        checkCompletedWithWrappedCFException(h, ex);
1347 >        checkCompletedWithWrappedCFException(f, ex);
1348 >        assertEquals(0, r.invocationCount);
1349 >        checkCompletedNormally(g, v1);
1350 >    }}
1351  
1352      /**
1353       * thenCombine result completes exceptionally if action does
1354       */
1355 <    public void testThenCombine3() {
1356 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1357 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1358 <        FailingBiFunction r = new FailingBiFunction();
1359 <        CompletableFuture<Integer> g = f.thenCombine(f2, r);
1360 <        f.complete(one);
1361 <        checkIncomplete(g);
1362 <        assertFalse(r.ran);
1363 <        f2.complete(two);
1364 <        checkCompletedWithWrappedCFException(g);
1365 <        assertTrue(r.ran);
1366 <    }
1355 >    public void testThenCombine_actionFailed1() {
1356 >        for (ExecutionMode m : ExecutionMode.values())
1357 >        for (Integer v1 : new Integer[] { 1, null })
1358 >        for (Integer v2 : new Integer[] { 2, null })
1359 >    {
1360 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1361 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1362 >        final FailingBiFunction r = new FailingBiFunction();
1363 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1364 >
1365 >        f.complete(v1);
1366 >        checkIncomplete(h);
1367 >        g.complete(v2);
1368 >
1369 >        checkCompletedWithWrappedCFException(h);
1370 >        checkCompletedNormally(f, v1);
1371 >        checkCompletedNormally(g, v2);
1372 >    }}
1373 >
1374 >    public void testThenCombine_actionFailed2() {
1375 >        for (ExecutionMode m : ExecutionMode.values())
1376 >        for (Integer v1 : new Integer[] { 1, null })
1377 >        for (Integer v2 : new Integer[] { 2, null })
1378 >    {
1379 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1380 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1381 >        final FailingBiFunction r = new FailingBiFunction();
1382 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1383 >
1384 >        g.complete(v2);
1385 >        checkIncomplete(h);
1386 >        f.complete(v1);
1387 >
1388 >        checkCompletedWithWrappedCFException(h);
1389 >        checkCompletedNormally(f, v1);
1390 >        checkCompletedNormally(g, v2);
1391 >    }}
1392  
1393      /**
1394       * thenCombine result completes exceptionally if either source cancelled
1395       */
1396 <    public void testThenCombine4() {
1397 <        CompletableFuture<Integer> f, g, h;
1396 >    public void testThenCombine_sourceCancelled1() {
1397 >        for (ExecutionMode m : ExecutionMode.values())
1398 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1399 >        for (Integer v1 : new Integer[] { 1, null })
1400 >    {
1401 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1402 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1403 >        final SubtractFunction r = new SubtractFunction();
1404 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1405  
1406 <        f = new CompletableFuture<>();
873 <        g = new CompletableFuture<>();
874 <        h = f.thenCombine(g, subtract);
875 <        assertTrue(f.cancel(true));
1406 >        assertTrue(f.cancel(mayInterruptIfRunning));
1407          checkIncomplete(h);
1408 <        g.complete(1);
1408 >        g.complete(v1);
1409 >
1410          checkCompletedWithWrappedCancellationException(h);
1411 +        checkCancelled(f);
1412 +        assertEquals(0, r.invocationCount);
1413 +        checkCompletedNormally(g, v1);
1414 +    }}
1415  
1416 <        f = new CompletableFuture<>();
1417 <        g = new CompletableFuture<>();
1418 <        h = f.thenCombine(g, subtract);
1419 <        assertTrue(g.cancel(true));
1416 >    public void testThenCombine_sourceCancelled2() {
1417 >        for (ExecutionMode m : ExecutionMode.values())
1418 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1419 >        for (Integer v1 : new Integer[] { 1, null })
1420 >    {
1421 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1422 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1423 >        final SubtractFunction r = new SubtractFunction();
1424 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1425 >
1426 >        assertTrue(g.cancel(mayInterruptIfRunning));
1427          checkIncomplete(h);
1428 <        f.complete(3);
1428 >        f.complete(v1);
1429 >
1430          checkCompletedWithWrappedCancellationException(h);
1431 +        checkCancelled(g);
1432 +        assertEquals(0, r.invocationCount);
1433 +        checkCompletedNormally(f, v1);
1434 +    }}
1435 +
1436 +    public void testThenCombine_sourceCancelled3() {
1437 +        for (ExecutionMode m : ExecutionMode.values())
1438 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1439 +        for (Integer v1 : new Integer[] { 1, null })
1440 +    {
1441 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
1442 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
1443 +        final SubtractFunction r = new SubtractFunction();
1444 +
1445 +        assertTrue(g.cancel(mayInterruptIfRunning));
1446 +        f.complete(v1);
1447 +        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1448  
888        f = new CompletableFuture<>();
889        g = new CompletableFuture<>();
890        assertTrue(f.cancel(true));
891        assertTrue(g.cancel(true));
892        h = f.thenCombine(g, subtract);
1449          checkCompletedWithWrappedCancellationException(h);
1450 <    }
1450 >        checkCancelled(g);
1451 >        assertEquals(0, r.invocationCount);
1452 >        checkCompletedNormally(f, v1);
1453 >    }}
1454 >
1455 >    public void testThenCombine_sourceCancelled4() {
1456 >        for (ExecutionMode m : ExecutionMode.values())
1457 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1458 >        for (Integer v1 : new Integer[] { 1, null })
1459 >    {
1460 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1461 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1462 >        final SubtractFunction r = new SubtractFunction();
1463 >
1464 >        assertTrue(f.cancel(mayInterruptIfRunning));
1465 >        g.complete(v1);
1466 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1467 >
1468 >        checkCompletedWithWrappedCancellationException(h);
1469 >        checkCancelled(f);
1470 >        assertEquals(0, r.invocationCount);
1471 >        checkCompletedNormally(g, v1);
1472 >    }}
1473  
1474      /**
1475       * thenAcceptBoth result completes normally after normal
# Line 900 | Line 1478 | public class CompletableFutureTest exten
1478      public void testThenAcceptBoth_normalCompletion1() {
1479          for (ExecutionMode m : ExecutionMode.values())
1480          for (Integer v1 : new Integer[] { 1, null })
1481 <        for (Integer v2 : new Integer[] { 2, null }) {
1482 <
1481 >        for (Integer v2 : new Integer[] { 2, null })
1482 >    {
1483          final CompletableFuture<Integer> f = new CompletableFuture<>();
1484          final CompletableFuture<Integer> g = new CompletableFuture<>();
1485          final SubtractAction r = new SubtractAction();
# Line 909 | Line 1487 | public class CompletableFutureTest exten
1487  
1488          f.complete(v1);
1489          checkIncomplete(h);
1490 <        assertEquals(r.value, 0);
1490 >        assertEquals(0, r.invocationCount);
1491          g.complete(v2);
1492  
1493          checkCompletedNormally(h, null);
1494 <        assertEquals(r.value, r.subtract(v1, v2));
1494 >        assertEquals(subtract(v1, v2), r.value);
1495          checkCompletedNormally(f, v1);
1496          checkCompletedNormally(g, v2);
1497 <        }
920 <    }
1497 >    }}
1498  
1499      public void testThenAcceptBoth_normalCompletion2() {
1500          for (ExecutionMode m : ExecutionMode.values())
1501          for (Integer v1 : new Integer[] { 1, null })
1502 <        for (Integer v2 : new Integer[] { 2, null }) {
1503 <
1502 >        for (Integer v2 : new Integer[] { 2, null })
1503 >    {
1504          final CompletableFuture<Integer> f = new CompletableFuture<>();
1505          final CompletableFuture<Integer> g = new CompletableFuture<>();
1506          final SubtractAction r = new SubtractAction();
# Line 931 | Line 1508 | public class CompletableFutureTest exten
1508  
1509          g.complete(v2);
1510          checkIncomplete(h);
1511 <        assertEquals(r.value, 0);
1511 >        assertEquals(0, r.invocationCount);
1512          f.complete(v1);
1513  
1514          checkCompletedNormally(h, null);
1515 <        assertEquals(r.value, r.subtract(v1, v2));
1515 >        assertEquals(subtract(v1, v2), r.value);
1516          checkCompletedNormally(f, v1);
1517          checkCompletedNormally(g, v2);
1518 <        }
942 <    }
1518 >    }}
1519  
1520      public void testThenAcceptBoth_normalCompletion3() {
1521          for (ExecutionMode m : ExecutionMode.values())
1522          for (Integer v1 : new Integer[] { 1, null })
1523 <        for (Integer v2 : new Integer[] { 2, null }) {
1524 <
1523 >        for (Integer v2 : new Integer[] { 2, null })
1524 >    {
1525          final CompletableFuture<Integer> f = new CompletableFuture<>();
1526          final CompletableFuture<Integer> g = new CompletableFuture<>();
1527          final SubtractAction r = new SubtractAction();
# Line 955 | Line 1531 | public class CompletableFutureTest exten
1531          final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1532  
1533          checkCompletedNormally(h, null);
1534 <        assertEquals(r.value, r.subtract(v1, v2));
1534 >        assertEquals(subtract(v1, v2), r.value);
1535          checkCompletedNormally(f, v1);
1536          checkCompletedNormally(g, v2);
1537 <        }
962 <    }
1537 >    }}
1538  
1539      public void testThenAcceptBoth_normalCompletion4() {
1540          for (ExecutionMode m : ExecutionMode.values())
1541          for (Integer v1 : new Integer[] { 1, null })
1542 <        for (Integer v2 : new Integer[] { 2, null }) {
1543 <
1542 >        for (Integer v2 : new Integer[] { 2, null })
1543 >    {
1544          final CompletableFuture<Integer> f = new CompletableFuture<>();
1545          final CompletableFuture<Integer> g = new CompletableFuture<>();
1546          final SubtractAction r = new SubtractAction();
# Line 975 | Line 1550 | public class CompletableFutureTest exten
1550          final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1551  
1552          checkCompletedNormally(h, null);
1553 <        assertEquals(r.value, r.subtract(v1, v2));
1553 >        assertEquals(subtract(v1, v2), r.value);
1554          checkCompletedNormally(f, v1);
1555          checkCompletedNormally(g, v2);
1556 <        }
982 <    }
1556 >    }}
1557  
1558      /**
1559       * thenAcceptBoth result completes exceptionally after exceptional
# Line 987 | Line 1561 | public class CompletableFutureTest exten
1561       */
1562      public void testThenAcceptBoth_exceptionalCompletion1() {
1563          for (ExecutionMode m : ExecutionMode.values())
1564 <        for (Integer v1 : new Integer[] { 1, null }) {
1565 <
1564 >        for (Integer v1 : new Integer[] { 1, null })
1565 >    {
1566          final CompletableFuture<Integer> f = new CompletableFuture<>();
1567          final CompletableFuture<Integer> g = new CompletableFuture<>();
1568          final SubtractAction r = new SubtractAction();
# Line 1001 | Line 1575 | public class CompletableFutureTest exten
1575  
1576          checkCompletedWithWrappedCFException(h, ex);
1577          checkCompletedWithWrappedCFException(f, ex);
1578 <        assertFalse(r.ran());
1578 >        assertEquals(0, r.invocationCount);
1579          checkCompletedNormally(g, v1);
1580 <        }
1007 <    }
1580 >    }}
1581  
1582      public void testThenAcceptBoth_exceptionalCompletion2() {
1583          for (ExecutionMode m : ExecutionMode.values())
1584 <        for (Integer v1 : new Integer[] { 1, null }) {
1585 <
1584 >        for (Integer v1 : new Integer[] { 1, null })
1585 >    {
1586          final CompletableFuture<Integer> f = new CompletableFuture<>();
1587          final CompletableFuture<Integer> g = new CompletableFuture<>();
1588          final SubtractAction r = new SubtractAction();
# Line 1022 | Line 1595 | public class CompletableFutureTest exten
1595  
1596          checkCompletedWithWrappedCFException(h, ex);
1597          checkCompletedWithWrappedCFException(g, ex);
1598 <        assertFalse(r.ran());
1598 >        assertEquals(0, r.invocationCount);
1599          checkCompletedNormally(f, v1);
1600 <        }
1028 <    }
1600 >    }}
1601  
1602      public void testThenAcceptBoth_exceptionalCompletion3() {
1603          for (ExecutionMode m : ExecutionMode.values())
1604 <        for (Integer v1 : new Integer[] { 1, null }) {
1605 <
1604 >        for (Integer v1 : new Integer[] { 1, null })
1605 >    {
1606          final CompletableFuture<Integer> f = new CompletableFuture<>();
1607          final CompletableFuture<Integer> g = new CompletableFuture<>();
1608          final SubtractAction r = new SubtractAction();
# Line 1042 | Line 1614 | public class CompletableFutureTest exten
1614  
1615          checkCompletedWithWrappedCFException(h, ex);
1616          checkCompletedWithWrappedCFException(g, ex);
1617 <        assertFalse(r.ran());
1617 >        assertEquals(0, r.invocationCount);
1618          checkCompletedNormally(f, v1);
1619 <        }
1048 <    }
1619 >    }}
1620  
1621      public void testThenAcceptBoth_exceptionalCompletion4() {
1622          for (ExecutionMode m : ExecutionMode.values())
1623 <        for (Integer v1 : new Integer[] { 1, null }) {
1624 <
1623 >        for (Integer v1 : new Integer[] { 1, null })
1624 >    {
1625          final CompletableFuture<Integer> f = new CompletableFuture<>();
1626          final CompletableFuture<Integer> g = new CompletableFuture<>();
1627          final SubtractAction r = new SubtractAction();
# Line 1062 | Line 1633 | public class CompletableFutureTest exten
1633  
1634          checkCompletedWithWrappedCFException(h, ex);
1635          checkCompletedWithWrappedCFException(f, ex);
1636 <        assertFalse(r.ran());
1636 >        assertEquals(0, r.invocationCount);
1637          checkCompletedNormally(g, v1);
1638 <        }
1068 <    }
1638 >    }}
1639  
1640      /**
1641       * thenAcceptBoth result completes exceptionally if action does
# Line 1073 | Line 1643 | public class CompletableFutureTest exten
1643      public void testThenAcceptBoth_actionFailed1() {
1644          for (ExecutionMode m : ExecutionMode.values())
1645          for (Integer v1 : new Integer[] { 1, null })
1646 <        for (Integer v2 : new Integer[] { 2, null }) {
1647 <
1646 >        for (Integer v2 : new Integer[] { 2, null })
1647 >    {
1648          final CompletableFuture<Integer> f = new CompletableFuture<>();
1649          final CompletableFuture<Integer> g = new CompletableFuture<>();
1650          final FailingBiConsumer r = new FailingBiConsumer();
# Line 1087 | Line 1657 | public class CompletableFutureTest exten
1657          checkCompletedWithWrappedCFException(h);
1658          checkCompletedNormally(f, v1);
1659          checkCompletedNormally(g, v2);
1660 <        }
1091 <    }
1660 >    }}
1661  
1662      public void testThenAcceptBoth_actionFailed2() {
1663          for (ExecutionMode m : ExecutionMode.values())
1664          for (Integer v1 : new Integer[] { 1, null })
1665 <        for (Integer v2 : new Integer[] { 2, null }) {
1666 <
1665 >        for (Integer v2 : new Integer[] { 2, null })
1666 >    {
1667          final CompletableFuture<Integer> f = new CompletableFuture<>();
1668          final CompletableFuture<Integer> g = new CompletableFuture<>();
1669          final FailingBiConsumer r = new FailingBiConsumer();
# Line 1107 | Line 1676 | public class CompletableFutureTest exten
1676          checkCompletedWithWrappedCFException(h);
1677          checkCompletedNormally(f, v1);
1678          checkCompletedNormally(g, v2);
1679 <        }
1111 <    }
1679 >    }}
1680  
1681      /**
1682       * thenAcceptBoth result completes exceptionally if either source cancelled
# Line 1116 | Line 1684 | public class CompletableFutureTest exten
1684      public void testThenAcceptBoth_sourceCancelled1() {
1685          for (ExecutionMode m : ExecutionMode.values())
1686          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1687 <        for (Integer v1 : new Integer[] { 1, null }) {
1688 <
1687 >        for (Integer v1 : new Integer[] { 1, null })
1688 >    {
1689          final CompletableFuture<Integer> f = new CompletableFuture<>();
1690          final CompletableFuture<Integer> g = new CompletableFuture<>();
1691          final SubtractAction r = new SubtractAction();
# Line 1129 | Line 1697 | public class CompletableFutureTest exten
1697  
1698          checkCompletedWithWrappedCancellationException(h);
1699          checkCancelled(f);
1700 <        assertFalse(r.ran());
1700 >        assertEquals(0, r.invocationCount);
1701          checkCompletedNormally(g, v1);
1702 <        }
1135 <    }
1702 >    }}
1703  
1704      public void testThenAcceptBoth_sourceCancelled2() {
1705          for (ExecutionMode m : ExecutionMode.values())
1706          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1707 <        for (Integer v1 : new Integer[] { 1, null }) {
1708 <
1707 >        for (Integer v1 : new Integer[] { 1, null })
1708 >    {
1709          final CompletableFuture<Integer> f = new CompletableFuture<>();
1710          final CompletableFuture<Integer> g = new CompletableFuture<>();
1711          final SubtractAction r = new SubtractAction();
# Line 1150 | Line 1717 | public class CompletableFutureTest exten
1717  
1718          checkCompletedWithWrappedCancellationException(h);
1719          checkCancelled(g);
1720 <        assertFalse(r.ran());
1720 >        assertEquals(0, r.invocationCount);
1721          checkCompletedNormally(f, v1);
1722 <        }
1156 <    }
1722 >    }}
1723  
1724      public void testThenAcceptBoth_sourceCancelled3() {
1725          for (ExecutionMode m : ExecutionMode.values())
1726          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1727 <        for (Integer v1 : new Integer[] { 1, null }) {
1728 <
1727 >        for (Integer v1 : new Integer[] { 1, null })
1728 >    {
1729          final CompletableFuture<Integer> f = new CompletableFuture<>();
1730          final CompletableFuture<Integer> g = new CompletableFuture<>();
1731          final SubtractAction r = new SubtractAction();
# Line 1170 | Line 1736 | public class CompletableFutureTest exten
1736  
1737          checkCompletedWithWrappedCancellationException(h);
1738          checkCancelled(g);
1739 <        assertFalse(r.ran());
1739 >        assertEquals(0, r.invocationCount);
1740          checkCompletedNormally(f, v1);
1741 <        }
1176 <    }
1741 >    }}
1742  
1743      public void testThenAcceptBoth_sourceCancelled4() {
1744          for (ExecutionMode m : ExecutionMode.values())
1745          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1746 <        for (Integer v1 : new Integer[] { 1, null }) {
1747 <
1746 >        for (Integer v1 : new Integer[] { 1, null })
1747 >    {
1748          final CompletableFuture<Integer> f = new CompletableFuture<>();
1749          final CompletableFuture<Integer> g = new CompletableFuture<>();
1750          final SubtractAction r = new SubtractAction();
# Line 1190 | Line 1755 | public class CompletableFutureTest exten
1755  
1756          checkCompletedWithWrappedCancellationException(h);
1757          checkCancelled(f);
1758 <        assertFalse(r.ran());
1758 >        assertEquals(0, r.invocationCount);
1759          checkCompletedNormally(g, v1);
1760 <        }
1196 <    }
1760 >    }}
1761  
1762      /**
1763       * runAfterBoth result completes normally after normal
# Line 1202 | Line 1766 | public class CompletableFutureTest exten
1766      public void testRunAfterBoth_normalCompletion1() {
1767          for (ExecutionMode m : ExecutionMode.values())
1768          for (Integer v1 : new Integer[] { 1, null })
1769 <        for (Integer v2 : new Integer[] { 2, null }) {
1770 <
1769 >        for (Integer v2 : new Integer[] { 2, null })
1770 >    {
1771          final CompletableFuture<Integer> f = new CompletableFuture<>();
1772          final CompletableFuture<Integer> g = new CompletableFuture<>();
1773          final Noop r = new Noop();
# Line 1211 | Line 1775 | public class CompletableFutureTest exten
1775  
1776          f.complete(v1);
1777          checkIncomplete(h);
1778 <        assertFalse(r.ran);
1778 >        assertEquals(0, r.invocationCount);
1779          g.complete(v2);
1780  
1781          checkCompletedNormally(h, null);
1782 <        assertTrue(r.ran);
1782 >        assertEquals(1, r.invocationCount);
1783          checkCompletedNormally(f, v1);
1784          checkCompletedNormally(g, v2);
1785 <        }
1222 <    }
1785 >    }}
1786  
1787      public void testRunAfterBoth_normalCompletion2() {
1788          for (ExecutionMode m : ExecutionMode.values())
1789          for (Integer v1 : new Integer[] { 1, null })
1790 <        for (Integer v2 : new Integer[] { 2, null }) {
1791 <
1790 >        for (Integer v2 : new Integer[] { 2, null })
1791 >    {
1792          final CompletableFuture<Integer> f = new CompletableFuture<>();
1793          final CompletableFuture<Integer> g = new CompletableFuture<>();
1794          final Noop r = new Noop();
# Line 1233 | Line 1796 | public class CompletableFutureTest exten
1796  
1797          g.complete(v2);
1798          checkIncomplete(h);
1799 <        assertFalse(r.ran);
1799 >        assertEquals(0, r.invocationCount);
1800          f.complete(v1);
1801  
1802          checkCompletedNormally(h, null);
1803 <        assertTrue(r.ran);
1803 >        assertEquals(1, r.invocationCount);
1804          checkCompletedNormally(f, v1);
1805          checkCompletedNormally(g, v2);
1806 <        }
1244 <    }
1806 >    }}
1807  
1808      public void testRunAfterBoth_normalCompletion3() {
1809          for (ExecutionMode m : ExecutionMode.values())
1810          for (Integer v1 : new Integer[] { 1, null })
1811 <        for (Integer v2 : new Integer[] { 2, null }) {
1812 <
1811 >        for (Integer v2 : new Integer[] { 2, null })
1812 >    {
1813          final CompletableFuture<Integer> f = new CompletableFuture<>();
1814          final CompletableFuture<Integer> g = new CompletableFuture<>();
1815          final Noop r = new Noop();
# Line 1257 | Line 1819 | public class CompletableFutureTest exten
1819          final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1820  
1821          checkCompletedNormally(h, null);
1822 <        assertTrue(r.ran);
1822 >        assertEquals(1, r.invocationCount);
1823          checkCompletedNormally(f, v1);
1824          checkCompletedNormally(g, v2);
1825 <        }
1264 <    }
1825 >    }}
1826  
1827      public void testRunAfterBoth_normalCompletion4() {
1828          for (ExecutionMode m : ExecutionMode.values())
1829          for (Integer v1 : new Integer[] { 1, null })
1830 <        for (Integer v2 : new Integer[] { 2, null }) {
1831 <
1830 >        for (Integer v2 : new Integer[] { 2, null })
1831 >    {
1832          final CompletableFuture<Integer> f = new CompletableFuture<>();
1833          final CompletableFuture<Integer> g = new CompletableFuture<>();
1834          final Noop r = new Noop();
# Line 1277 | Line 1838 | public class CompletableFutureTest exten
1838          final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1839  
1840          checkCompletedNormally(h, null);
1841 <        assertTrue(r.ran);
1841 >        assertEquals(1, r.invocationCount);
1842          checkCompletedNormally(f, v1);
1843          checkCompletedNormally(g, v2);
1844 <        }
1284 <    }
1844 >    }}
1845  
1846      /**
1847       * runAfterBoth result completes exceptionally after exceptional
# Line 1289 | Line 1849 | public class CompletableFutureTest exten
1849       */
1850      public void testRunAfterBoth_exceptionalCompletion1() {
1851          for (ExecutionMode m : ExecutionMode.values())
1852 <        for (Integer v1 : new Integer[] { 1, null }) {
1853 <
1852 >        for (Integer v1 : new Integer[] { 1, null })
1853 >    {
1854          final CompletableFuture<Integer> f = new CompletableFuture<>();
1855          final CompletableFuture<Integer> g = new CompletableFuture<>();
1856          final Noop r = new Noop();
# Line 1303 | Line 1863 | public class CompletableFutureTest exten
1863  
1864          checkCompletedWithWrappedCFException(h, ex);
1865          checkCompletedWithWrappedCFException(f, ex);
1866 <        assertFalse(r.ran);
1866 >        assertEquals(0, r.invocationCount);
1867          checkCompletedNormally(g, v1);
1868 <        }
1309 <    }
1868 >    }}
1869  
1870      public void testRunAfterBoth_exceptionalCompletion2() {
1871          for (ExecutionMode m : ExecutionMode.values())
1872 <        for (Integer v1 : new Integer[] { 1, null }) {
1873 <
1872 >        for (Integer v1 : new Integer[] { 1, null })
1873 >    {
1874          final CompletableFuture<Integer> f = new CompletableFuture<>();
1875          final CompletableFuture<Integer> g = new CompletableFuture<>();
1876          final Noop r = new Noop();
# Line 1324 | Line 1883 | public class CompletableFutureTest exten
1883  
1884          checkCompletedWithWrappedCFException(h, ex);
1885          checkCompletedWithWrappedCFException(g, ex);
1886 <        assertFalse(r.ran);
1886 >        assertEquals(0, r.invocationCount);
1887          checkCompletedNormally(f, v1);
1888 <        }
1330 <    }
1888 >    }}
1889  
1890      public void testRunAfterBoth_exceptionalCompletion3() {
1891          for (ExecutionMode m : ExecutionMode.values())
1892 <        for (Integer v1 : new Integer[] { 1, null }) {
1893 <
1892 >        for (Integer v1 : new Integer[] { 1, null })
1893 >    {
1894          final CompletableFuture<Integer> f = new CompletableFuture<>();
1895          final CompletableFuture<Integer> g = new CompletableFuture<>();
1896          final Noop r = new Noop();
# Line 1344 | Line 1902 | public class CompletableFutureTest exten
1902  
1903          checkCompletedWithWrappedCFException(h, ex);
1904          checkCompletedWithWrappedCFException(g, ex);
1905 <        assertFalse(r.ran);
1905 >        assertEquals(0, r.invocationCount);
1906          checkCompletedNormally(f, v1);
1907 <        }
1350 <    }
1907 >    }}
1908  
1909      public void testRunAfterBoth_exceptionalCompletion4() {
1910          for (ExecutionMode m : ExecutionMode.values())
1911 <        for (Integer v1 : new Integer[] { 1, null }) {
1912 <
1911 >        for (Integer v1 : new Integer[] { 1, null })
1912 >    {
1913          final CompletableFuture<Integer> f = new CompletableFuture<>();
1914          final CompletableFuture<Integer> g = new CompletableFuture<>();
1915          final Noop r = new Noop();
# Line 1364 | Line 1921 | public class CompletableFutureTest exten
1921  
1922          checkCompletedWithWrappedCFException(h, ex);
1923          checkCompletedWithWrappedCFException(f, ex);
1924 <        assertFalse(r.ran);
1924 >        assertEquals(0, r.invocationCount);
1925          checkCompletedNormally(g, v1);
1926 <        }
1370 <    }
1926 >    }}
1927  
1928      /**
1929       * runAfterBoth result completes exceptionally if action does
# Line 1375 | Line 1931 | public class CompletableFutureTest exten
1931      public void testRunAfterBoth_actionFailed1() {
1932          for (ExecutionMode m : ExecutionMode.values())
1933          for (Integer v1 : new Integer[] { 1, null })
1934 <        for (Integer v2 : new Integer[] { 2, null }) {
1935 <
1934 >        for (Integer v2 : new Integer[] { 2, null })
1935 >    {
1936          final CompletableFuture<Integer> f = new CompletableFuture<>();
1937          final CompletableFuture<Integer> g = new CompletableFuture<>();
1938 <        final FailingNoop r = new FailingNoop();
1938 >        final FailingRunnable r = new FailingRunnable();
1939          final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1940  
1941          f.complete(v1);
# Line 1389 | Line 1945 | public class CompletableFutureTest exten
1945          checkCompletedWithWrappedCFException(h);
1946          checkCompletedNormally(f, v1);
1947          checkCompletedNormally(g, v2);
1948 <        }
1393 <    }
1948 >    }}
1949  
1950      public void testRunAfterBoth_actionFailed2() {
1951          for (ExecutionMode m : ExecutionMode.values())
1952          for (Integer v1 : new Integer[] { 1, null })
1953 <        for (Integer v2 : new Integer[] { 2, null }) {
1954 <
1953 >        for (Integer v2 : new Integer[] { 2, null })
1954 >    {
1955          final CompletableFuture<Integer> f = new CompletableFuture<>();
1956          final CompletableFuture<Integer> g = new CompletableFuture<>();
1957 <        final FailingNoop r = new FailingNoop();
1957 >        final FailingRunnable r = new FailingRunnable();
1958          final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1959  
1960          g.complete(v2);
# Line 1409 | Line 1964 | public class CompletableFutureTest exten
1964          checkCompletedWithWrappedCFException(h);
1965          checkCompletedNormally(f, v1);
1966          checkCompletedNormally(g, v2);
1967 <        }
1413 <    }
1967 >    }}
1968  
1969      /**
1970       * runAfterBoth result completes exceptionally if either source cancelled
# Line 1418 | Line 1972 | public class CompletableFutureTest exten
1972      public void testRunAfterBoth_sourceCancelled1() {
1973          for (ExecutionMode m : ExecutionMode.values())
1974          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1975 <        for (Integer v1 : new Integer[] { 1, null }) {
1976 <
1975 >        for (Integer v1 : new Integer[] { 1, null })
1976 >    {
1977          final CompletableFuture<Integer> f = new CompletableFuture<>();
1978          final CompletableFuture<Integer> g = new CompletableFuture<>();
1979          final Noop r = new Noop();
# Line 1431 | Line 1985 | public class CompletableFutureTest exten
1985  
1986          checkCompletedWithWrappedCancellationException(h);
1987          checkCancelled(f);
1988 <        assertFalse(r.ran);
1988 >        assertEquals(0, r.invocationCount);
1989          checkCompletedNormally(g, v1);
1990 <        }
1437 <    }
1990 >    }}
1991  
1992      public void testRunAfterBoth_sourceCancelled2() {
1993          for (ExecutionMode m : ExecutionMode.values())
1994          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1995 <        for (Integer v1 : new Integer[] { 1, null }) {
1996 <
1995 >        for (Integer v1 : new Integer[] { 1, null })
1996 >    {
1997          final CompletableFuture<Integer> f = new CompletableFuture<>();
1998          final CompletableFuture<Integer> g = new CompletableFuture<>();
1999          final Noop r = new Noop();
# Line 1452 | Line 2005 | public class CompletableFutureTest exten
2005  
2006          checkCompletedWithWrappedCancellationException(h);
2007          checkCancelled(g);
2008 <        assertFalse(r.ran);
2008 >        assertEquals(0, r.invocationCount);
2009          checkCompletedNormally(f, v1);
2010 <        }
1458 <    }
2010 >    }}
2011  
2012      public void testRunAfterBoth_sourceCancelled3() {
2013          for (ExecutionMode m : ExecutionMode.values())
2014          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2015 <        for (Integer v1 : new Integer[] { 1, null }) {
2016 <
2015 >        for (Integer v1 : new Integer[] { 1, null })
2016 >    {
2017          final CompletableFuture<Integer> f = new CompletableFuture<>();
2018          final CompletableFuture<Integer> g = new CompletableFuture<>();
2019          final Noop r = new Noop();
# Line 1472 | Line 2024 | public class CompletableFutureTest exten
2024  
2025          checkCompletedWithWrappedCancellationException(h);
2026          checkCancelled(g);
2027 <        assertFalse(r.ran);
2027 >        assertEquals(0, r.invocationCount);
2028          checkCompletedNormally(f, v1);
2029 <        }
1478 <    }
2029 >    }}
2030  
2031      public void testRunAfterBoth_sourceCancelled4() {
2032          for (ExecutionMode m : ExecutionMode.values())
2033          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2034 <        for (Integer v1 : new Integer[] { 1, null }) {
2035 <
2034 >        for (Integer v1 : new Integer[] { 1, null })
2035 >    {
2036          final CompletableFuture<Integer> f = new CompletableFuture<>();
2037          final CompletableFuture<Integer> g = new CompletableFuture<>();
2038          final Noop r = new Noop();
# Line 1492 | Line 2043 | public class CompletableFutureTest exten
2043  
2044          checkCompletedWithWrappedCancellationException(h);
2045          checkCancelled(f);
2046 <        assertFalse(r.ran);
2046 >        assertEquals(0, r.invocationCount);
2047          checkCompletedNormally(g, v1);
2048 <        }
1498 <    }
2048 >    }}
2049  
2050      /**
2051       * applyToEither result completes normally after normal completion
2052       * of either source
2053       */
2054 <    public void testApplyToEither() {
2055 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2056 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2057 <        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
2058 <        f.complete(one);
2059 <        checkCompletedNormally(g, two);
2060 <        f2.complete(one);
2061 <        checkCompletedNormally(g, two);
2054 >    public void testApplyToEither_normalCompletion1() {
2055 >        for (ExecutionMode m : ExecutionMode.values())
2056 >        for (Integer v1 : new Integer[] { 1, null })
2057 >        for (Integer v2 : new Integer[] { 2, null })
2058 >    {
2059 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2060 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2061 >        final IncFunction r = new IncFunction();
2062 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2063  
2064 <        f = new CompletableFuture<>();
2065 <        f.complete(one);
2066 <        f2 = new CompletableFuture<>();
1516 <        g = f.applyToEither(f2, inc);
1517 <        checkCompletedNormally(g, two);
1518 <    }
2064 >        f.complete(v1);
2065 >        checkCompletedNormally(h, inc(v1));
2066 >        g.complete(v2);
2067  
2068 <    /**
2069 <     * applyToEither result completes exceptionally after exceptional
2070 <     * completion of either source
2071 <     */
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);
2068 >        checkCompletedNormally(f, v1);
2069 >        checkCompletedNormally(g, v2);
2070 >        checkCompletedNormally(h, inc(v1));
2071 >    }}
2072  
2073 <        f = new CompletableFuture<>();
2074 <        f2 = new CompletableFuture<>();
2075 <        f2.completeExceptionally(new CFException());
2076 <        g = f.applyToEither(f2, inc);
2077 <        checkCompletedWithWrappedCFException(g);
2078 <    }
2073 >    public void testApplyToEither_normalCompletion2() {
2074 >        for (ExecutionMode m : ExecutionMode.values())
2075 >        for (Integer v1 : new Integer[] { 1, null })
2076 >        for (Integer v2 : new Integer[] { 2, null })
2077 >    {
2078 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2079 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2080 >        final IncFunction r = new IncFunction();
2081 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2082  
2083 <    /**
2084 <     * applyToEither result completes exceptionally if action does
2085 <     */
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 <    }
2083 >        g.complete(v2);
2084 >        checkCompletedNormally(h, inc(v2));
2085 >        f.complete(v1);
2086  
2087 <    /**
2088 <     * applyToEither result completes exceptionally if either source cancelled
2089 <     */
2090 <    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 <    }
2087 >        checkCompletedNormally(f, v1);
2088 >        checkCompletedNormally(g, v2);
2089 >        checkCompletedNormally(h, inc(v2));
2090 >        }}
2091  
2092 <    /**
2093 <     * acceptEither result completes normally after normal completion
2094 <     * of either source
2095 <     */
2096 <    public void testAcceptEither() {
2097 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2098 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2099 <        IncAction r = new IncAction();
1574 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
1575 <        f.complete(one);
1576 <        checkCompletedNormally(g, null);
1577 <        f2.complete(one);
1578 <        checkCompletedNormally(g, null);
1579 <        assertEquals(r.value, 2);
2092 >    public void testApplyToEither_normalCompletion3() {
2093 >        for (ExecutionMode m : ExecutionMode.values())
2094 >        for (Integer v1 : new Integer[] { 1, null })
2095 >        for (Integer v2 : new Integer[] { 2, null })
2096 >    {
2097 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2098 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2099 >        final IncFunction r = new IncFunction();
2100  
2101 <        r = new IncAction();
2102 <        f = new CompletableFuture<>();
2103 <        f.complete(one);
1584 <        f2 = new CompletableFuture<>();
1585 <        g = f.acceptEither(f2, r);
1586 <        checkCompletedNormally(g, null);
1587 <        assertEquals(r.value, 2);
1588 <    }
2101 >        f.complete(v1);
2102 >        g.complete(v2);
2103 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2104  
2105 <    /**
2106 <     * 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);
2105 >        checkCompletedNormally(f, v1);
2106 >        checkCompletedNormally(g, v2);
2107  
2108 <        r = new IncAction();
2109 <        f = new CompletableFuture<>();
2110 <        f2 = new CompletableFuture<>();
2111 <        f2.completeExceptionally(new CFException());
2112 <        g = f.acceptEither(f2, r);
1608 <        checkCompletedWithWrappedCFException(g);
1609 <    }
2108 >        // unspecified behavior
2109 >        assertTrue(Objects.equals(h.join(), inc(v1)) ||
2110 >                   Objects.equals(h.join(), inc(v2)));
2111 >        assertEquals(1, r.invocationCount);
2112 >    }}
2113  
2114      /**
2115 <     * acceptEither result completes exceptionally if action does
2115 >     * applyToEither result completes exceptionally after exceptional
2116 >     * completion of either source
2117       */
2118 <    public void testAcceptEither3() {
2119 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2120 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2121 <        FailingConsumer r = new FailingConsumer();
2122 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
2123 <        f2.complete(two);
2124 <        checkCompletedWithWrappedCFException(g);
2125 <    }
2118 >    public void testApplyToEither_exceptionalCompletion1() {
2119 >        for (ExecutionMode m : ExecutionMode.values())
2120 >        for (Integer v1 : new Integer[] { 1, null })
2121 >    {
2122 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2123 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2124 >        final IncFunction r = new IncFunction();
2125 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2126 >        final CFException ex = new CFException();
2127  
2128 <    /**
2129 <     * acceptEither result completes exceptionally if either source cancelled
2130 <     */
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 <    }
2128 >        f.completeExceptionally(ex);
2129 >        checkCompletedWithWrappedCFException(h, ex);
2130 >        g.complete(v1);
2131  
2132 <    /**
2133 <     * runAfterEither result completes normally after normal completion
2134 <     * of either source
2135 <     */
2136 <    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);
2132 >        assertEquals(0, r.invocationCount);
2133 >        checkCompletedNormally(g, v1);
2134 >        checkCompletedWithWrappedCFException(f, ex);
2135 >        checkCompletedWithWrappedCFException(h, ex);
2136 >    }}
2137  
2138 <        r = new Noop();
2139 <        f = new CompletableFuture<>();
2140 <        f.complete(one);
2141 <        f2 = new CompletableFuture<>();
2142 <        g = f.runAfterEither(f2, r);
2143 <        checkCompletedNormally(g, null);
2144 <        assertTrue(r.ran);
2145 <    }
2138 >    public void testApplyToEither_exceptionalCompletion2() {
2139 >        for (ExecutionMode m : ExecutionMode.values())
2140 >        for (Integer v1 : new Integer[] { 1, null })
2141 >    {
2142 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2143 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2144 >        final IncFunction r = new IncFunction();
2145 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2146 >        final CFException ex = new CFException();
2147  
2148 <    /**
2149 <     * runAfterEither result completes exceptionally after exceptional
2150 <     * 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);
2148 >        g.completeExceptionally(ex);
2149 >        checkCompletedWithWrappedCFException(h, ex);
2150 >        f.complete(v1);
2151  
2152 <        r = new Noop();
2153 <        f = new CompletableFuture<>();
2154 <        f2 = new CompletableFuture<>();
2155 <        f2.completeExceptionally(new CFException());
2156 <        g = f.runAfterEither(f2, r);
1681 <        checkCompletedWithWrappedCFException(g);
1682 <    }
2152 >        assertEquals(0, r.invocationCount);
2153 >        checkCompletedNormally(f, v1);
2154 >        checkCompletedWithWrappedCFException(g, ex);
2155 >        checkCompletedWithWrappedCFException(h, ex);
2156 >    }}
2157  
2158 <    /**
2159 <     * runAfterEither result completes exceptionally if action does
2160 <     */
2161 <    public void testRunAfterEither3() {
2162 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2163 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2164 <        FailingNoop r = new FailingNoop();
2165 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
1692 <        f2.complete(two);
1693 <        checkCompletedWithWrappedCFException(g);
1694 <    }
2158 >    public void testApplyToEither_exceptionalCompletion3() {
2159 >        for (ExecutionMode m : ExecutionMode.values())
2160 >        for (Integer v1 : new Integer[] { 1, null })
2161 >    {
2162 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2163 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2164 >        final IncFunction r = new IncFunction();
2165 >        final CFException ex = new CFException();
2166  
2167 <    /**
2168 <     * runAfterEither result completes exceptionally if either source cancelled
2169 <     */
1699 <    public void testRunAfterEither4() {
1700 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1701 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1702 <        Noop r = new Noop();
1703 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
1704 <        assertTrue(f.cancel(true));
1705 <        checkCompletedWithWrappedCancellationException(g);
1706 <        f = new CompletableFuture<>();
1707 <        f2 = new CompletableFuture<>();
1708 <        assertTrue(f2.cancel(true));
1709 <        checkCompletedWithWrappedCancellationException(g);
1710 <    }
2167 >        g.completeExceptionally(ex);
2168 >        f.complete(v1);
2169 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2170  
2171 <    /**
2172 <     * thenCompose result completes normally after normal completion of source
2173 <     */
2174 <    public void testThenCompose() {
2175 <        CompletableFuture<Integer> f, g;
2176 <        CompletableFutureInc r;
2171 >        // unspecified behavior
2172 >        Integer v;
2173 >        try {
2174 >            assertEquals(inc(v1), h.join());
2175 >            assertEquals(1, r.invocationCount);
2176 >        } catch (CompletionException ok) {
2177 >            checkCompletedWithWrappedCFException(h, ex);
2178 >            assertEquals(0, r.invocationCount);
2179 >        }
2180  
2181 <        f = new CompletableFuture<>();
2182 <        g = f.thenCompose(r = new CompletableFutureInc());
2183 <        f.complete(one);
1722 <        checkCompletedNormally(g, two);
1723 <        assertTrue(r.ran);
2181 >        checkCompletedWithWrappedCFException(g, ex);
2182 >        checkCompletedNormally(f, v1);
2183 >    }}
2184  
2185 <        f = new CompletableFuture<>();
2186 <        f.complete(one);
2187 <        g = f.thenCompose(r = new CompletableFutureInc());
2188 <        checkCompletedNormally(g, two);
2189 <        assertTrue(r.ran);
2190 <    }
2185 >    public void testApplyToEither_exceptionalCompletion4() {
2186 >        for (ExecutionMode m : ExecutionMode.values())
2187 >        for (Integer v1 : new Integer[] { 1, null })
2188 >    {
2189 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2190 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2191 >        final IncFunction r = new IncFunction();
2192 >        final CFException ex = new CFException();
2193  
2194 <    /**
2195 <     * thenCompose result completes exceptionally after exceptional
2196 <     * completion of source
1735 <     */
1736 <    public void testThenCompose2() {
1737 <        CompletableFuture<Integer> f, g;
1738 <        CompletableFutureInc r;
2194 >        f.completeExceptionally(ex);
2195 >        g.complete(v1);
2196 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2197  
2198 <        f = new CompletableFuture<>();
2199 <        g = f.thenCompose(r = new CompletableFutureInc());
2200 <        f.completeExceptionally(new CFException());
2201 <        checkCompletedWithWrappedCFException(g);
2198 >        // unspecified behavior
2199 >        Integer v;
2200 >        try {
2201 >            assertEquals(inc(v1), h.join());
2202 >            assertEquals(1, r.invocationCount);
2203 >        } catch (CompletionException ok) {
2204 >            checkCompletedWithWrappedCFException(h, ex);
2205 >            assertEquals(0, r.invocationCount);
2206 >        }
2207  
2208 <        f = new CompletableFuture<>();
2209 <        f.completeExceptionally(new CFException());
2210 <        g = f.thenCompose(r = new CompletableFutureInc());
1748 <        checkCompletedWithWrappedCFException(g);
1749 <    }
2208 >        checkCompletedWithWrappedCFException(f, ex);
2209 >        checkCompletedNormally(g, v1);
2210 >    }}
2211  
2212      /**
2213 <     * thenCompose result completes exceptionally if action does
2213 >     * applyToEither result completes exceptionally if action does
2214       */
2215 <    public void testThenCompose3() {
2216 <        CompletableFuture<Integer> f, g;
2217 <        FailingCompletableFutureFunction r;
2215 >    public void testApplyToEither_actionFailed1() {
2216 >        for (ExecutionMode m : ExecutionMode.values())
2217 >        for (Integer v1 : new Integer[] { 1, null })
2218 >        for (Integer v2 : new Integer[] { 2, null })
2219 >    {
2220 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2221 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2222 >        final FailingFunction r = new FailingFunction();
2223 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2224  
2225 <        f = new CompletableFuture<>();
2226 <        g = f.thenCompose(r = new FailingCompletableFutureFunction());
2227 <        f.complete(one);
2228 <        checkCompletedWithWrappedCFException(g);
2225 >        f.complete(v1);
2226 >        checkCompletedWithWrappedCFException(h);
2227 >        g.complete(v2);
2228 >        checkCompletedNormally(f, v1);
2229 >        checkCompletedNormally(g, v2);
2230 >    }}
2231  
2232 <        f = new CompletableFuture<>();
2233 <        f.complete(one);
2234 <        g = f.thenCompose(r = new FailingCompletableFutureFunction());
2235 <        checkCompletedWithWrappedCFException(g);
2236 <    }
2232 >    public void testApplyToEither_actionFailed2() {
2233 >        for (ExecutionMode m : ExecutionMode.values())
2234 >        for (Integer v1 : new Integer[] { 1, null })
2235 >        for (Integer v2 : new Integer[] { 2, null })
2236 >    {
2237 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2238 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2239 >        final FailingFunction r = new FailingFunction();
2240 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2241 >
2242 >        g.complete(v2);
2243 >        checkCompletedWithWrappedCFException(h);
2244 >        f.complete(v1);
2245 >        checkCompletedNormally(f, v1);
2246 >        checkCompletedNormally(g, v2);
2247 >    }}
2248  
2249      /**
2250 <     * thenCompose result completes exceptionally if source cancelled
2250 >     * applyToEither result completes exceptionally if either source cancelled
2251       */
2252 <    public void testThenCompose4() {
2253 <        CompletableFuture<Integer> f, g;
2254 <        CompletableFutureInc r;
2255 <
2256 <        f = new CompletableFuture<>();
2257 <        g = f.thenCompose(r = new CompletableFutureInc());
2258 <        assertTrue(f.cancel(true));
2259 <        checkCompletedWithWrappedCancellationException(g);
2260 <
1781 <        f = new CompletableFuture<>();
1782 <        assertTrue(f.cancel(true));
1783 <        g = f.thenCompose(r = new CompletableFutureInc());
1784 <        checkCompletedWithWrappedCancellationException(g);
1785 <    }
2252 >    public void testApplyToEither_sourceCancelled1() {
2253 >        for (ExecutionMode m : ExecutionMode.values())
2254 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2255 >        for (Integer v1 : new Integer[] { 1, null })
2256 >    {
2257 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2258 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2259 >        final IncFunction r = new IncFunction();
2260 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2261  
2262 <    // asyncs
2262 >        assertTrue(f.cancel(mayInterruptIfRunning));
2263 >        checkCompletedWithWrappedCancellationException(h);
2264 >        g.complete(v1);
2265  
2266 <    /**
2267 <     * thenRunAsync result completes normally after normal completion of source
2268 <     */
2269 <    public void testThenRunAsync() {
2270 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1794 <        Noop r = new Noop();
1795 <        CompletableFuture<Void> g = f.thenRunAsync(r);
1796 <        f.complete(null);
1797 <        checkCompletedNormally(g, null);
2266 >        checkCancelled(f);
2267 >        assertEquals(0, r.invocationCount);
2268 >        checkCompletedNormally(g, v1);
2269 >        checkCompletedWithWrappedCancellationException(h);
2270 >    }}
2271  
2272 <        // reordered version
2273 <        f = new CompletableFuture<>();
2274 <        f.complete(null);
2275 <        r = new Noop();
2276 <        g = f.thenRunAsync(r);
2277 <        checkCompletedNormally(g, null);
2278 <    }
2272 >    public void testApplyToEither_sourceCancelled2() {
2273 >        for (ExecutionMode m : ExecutionMode.values())
2274 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2275 >        for (Integer v1 : new Integer[] { 1, null })
2276 >    {
2277 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2278 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2279 >        final IncFunction r = new IncFunction();
2280 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2281  
2282 <    /**
2283 <     * thenRunAsync result completes exceptionally after exceptional
2284 <     * 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());
1816 <        try {
1817 <            g.join();
1818 <            shouldThrow();
1819 <        } catch (CompletionException success) {}
1820 <        checkCompletedWithWrappedCFException(g);
1821 <    }
2282 >        assertTrue(g.cancel(mayInterruptIfRunning));
2283 >        checkCompletedWithWrappedCancellationException(h);
2284 >        f.complete(v1);
2285  
2286 <    /**
2287 <     * thenRunAsync result completes exceptionally if action does
2288 <     */
2289 <    public void testThenRunAsync3() {
2290 <        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 <    }
2286 >        checkCancelled(g);
2287 >        assertEquals(0, r.invocationCount);
2288 >        checkCompletedNormally(f, v1);
2289 >        checkCompletedWithWrappedCancellationException(h);
2290 >    }}
2291  
2292 <    /**
2293 <     * thenRunAsync result completes exceptionally if source cancelled
2294 <     */
2295 <    public void testThenRunAsync4() {
2296 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2297 <        Noop r = new Noop();
2298 <        CompletableFuture<Void> g = f.thenRunAsync(r);
2299 <        assertTrue(f.cancel(true));
1842 <        checkCompletedWithWrappedCancellationException(g);
1843 <    }
2292 >    public void testApplyToEither_sourceCancelled3() {
2293 >        for (ExecutionMode m : ExecutionMode.values())
2294 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2295 >        for (Integer v1 : new Integer[] { 1, null })
2296 >    {
2297 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2298 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2299 >        final IncFunction r = new IncFunction();
2300  
2301 <    /**
2302 <     * thenApplyAsync result completes normally after normal completion of source
2303 <     */
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 <    }
2301 >        assertTrue(g.cancel(mayInterruptIfRunning));
2302 >        f.complete(v1);
2303 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2304  
2305 <    /**
2306 <     * thenApplyAsync result completes exceptionally after exceptional
2307 <     * completion of source
2308 <     */
2309 <    public void testThenApplyAsync2() {
2310 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2311 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
2312 <        f.completeExceptionally(new CFException());
2313 <        checkCompletedWithWrappedCFException(g);
1864 <    }
2305 >        // unspecified behavior
2306 >        Integer v;
2307 >        try {
2308 >            assertEquals(inc(v1), h.join());
2309 >            assertEquals(1, r.invocationCount);
2310 >        } catch (CompletionException ok) {
2311 >            checkCompletedWithWrappedCancellationException(h);
2312 >            assertEquals(0, r.invocationCount);
2313 >        }
2314  
2315 <    /**
2316 <     * thenApplyAsync result completes exceptionally if action does
2317 <     */
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 <    }
2315 >        checkCancelled(g);
2316 >        checkCompletedNormally(f, v1);
2317 >    }}
2318  
2319 <    /**
2320 <     * thenApplyAsync result completes exceptionally if source cancelled
2321 <     */
2322 <    public void testThenApplyAsync4() {
2323 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2324 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
2325 <        assertTrue(f.cancel(true));
2326 <        checkCompletedWithWrappedCancellationException(g);
1885 <    }
2319 >    public void testApplyToEither_sourceCancelled4() {
2320 >        for (ExecutionMode m : ExecutionMode.values())
2321 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2322 >        for (Integer v1 : new Integer[] { 1, null })
2323 >    {
2324 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2325 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2326 >        final IncFunction r = new IncFunction();
2327  
2328 <    /**
2329 <     * thenAcceptAsync result completes normally after normal
2330 <     * 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 <    }
2328 >        assertTrue(f.cancel(mayInterruptIfRunning));
2329 >        g.complete(v1);
2330 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2331  
2332 <    /**
2333 <     * thenAcceptAsync result completes exceptionally after exceptional
2334 <     * completion of source
2335 <     */
2336 <    public void testThenAcceptAsync2() {
2337 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2338 <        IncAction r = new IncAction();
2339 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2340 <        f.completeExceptionally(new CFException());
1909 <        checkCompletedWithWrappedCFException(g);
1910 <    }
2332 >        // unspecified behavior
2333 >        Integer v;
2334 >        try {
2335 >            assertEquals(inc(v1), h.join());
2336 >            assertEquals(1, r.invocationCount);
2337 >        } catch (CompletionException ok) {
2338 >            checkCompletedWithWrappedCancellationException(h);
2339 >            assertEquals(0, r.invocationCount);
2340 >        }
2341  
2342 <    /**
2343 <     * thenAcceptAsync result completes exceptionally if action does
2344 <     */
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 <    }
2342 >        checkCancelled(f);
2343 >        checkCompletedNormally(g, v1);
2344 >    }}
2345  
2346      /**
2347 <     * thenAcceptAsync result completes exceptionally if source cancelled
2347 >     * acceptEither result completes normally after normal completion
2348 >     * of either source
2349       */
2350 <    public void testThenAcceptAsync4() {
2351 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2352 <        IncAction r = new IncAction();
2353 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2354 <        assertTrue(f.cancel(true));
2355 <        checkCompletedWithWrappedCancellationException(g);
2356 <    }
2350 >    public void testAcceptEither_normalCompletion1() {
2351 >        for (ExecutionMode m : ExecutionMode.values())
2352 >        for (Integer v1 : new Integer[] { 1, null })
2353 >        for (Integer v2 : new Integer[] { 2, null })
2354 >    {
2355 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2356 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2357 >        final IncAction r = new IncAction();
2358 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2359  
2360 <    /**
2361 <     * thenCombineAsync result completes normally after normal
2362 <     * completion of sources
2363 <     */
1938 <    public void testThenCombineAsync() {
1939 <        CompletableFuture<Integer> f, g, h;
2360 >        f.complete(v1);
2361 >        checkCompletedNormally(h, null);
2362 >        assertEquals(inc(v1), r.value);
2363 >        g.complete(v2);
2364  
2365 <        f = new CompletableFuture<>();
2366 <        g = new CompletableFuture<>();
2367 <        h = f.thenCombineAsync(g, subtract);
2368 <        f.complete(3);
1945 <        checkIncomplete(h);
1946 <        g.complete(1);
1947 <        checkCompletedNormally(h, 2);
2365 >        checkCompletedNormally(f, v1);
2366 >        checkCompletedNormally(g, v2);
2367 >        checkCompletedNormally(h, null);
2368 >    }}
2369  
2370 <        f = new CompletableFuture<>();
2371 <        g = new CompletableFuture<>();
2372 <        h = f.thenCombineAsync(g, subtract);
2373 <        g.complete(1);
2374 <        checkIncomplete(h);
2375 <        f.complete(3);
2376 <        checkCompletedNormally(h, 2);
2370 >    public void testAcceptEither_normalCompletion2() {
2371 >        for (ExecutionMode m : ExecutionMode.values())
2372 >        for (Integer v1 : new Integer[] { 1, null })
2373 >        for (Integer v2 : new Integer[] { 2, null })
2374 >    {
2375 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2376 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2377 >        final IncAction r = new IncAction();
2378 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2379  
2380 <        f = new CompletableFuture<>();
2381 <        g = new CompletableFuture<>();
2382 <        g.complete(1);
2383 <        f.complete(3);
1961 <        h = f.thenCombineAsync(g, subtract);
1962 <        checkCompletedNormally(h, 2);
1963 <    }
2380 >        g.complete(v2);
2381 >        checkCompletedNormally(h, null);
2382 >        assertEquals(inc(v2), r.value);
2383 >        f.complete(v1);
2384  
2385 <    /**
2386 <     * thenCombineAsync result completes exceptionally after exceptional
2387 <     * completion of either source
2388 <     */
1969 <    public void testThenCombineAsync2() {
1970 <        CompletableFuture<Integer> f, g, h;
2385 >        checkCompletedNormally(f, v1);
2386 >        checkCompletedNormally(g, v2);
2387 >        checkCompletedNormally(h, null);
2388 >    }}
2389  
2390 <        f = new CompletableFuture<>();
2391 <        g = new CompletableFuture<>();
2392 <        h = f.thenCombineAsync(g, subtract);
2393 <        f.completeExceptionally(new CFException());
2394 <        checkIncomplete(h);
2395 <        g.complete(1);
2396 <        checkCompletedWithWrappedCFException(h);
2390 >    public void testAcceptEither_normalCompletion3() {
2391 >        for (ExecutionMode m : ExecutionMode.values())
2392 >        for (Integer v1 : new Integer[] { 1, null })
2393 >        for (Integer v2 : new Integer[] { 2, null })
2394 >    {
2395 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2396 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2397 >        final IncAction r = new IncAction();
2398  
2399 <        f = new CompletableFuture<>();
2400 <        g = new CompletableFuture<>();
2401 <        h = f.thenCombineAsync(g, subtract);
1983 <        g.completeExceptionally(new CFException());
1984 <        checkIncomplete(h);
1985 <        f.complete(3);
1986 <        checkCompletedWithWrappedCFException(h);
2399 >        f.complete(v1);
2400 >        g.complete(v2);
2401 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2402  
2403 <        f = new CompletableFuture<>();
2404 <        g = new CompletableFuture<>();
2405 <        g.completeExceptionally(new CFException());
1991 <        f.complete(3);
1992 <        h = f.thenCombineAsync(g, subtract);
1993 <        checkCompletedWithWrappedCFException(h);
1994 <    }
2403 >        checkCompletedNormally(h, null);
2404 >        checkCompletedNormally(f, v1);
2405 >        checkCompletedNormally(g, v2);
2406  
2407 <    /**
2408 <     * thenCombineAsync result completes exceptionally if action does
2409 <     */
2410 <    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 <    }
2407 >        // unspecified behavior
2408 >        assertTrue(Objects.equals(r.value, inc(v1)) ||
2409 >                   Objects.equals(r.value, inc(v2)));
2410 >    }}
2411  
2412      /**
2413 <     * thenCombineAsync result completes exceptionally if either source cancelled
2413 >     * acceptEither result completes exceptionally after exceptional
2414 >     * completion of either source
2415       */
2416 <    public void testThenCombineAsync4() {
2417 <        CompletableFuture<Integer> f, g, h;
2416 >    public void testAcceptEither_exceptionalCompletion1() {
2417 >        for (ExecutionMode m : ExecutionMode.values())
2418 >        for (Integer v1 : new Integer[] { 1, null })
2419 >    {
2420 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2421 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2422 >        final IncAction r = new IncAction();
2423 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2424 >        final CFException ex = new CFException();
2425  
2426 <        f = new CompletableFuture<>();
2427 <        g = new CompletableFuture<>();
2428 <        h = f.thenCombineAsync(g, subtract);
2021 <        assertTrue(f.cancel(true));
2022 <        checkIncomplete(h);
2023 <        g.complete(1);
2024 <        checkCompletedWithWrappedCancellationException(h);
2426 >        f.completeExceptionally(ex);
2427 >        checkCompletedWithWrappedCFException(h, ex);
2428 >        g.complete(v1);
2429  
2430 <        f = new CompletableFuture<>();
2431 <        g = new CompletableFuture<>();
2432 <        h = f.thenCombineAsync(g, subtract);
2433 <        assertTrue(g.cancel(true));
2434 <        checkIncomplete(h);
2031 <        f.complete(3);
2032 <        checkCompletedWithWrappedCancellationException(h);
2430 >        assertEquals(0, r.invocationCount);
2431 >        checkCompletedNormally(g, v1);
2432 >        checkCompletedWithWrappedCFException(f, ex);
2433 >        checkCompletedWithWrappedCFException(h, ex);
2434 >    }}
2435  
2436 <        f = new CompletableFuture<>();
2437 <        g = new CompletableFuture<>();
2438 <        g.complete(3);
2439 <        assertTrue(f.cancel(true));
2440 <        h = f.thenCombineAsync(g, subtract);
2441 <        checkCompletedWithWrappedCancellationException(h);
2436 >    public void testAcceptEither_exceptionalCompletion2() {
2437 >        for (ExecutionMode m : ExecutionMode.values())
2438 >        for (Integer v1 : new Integer[] { 1, null })
2439 >    {
2440 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2441 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2442 >        final IncAction r = new IncAction();
2443 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2444 >        final CFException ex = new CFException();
2445  
2446 <        f = new CompletableFuture<>();
2447 <        g = new CompletableFuture<>();
2448 <        f.complete(3);
2044 <        assertTrue(g.cancel(true));
2045 <        h = f.thenCombineAsync(g, subtract);
2046 <        checkCompletedWithWrappedCancellationException(h);
2047 <    }
2446 >        g.completeExceptionally(ex);
2447 >        checkCompletedWithWrappedCFException(h, ex);
2448 >        f.complete(v1);
2449  
2450 <    /**
2451 <     * applyToEitherAsync result completes normally after normal
2452 <     * completion of sources
2453 <     */
2454 <    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);
2450 >        assertEquals(0, r.invocationCount);
2451 >        checkCompletedNormally(f, v1);
2452 >        checkCompletedWithWrappedCFException(g, ex);
2453 >        checkCompletedWithWrappedCFException(h, ex);
2454 >    }}
2455  
2456 <        f = new CompletableFuture<>();
2457 <        f.complete(one);
2458 <        f2 = new CompletableFuture<>();
2459 <        g = f.applyToEitherAsync(f2, inc);
2460 <        checkCompletedNormally(g, two);
2461 <    }
2456 >    public void testAcceptEither_exceptionalCompletion3() {
2457 >        for (ExecutionMode m : ExecutionMode.values())
2458 >        for (Integer v1 : new Integer[] { 1, null })
2459 >    {
2460 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2461 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2462 >        final IncAction r = new IncAction();
2463 >        final CFException ex = new CFException();
2464  
2465 <    /**
2466 <     * applyToEitherAsync result completes exceptionally after exceptional
2467 <     * 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);
2465 >        g.completeExceptionally(ex);
2466 >        f.complete(v1);
2467 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2468  
2469 <        f = new CompletableFuture<>();
2470 <        f2 = new CompletableFuture<>();
2471 <        f2.completeExceptionally(new CFException());
2472 <        g = f.applyToEitherAsync(f2, inc);
2473 <        f.complete(one);
2474 <        checkCompletedWithWrappedCFException(g);
2475 <    }
2469 >        // unspecified behavior
2470 >        Integer v;
2471 >        try {
2472 >            assertNull(h.join());
2473 >            assertEquals(1, r.invocationCount);
2474 >            assertEquals(inc(v1), r.value);
2475 >        } catch (CompletionException ok) {
2476 >            checkCompletedWithWrappedCFException(h, ex);
2477 >            assertEquals(0, r.invocationCount);
2478 >        }
2479  
2480 <    /**
2481 <     * applyToEitherAsync result completes exceptionally if action does
2482 <     */
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 <    }
2480 >        checkCompletedWithWrappedCFException(g, ex);
2481 >        checkCompletedNormally(f, v1);
2482 >    }}
2483  
2484 <    /**
2485 <     * applyToEitherAsync result completes exceptionally if either source cancelled
2486 <     */
2487 <    public void testApplyToEitherAsync4() {
2488 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2489 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2490 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
2491 <        assertTrue(f.cancel(true));
2106 <        checkCompletedWithWrappedCancellationException(g);
2484 >    public void testAcceptEither_exceptionalCompletion4() {
2485 >        for (ExecutionMode m : ExecutionMode.values())
2486 >        for (Integer v1 : new Integer[] { 1, null })
2487 >    {
2488 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2489 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2490 >        final IncAction r = new IncAction();
2491 >        final CFException ex = new CFException();
2492  
2493 <        f = new CompletableFuture<>();
2494 <        f2 = new CompletableFuture<>();
2495 <        assertTrue(f2.cancel(true));
2111 <        g = f.applyToEitherAsync(f2, inc);
2112 <        checkCompletedWithWrappedCancellationException(g);
2113 <    }
2493 >        f.completeExceptionally(ex);
2494 >        g.complete(v1);
2495 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2496  
2497 <    /**
2498 <     * acceptEitherAsync result completes normally after normal
2499 <     * completion of sources
2500 <     */
2501 <    public void testAcceptEitherAsync() {
2502 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2503 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2504 <        IncAction r = new IncAction();
2505 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
2506 <        f.complete(one);
2125 <        checkCompletedNormally(g, null);
2126 <        assertEquals(r.value, 2);
2497 >        // unspecified behavior
2498 >        Integer v;
2499 >        try {
2500 >            assertNull(h.join());
2501 >            assertEquals(1, r.invocationCount);
2502 >            assertEquals(inc(v1), r.value);
2503 >        } catch (CompletionException ok) {
2504 >            checkCompletedWithWrappedCFException(h, ex);
2505 >            assertEquals(0, r.invocationCount);
2506 >        }
2507  
2508 <        r = new IncAction();
2509 <        f = new CompletableFuture<>();
2510 <        f.complete(one);
2131 <        f2 = new CompletableFuture<>();
2132 <        g = f.acceptEitherAsync(f2, r);
2133 <        checkCompletedNormally(g, null);
2134 <        assertEquals(r.value, 2);
2135 <    }
2508 >        checkCompletedWithWrappedCFException(f, ex);
2509 >        checkCompletedNormally(g, v1);
2510 >    }}
2511  
2512      /**
2513 <     * acceptEitherAsync result completes exceptionally after exceptional
2139 <     * completion of source
2513 >     * acceptEither result completes exceptionally if action does
2514       */
2515 <    public void testAcceptEitherAsync2() {
2516 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2517 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2518 <        IncAction r = new IncAction();
2519 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
2520 <        f.completeExceptionally(new CFException());
2521 <        checkCompletedWithWrappedCFException(g);
2522 <
2523 <        r = new IncAction();
2150 <        f = new CompletableFuture<>();
2151 <        f2 = new CompletableFuture<>();
2152 <        f2.completeExceptionally(new CFException());
2153 <        g = f.acceptEitherAsync(f2, r);
2154 <        f.complete(one);
2155 <        checkCompletedWithWrappedCFException(g);
2156 <    }
2515 >    public void testAcceptEither_actionFailed1() {
2516 >        for (ExecutionMode m : ExecutionMode.values())
2517 >        for (Integer v1 : new Integer[] { 1, null })
2518 >        for (Integer v2 : new Integer[] { 2, null })
2519 >    {
2520 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2521 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2522 >        final FailingConsumer r = new FailingConsumer();
2523 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2524  
2525 <    /**
2526 <     * acceptEitherAsync result completes exceptionally if action does
2527 <     */
2528 <    public void testAcceptEitherAsync3() {
2529 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2530 <        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 <    }
2525 >        f.complete(v1);
2526 >        checkCompletedWithWrappedCFException(h);
2527 >        g.complete(v2);
2528 >        checkCompletedNormally(f, v1);
2529 >        checkCompletedNormally(g, v2);
2530 >    }}
2531  
2532 <    /**
2533 <     * acceptEitherAsync result completes exceptionally if either
2534 <     * source cancelled
2535 <     */
2536 <    public void testAcceptEitherAsync4() {
2537 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2538 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2539 <        IncAction r = new IncAction();
2540 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
2179 <        assertTrue(f.cancel(true));
2180 <        checkCompletedWithWrappedCancellationException(g);
2532 >    public void testAcceptEither_actionFailed2() {
2533 >        for (ExecutionMode m : ExecutionMode.values())
2534 >        for (Integer v1 : new Integer[] { 1, null })
2535 >        for (Integer v2 : new Integer[] { 2, null })
2536 >    {
2537 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2538 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2539 >        final FailingConsumer r = new FailingConsumer();
2540 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2541  
2542 <        r = new IncAction();
2543 <        f = new CompletableFuture<>();
2544 <        f2 = new CompletableFuture<>();
2545 <        assertTrue(f2.cancel(true));
2546 <        g = f.acceptEitherAsync(f2, r);
2547 <        checkCompletedWithWrappedCancellationException(g);
2188 <    }
2542 >        g.complete(v2);
2543 >        checkCompletedWithWrappedCFException(h);
2544 >        f.complete(v1);
2545 >        checkCompletedNormally(f, v1);
2546 >        checkCompletedNormally(g, v2);
2547 >    }}
2548  
2549      /**
2550 <     * runAfterEitherAsync result completes normally after normal
2192 <     * completion of sources
2550 >     * acceptEither result completes exceptionally if either source cancelled
2551       */
2552 <    public void testRunAfterEitherAsync() {
2553 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2554 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2555 <        Noop r = new Noop();
2556 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
2557 <        f.complete(one);
2558 <        checkCompletedNormally(g, null);
2559 <        assertTrue(r.ran);
2552 >    public void testAcceptEither_sourceCancelled1() {
2553 >        for (ExecutionMode m : ExecutionMode.values())
2554 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2555 >        for (Integer v1 : new Integer[] { 1, null })
2556 >    {
2557 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2558 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2559 >        final IncAction r = new IncAction();
2560 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2561  
2562 <        r = new Noop();
2563 <        f = new CompletableFuture<>();
2564 <        f.complete(one);
2206 <        f2 = new CompletableFuture<>();
2207 <        g = f.runAfterEitherAsync(f2, r);
2208 <        checkCompletedNormally(g, null);
2209 <        assertTrue(r.ran);
2210 <    }
2562 >        assertTrue(f.cancel(mayInterruptIfRunning));
2563 >        checkCompletedWithWrappedCancellationException(h);
2564 >        g.complete(v1);
2565  
2566 <    /**
2567 <     * runAfterEitherAsync result completes exceptionally after exceptional
2568 <     * completion of source
2569 <     */
2570 <    public void testRunAfterEitherAsync2() {
2217 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2218 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2219 <        Noop r = new Noop();
2220 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
2221 <        f.completeExceptionally(new CFException());
2222 <        checkCompletedWithWrappedCFException(g);
2566 >        checkCancelled(f);
2567 >        assertEquals(0, r.invocationCount);
2568 >        checkCompletedNormally(g, v1);
2569 >        checkCompletedWithWrappedCancellationException(h);
2570 >    }}
2571  
2572 <        r = new Noop();
2573 <        f = new CompletableFuture<>();
2574 <        f2 = new CompletableFuture<>();
2575 <        f2.completeExceptionally(new CFException());
2576 <        g = f.runAfterEitherAsync(f2, r);
2577 <        f.complete(one);
2578 <        checkCompletedWithWrappedCFException(g);
2579 <    }
2572 >    public void testAcceptEither_sourceCancelled2() {
2573 >        for (ExecutionMode m : ExecutionMode.values())
2574 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2575 >        for (Integer v1 : new Integer[] { 1, null })
2576 >    {
2577 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2578 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2579 >        final IncAction r = new IncAction();
2580 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2581  
2582 <    /**
2583 <     * runAfterEitherAsync result completes exceptionally if action does
2584 <     */
2236 <    public void testRunAfterEitherAsync3() {
2237 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2238 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2239 <        FailingNoop r = new FailingNoop();
2240 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
2241 <        f.complete(one);
2242 <        checkCompletedWithWrappedCFException(g);
2243 <    }
2582 >        assertTrue(g.cancel(mayInterruptIfRunning));
2583 >        checkCompletedWithWrappedCancellationException(h);
2584 >        f.complete(v1);
2585  
2586 <    /**
2587 <     * runAfterEitherAsync result completes exceptionally if either
2588 <     * source cancelled
2589 <     */
2590 <    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);
2586 >        checkCancelled(g);
2587 >        assertEquals(0, r.invocationCount);
2588 >        checkCompletedNormally(f, v1);
2589 >        checkCompletedWithWrappedCancellationException(h);
2590 >    }}
2591  
2592 <        r = new Noop();
2593 <        f = new CompletableFuture<>();
2594 <        f2 = new CompletableFuture<>();
2595 <        assertTrue(f2.cancel(true));
2596 <        g = f.runAfterEitherAsync(f2, r);
2597 <        checkCompletedWithWrappedCancellationException(g);
2598 <    }
2592 >    public void testAcceptEither_sourceCancelled3() {
2593 >        for (ExecutionMode m : ExecutionMode.values())
2594 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2595 >        for (Integer v1 : new Integer[] { 1, null })
2596 >    {
2597 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2598 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2599 >        final IncAction r = new IncAction();
2600  
2601 <    /**
2602 <     * thenComposeAsync result completes normally after normal
2603 <     * completion of source
2268 <     */
2269 <    public void testThenComposeAsync() {
2270 <        CompletableFuture<Integer> f, g;
2271 <        CompletableFutureInc r;
2601 >        assertTrue(g.cancel(mayInterruptIfRunning));
2602 >        f.complete(v1);
2603 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2604  
2605 <        f = new CompletableFuture<>();
2606 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2607 <        f.complete(one);
2608 <        checkCompletedNormally(g, two);
2605 >        // unspecified behavior
2606 >        Integer v;
2607 >        try {
2608 >            assertNull(h.join());
2609 >            assertEquals(1, r.invocationCount);
2610 >            assertEquals(inc(v1), r.value);
2611 >        } catch (CompletionException ok) {
2612 >            checkCompletedWithWrappedCancellationException(h);
2613 >            assertEquals(0, r.invocationCount);
2614 >        }
2615  
2616 <        f = new CompletableFuture<>();
2617 <        f.complete(one);
2618 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2281 <        checkCompletedNormally(g, two);
2282 <    }
2616 >        checkCancelled(g);
2617 >        checkCompletedNormally(f, v1);
2618 >    }}
2619  
2620 <    /**
2621 <     * thenComposeAsync result completes exceptionally after
2622 <     * exceptional completion of source
2623 <     */
2624 <    public void testThenComposeAsync2() {
2625 <        CompletableFuture<Integer> f, g;
2626 <        CompletableFutureInc r;
2620 >    public void testAcceptEither_sourceCancelled4() {
2621 >        for (ExecutionMode m : ExecutionMode.values())
2622 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2623 >        for (Integer v1 : new Integer[] { 1, null })
2624 >    {
2625 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2626 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2627 >        final IncAction r = new IncAction();
2628  
2629 <        f = new CompletableFuture<>();
2630 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2631 <        f.completeExceptionally(new CFException());
2295 <        checkCompletedWithWrappedCFException(g);
2296 <        assertFalse(r.ran);
2629 >        assertTrue(f.cancel(mayInterruptIfRunning));
2630 >        g.complete(v1);
2631 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2632  
2633 <        f = new CompletableFuture<>();
2634 <        f.completeExceptionally(new CFException());
2635 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2636 <        checkCompletedWithWrappedCFException(g);
2637 <        assertFalse(r.ran);
2638 <    }
2633 >        // unspecified behavior
2634 >        Integer v;
2635 >        try {
2636 >            assertNull(h.join());
2637 >            assertEquals(1, r.invocationCount);
2638 >            assertEquals(inc(v1), r.value);
2639 >        } catch (CompletionException ok) {
2640 >            checkCompletedWithWrappedCancellationException(h);
2641 >            assertEquals(0, r.invocationCount);
2642 >        }
2643 >
2644 >        checkCancelled(f);
2645 >        checkCompletedNormally(g, v1);
2646 >    }}
2647  
2648      /**
2649 <     * thenComposeAsync result completes exceptionally if action does
2649 >     * runAfterEither result completes normally after normal completion
2650 >     * of either source
2651       */
2652 <    public void testThenComposeAsync3() {
2653 <        CompletableFuture<Integer> f, g;
2654 <        FailingCompletableFutureFunction r;
2655 <
2656 <        f = new CompletableFuture<>();
2657 <        g = f.thenComposeAsync(r = new FailingCompletableFutureFunction());
2658 <        f.complete(one);
2659 <        checkCompletedWithWrappedCFException(g);
2652 >    public void testRunAfterEither_normalCompletion1() {
2653 >        for (ExecutionMode m : ExecutionMode.values())
2654 >        for (Integer v1 : new Integer[] { 1, null })
2655 >        for (Integer v2 : new Integer[] { 2, null })
2656 >    {
2657 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2658 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2659 >        final Noop r = new Noop();
2660 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2661  
2662 <        f = new CompletableFuture<>();
2663 <        f.complete(one);
2664 <        g = f.thenComposeAsync(r = new FailingCompletableFutureFunction());
2665 <        checkCompletedWithWrappedCFException(g);
2321 <    }
2662 >        f.complete(v1);
2663 >        checkCompletedNormally(h, null);
2664 >        assertEquals(1, r.invocationCount);
2665 >        g.complete(v2);
2666  
2667 <    /**
2668 <     * thenComposeAsync result completes exceptionally if source cancelled
2669 <     */
2670 <    public void testThenComposeAsync4() {
2671 <        CompletableFuture<Integer> f, g;
2328 <        CompletableFutureInc r;
2667 >        checkCompletedNormally(f, v1);
2668 >        checkCompletedNormally(g, v2);
2669 >        checkCompletedNormally(h, null);
2670 >        assertEquals(1, r.invocationCount);
2671 >    }}
2672  
2673 <        f = new CompletableFuture<>();
2674 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2675 <        assertTrue(f.cancel(true));
2676 <        checkCompletedWithWrappedCancellationException(g);
2673 >    public void testRunAfterEither_normalCompletion2() {
2674 >        for (ExecutionMode m : ExecutionMode.values())
2675 >        for (Integer v1 : new Integer[] { 1, null })
2676 >        for (Integer v2 : new Integer[] { 2, null })
2677 >    {
2678 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2679 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2680 >        final Noop r = new Noop();
2681 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2682  
2683 <        f = new CompletableFuture<>();
2684 <        assertTrue(f.cancel(true));
2685 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2686 <        checkCompletedWithWrappedCancellationException(g);
2339 <    }
2683 >        g.complete(v2);
2684 >        checkCompletedNormally(h, null);
2685 >        assertEquals(1, r.invocationCount);
2686 >        f.complete(v1);
2687  
2688 <    // async with explicit executors
2688 >        checkCompletedNormally(f, v1);
2689 >        checkCompletedNormally(g, v2);
2690 >        checkCompletedNormally(h, null);
2691 >        assertEquals(1, r.invocationCount);
2692 >        }}
2693  
2694 <    /**
2695 <     * thenRunAsync result completes normally after normal completion of source
2696 <     */
2697 <    public void testThenRunAsyncE() {
2698 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2699 <        Noop r = new Noop();
2700 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2701 <        f.complete(null);
2351 <        checkCompletedNormally(g, null);
2694 >    public void testRunAfterEither_normalCompletion3() {
2695 >        for (ExecutionMode m : ExecutionMode.values())
2696 >        for (Integer v1 : new Integer[] { 1, null })
2697 >        for (Integer v2 : new Integer[] { 2, null })
2698 >    {
2699 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2700 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2701 >        final Noop r = new Noop();
2702  
2703 <        // reordered version
2704 <        f = new CompletableFuture<>();
2705 <        f.complete(null);
2356 <        r = new Noop();
2357 <        g = f.thenRunAsync(r, new ThreadExecutor());
2358 <        checkCompletedNormally(g, null);
2359 <    }
2703 >        f.complete(v1);
2704 >        g.complete(v2);
2705 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2706  
2707 <    /**
2708 <     * thenRunAsync result completes exceptionally after exceptional
2709 <     * completion of source
2710 <     */
2711 <    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());
2370 <        try {
2371 <            g.join();
2372 <            shouldThrow();
2373 <        } catch (CompletionException success) {}
2374 <        checkCompletedWithWrappedCFException(g);
2375 <    }
2707 >        checkCompletedNormally(h, null);
2708 >        checkCompletedNormally(f, v1);
2709 >        checkCompletedNormally(g, v2);
2710 >        assertEquals(1, r.invocationCount);
2711 >    }}
2712  
2713      /**
2714 <     * thenRunAsync result completes exceptionally if action does
2714 >     * runAfterEither result completes exceptionally after exceptional
2715 >     * completion of either source
2716       */
2717 <    public void testThenRunAsync3E() {
2718 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2719 <        FailingNoop r = new FailingNoop();
2720 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2721 <        f.complete(null);
2722 <        checkCompletedWithWrappedCFException(g);
2723 <    }
2717 >    public void testRunAfterEither_exceptionalCompletion1() {
2718 >        for (ExecutionMode m : ExecutionMode.values())
2719 >        for (Integer v1 : new Integer[] { 1, null })
2720 >    {
2721 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2722 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2723 >        final Noop r = new Noop();
2724 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2725 >        final CFException ex = new CFException();
2726  
2727 <    /**
2728 <     * thenRunAsync result completes exceptionally if source cancelled
2729 <     */
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 <    }
2727 >        f.completeExceptionally(ex);
2728 >        checkCompletedWithWrappedCFException(h, ex);
2729 >        g.complete(v1);
2730  
2731 <    /**
2732 <     * thenApplyAsync result completes normally after normal completion of source
2733 <     */
2734 <    public void testThenApplyAsyncE() {
2735 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2404 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
2405 <        f.complete(one);
2406 <        checkCompletedNormally(g, two);
2407 <    }
2731 >        assertEquals(0, r.invocationCount);
2732 >        checkCompletedNormally(g, v1);
2733 >        checkCompletedWithWrappedCFException(f, ex);
2734 >        checkCompletedWithWrappedCFException(h, ex);
2735 >    }}
2736  
2737 <    /**
2738 <     * thenApplyAsync result completes exceptionally after exceptional
2739 <     * completion of source
2740 <     */
2741 <    public void testThenApplyAsync2E() {
2742 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2743 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
2744 <        f.completeExceptionally(new CFException());
2745 <        checkCompletedWithWrappedCFException(g);
2418 <    }
2737 >    public void testRunAfterEither_exceptionalCompletion2() {
2738 >        for (ExecutionMode m : ExecutionMode.values())
2739 >        for (Integer v1 : new Integer[] { 1, null })
2740 >    {
2741 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2742 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2743 >        final Noop r = new Noop();
2744 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2745 >        final CFException ex = new CFException();
2746  
2747 <    /**
2748 <     * thenApplyAsync result completes exceptionally if action does
2749 <     */
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 <    }
2747 >        g.completeExceptionally(ex);
2748 >        checkCompletedWithWrappedCFException(h, ex);
2749 >        f.complete(v1);
2750  
2751 <    /**
2752 <     * thenApplyAsync result completes exceptionally if source cancelled
2753 <     */
2754 <    public void testThenApplyAsync4E() {
2755 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2436 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
2437 <        assertTrue(f.cancel(true));
2438 <        checkCompletedWithWrappedCancellationException(g);
2439 <    }
2751 >        assertEquals(0, r.invocationCount);
2752 >        checkCompletedNormally(f, v1);
2753 >        checkCompletedWithWrappedCFException(g, ex);
2754 >        checkCompletedWithWrappedCFException(h, ex);
2755 >    }}
2756  
2757 <    /**
2758 <     * thenAcceptAsync result completes normally after normal
2759 <     * completion of source
2760 <     */
2761 <    public void testThenAcceptAsyncE() {
2762 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2763 <        IncAction r = new IncAction();
2764 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2449 <        f.complete(one);
2450 <        checkCompletedNormally(g, null);
2451 <        assertEquals(r.value, 2);
2452 <    }
2757 >    public void testRunAfterEither_exceptionalCompletion3() {
2758 >        for (ExecutionMode m : ExecutionMode.values())
2759 >        for (Integer v1 : new Integer[] { 1, null })
2760 >    {
2761 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2762 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2763 >        final Noop r = new Noop();
2764 >        final CFException ex = new CFException();
2765  
2766 <    /**
2767 <     * thenAcceptAsync result completes exceptionally after exceptional
2768 <     * 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 <    }
2766 >        g.completeExceptionally(ex);
2767 >        f.complete(v1);
2768 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2769  
2770 <    /**
2771 <     * thenAcceptAsync result completes exceptionally if action does
2772 <     */
2773 <    public void testThenAcceptAsync3E() {
2774 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2775 <        FailingConsumer r = new FailingConsumer();
2776 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2777 <        f.complete(null);
2778 <        checkCompletedWithWrappedCFException(g);
2475 <    }
2770 >        // unspecified behavior
2771 >        Integer v;
2772 >        try {
2773 >            assertNull(h.join());
2774 >            assertEquals(1, r.invocationCount);
2775 >        } catch (CompletionException ok) {
2776 >            checkCompletedWithWrappedCFException(h, ex);
2777 >            assertEquals(0, r.invocationCount);
2778 >        }
2779  
2780 <    /**
2781 <     * thenAcceptAsync result completes exceptionally if source cancelled
2782 <     */
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 <    }
2780 >        checkCompletedWithWrappedCFException(g, ex);
2781 >        checkCompletedNormally(f, v1);
2782 >    }}
2783  
2784 <    /**
2785 <     * thenCombineAsync result completes normally after normal
2786 <     * completion of sources
2787 <     */
2788 <    public void testThenCombineAsyncE() {
2789 <        CompletableFuture<Integer> f, g, h;
2790 <        ThreadExecutor e = new ThreadExecutor();
2791 <        int count = 0;
2784 >    public void testRunAfterEither_exceptionalCompletion4() {
2785 >        for (ExecutionMode m : ExecutionMode.values())
2786 >        for (Integer v1 : new Integer[] { 1, null })
2787 >    {
2788 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2789 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2790 >        final Noop r = new Noop();
2791 >        final CFException ex = new CFException();
2792  
2793 <        f = new CompletableFuture<>();
2794 <        g = new CompletableFuture<>();
2795 <        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());
2793 >        f.completeExceptionally(ex);
2794 >        g.complete(v1);
2795 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2796  
2797 <        f = new CompletableFuture<>();
2798 <        g = new CompletableFuture<>();
2799 <        h = f.thenCombineAsync(g, subtract, e);
2800 <        g.complete(1);
2801 <        checkIncomplete(h);
2802 <        f.complete(3);
2803 <        checkCompletedNormally(h, 2);
2804 <        assertEquals(++count, e.count.get());
2797 >        // unspecified behavior
2798 >        Integer v;
2799 >        try {
2800 >            assertNull(h.join());
2801 >            assertEquals(1, r.invocationCount);
2802 >        } catch (CompletionException ok) {
2803 >            checkCompletedWithWrappedCFException(h, ex);
2804 >            assertEquals(0, r.invocationCount);
2805 >        }
2806  
2807 <        f = new CompletableFuture<>();
2808 <        g = new CompletableFuture<>();
2809 <        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 <    }
2807 >        checkCompletedWithWrappedCFException(f, ex);
2808 >        checkCompletedNormally(g, v1);
2809 >    }}
2810  
2811      /**
2812 <     * thenCombineAsync result completes exceptionally after exceptional
2526 <     * completion of either source
2812 >     * runAfterEither result completes exceptionally if action does
2813       */
2814 <    public void testThenCombineAsync2E() {
2815 <        CompletableFuture<Integer> f, g, h;
2816 <        ThreadExecutor e = new ThreadExecutor();
2817 <        int count = 0;
2814 >    public void testRunAfterEither_actionFailed1() {
2815 >        for (ExecutionMode m : ExecutionMode.values())
2816 >        for (Integer v1 : new Integer[] { 1, null })
2817 >        for (Integer v2 : new Integer[] { 2, null })
2818 >    {
2819 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2820 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2821 >        final FailingRunnable r = new FailingRunnable();
2822 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2823  
2824 <        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);
2824 >        f.complete(v1);
2825          checkCompletedWithWrappedCFException(h);
2826 +        g.complete(v2);
2827 +        checkCompletedNormally(f, v1);
2828 +        checkCompletedNormally(g, v2);
2829 +    }}
2830  
2831 <        f = new CompletableFuture<>();
2832 <        g = new CompletableFuture<>();
2833 <        h = f.thenCombineAsync(g, subtract, e);
2834 <        g.completeExceptionally(new CFException());
2835 <        checkIncomplete(h);
2836 <        f.complete(3);
2837 <        checkCompletedWithWrappedCFException(h);
2831 >    public void testRunAfterEither_actionFailed2() {
2832 >        for (ExecutionMode m : ExecutionMode.values())
2833 >        for (Integer v1 : new Integer[] { 1, null })
2834 >        for (Integer v2 : new Integer[] { 2, null })
2835 >    {
2836 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2837 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2838 >        final FailingRunnable r = new FailingRunnable();
2839 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2840  
2841 <        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);
2841 >        g.complete(v2);
2842          checkCompletedWithWrappedCFException(h);
2843 <
2844 <        assertEquals(0, e.count.get());
2845 <    }
2846 <
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 <    }
2843 >        f.complete(v1);
2844 >        checkCompletedNormally(f, v1);
2845 >        checkCompletedNormally(g, v2);
2846 >    }}
2847  
2848      /**
2849 <     * thenCombineAsync result completes exceptionally if either source cancelled
2849 >     * runAfterEither result completes exceptionally if either source cancelled
2850       */
2851 <    public void testThenCombineAsync4E() {
2852 <        CompletableFuture<Integer> f, g, h;
2853 <        ThreadExecutor e = new ThreadExecutor();
2851 >    public void testRunAfterEither_sourceCancelled1() {
2852 >        for (ExecutionMode m : ExecutionMode.values())
2853 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2854 >        for (Integer v1 : new Integer[] { 1, null })
2855 >    {
2856 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2857 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2858 >        final Noop r = new Noop();
2859 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2860  
2861 <        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);
2861 >        assertTrue(f.cancel(mayInterruptIfRunning));
2862          checkCompletedWithWrappedCancellationException(h);
2863 +        g.complete(v1);
2864  
2865 <        f = new CompletableFuture<>();
2866 <        g = new CompletableFuture<>();
2867 <        h = f.thenCombineAsync(g, subtract, e);
2594 <        assertTrue(g.cancel(true));
2595 <        checkIncomplete(h);
2596 <        f.complete(3);
2865 >        checkCancelled(f);
2866 >        assertEquals(0, r.invocationCount);
2867 >        checkCompletedNormally(g, v1);
2868          checkCompletedWithWrappedCancellationException(h);
2869 +    }}
2870  
2871 <        f = new CompletableFuture<>();
2872 <        g = new CompletableFuture<>();
2873 <        assertTrue(g.cancel(true));
2874 <        h = f.thenCombineAsync(g, subtract, e);
2875 <        checkIncomplete(h);
2876 <        f.complete(3);
2877 <        checkCompletedWithWrappedCancellationException(h);
2871 >    public void testRunAfterEither_sourceCancelled2() {
2872 >        for (ExecutionMode m : ExecutionMode.values())
2873 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2874 >        for (Integer v1 : new Integer[] { 1, null })
2875 >    {
2876 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2877 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2878 >        final Noop r = new Noop();
2879 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2880  
2881 <        f = new CompletableFuture<>();
2608 <        g = new CompletableFuture<>();
2609 <        assertTrue(f.cancel(true));
2610 <        assertTrue(g.cancel(true));
2611 <        h = f.thenCombineAsync(g, subtract, e);
2881 >        assertTrue(g.cancel(mayInterruptIfRunning));
2882          checkCompletedWithWrappedCancellationException(h);
2883 +        f.complete(v1);
2884  
2885 <        assertEquals(0, e.count.get());
2886 <    }
2887 <
2888 <    /**
2889 <     * 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);
2885 >        checkCancelled(g);
2886 >        assertEquals(0, r.invocationCount);
2887 >        checkCompletedNormally(f, v1);
2888 >        checkCompletedWithWrappedCancellationException(h);
2889 >    }}
2890  
2891 <        f = new CompletableFuture<>();
2892 <        f2 = new CompletableFuture<>();
2893 <        assertTrue(f2.cancel(true));
2894 <        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2895 <        checkCompletedWithWrappedCancellationException(g);
2896 <    }
2891 >    public void testRunAfterEither_sourceCancelled3() {
2892 >        for (ExecutionMode m : ExecutionMode.values())
2893 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2894 >        for (Integer v1 : new Integer[] { 1, null })
2895 >    {
2896 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2897 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2898 >        final Noop r = new Noop();
2899  
2900 <    /**
2901 <     * acceptEitherAsync result completes normally after normal
2902 <     * 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);
2900 >        assertTrue(g.cancel(mayInterruptIfRunning));
2901 >        f.complete(v1);
2902 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2903  
2904 <        r = new IncAction();
2905 <        f = new CompletableFuture<>();
2906 <        f.complete(one);
2907 <        f2 = new CompletableFuture<>();
2908 <        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2909 <        checkCompletedNormally(g, null);
2910 <        assertEquals(r.value, 2);
2911 <    }
2904 >        // unspecified behavior
2905 >        Integer v;
2906 >        try {
2907 >            assertNull(h.join());
2908 >            assertEquals(1, r.invocationCount);
2909 >        } catch (CompletionException ok) {
2910 >            checkCompletedWithWrappedCancellationException(h);
2911 >            assertEquals(0, r.invocationCount);
2912 >        }
2913  
2914 <    /**
2915 <     * acceptEitherAsync result completes exceptionally after exceptional
2916 <     * 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);
2914 >        checkCancelled(g);
2915 >        checkCompletedNormally(f, v1);
2916 >    }}
2917  
2918 <        r = new IncAction();
2919 <        f = new CompletableFuture<>();
2920 <        f2 = new CompletableFuture<>();
2921 <        f2.completeExceptionally(new CFException());
2922 <        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2923 <        f.complete(one);
2924 <        checkCompletedWithWrappedCFException(g);
2925 <    }
2918 >    public void testRunAfterEither_sourceCancelled4() {
2919 >        for (ExecutionMode m : ExecutionMode.values())
2920 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2921 >        for (Integer v1 : new Integer[] { 1, null })
2922 >    {
2923 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2924 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2925 >        final Noop r = new Noop();
2926  
2927 <    /**
2928 <     * acceptEitherAsync result completes exceptionally if action does
2929 <     */
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 <    }
2927 >        assertTrue(f.cancel(mayInterruptIfRunning));
2928 >        g.complete(v1);
2929 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2930  
2931 <    /**
2932 <     * acceptEitherAsync result completes exceptionally if either
2933 <     * source cancelled
2934 <     */
2935 <    public void testAcceptEitherAsync4E() {
2936 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2937 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2938 <        IncAction r = new IncAction();
2939 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2747 <        assertTrue(f.cancel(true));
2748 <        checkCompletedWithWrappedCancellationException(g);
2931 >        // unspecified behavior
2932 >        Integer v;
2933 >        try {
2934 >            assertNull(h.join());
2935 >            assertEquals(1, r.invocationCount);
2936 >        } catch (CompletionException ok) {
2937 >            checkCompletedWithWrappedCancellationException(h);
2938 >            assertEquals(0, r.invocationCount);
2939 >        }
2940  
2941 <        r = new IncAction();
2942 <        f = new CompletableFuture<>();
2943 <        f2 = new CompletableFuture<>();
2753 <        assertTrue(f2.cancel(true));
2754 <        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2755 <        checkCompletedWithWrappedCancellationException(g);
2756 <    }
2941 >        checkCancelled(f);
2942 >        checkCompletedNormally(g, v1);
2943 >    }}
2944  
2945      /**
2946 <     * runAfterEitherAsync result completes normally after normal
2760 <     * completion of sources
2946 >     * thenCompose result completes normally after normal completion of source
2947       */
2948 <    public void testRunAfterEitherAsyncE() {
2949 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2950 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2951 <        Noop r = new Noop();
2952 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2953 <        f.complete(one);
2954 <        checkCompletedNormally(g, null);
2955 <        assertTrue(r.ran);
2948 >    public void testThenCompose_normalCompletion() {
2949 >        for (ExecutionMode m : ExecutionMode.values())
2950 >        for (boolean createIncomplete : new boolean[] { true, false })
2951 >        for (Integer v1 : new Integer[] { 1, null })
2952 >    {
2953 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2954 >        final CompletableFutureInc r = new CompletableFutureInc();
2955 >        if (!createIncomplete) f.complete(v1);
2956 >        final CompletableFuture<Integer> g = f.thenCompose(r);
2957 >        if (createIncomplete) f.complete(v1);
2958  
2959 <        r = new Noop();
2960 <        f = new CompletableFuture<>();
2961 <        f.complete(one);
2962 <        f2 = new CompletableFuture<>();
2775 <        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2776 <        checkCompletedNormally(g, null);
2777 <        assertTrue(r.ran);
2778 <    }
2959 >        checkCompletedNormally(g, inc(v1));
2960 >        checkCompletedNormally(f, v1);
2961 >        assertEquals(1, r.invocationCount);
2962 >    }}
2963  
2964      /**
2965 <     * runAfterEitherAsync result completes exceptionally after exceptional
2965 >     * thenCompose result completes exceptionally after exceptional
2966       * completion of source
2967       */
2968 <    public void testRunAfterEitherAsync2E() {
2969 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2970 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2971 <        Noop r = new Noop();
2972 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2973 <        f.completeExceptionally(new CFException());
2974 <        checkCompletedWithWrappedCFException(g);
2975 <
2976 <        r = new Noop();
2977 <        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);
2968 >    public void testThenCompose_exceptionalCompletion() {
2969 >        for (ExecutionMode m : ExecutionMode.values())
2970 >        for (boolean createIncomplete : new boolean[] { true, false })
2971 >    {
2972 >        final CFException ex = new CFException();
2973 >        final CompletableFutureInc r = new CompletableFutureInc();
2974 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2975 >        if (!createIncomplete) f.completeExceptionally(ex);
2976 >        final CompletableFuture<Integer> g = f.thenCompose(r);
2977 >        if (createIncomplete) f.completeExceptionally(ex);
2978  
2979 <        r = new Noop();
2980 <        f = new CompletableFuture<>();
2981 <        f2 = new CompletableFuture<>();
2982 <        assertTrue(f2.cancel(true));
2829 <        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2830 <        checkCompletedWithWrappedCancellationException(g);
2831 <    }
2979 >        checkCompletedWithWrappedCFException(g, ex);
2980 >        checkCompletedWithWrappedCFException(f, ex);
2981 >        assertEquals(0, r.invocationCount);
2982 >    }}
2983  
2984      /**
2985 <     * thenComposeAsync result completes normally after normal
2835 <     * completion of source
2985 >     * thenCompose result completes exceptionally if action does
2986       */
2987 <    public void testThenComposeAsyncE() {
2988 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2989 <        CompletableFutureInc r = new CompletableFutureInc();
2990 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2991 <        f.complete(one);
2992 <        checkCompletedNormally(g, two);
2993 <    }
2987 >    public void testThenCompose_actionFailed() {
2988 >        for (ExecutionMode m : ExecutionMode.values())
2989 >        for (boolean createIncomplete : new boolean[] { true, false })
2990 >        for (Integer v1 : new Integer[] { 1, null })
2991 >    {
2992 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2993 >        final FailingCompletableFutureFunction r
2994 >            = new FailingCompletableFutureFunction();
2995 >        if (!createIncomplete) f.complete(v1);
2996 >        final CompletableFuture<Integer> g = f.thenCompose(r);
2997 >        if (createIncomplete) f.complete(v1);
2998  
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());
2999          checkCompletedWithWrappedCFException(g);
3000 <    }
3000 >        checkCompletedNormally(f, v1);
3001 >    }}
3002  
3003      /**
3004 <     * thenComposeAsync result completes exceptionally if action does
3004 >     * thenCompose result completes exceptionally if source cancelled
3005       */
3006 <    public void testThenComposeAsync3E() {
3007 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3008 <        FailingCompletableFutureFunction r = new FailingCompletableFutureFunction();
3009 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
3010 <        f.complete(one);
3011 <        checkCompletedWithWrappedCFException(g);
3012 <    }
3006 >    public void testThenCompose_sourceCancelled() {
3007 >        for (ExecutionMode m : ExecutionMode.values())
3008 >        for (boolean createIncomplete : new boolean[] { true, false })
3009 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3010 >    {
3011 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
3012 >        final CompletableFutureInc r = new CompletableFutureInc();
3013 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
3014 >        final CompletableFuture<Integer> g = f.thenCompose(r);
3015 >        if (createIncomplete) {
3016 >            checkIncomplete(g);
3017 >            assertTrue(f.cancel(mayInterruptIfRunning));
3018 >        }
3019  
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));
3020          checkCompletedWithWrappedCancellationException(g);
3021 <    }
3021 >        checkCancelled(f);
3022 >    }}
3023  
3024      // other static methods
3025  
# Line 3074 | Line 3219 | public class CompletableFutureTest exten
3219       * whenComplete action executes on normal completion, propagating
3220       * source result.
3221       */
3222 <    public void testWhenComplete1() {
3223 <        final AtomicInteger a = new AtomicInteger();
3224 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3225 <        CompletableFuture<Integer> g =
3226 <            f.whenComplete((Integer x, Throwable t) -> a.getAndIncrement());
3227 <        f.complete(three);
3228 <        checkCompletedNormally(f, three);
3229 <        checkCompletedNormally(g, three);
3230 <        assertEquals(a.get(), 1);
3231 <    }
3232 <
3233 <    /**
3234 <     * whenComplete action executes on exceptional completion, propagating
3235 <     * source result.
3236 <     */
3237 <    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 <    }
3222 >    public void testWhenComplete_normalCompletion1() {
3223 >        for (ExecutionMode m : ExecutionMode.values())
3224 >        for (boolean createIncomplete : new boolean[] { true, false })
3225 >        for (Integer v1 : new Integer[] { 1, null })
3226 >    {
3227 >        final AtomicInteger a = new AtomicInteger(0);
3228 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
3229 >        if (!createIncomplete) f.complete(v1);
3230 >        final CompletableFuture<Integer> g = m.whenComplete
3231 >            (f,
3232 >             (Integer x, Throwable t) -> {
3233 >                threadAssertSame(x, v1);
3234 >                threadAssertNull(t);
3235 >                a.getAndIncrement();
3236 >            });
3237 >        if (createIncomplete) f.complete(v1);
3238  
3239 <    /**
3240 <     * If a whenCompleteAsync action throws an exception when
3241 <     * triggered by a normal completion, it completes exceptionally
3242 <     */
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 <    }
3239 >        checkCompletedNormally(g, v1);
3240 >        checkCompletedNormally(f, v1);
3241 >        assertEquals(1, a.get());
3242 >    }}
3243  
3244      /**
3245 <     * whenCompleteAsync action executes on normal completion, propagating
3245 >     * whenComplete action executes on exceptional completion, propagating
3246       * source result.
3247       */
3248 <    public void testWhenCompleteAsync1e() {
3249 <        final AtomicInteger a = new AtomicInteger();
3250 <        ThreadExecutor exec = new ThreadExecutor();
3251 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3252 <        CompletableFuture<Integer> g =
3253 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement(),
3254 <                                exec);
3255 <        f.complete(three);
3256 <        checkCompletedNormally(f, three);
3257 <        checkCompletedNormally(g, three);
3258 <        assertEquals(a.get(), 1);
3259 <    }
3248 >    public void testWhenComplete_exceptionalCompletion() {
3249 >        for (ExecutionMode m : ExecutionMode.values())
3250 >        for (boolean createIncomplete : new boolean[] { true, false })
3251 >        for (Integer v1 : new Integer[] { 1, null })
3252 >    {
3253 >        final AtomicInteger a = new AtomicInteger(0);
3254 >        final CFException ex = new CFException();
3255 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
3256 >        if (!createIncomplete) f.completeExceptionally(ex);
3257 >        final CompletableFuture<Integer> g = m.whenComplete
3258 >            (f,
3259 >             (Integer x, Throwable t) -> {
3260 >                threadAssertNull(x);
3261 >                threadAssertSame(t, ex);
3262 >                a.getAndIncrement();
3263 >            });
3264 >        if (createIncomplete) f.completeExceptionally(ex);
3265 >        checkCompletedWithWrappedCFException(f, ex);
3266 >        checkCompletedWithWrappedCFException(g, ex);
3267 >        assertEquals(1, a.get());
3268 >    }}
3269  
3270      /**
3271 <     * whenCompleteAsync action executes on exceptional completion, propagating
3272 <     * source result.
3271 >     * whenComplete action executes on cancelled source, propagating
3272 >     * CancellationException.
3273       */
3274 <    public void testWhenCompleteAsync2e() {
3275 <        final AtomicInteger a = new AtomicInteger();
3276 <        ThreadExecutor exec = new ThreadExecutor();
3277 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3278 <        CompletableFuture<Integer> g =
3279 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement(),
3280 <                                exec);
3281 <        f.completeExceptionally(new CFException());
3282 <        checkCompletedWithWrappedCFException(f);
3283 <        checkCompletedWithWrappedCFException(g);
3284 <    }
3274 >    public void testWhenComplete_sourceCancelled() {
3275 >        for (ExecutionMode m : ExecutionMode.values())
3276 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3277 >        for (boolean createIncomplete : new boolean[] { true, false })
3278 >    {
3279 >        final AtomicInteger a = new AtomicInteger(0);
3280 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
3281 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
3282 >        final CompletableFuture<Integer> g = m.whenComplete
3283 >            (f,
3284 >             (Integer x, Throwable t) -> {
3285 >                threadAssertNull(x);
3286 >                threadAssertTrue(t instanceof CancellationException);
3287 >                a.getAndIncrement();
3288 >            });
3289 >        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
3290  
3291 <    /**
3292 <     * If a whenCompleteAsync action throws an exception when triggered
3293 <     * by a normal completion, it completes exceptionally
3294 <     */
3295 <    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 <    }
3291 >        //try { g.join(); } catch (Throwable t) { throw new Error(t); }
3292 >        checkCompletedWithWrappedCancellationException(g);
3293 >        checkCancelled(f);
3294 >        assertEquals(1, a.get());
3295 >    }}
3296  
3297      /**
3298 <     * handleAsync action completes normally with function value on
3299 <     * either normal or exceptional completion of source
3298 >     * If a whenComplete action throws an exception when triggered by
3299 >     * a normal completion, it completes exceptionally
3300       */
3301 <    public void testHandleAsync() {
3302 <        CompletableFuture<Integer> f, g;
3303 <        IntegerHandler r;
3304 <
3305 <        f = new CompletableFuture<>();
3306 <        g = f.handleAsync(r = new IntegerHandler());
3307 <        assertFalse(r.ran);
3308 <        f.completeExceptionally(new CFException());
3309 <        checkCompletedWithWrappedCFException(f);
3310 <        checkCompletedNormally(g, three);
3311 <        assertTrue(r.ran);
3312 <
3313 <        f = new CompletableFuture<>();
3314 <        g = f.handleAsync(r = new IntegerHandler());
3315 <        assertFalse(r.ran);
3316 <        f.completeExceptionally(new CFException());
3317 <        checkCompletedWithWrappedCFException(f);
3318 <        checkCompletedNormally(g, three);
3319 <        assertTrue(r.ran);
3320 <
3321 <        f = new CompletableFuture<>();
3322 <        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 <    }
3301 >    public void testWhenComplete_actionFailed() {
3302 >        for (boolean createIncomplete : new boolean[] { true, false })
3303 >        for (ExecutionMode m : ExecutionMode.values())
3304 >        for (Integer v1 : new Integer[] { 1, null })
3305 >    {
3306 >        final AtomicInteger a = new AtomicInteger(0);
3307 >        final CFException ex = new CFException();
3308 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
3309 >        if (!createIncomplete) f.complete(v1);
3310 >        final CompletableFuture<Integer> g = m.whenComplete
3311 >            (f,
3312 >             (Integer x, Throwable t) -> {
3313 >                threadAssertSame(x, v1);
3314 >                threadAssertNull(t);
3315 >                a.getAndIncrement();
3316 >                throw ex;
3317 >            });
3318 >        if (createIncomplete) f.complete(v1);
3319 >        checkCompletedNormally(f, v1);
3320 >        checkCompletedWithWrappedCFException(g, ex);
3321 >        assertEquals(1, a.get());
3322 >    }}
3323  
3324      /**
3325 <     * handleAsync action with Executor completes normally with
3326 <     * function value on either normal or exceptional completion of
3327 <     * source
3325 >     * If a whenComplete action throws an exception when triggered by
3326 >     * a source completion that also throws an exception, the source
3327 >     * exception takes precedence.
3328       */
3329 <    public void testHandleAsync2() {
3330 <        CompletableFuture<Integer> f, g;
3331 <        ThreadExecutor exec = new ThreadExecutor();
3332 <        IntegerHandler r;
3333 <
3334 <        f = new CompletableFuture<>();
3335 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3336 <        assertFalse(r.ran);
3337 <        f.completeExceptionally(new CFException());
3338 <        checkCompletedWithWrappedCFException(f);
3339 <        checkCompletedNormally(g, three);
3340 <        assertTrue(r.ran);
3341 <
3342 <        f = new CompletableFuture<>();
3343 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3344 <        assertFalse(r.ran);
3345 <        f.completeExceptionally(new CFException());
3346 <        checkCompletedWithWrappedCFException(f);
3347 <        checkCompletedNormally(g, three);
3348 <        assertTrue(r.ran);
3349 <
3350 <        f = new CompletableFuture<>();
3351 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3352 <        assertFalse(r.ran);
3353 <        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 <    }
3329 >    public void testWhenComplete_actionFailedSourceFailed() {
3330 >        for (boolean createIncomplete : new boolean[] { true, false })
3331 >        for (ExecutionMode m : ExecutionMode.values())
3332 >        for (Integer v1 : new Integer[] { 1, null })
3333 >    {
3334 >        final AtomicInteger a = new AtomicInteger(0);
3335 >        final CFException ex1 = new CFException();
3336 >        final CFException ex2 = new CFException();
3337 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
3338 >
3339 >        if (!createIncomplete) f.completeExceptionally(ex1);
3340 >        final CompletableFuture<Integer> g = m.whenComplete
3341 >            (f,
3342 >             (Integer x, Throwable t) -> {
3343 >                threadAssertSame(t, ex1);
3344 >                threadAssertNull(x);
3345 >                a.getAndIncrement();
3346 >                throw ex2;
3347 >            });
3348 >        if (createIncomplete) f.completeExceptionally(ex1);
3349 >
3350 >        checkCompletedWithWrappedCFException(f, ex1);
3351 >        checkCompletedWithWrappedCFException(g, ex1);
3352 >        assertEquals(1, a.get());
3353 >    }}
3354  
3355   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines