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.52 by jsr166, Mon Jun 2 20:10:04 2014 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines