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.48 by jsr166, Mon Jun 2 19:07:14 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(); }
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 574 | Line 936 | public class CompletableFutureTest exten
936          FailingNoop r = new FailingNoop();
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) f.complete(v1);
987  
626        f = new CompletableFuture<>();
627        f.complete(null);
628        g = f.thenRun(r = new Noop());
988          checkCompletedNormally(g, null);
989 <        assertTrue(r.ran);
990 <    }
989 >        checkCompletedNormally(f, v1);
990 >        assertEquals(1, r.invocationCount);
991 >    }}
992  
993      /**
994       * thenRun result completes exceptionally after exceptional
995       * completion of source
996       */
997 <    public void testThenRun2() {
998 <        CompletableFuture<Integer> f;
999 <        CompletableFuture<Void> g;
1000 <        Noop r;
1001 <
1002 <        f = new CompletableFuture<>();
1003 <        g = f.thenRun(r = new Noop());
1004 <        f.completeExceptionally(new CFException());
1005 <        checkCompletedWithWrappedCFException(g);
1006 <        assertFalse(r.ran);
997 >    public void testThenRun_exceptionalCompletion() {
998 >        for (ExecutionMode m : ExecutionMode.values())
999 >        for (boolean createIncomplete : new boolean[] { true, false })
1000 >    {
1001 >        final CFException ex = new CFException();
1002 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1003 >        final Noop r = new Noop();
1004 >        if (!createIncomplete) f.completeExceptionally(ex);
1005 >        final CompletableFuture<Void> g = m.thenRun(f, r);
1006 >        if (createIncomplete) f.completeExceptionally(ex);
1007  
1008 <        f = new CompletableFuture<>();
1009 <        f.completeExceptionally(new CFException());
1010 <        g = f.thenRun(r = new Noop());
1011 <        checkCompletedWithWrappedCFException(g);
652 <        assertFalse(r.ran);
653 <    }
1008 >        checkCompletedWithWrappedCFException(g, ex);
1009 >        checkCompletedWithWrappedCFException(f, ex);
1010 >        assertEquals(0, r.invocationCount);
1011 >    }}
1012  
1013      /**
1014 <     * thenRun result completes exceptionally if action does
1014 >     * thenRun result completes exceptionally if source cancelled
1015       */
1016 <    public void testThenRun3() {
1017 <        CompletableFuture<Integer> f;
1018 <        CompletableFuture<Void> g;
1019 <        FailingNoop r;
1020 <
1021 <        f = new CompletableFuture<>();
1022 <        g = f.thenRun(r = new FailingNoop());
1023 <        f.complete(null);
1024 <        checkCompletedWithWrappedCFException(g);
1016 >    public void testThenRun_sourceCancelled() {
1017 >        for (ExecutionMode m : ExecutionMode.values())
1018 >        for (boolean createIncomplete : new boolean[] { true, false })
1019 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1020 >    {
1021 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1022 >        final Noop r = new Noop();
1023 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1024 >        final CompletableFuture<Void> g = f.thenRun(r);
1025 >        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1026  
1027 <        f = new CompletableFuture<>();
1028 <        f.complete(null);
1029 <        g = f.thenRun(r = new FailingNoop());
1030 <        checkCompletedWithWrappedCFException(g);
672 <    }
1027 >        checkCompletedWithWrappedCancellationException(g);
1028 >        checkCancelled(f);
1029 >        assertEquals(0, r.invocationCount);
1030 >    }}
1031  
1032      /**
1033 <     * thenRun result completes exceptionally if source cancelled
1033 >     * thenRun result completes exceptionally if action does
1034       */
1035 <    public void testThenRun4() {
1036 <        CompletableFuture<Integer> f;
1037 <        CompletableFuture<Void> g;
1038 <        Noop r;
1039 <
1040 <        f = new CompletableFuture<>();
1041 <        g = f.thenRun(r = new Noop());
1042 <        assertTrue(f.cancel(true));
1043 <        checkCompletedWithWrappedCancellationException(g);
1035 >    public void testThenRun_actionFailed() {
1036 >        for (ExecutionMode m : ExecutionMode.values())
1037 >        for (boolean createIncomplete : new boolean[] { true, false })
1038 >        for (Integer v1 : new Integer[] { 1, null })
1039 >    {
1040 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1041 >        final FailingNoop r = new FailingNoop();
1042 >        if (!createIncomplete) f.complete(v1);
1043 >        final CompletableFuture<Void> g = f.thenRun(r);
1044 >        if (createIncomplete) f.complete(v1);
1045  
1046 <        f = new CompletableFuture<>();
1047 <        assertTrue(f.cancel(true));
1048 <        g = f.thenRun(r = new Noop());
690 <        checkCompletedWithWrappedCancellationException(g);
691 <    }
1046 >        checkCompletedWithWrappedCFException(g);
1047 >        checkCompletedNormally(f, v1);
1048 >    }}
1049  
1050      /**
1051       * thenApply result completes normally after normal completion of source
# Line 740 | Line 1097 | public class CompletableFutureTest exten
1097          CompletableFuture<Void> g = f.thenAccept(r);
1098          f.complete(one);
1099          checkCompletedNormally(g, null);
1100 <        assertEquals(r.value, 2);
1100 >        assertEquals(r.value, (Integer) 2);
1101      }
1102  
1103      /**
# Line 764 | Line 1121 | public class CompletableFutureTest exten
1121          CompletableFuture<Void> g = f.thenAccept(r);
1122          f.complete(one);
1123          checkCompletedWithWrappedCFException(g);
1124 <        assertTrue(r.ran);
1124 >        assertEquals(1, r.invocationCount);
1125      }
1126  
1127      /**
# Line 782 | Line 1139 | public class CompletableFutureTest exten
1139       * thenCombine result completes normally after normal completion
1140       * of sources
1141       */
1142 <    public void testThenCombine() {
1143 <        CompletableFuture<Integer> f, g, h;
1144 <
1145 <        f = new CompletableFuture<>();
1146 <        g = new CompletableFuture<>();
1147 <        h = f.thenCombine(g, subtract);
1148 <        f.complete(3);
1149 <        checkIncomplete(h);
1150 <        g.complete(1);
1151 <        checkCompletedNormally(h, 2);
1152 <
1153 <        f = new CompletableFuture<>();
1154 <        g = new CompletableFuture<>();
1155 <        h = f.thenCombine(g, subtract);
1156 <        g.complete(1);
1157 <        checkIncomplete(h);
1158 <        f.complete(3);
1159 <        checkCompletedNormally(h, 2);
1142 >    public void testThenCombine_normalCompletion1() {
1143 >        for (boolean createIncomplete : new boolean[] { true, false })
1144 >        for (boolean fFirst : new boolean[] { true, false })
1145 >        for (ExecutionMode m : ExecutionMode.values())
1146 >        for (Integer v1 : new Integer[] { 1, null })
1147 >        for (Integer v2 : new Integer[] { 2, null })
1148 >    {
1149 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1150 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1151 >        final SubtractFunction r = new SubtractFunction();
1152 >        CompletableFuture<Integer> h = null;
1153 >        if (createIncomplete) h = m.thenCombine(f, g, r);
1154 >
1155 >        if (fFirst)
1156 >            f.complete(v1);
1157 >        else
1158 >            g.complete(v2);
1159 >        if (createIncomplete) checkIncomplete(h);
1160 >        assertEquals(0, r.invocationCount);
1161 >        if (!fFirst)
1162 >            f.complete(v1);
1163 >        else
1164 >            g.complete(v2);
1165 >        if (!createIncomplete) h = m.thenCombine(f, g, r);
1166  
1167 <        f = new CompletableFuture<>();
1168 <        g = new CompletableFuture<>();
1169 <        g.complete(1);
1170 <        f.complete(3);
1171 <        h = f.thenCombine(g, subtract);
809 <        checkCompletedNormally(h, 2);
810 <    }
1167 >        checkCompletedNormally(h, subtract(v1, v2));
1168 >        checkCompletedNormally(f, v1);
1169 >        checkCompletedNormally(g, v2);
1170 >        assertEquals(1, r.invocationCount);
1171 >    }}
1172  
1173      /**
1174       * thenCombine result completes exceptionally after exceptional
1175       * completion of either source
1176       */
1177 <    public void testThenCombine2() {
1178 <        CompletableFuture<Integer> f, g, h;
1177 >    public void testThenCombine_exceptionalCompletion1() {
1178 >        for (ExecutionMode m : ExecutionMode.values())
1179 >        for (Integer v1 : new Integer[] { 1, null })
1180 >    {
1181 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1182 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1183 >        final SubtractFunction r = new SubtractFunction();
1184 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1185 >        final CFException ex = new CFException();
1186  
1187 <        f = new CompletableFuture<>();
820 <        g = new CompletableFuture<>();
821 <        h = f.thenCombine(g, subtract);
822 <        f.completeExceptionally(new CFException());
1187 >        f.completeExceptionally(ex);
1188          checkIncomplete(h);
1189 <        g.complete(1);
825 <        checkCompletedWithWrappedCFException(h);
1189 >        g.complete(v1);
1190  
1191 <        f = new CompletableFuture<>();
1192 <        g = new CompletableFuture<>();
1193 <        h = f.thenCombine(g, subtract);
1194 <        g.completeExceptionally(new CFException());
1191 >        checkCompletedWithWrappedCFException(h, ex);
1192 >        checkCompletedWithWrappedCFException(f, ex);
1193 >        assertEquals(0, r.invocationCount);
1194 >        checkCompletedNormally(g, v1);
1195 >    }}
1196 >
1197 >    public void testThenCombine_exceptionalCompletion2() {
1198 >        for (ExecutionMode m : ExecutionMode.values())
1199 >        for (Integer v1 : new Integer[] { 1, null })
1200 >    {
1201 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1202 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1203 >        final SubtractFunction r = new SubtractFunction();
1204 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1205 >        final CFException ex = new CFException();
1206 >
1207 >        g.completeExceptionally(ex);
1208          checkIncomplete(h);
1209 <        f.complete(3);
833 <        checkCompletedWithWrappedCFException(h);
1209 >        f.complete(v1);
1210  
1211 <        f = new CompletableFuture<>();
1212 <        g = new CompletableFuture<>();
1213 <        f.complete(3);
1214 <        g.completeExceptionally(new CFException());
1215 <        h = f.thenCombine(g, subtract);
840 <        checkCompletedWithWrappedCFException(h);
1211 >        checkCompletedWithWrappedCFException(h, ex);
1212 >        checkCompletedWithWrappedCFException(g, ex);
1213 >        assertEquals(0, r.invocationCount);
1214 >        checkCompletedNormally(f, v1);
1215 >    }}
1216  
1217 <        f = new CompletableFuture<>();
1218 <        g = new CompletableFuture<>();
1219 <        f.completeExceptionally(new CFException());
1220 <        g.complete(3);
1221 <        h = f.thenCombine(g, subtract);
1222 <        checkCompletedWithWrappedCFException(h);
1223 <    }
1217 >    public void testThenCombine_exceptionalCompletion3() {
1218 >        for (ExecutionMode m : ExecutionMode.values())
1219 >        for (Integer v1 : new Integer[] { 1, null })
1220 >    {
1221 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1222 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1223 >        final SubtractFunction r = new SubtractFunction();
1224 >        final CFException ex = new CFException();
1225 >
1226 >        g.completeExceptionally(ex);
1227 >        f.complete(v1);
1228 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1229 >
1230 >        checkCompletedWithWrappedCFException(h, ex);
1231 >        checkCompletedWithWrappedCFException(g, ex);
1232 >        assertEquals(0, r.invocationCount);
1233 >        checkCompletedNormally(f, v1);
1234 >    }}
1235 >
1236 >    public void testThenCombine_exceptionalCompletion4() {
1237 >        for (ExecutionMode m : ExecutionMode.values())
1238 >        for (Integer v1 : new Integer[] { 1, null })
1239 >    {
1240 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1241 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1242 >        final SubtractFunction r = new SubtractFunction();
1243 >        final CFException ex = new CFException();
1244 >
1245 >        f.completeExceptionally(ex);
1246 >        g.complete(v1);
1247 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1248 >
1249 >        checkCompletedWithWrappedCFException(h, ex);
1250 >        checkCompletedWithWrappedCFException(f, ex);
1251 >        assertEquals(0, r.invocationCount);
1252 >        checkCompletedNormally(g, v1);
1253 >    }}
1254  
1255      /**
1256       * thenCombine result completes exceptionally if action does
1257       */
1258 <    public void testThenCombine3() {
1259 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1260 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1261 <        FailingBiFunction r = new FailingBiFunction();
1262 <        CompletableFuture<Integer> g = f.thenCombine(f2, r);
1263 <        f.complete(one);
1264 <        checkIncomplete(g);
1265 <        assertFalse(r.ran);
1266 <        f2.complete(two);
1267 <        checkCompletedWithWrappedCFException(g);
1268 <        assertTrue(r.ran);
1269 <    }
1258 >    public void testThenCombine_actionFailed1() {
1259 >        for (ExecutionMode m : ExecutionMode.values())
1260 >        for (Integer v1 : new Integer[] { 1, null })
1261 >        for (Integer v2 : new Integer[] { 2, null })
1262 >    {
1263 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1264 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1265 >        final FailingBiFunction r = new FailingBiFunction();
1266 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1267 >
1268 >        f.complete(v1);
1269 >        checkIncomplete(h);
1270 >        g.complete(v2);
1271 >
1272 >        checkCompletedWithWrappedCFException(h);
1273 >        checkCompletedNormally(f, v1);
1274 >        checkCompletedNormally(g, v2);
1275 >    }}
1276 >
1277 >    public void testThenCombine_actionFailed2() {
1278 >        for (ExecutionMode m : ExecutionMode.values())
1279 >        for (Integer v1 : new Integer[] { 1, null })
1280 >        for (Integer v2 : new Integer[] { 2, null })
1281 >    {
1282 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1283 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1284 >        final FailingBiFunction r = new FailingBiFunction();
1285 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1286 >
1287 >        g.complete(v2);
1288 >        checkIncomplete(h);
1289 >        f.complete(v1);
1290 >
1291 >        checkCompletedWithWrappedCFException(h);
1292 >        checkCompletedNormally(f, v1);
1293 >        checkCompletedNormally(g, v2);
1294 >    }}
1295  
1296      /**
1297       * thenCombine result completes exceptionally if either source cancelled
1298       */
1299 <    public void testThenCombine4() {
1300 <        CompletableFuture<Integer> f, g, h;
1299 >    public void testThenCombine_sourceCancelled1() {
1300 >        for (ExecutionMode m : ExecutionMode.values())
1301 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1302 >        for (Integer v1 : new Integer[] { 1, null })
1303 >    {
1304 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1305 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1306 >        final SubtractFunction r = new SubtractFunction();
1307 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1308  
1309 <        f = new CompletableFuture<>();
873 <        g = new CompletableFuture<>();
874 <        h = f.thenCombine(g, subtract);
875 <        assertTrue(f.cancel(true));
1309 >        assertTrue(f.cancel(mayInterruptIfRunning));
1310          checkIncomplete(h);
1311 <        g.complete(1);
1311 >        g.complete(v1);
1312 >
1313          checkCompletedWithWrappedCancellationException(h);
1314 +        checkCancelled(f);
1315 +        assertEquals(0, r.invocationCount);
1316 +        checkCompletedNormally(g, v1);
1317 +    }}
1318  
1319 <        f = new CompletableFuture<>();
1320 <        g = new CompletableFuture<>();
1321 <        h = f.thenCombine(g, subtract);
1322 <        assertTrue(g.cancel(true));
1319 >    public void testThenCombine_sourceCancelled2() {
1320 >        for (ExecutionMode m : ExecutionMode.values())
1321 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1322 >        for (Integer v1 : new Integer[] { 1, null })
1323 >    {
1324 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1325 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1326 >        final SubtractFunction r = new SubtractFunction();
1327 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1328 >
1329 >        assertTrue(g.cancel(mayInterruptIfRunning));
1330          checkIncomplete(h);
1331 <        f.complete(3);
1331 >        f.complete(v1);
1332 >
1333          checkCompletedWithWrappedCancellationException(h);
1334 +        checkCancelled(g);
1335 +        assertEquals(0, r.invocationCount);
1336 +        checkCompletedNormally(f, v1);
1337 +    }}
1338 +
1339 +    public void testThenCombine_sourceCancelled3() {
1340 +        for (ExecutionMode m : ExecutionMode.values())
1341 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1342 +        for (Integer v1 : new Integer[] { 1, null })
1343 +    {
1344 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
1345 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
1346 +        final SubtractFunction r = new SubtractFunction();
1347 +
1348 +        assertTrue(g.cancel(mayInterruptIfRunning));
1349 +        f.complete(v1);
1350 +        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1351  
888        f = new CompletableFuture<>();
889        g = new CompletableFuture<>();
890        assertTrue(f.cancel(true));
891        assertTrue(g.cancel(true));
892        h = f.thenCombine(g, subtract);
1352          checkCompletedWithWrappedCancellationException(h);
1353 <    }
1353 >        checkCancelled(g);
1354 >        assertEquals(0, r.invocationCount);
1355 >        checkCompletedNormally(f, v1);
1356 >    }}
1357 >
1358 >    public void testThenCombine_sourceCancelled4() {
1359 >        for (ExecutionMode m : ExecutionMode.values())
1360 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1361 >        for (Integer v1 : new Integer[] { 1, null })
1362 >    {
1363 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1364 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1365 >        final SubtractFunction r = new SubtractFunction();
1366 >
1367 >        assertTrue(f.cancel(mayInterruptIfRunning));
1368 >        g.complete(v1);
1369 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1370 >
1371 >        checkCompletedWithWrappedCancellationException(h);
1372 >        checkCancelled(f);
1373 >        assertEquals(0, r.invocationCount);
1374 >        checkCompletedNormally(g, v1);
1375 >    }}
1376  
1377      /**
1378       * thenAcceptBoth result completes normally after normal
# Line 900 | Line 1381 | public class CompletableFutureTest exten
1381      public void testThenAcceptBoth_normalCompletion1() {
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 909 | Line 1390 | public class CompletableFutureTest exten
1390  
1391          f.complete(v1);
1392          checkIncomplete(h);
1393 <        assertEquals(r.value, 0);
1393 >        assertEquals(0, r.invocationCount);
1394          g.complete(v2);
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 <        }
920 <    }
1400 >    }}
1401  
1402      public void testThenAcceptBoth_normalCompletion2() {
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 931 | Line 1411 | public class CompletableFutureTest exten
1411  
1412          g.complete(v2);
1413          checkIncomplete(h);
1414 <        assertEquals(r.value, 0);
1414 >        assertEquals(0, r.invocationCount);
1415          f.complete(v1);
1416  
1417          checkCompletedNormally(h, null);
1418 <        assertEquals(r.value, r.subtract(v1, v2));
1418 >        assertEquals(subtract(v1, v2), r.value);
1419          checkCompletedNormally(f, v1);
1420          checkCompletedNormally(g, v2);
1421 <        }
942 <    }
1421 >    }}
1422  
1423      public void testThenAcceptBoth_normalCompletion3() {
1424          for (ExecutionMode m : ExecutionMode.values())
1425          for (Integer v1 : new Integer[] { 1, null })
1426 <        for (Integer v2 : new Integer[] { 2, null }) {
1427 <
1426 >        for (Integer v2 : new Integer[] { 2, null })
1427 >    {
1428          final CompletableFuture<Integer> f = new CompletableFuture<>();
1429          final CompletableFuture<Integer> g = new CompletableFuture<>();
1430          final SubtractAction r = new SubtractAction();
# Line 955 | Line 1434 | public class CompletableFutureTest exten
1434          final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1435  
1436          checkCompletedNormally(h, null);
1437 <        assertEquals(r.value, r.subtract(v1, v2));
1437 >        assertEquals(subtract(v1, v2), r.value);
1438          checkCompletedNormally(f, v1);
1439          checkCompletedNormally(g, v2);
1440 <        }
962 <    }
1440 >    }}
1441  
1442      public void testThenAcceptBoth_normalCompletion4() {
1443          for (ExecutionMode m : ExecutionMode.values())
1444          for (Integer v1 : new Integer[] { 1, null })
1445 <        for (Integer v2 : new Integer[] { 2, null }) {
1446 <
1445 >        for (Integer v2 : new Integer[] { 2, null })
1446 >    {
1447          final CompletableFuture<Integer> f = new CompletableFuture<>();
1448          final CompletableFuture<Integer> g = new CompletableFuture<>();
1449          final SubtractAction r = new SubtractAction();
# Line 975 | Line 1453 | public class CompletableFutureTest exten
1453          final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1454  
1455          checkCompletedNormally(h, null);
1456 <        assertEquals(r.value, r.subtract(v1, v2));
1456 >        assertEquals(subtract(v1, v2), r.value);
1457          checkCompletedNormally(f, v1);
1458          checkCompletedNormally(g, v2);
1459 <        }
982 <    }
1459 >    }}
1460  
1461      /**
1462       * thenAcceptBoth result completes exceptionally after exceptional
# Line 987 | Line 1464 | public class CompletableFutureTest exten
1464       */
1465      public void testThenAcceptBoth_exceptionalCompletion1() {
1466          for (ExecutionMode m : ExecutionMode.values())
1467 <        for (Integer v1 : new Integer[] { 1, null }) {
1468 <
1467 >        for (Integer v1 : new Integer[] { 1, null })
1468 >    {
1469          final CompletableFuture<Integer> f = new CompletableFuture<>();
1470          final CompletableFuture<Integer> g = new CompletableFuture<>();
1471          final SubtractAction r = new SubtractAction();
# Line 1001 | Line 1478 | public class CompletableFutureTest exten
1478  
1479          checkCompletedWithWrappedCFException(h, ex);
1480          checkCompletedWithWrappedCFException(f, ex);
1481 <        assertFalse(r.ran());
1481 >        assertEquals(0, r.invocationCount);
1482          checkCompletedNormally(g, v1);
1483 <        }
1007 <    }
1483 >    }}
1484  
1485      public void testThenAcceptBoth_exceptionalCompletion2() {
1486          for (ExecutionMode m : ExecutionMode.values())
1487 <        for (Integer v1 : new Integer[] { 1, null }) {
1488 <
1487 >        for (Integer v1 : new Integer[] { 1, null })
1488 >    {
1489          final CompletableFuture<Integer> f = new CompletableFuture<>();
1490          final CompletableFuture<Integer> g = new CompletableFuture<>();
1491          final SubtractAction r = new SubtractAction();
# Line 1022 | Line 1498 | public class CompletableFutureTest exten
1498  
1499          checkCompletedWithWrappedCFException(h, ex);
1500          checkCompletedWithWrappedCFException(g, ex);
1501 <        assertFalse(r.ran());
1501 >        assertEquals(0, r.invocationCount);
1502          checkCompletedNormally(f, v1);
1503 <        }
1028 <    }
1503 >    }}
1504  
1505      public void testThenAcceptBoth_exceptionalCompletion3() {
1506          for (ExecutionMode m : ExecutionMode.values())
1507 <        for (Integer v1 : new Integer[] { 1, null }) {
1508 <
1507 >        for (Integer v1 : new Integer[] { 1, null })
1508 >    {
1509          final CompletableFuture<Integer> f = new CompletableFuture<>();
1510          final CompletableFuture<Integer> g = new CompletableFuture<>();
1511          final SubtractAction r = new SubtractAction();
# Line 1042 | Line 1517 | public class CompletableFutureTest exten
1517  
1518          checkCompletedWithWrappedCFException(h, ex);
1519          checkCompletedWithWrappedCFException(g, ex);
1520 <        assertFalse(r.ran());
1520 >        assertEquals(0, r.invocationCount);
1521          checkCompletedNormally(f, v1);
1522 <        }
1048 <    }
1522 >    }}
1523  
1524      public void testThenAcceptBoth_exceptionalCompletion4() {
1525          for (ExecutionMode m : ExecutionMode.values())
1526 <        for (Integer v1 : new Integer[] { 1, null }) {
1527 <
1526 >        for (Integer v1 : new Integer[] { 1, null })
1527 >    {
1528          final CompletableFuture<Integer> f = new CompletableFuture<>();
1529          final CompletableFuture<Integer> g = new CompletableFuture<>();
1530          final SubtractAction r = new SubtractAction();
# Line 1062 | Line 1536 | public class CompletableFutureTest exten
1536  
1537          checkCompletedWithWrappedCFException(h, ex);
1538          checkCompletedWithWrappedCFException(f, ex);
1539 <        assertFalse(r.ran());
1539 >        assertEquals(0, r.invocationCount);
1540          checkCompletedNormally(g, v1);
1541 <        }
1068 <    }
1541 >    }}
1542  
1543      /**
1544       * thenAcceptBoth result completes exceptionally if action does
# Line 1073 | Line 1546 | public class CompletableFutureTest exten
1546      public void testThenAcceptBoth_actionFailed1() {
1547          for (ExecutionMode m : ExecutionMode.values())
1548          for (Integer v1 : new Integer[] { 1, null })
1549 <        for (Integer v2 : new Integer[] { 2, null }) {
1550 <
1549 >        for (Integer v2 : new Integer[] { 2, null })
1550 >    {
1551          final CompletableFuture<Integer> f = new CompletableFuture<>();
1552          final CompletableFuture<Integer> g = new CompletableFuture<>();
1553          final FailingBiConsumer r = new FailingBiConsumer();
# Line 1087 | Line 1560 | public class CompletableFutureTest exten
1560          checkCompletedWithWrappedCFException(h);
1561          checkCompletedNormally(f, v1);
1562          checkCompletedNormally(g, v2);
1563 <        }
1091 <    }
1563 >    }}
1564  
1565      public void testThenAcceptBoth_actionFailed2() {
1566          for (ExecutionMode m : ExecutionMode.values())
1567          for (Integer v1 : new Integer[] { 1, null })
1568 <        for (Integer v2 : new Integer[] { 2, null }) {
1569 <
1568 >        for (Integer v2 : new Integer[] { 2, null })
1569 >    {
1570          final CompletableFuture<Integer> f = new CompletableFuture<>();
1571          final CompletableFuture<Integer> g = new CompletableFuture<>();
1572          final FailingBiConsumer r = new FailingBiConsumer();
# Line 1107 | Line 1579 | public class CompletableFutureTest exten
1579          checkCompletedWithWrappedCFException(h);
1580          checkCompletedNormally(f, v1);
1581          checkCompletedNormally(g, v2);
1582 <        }
1111 <    }
1582 >    }}
1583  
1584      /**
1585       * thenAcceptBoth result completes exceptionally if either source cancelled
# Line 1116 | Line 1587 | public class CompletableFutureTest exten
1587      public void testThenAcceptBoth_sourceCancelled1() {
1588          for (ExecutionMode m : ExecutionMode.values())
1589          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1590 <        for (Integer v1 : new Integer[] { 1, null }) {
1591 <
1590 >        for (Integer v1 : new Integer[] { 1, null })
1591 >    {
1592          final CompletableFuture<Integer> f = new CompletableFuture<>();
1593          final CompletableFuture<Integer> g = new CompletableFuture<>();
1594          final SubtractAction r = new SubtractAction();
# Line 1129 | Line 1600 | public class CompletableFutureTest exten
1600  
1601          checkCompletedWithWrappedCancellationException(h);
1602          checkCancelled(f);
1603 <        assertFalse(r.ran());
1603 >        assertEquals(0, r.invocationCount);
1604          checkCompletedNormally(g, v1);
1605 <        }
1135 <    }
1605 >    }}
1606  
1607      public void testThenAcceptBoth_sourceCancelled2() {
1608          for (ExecutionMode m : ExecutionMode.values())
1609          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1610 <        for (Integer v1 : new Integer[] { 1, null }) {
1611 <
1610 >        for (Integer v1 : new Integer[] { 1, null })
1611 >    {
1612          final CompletableFuture<Integer> f = new CompletableFuture<>();
1613          final CompletableFuture<Integer> g = new CompletableFuture<>();
1614          final SubtractAction r = new SubtractAction();
# Line 1150 | Line 1620 | public class CompletableFutureTest exten
1620  
1621          checkCompletedWithWrappedCancellationException(h);
1622          checkCancelled(g);
1623 <        assertFalse(r.ran());
1623 >        assertEquals(0, r.invocationCount);
1624          checkCompletedNormally(f, v1);
1625 <        }
1156 <    }
1625 >    }}
1626  
1627      public void testThenAcceptBoth_sourceCancelled3() {
1628          for (ExecutionMode m : ExecutionMode.values())
1629          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1630 <        for (Integer v1 : new Integer[] { 1, null }) {
1631 <
1630 >        for (Integer v1 : new Integer[] { 1, null })
1631 >    {
1632          final CompletableFuture<Integer> f = new CompletableFuture<>();
1633          final CompletableFuture<Integer> g = new CompletableFuture<>();
1634          final SubtractAction r = new SubtractAction();
# Line 1170 | Line 1639 | public class CompletableFutureTest exten
1639  
1640          checkCompletedWithWrappedCancellationException(h);
1641          checkCancelled(g);
1642 <        assertFalse(r.ran());
1642 >        assertEquals(0, r.invocationCount);
1643          checkCompletedNormally(f, v1);
1644 <        }
1176 <    }
1644 >    }}
1645  
1646      public void testThenAcceptBoth_sourceCancelled4() {
1647          for (ExecutionMode m : ExecutionMode.values())
1648          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1649 <        for (Integer v1 : new Integer[] { 1, null }) {
1650 <
1649 >        for (Integer v1 : new Integer[] { 1, null })
1650 >    {
1651          final CompletableFuture<Integer> f = new CompletableFuture<>();
1652          final CompletableFuture<Integer> g = new CompletableFuture<>();
1653          final SubtractAction r = new SubtractAction();
# Line 1190 | Line 1658 | public class CompletableFutureTest exten
1658  
1659          checkCompletedWithWrappedCancellationException(h);
1660          checkCancelled(f);
1661 <        assertFalse(r.ran());
1661 >        assertEquals(0, r.invocationCount);
1662          checkCompletedNormally(g, v1);
1663 <        }
1196 <    }
1663 >    }}
1664  
1665      /**
1666       * runAfterBoth result completes normally after normal
# Line 1202 | Line 1669 | public class CompletableFutureTest exten
1669      public void testRunAfterBoth_normalCompletion1() {
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 1211 | Line 1678 | public class CompletableFutureTest exten
1678  
1679          f.complete(v1);
1680          checkIncomplete(h);
1681 <        assertFalse(r.ran);
1681 >        assertEquals(0, r.invocationCount);
1682          g.complete(v2);
1683  
1684          checkCompletedNormally(h, null);
1685 <        assertTrue(r.ran);
1685 >        assertEquals(1, r.invocationCount);
1686          checkCompletedNormally(f, v1);
1687          checkCompletedNormally(g, v2);
1688 <        }
1222 <    }
1688 >    }}
1689  
1690      public void testRunAfterBoth_normalCompletion2() {
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 1233 | Line 1699 | public class CompletableFutureTest exten
1699  
1700          g.complete(v2);
1701          checkIncomplete(h);
1702 <        assertFalse(r.ran);
1702 >        assertEquals(0, r.invocationCount);
1703          f.complete(v1);
1704  
1705          checkCompletedNormally(h, null);
1706 <        assertTrue(r.ran);
1706 >        assertEquals(1, r.invocationCount);
1707          checkCompletedNormally(f, v1);
1708          checkCompletedNormally(g, v2);
1709 <        }
1244 <    }
1709 >    }}
1710  
1711      public void testRunAfterBoth_normalCompletion3() {
1712          for (ExecutionMode m : ExecutionMode.values())
1713          for (Integer v1 : new Integer[] { 1, null })
1714 <        for (Integer v2 : new Integer[] { 2, null }) {
1715 <
1714 >        for (Integer v2 : new Integer[] { 2, null })
1715 >    {
1716          final CompletableFuture<Integer> f = new CompletableFuture<>();
1717          final CompletableFuture<Integer> g = new CompletableFuture<>();
1718          final Noop r = new Noop();
# Line 1257 | Line 1722 | public class CompletableFutureTest exten
1722          final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1723  
1724          checkCompletedNormally(h, null);
1725 <        assertTrue(r.ran);
1725 >        assertEquals(1, r.invocationCount);
1726          checkCompletedNormally(f, v1);
1727          checkCompletedNormally(g, v2);
1728 <        }
1264 <    }
1728 >    }}
1729  
1730      public void testRunAfterBoth_normalCompletion4() {
1731          for (ExecutionMode m : ExecutionMode.values())
1732          for (Integer v1 : new Integer[] { 1, null })
1733 <        for (Integer v2 : new Integer[] { 2, null }) {
1734 <
1733 >        for (Integer v2 : new Integer[] { 2, null })
1734 >    {
1735          final CompletableFuture<Integer> f = new CompletableFuture<>();
1736          final CompletableFuture<Integer> g = new CompletableFuture<>();
1737          final Noop r = new Noop();
# Line 1277 | Line 1741 | public class CompletableFutureTest exten
1741          final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1742  
1743          checkCompletedNormally(h, null);
1744 <        assertTrue(r.ran);
1744 >        assertEquals(1, r.invocationCount);
1745          checkCompletedNormally(f, v1);
1746          checkCompletedNormally(g, v2);
1747 <        }
1284 <    }
1747 >    }}
1748  
1749      /**
1750       * runAfterBoth result completes exceptionally after exceptional
# Line 1289 | Line 1752 | public class CompletableFutureTest exten
1752       */
1753      public void testRunAfterBoth_exceptionalCompletion1() {
1754          for (ExecutionMode m : ExecutionMode.values())
1755 <        for (Integer v1 : new Integer[] { 1, null }) {
1756 <
1755 >        for (Integer v1 : new Integer[] { 1, null })
1756 >    {
1757          final CompletableFuture<Integer> f = new CompletableFuture<>();
1758          final CompletableFuture<Integer> g = new CompletableFuture<>();
1759          final Noop r = new Noop();
# Line 1303 | Line 1766 | public class CompletableFutureTest exten
1766  
1767          checkCompletedWithWrappedCFException(h, ex);
1768          checkCompletedWithWrappedCFException(f, ex);
1769 <        assertFalse(r.ran);
1769 >        assertEquals(0, r.invocationCount);
1770          checkCompletedNormally(g, v1);
1771 <        }
1309 <    }
1771 >    }}
1772  
1773      public void testRunAfterBoth_exceptionalCompletion2() {
1774          for (ExecutionMode m : ExecutionMode.values())
1775 <        for (Integer v1 : new Integer[] { 1, null }) {
1776 <
1775 >        for (Integer v1 : new Integer[] { 1, null })
1776 >    {
1777          final CompletableFuture<Integer> f = new CompletableFuture<>();
1778          final CompletableFuture<Integer> g = new CompletableFuture<>();
1779          final Noop r = new Noop();
# Line 1324 | Line 1786 | public class CompletableFutureTest exten
1786  
1787          checkCompletedWithWrappedCFException(h, ex);
1788          checkCompletedWithWrappedCFException(g, ex);
1789 <        assertFalse(r.ran);
1789 >        assertEquals(0, r.invocationCount);
1790          checkCompletedNormally(f, v1);
1791 <        }
1330 <    }
1791 >    }}
1792  
1793      public void testRunAfterBoth_exceptionalCompletion3() {
1794          for (ExecutionMode m : ExecutionMode.values())
1795 <        for (Integer v1 : new Integer[] { 1, null }) {
1796 <
1795 >        for (Integer v1 : new Integer[] { 1, null })
1796 >    {
1797          final CompletableFuture<Integer> f = new CompletableFuture<>();
1798          final CompletableFuture<Integer> g = new CompletableFuture<>();
1799          final Noop r = new Noop();
# Line 1344 | Line 1805 | public class CompletableFutureTest exten
1805  
1806          checkCompletedWithWrappedCFException(h, ex);
1807          checkCompletedWithWrappedCFException(g, ex);
1808 <        assertFalse(r.ran);
1808 >        assertEquals(0, r.invocationCount);
1809          checkCompletedNormally(f, v1);
1810 <        }
1350 <    }
1810 >    }}
1811  
1812      public void testRunAfterBoth_exceptionalCompletion4() {
1813          for (ExecutionMode m : ExecutionMode.values())
1814 <        for (Integer v1 : new Integer[] { 1, null }) {
1815 <
1814 >        for (Integer v1 : new Integer[] { 1, null })
1815 >    {
1816          final CompletableFuture<Integer> f = new CompletableFuture<>();
1817          final CompletableFuture<Integer> g = new CompletableFuture<>();
1818          final Noop r = new Noop();
# Line 1364 | Line 1824 | public class CompletableFutureTest exten
1824  
1825          checkCompletedWithWrappedCFException(h, ex);
1826          checkCompletedWithWrappedCFException(f, ex);
1827 <        assertFalse(r.ran);
1827 >        assertEquals(0, r.invocationCount);
1828          checkCompletedNormally(g, v1);
1829 <        }
1370 <    }
1829 >    }}
1830  
1831      /**
1832       * runAfterBoth result completes exceptionally if action does
# Line 1375 | Line 1834 | public class CompletableFutureTest exten
1834      public void testRunAfterBoth_actionFailed1() {
1835          for (ExecutionMode m : ExecutionMode.values())
1836          for (Integer v1 : new Integer[] { 1, null })
1837 <        for (Integer v2 : new Integer[] { 2, null }) {
1838 <
1837 >        for (Integer v2 : new Integer[] { 2, null })
1838 >    {
1839          final CompletableFuture<Integer> f = new CompletableFuture<>();
1840          final CompletableFuture<Integer> g = new CompletableFuture<>();
1841          final FailingNoop r = new FailingNoop();
# Line 1389 | Line 1848 | public class CompletableFutureTest exten
1848          checkCompletedWithWrappedCFException(h);
1849          checkCompletedNormally(f, v1);
1850          checkCompletedNormally(g, v2);
1851 <        }
1393 <    }
1851 >    }}
1852  
1853      public void testRunAfterBoth_actionFailed2() {
1854          for (ExecutionMode m : ExecutionMode.values())
1855          for (Integer v1 : new Integer[] { 1, null })
1856 <        for (Integer v2 : new Integer[] { 2, null }) {
1857 <
1856 >        for (Integer v2 : new Integer[] { 2, null })
1857 >    {
1858          final CompletableFuture<Integer> f = new CompletableFuture<>();
1859          final CompletableFuture<Integer> g = new CompletableFuture<>();
1860          final FailingNoop r = new FailingNoop();
# Line 1409 | Line 1867 | public class CompletableFutureTest exten
1867          checkCompletedWithWrappedCFException(h);
1868          checkCompletedNormally(f, v1);
1869          checkCompletedNormally(g, v2);
1870 <        }
1413 <    }
1870 >    }}
1871  
1872      /**
1873       * runAfterBoth result completes exceptionally if either source cancelled
# Line 1418 | Line 1875 | public class CompletableFutureTest exten
1875      public void testRunAfterBoth_sourceCancelled1() {
1876          for (ExecutionMode m : ExecutionMode.values())
1877          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1878 <        for (Integer v1 : new Integer[] { 1, null }) {
1879 <
1878 >        for (Integer v1 : new Integer[] { 1, null })
1879 >    {
1880          final CompletableFuture<Integer> f = new CompletableFuture<>();
1881          final CompletableFuture<Integer> g = new CompletableFuture<>();
1882          final Noop r = new Noop();
# Line 1431 | Line 1888 | public class CompletableFutureTest exten
1888  
1889          checkCompletedWithWrappedCancellationException(h);
1890          checkCancelled(f);
1891 <        assertFalse(r.ran);
1891 >        assertEquals(0, r.invocationCount);
1892          checkCompletedNormally(g, v1);
1893 <        }
1437 <    }
1893 >    }}
1894  
1895      public void testRunAfterBoth_sourceCancelled2() {
1896          for (ExecutionMode m : ExecutionMode.values())
1897          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1898 <        for (Integer v1 : new Integer[] { 1, null }) {
1899 <
1898 >        for (Integer v1 : new Integer[] { 1, null })
1899 >    {
1900          final CompletableFuture<Integer> f = new CompletableFuture<>();
1901          final CompletableFuture<Integer> g = new CompletableFuture<>();
1902          final Noop r = new Noop();
# Line 1452 | Line 1908 | public class CompletableFutureTest exten
1908  
1909          checkCompletedWithWrappedCancellationException(h);
1910          checkCancelled(g);
1911 <        assertFalse(r.ran);
1911 >        assertEquals(0, r.invocationCount);
1912          checkCompletedNormally(f, v1);
1913 <        }
1458 <    }
1913 >    }}
1914  
1915      public void testRunAfterBoth_sourceCancelled3() {
1916          for (ExecutionMode m : ExecutionMode.values())
1917          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1918 <        for (Integer v1 : new Integer[] { 1, null }) {
1919 <
1918 >        for (Integer v1 : new Integer[] { 1, null })
1919 >    {
1920          final CompletableFuture<Integer> f = new CompletableFuture<>();
1921          final CompletableFuture<Integer> g = new CompletableFuture<>();
1922          final Noop r = new Noop();
# Line 1472 | Line 1927 | public class CompletableFutureTest exten
1927  
1928          checkCompletedWithWrappedCancellationException(h);
1929          checkCancelled(g);
1930 <        assertFalse(r.ran);
1930 >        assertEquals(0, r.invocationCount);
1931          checkCompletedNormally(f, v1);
1932 <        }
1478 <    }
1932 >    }}
1933  
1934      public void testRunAfterBoth_sourceCancelled4() {
1935          for (ExecutionMode m : ExecutionMode.values())
1936          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1937 <        for (Integer v1 : new Integer[] { 1, null }) {
1938 <
1937 >        for (Integer v1 : new Integer[] { 1, null })
1938 >    {
1939          final CompletableFuture<Integer> f = new CompletableFuture<>();
1940          final CompletableFuture<Integer> g = new CompletableFuture<>();
1941          final Noop r = new Noop();
# Line 1492 | Line 1946 | public class CompletableFutureTest exten
1946  
1947          checkCompletedWithWrappedCancellationException(h);
1948          checkCancelled(f);
1949 <        assertFalse(r.ran);
1949 >        assertEquals(0, r.invocationCount);
1950          checkCompletedNormally(g, v1);
1951 <        }
1498 <    }
1951 >    }}
1952  
1953      /**
1954       * applyToEither result completes normally after normal completion
1955       * of either source
1956       */
1957 <    public void testApplyToEither() {
1958 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1959 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1960 <        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
1961 <        f.complete(one);
1962 <        checkCompletedNormally(g, two);
1963 <        f2.complete(one);
1964 <        checkCompletedNormally(g, two);
1957 >    public void testApplyToEither_normalCompletion1() {
1958 >        for (ExecutionMode m : ExecutionMode.values())
1959 >        for (Integer v1 : new Integer[] { 1, null })
1960 >        for (Integer v2 : new Integer[] { 2, null })
1961 >    {
1962 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1963 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1964 >        final IncFunction r = new IncFunction();
1965 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1966  
1967 <        f = new CompletableFuture<>();
1968 <        f.complete(one);
1969 <        f2 = new CompletableFuture<>();
1516 <        g = f.applyToEither(f2, inc);
1517 <        checkCompletedNormally(g, two);
1518 <    }
1967 >        f.complete(v1);
1968 >        checkCompletedNormally(h, inc(v1));
1969 >        g.complete(v2);
1970  
1971 <    /**
1972 <     * applyToEither result completes exceptionally after exceptional
1973 <     * completion of either source
1974 <     */
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);
1971 >        checkCompletedNormally(f, v1);
1972 >        checkCompletedNormally(g, v2);
1973 >        checkCompletedNormally(h, inc(v1));
1974 >    }}
1975  
1976 <        f = new CompletableFuture<>();
1977 <        f2 = new CompletableFuture<>();
1978 <        f2.completeExceptionally(new CFException());
1979 <        g = f.applyToEither(f2, inc);
1980 <        checkCompletedWithWrappedCFException(g);
1981 <    }
1976 >    public void testApplyToEither_normalCompletion2() {
1977 >        for (ExecutionMode m : ExecutionMode.values())
1978 >        for (Integer v1 : new Integer[] { 1, null })
1979 >        for (Integer v2 : new Integer[] { 2, null })
1980 >    {
1981 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1982 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1983 >        final IncFunction r = new IncFunction();
1984 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1985  
1986 <    /**
1987 <     * applyToEither result completes exceptionally if action does
1988 <     */
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 <    }
1986 >        g.complete(v2);
1987 >        checkCompletedNormally(h, inc(v2));
1988 >        f.complete(v1);
1989  
1990 <    /**
1991 <     * applyToEither result completes exceptionally if either source cancelled
1992 <     */
1993 <    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 <    }
1990 >        checkCompletedNormally(f, v1);
1991 >        checkCompletedNormally(g, v2);
1992 >        checkCompletedNormally(h, inc(v2));
1993 >        }}
1994  
1995 <    /**
1996 <     * acceptEither result completes normally after normal completion
1997 <     * of either source
1998 <     */
1999 <    public void testAcceptEither() {
2000 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2001 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2002 <        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);
1995 >    public void testApplyToEither_normalCompletion3() {
1996 >        for (ExecutionMode m : ExecutionMode.values())
1997 >        for (Integer v1 : new Integer[] { 1, null })
1998 >        for (Integer v2 : new Integer[] { 2, null })
1999 >    {
2000 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2001 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2002 >        final IncFunction r = new IncFunction();
2003  
2004 <        r = new IncAction();
2005 <        f = new CompletableFuture<>();
2006 <        f.complete(one);
2007 <        f2 = new CompletableFuture<>();
2008 <        g = f.acceptEither(f2, r);
2009 <        checkCompletedNormally(g, null);
2010 <        assertEquals(r.value, 2);
2011 <    }
2004 >        f.complete(v1);
2005 >        g.complete(v2);
2006 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2007 >
2008 >        checkCompletedNormally(f, v1);
2009 >        checkCompletedNormally(g, v2);
2010 >
2011 >        // unspecified behavior
2012 >        assertTrue(Objects.equals(h.join(), inc(v1)) ||
2013 >                   Objects.equals(h.join(), inc(v2)));
2014 >        assertEquals(1, r.invocationCount);
2015 >    }}
2016  
2017      /**
2018 <     * acceptEither result completes exceptionally after exceptional
2018 >     * applyToEither result completes exceptionally after exceptional
2019       * completion of either source
2020       */
2021 <    public void testAcceptEither2() {
2022 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2023 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2024 <        IncAction r = new IncAction();
2025 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
2026 <        f.completeExceptionally(new CFException());
2027 <        f2.complete(one);
2028 <        checkCompletedWithWrappedCFException(g);
2021 >    public void testApplyToEither_exceptionalCompletion1() {
2022 >        for (ExecutionMode m : ExecutionMode.values())
2023 >        for (Integer v1 : new Integer[] { 1, null })
2024 >    {
2025 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2026 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2027 >        final IncFunction r = new IncFunction();
2028 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2029 >        final CFException ex = new CFException();
2030  
2031 <        r = new IncAction();
2032 <        f = new CompletableFuture<>();
2033 <        f2 = new CompletableFuture<>();
1606 <        f2.completeExceptionally(new CFException());
1607 <        g = f.acceptEither(f2, r);
1608 <        checkCompletedWithWrappedCFException(g);
1609 <    }
2031 >        f.completeExceptionally(ex);
2032 >        checkCompletedWithWrappedCFException(h, ex);
2033 >        g.complete(v1);
2034  
2035 <    /**
2036 <     * acceptEither result completes exceptionally if action does
2037 <     */
2038 <    public void testAcceptEither3() {
2039 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1616 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1617 <        FailingConsumer r = new FailingConsumer();
1618 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
1619 <        f2.complete(two);
1620 <        checkCompletedWithWrappedCFException(g);
1621 <    }
2035 >        assertEquals(0, r.invocationCount);
2036 >        checkCompletedNormally(g, v1);
2037 >        checkCompletedWithWrappedCFException(f, ex);
2038 >        checkCompletedWithWrappedCFException(h, ex);
2039 >    }}
2040  
2041 <    /**
2042 <     * acceptEither result completes exceptionally if either source cancelled
2043 <     */
2044 <    public void testAcceptEither4() {
2045 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2046 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2047 <        IncAction r = new IncAction();
2048 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
2049 <        assertTrue(f.cancel(true));
1632 <        checkCompletedWithWrappedCancellationException(g);
1633 <        f = new CompletableFuture<>();
1634 <        f2 = new CompletableFuture<>();
1635 <        assertTrue(f2.cancel(true));
1636 <        checkCompletedWithWrappedCancellationException(g);
1637 <    }
2041 >    public void testApplyToEither_exceptionalCompletion2() {
2042 >        for (ExecutionMode m : ExecutionMode.values())
2043 >        for (Integer v1 : new Integer[] { 1, null })
2044 >    {
2045 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2046 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2047 >        final IncFunction r = new IncFunction();
2048 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2049 >        final CFException ex = new CFException();
2050  
2051 <    /**
2052 <     * runAfterEither result completes normally after normal completion
2053 <     * of either source
1642 <     */
1643 <    public void testRunAfterEither() {
1644 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1645 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1646 <        Noop r = new Noop();
1647 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
1648 <        f.complete(one);
1649 <        checkCompletedNormally(g, null);
1650 <        f2.complete(one);
1651 <        checkCompletedNormally(g, null);
1652 <        assertTrue(r.ran);
2051 >        g.completeExceptionally(ex);
2052 >        checkCompletedWithWrappedCFException(h, ex);
2053 >        f.complete(v1);
2054  
2055 <        r = new Noop();
2056 <        f = new CompletableFuture<>();
2057 <        f.complete(one);
2058 <        f2 = new CompletableFuture<>();
2059 <        g = f.runAfterEither(f2, r);
1659 <        checkCompletedNormally(g, null);
1660 <        assertTrue(r.ran);
1661 <    }
2055 >        assertEquals(0, r.invocationCount);
2056 >        checkCompletedNormally(f, v1);
2057 >        checkCompletedWithWrappedCFException(g, ex);
2058 >        checkCompletedWithWrappedCFException(h, ex);
2059 >    }}
2060  
2061 <    /**
2062 <     * runAfterEither result completes exceptionally after exceptional
2063 <     * completion of either source
2064 <     */
2065 <    public void testRunAfterEither2() {
2066 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2067 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2068 <        Noop r = new Noop();
1671 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
1672 <        f.completeExceptionally(new CFException());
1673 <        f2.complete(one);
1674 <        checkCompletedWithWrappedCFException(g);
2061 >    public void testApplyToEither_exceptionalCompletion3() {
2062 >        for (ExecutionMode m : ExecutionMode.values())
2063 >        for (Integer v1 : new Integer[] { 1, null })
2064 >    {
2065 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2066 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2067 >        final IncFunction r = new IncFunction();
2068 >        final CFException ex = new CFException();
2069  
2070 <        r = new Noop();
2071 <        f = new CompletableFuture<>();
2072 <        f2 = new CompletableFuture<>();
1679 <        f2.completeExceptionally(new CFException());
1680 <        g = f.runAfterEither(f2, r);
1681 <        checkCompletedWithWrappedCFException(g);
1682 <    }
2070 >        g.completeExceptionally(ex);
2071 >        f.complete(v1);
2072 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2073  
2074 <    /**
2075 <     * runAfterEither result completes exceptionally if action does
2076 <     */
2077 <    public void testRunAfterEither3() {
2078 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2079 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2080 <        FailingNoop r = new FailingNoop();
2081 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
2082 <        f2.complete(two);
1693 <        checkCompletedWithWrappedCFException(g);
1694 <    }
2074 >        // unspecified behavior
2075 >        Integer v;
2076 >        try {
2077 >            assertEquals(inc(v1), h.join());
2078 >            assertEquals(1, r.invocationCount);
2079 >        } catch (CompletionException ok) {
2080 >            checkCompletedWithWrappedCFException(h, ex);
2081 >            assertEquals(0, r.invocationCount);
2082 >        }
2083  
2084 <    /**
2085 <     * runAfterEither result completes exceptionally if either source cancelled
2086 <     */
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 <    }
2084 >        checkCompletedWithWrappedCFException(g, ex);
2085 >        checkCompletedNormally(f, v1);
2086 >    }}
2087  
2088 <    /**
2089 <     * thenCompose result completes normally after normal completion of source
2090 <     */
2091 <    public void testThenCompose() {
2092 <        CompletableFuture<Integer> f, g;
2093 <        CompletableFutureInc r;
2088 >    public void testApplyToEither_exceptionalCompletion4() {
2089 >        for (ExecutionMode m : ExecutionMode.values())
2090 >        for (Integer v1 : new Integer[] { 1, null })
2091 >    {
2092 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2093 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2094 >        final IncFunction r = new IncFunction();
2095 >        final CFException ex = new CFException();
2096  
2097 <        f = new CompletableFuture<>();
2098 <        g = f.thenCompose(r = new CompletableFutureInc());
2099 <        f.complete(one);
1722 <        checkCompletedNormally(g, two);
1723 <        assertTrue(r.ran);
2097 >        f.completeExceptionally(ex);
2098 >        g.complete(v1);
2099 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2100  
2101 <        f = new CompletableFuture<>();
2102 <        f.complete(one);
2103 <        g = f.thenCompose(r = new CompletableFutureInc());
2104 <        checkCompletedNormally(g, two);
2105 <        assertTrue(r.ran);
2106 <    }
2101 >        // unspecified behavior
2102 >        Integer v;
2103 >        try {
2104 >            assertEquals(inc(v1), h.join());
2105 >            assertEquals(1, r.invocationCount);
2106 >        } catch (CompletionException ok) {
2107 >            checkCompletedWithWrappedCFException(h, ex);
2108 >            assertEquals(0, r.invocationCount);
2109 >        }
2110 >
2111 >        checkCompletedWithWrappedCFException(f, ex);
2112 >        checkCompletedNormally(g, v1);
2113 >    }}
2114  
2115      /**
2116 <     * thenCompose result completes exceptionally after exceptional
1734 <     * completion of source
2116 >     * applyToEither result completes exceptionally if action does
2117       */
2118 <    public void testThenCompose2() {
2119 <        CompletableFuture<Integer> f, g;
2120 <        CompletableFutureInc r;
2118 >    public void testApplyToEither_actionFailed1() {
2119 >        for (ExecutionMode m : ExecutionMode.values())
2120 >        for (Integer v1 : new Integer[] { 1, null })
2121 >        for (Integer v2 : new Integer[] { 2, null })
2122 >    {
2123 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2124 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2125 >        final FailingFunction r = new FailingFunction();
2126 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2127  
2128 <        f = new CompletableFuture<>();
2129 <        g = f.thenCompose(r = new CompletableFutureInc());
2130 <        f.completeExceptionally(new CFException());
2131 <        checkCompletedWithWrappedCFException(g);
2128 >        f.complete(v1);
2129 >        checkCompletedWithWrappedCFException(h);
2130 >        g.complete(v2);
2131 >        checkCompletedNormally(f, v1);
2132 >        checkCompletedNormally(g, v2);
2133 >    }}
2134  
2135 <        f = new CompletableFuture<>();
2136 <        f.completeExceptionally(new CFException());
2137 <        g = f.thenCompose(r = new CompletableFutureInc());
2138 <        checkCompletedWithWrappedCFException(g);
2139 <    }
2135 >    public void testApplyToEither_actionFailed2() {
2136 >        for (ExecutionMode m : ExecutionMode.values())
2137 >        for (Integer v1 : new Integer[] { 1, null })
2138 >        for (Integer v2 : new Integer[] { 2, null })
2139 >    {
2140 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2141 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2142 >        final FailingFunction r = new FailingFunction();
2143 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2144 >
2145 >        g.complete(v2);
2146 >        checkCompletedWithWrappedCFException(h);
2147 >        f.complete(v1);
2148 >        checkCompletedNormally(f, v1);
2149 >        checkCompletedNormally(g, v2);
2150 >    }}
2151  
2152      /**
2153 <     * thenCompose result completes exceptionally if action does
2153 >     * applyToEither result completes exceptionally if either source cancelled
2154       */
2155 <    public void testThenCompose3() {
2156 <        CompletableFuture<Integer> f, g;
2157 <        FailingCompletableFutureFunction r;
2155 >    public void testApplyToEither_sourceCancelled1() {
2156 >        for (ExecutionMode m : ExecutionMode.values())
2157 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2158 >        for (Integer v1 : new Integer[] { 1, null })
2159 >    {
2160 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2161 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2162 >        final IncFunction r = new IncFunction();
2163 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2164  
2165 <        f = new CompletableFuture<>();
2166 <        g = f.thenCompose(r = new FailingCompletableFutureFunction());
2167 <        f.complete(one);
1761 <        checkCompletedWithWrappedCFException(g);
2165 >        assertTrue(f.cancel(mayInterruptIfRunning));
2166 >        checkCompletedWithWrappedCancellationException(h);
2167 >        g.complete(v1);
2168  
2169 <        f = new CompletableFuture<>();
2170 <        f.complete(one);
2171 <        g = f.thenCompose(r = new FailingCompletableFutureFunction());
2172 <        checkCompletedWithWrappedCFException(g);
2173 <    }
2169 >        checkCancelled(f);
2170 >        assertEquals(0, r.invocationCount);
2171 >        checkCompletedNormally(g, v1);
2172 >        checkCompletedWithWrappedCancellationException(h);
2173 >    }}
2174  
2175 <    /**
2176 <     * thenCompose result completes exceptionally if source cancelled
2177 <     */
2178 <    public void testThenCompose4() {
2179 <        CompletableFuture<Integer> f, g;
2180 <        CompletableFutureInc r;
2175 >    public void testApplyToEither_sourceCancelled2() {
2176 >        for (ExecutionMode m : ExecutionMode.values())
2177 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2178 >        for (Integer v1 : new Integer[] { 1, null })
2179 >    {
2180 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2181 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2182 >        final IncFunction r = new IncFunction();
2183 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2184  
2185 <        f = new CompletableFuture<>();
2186 <        g = f.thenCompose(r = new CompletableFutureInc());
2187 <        assertTrue(f.cancel(true));
1779 <        checkCompletedWithWrappedCancellationException(g);
2185 >        assertTrue(g.cancel(mayInterruptIfRunning));
2186 >        checkCompletedWithWrappedCancellationException(h);
2187 >        f.complete(v1);
2188  
2189 <        f = new CompletableFuture<>();
2190 <        assertTrue(f.cancel(true));
2191 <        g = f.thenCompose(r = new CompletableFutureInc());
2192 <        checkCompletedWithWrappedCancellationException(g);
2193 <    }
2189 >        checkCancelled(g);
2190 >        assertEquals(0, r.invocationCount);
2191 >        checkCompletedNormally(f, v1);
2192 >        checkCompletedWithWrappedCancellationException(h);
2193 >    }}
2194  
2195 <    // asyncs
2195 >    public void testApplyToEither_sourceCancelled3() {
2196 >        for (ExecutionMode m : ExecutionMode.values())
2197 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2198 >        for (Integer v1 : new Integer[] { 1, null })
2199 >    {
2200 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2201 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2202 >        final IncFunction r = new IncFunction();
2203  
2204 <    /**
2205 <     * thenRunAsync result completes normally after normal completion of source
2206 <     */
1792 <    public void testThenRunAsync() {
1793 <        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);
2204 >        assertTrue(g.cancel(mayInterruptIfRunning));
2205 >        f.complete(v1);
2206 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2207  
2208 <        // reordered version
2209 <        f = new CompletableFuture<>();
2210 <        f.complete(null);
2211 <        r = new Noop();
2212 <        g = f.thenRunAsync(r);
2213 <        checkCompletedNormally(g, null);
2214 <    }
2208 >        // unspecified behavior
2209 >        Integer v;
2210 >        try {
2211 >            assertEquals(inc(v1), h.join());
2212 >            assertEquals(1, r.invocationCount);
2213 >        } catch (CompletionException ok) {
2214 >            checkCompletedWithWrappedCancellationException(h);
2215 >            assertEquals(0, r.invocationCount);
2216 >        }
2217  
2218 <    /**
2219 <     * thenRunAsync result completes exceptionally after exceptional
2220 <     * completion of source
2221 <     */
2222 <    public void testThenRunAsync2() {
2223 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2224 <        Noop r = new Noop();
2225 <        CompletableFuture<Void> g = f.thenRunAsync(r);
2226 <        f.completeExceptionally(new CFException());
2218 >        checkCancelled(g);
2219 >        checkCompletedNormally(f, v1);
2220 >    }}
2221 >
2222 >    public void testApplyToEither_sourceCancelled4() {
2223 >        for (ExecutionMode m : ExecutionMode.values())
2224 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2225 >        for (Integer v1 : new Integer[] { 1, null })
2226 >    {
2227 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2228 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2229 >        final IncFunction r = new IncFunction();
2230 >
2231 >        assertTrue(f.cancel(mayInterruptIfRunning));
2232 >        g.complete(v1);
2233 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2234 >
2235 >        // unspecified behavior
2236 >        Integer v;
2237          try {
2238 <            g.join();
2239 <            shouldThrow();
2240 <        } catch (CompletionException success) {}
2241 <        checkCompletedWithWrappedCFException(g);
2242 <    }
2238 >            assertEquals(inc(v1), h.join());
2239 >            assertEquals(1, r.invocationCount);
2240 >        } catch (CompletionException ok) {
2241 >            checkCompletedWithWrappedCancellationException(h);
2242 >            assertEquals(0, r.invocationCount);
2243 >        }
2244  
2245 <    /**
2246 <     * thenRunAsync result completes exceptionally if action does
2247 <     */
1826 <    public void testThenRunAsync3() {
1827 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1828 <        FailingNoop r = new FailingNoop();
1829 <        CompletableFuture<Void> g = f.thenRunAsync(r);
1830 <        f.complete(null);
1831 <        checkCompletedWithWrappedCFException(g);
1832 <    }
2245 >        checkCancelled(f);
2246 >        checkCompletedNormally(g, v1);
2247 >    }}
2248  
2249      /**
2250 <     * thenRunAsync result completes exceptionally if source cancelled
2250 >     * acceptEither result completes normally after normal completion
2251 >     * of either source
2252       */
2253 <    public void testThenRunAsync4() {
2254 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2255 <        Noop r = new Noop();
2256 <        CompletableFuture<Void> g = f.thenRunAsync(r);
2257 <        assertTrue(f.cancel(true));
2258 <        checkCompletedWithWrappedCancellationException(g);
2259 <    }
2253 >    public void testAcceptEither_normalCompletion1() {
2254 >        for (ExecutionMode m : ExecutionMode.values())
2255 >        for (Integer v1 : new Integer[] { 1, null })
2256 >        for (Integer v2 : new Integer[] { 2, null })
2257 >    {
2258 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2259 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2260 >        final IncAction r = new IncAction();
2261 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2262  
2263 <    /**
2264 <     * thenApplyAsync result completes normally after normal completion of source
2265 <     */
2266 <    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 <    }
2263 >        f.complete(v1);
2264 >        checkCompletedNormally(h, null);
2265 >        assertEquals(inc(v1), r.value);
2266 >        g.complete(v2);
2267  
2268 <    /**
2269 <     * thenApplyAsync result completes exceptionally after exceptional
2270 <     * completion of source
2271 <     */
1859 <    public void testThenApplyAsync2() {
1860 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1861 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
1862 <        f.completeExceptionally(new CFException());
1863 <        checkCompletedWithWrappedCFException(g);
1864 <    }
2268 >        checkCompletedNormally(f, v1);
2269 >        checkCompletedNormally(g, v2);
2270 >        checkCompletedNormally(h, null);
2271 >    }}
2272  
2273 <    /**
2274 <     * thenApplyAsync result completes exceptionally if action does
2275 <     */
2276 <    public void testThenApplyAsync3() {
2277 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2278 <        FailingFunction r = new FailingFunction();
2279 <        CompletableFuture<Integer> g = f.thenApplyAsync(r);
2280 <        f.complete(null);
2281 <        checkCompletedWithWrappedCFException(g);
1875 <    }
2273 >    public void testAcceptEither_normalCompletion2() {
2274 >        for (ExecutionMode m : ExecutionMode.values())
2275 >        for (Integer v1 : new Integer[] { 1, null })
2276 >        for (Integer v2 : new Integer[] { 2, null })
2277 >    {
2278 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2279 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2280 >        final IncAction r = new IncAction();
2281 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2282  
2283 <    /**
2284 <     * thenApplyAsync result completes exceptionally if source cancelled
2285 <     */
2286 <    public void testThenApplyAsync4() {
1881 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1882 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
1883 <        assertTrue(f.cancel(true));
1884 <        checkCompletedWithWrappedCancellationException(g);
1885 <    }
2283 >        g.complete(v2);
2284 >        checkCompletedNormally(h, null);
2285 >        assertEquals(inc(v2), r.value);
2286 >        f.complete(v1);
2287  
2288 <    /**
2289 <     * thenAcceptAsync result completes normally after normal
2290 <     * completion of source
2291 <     */
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 <    }
2288 >        checkCompletedNormally(f, v1);
2289 >        checkCompletedNormally(g, v2);
2290 >        checkCompletedNormally(h, null);
2291 >    }}
2292  
2293 <    /**
2294 <     * thenAcceptAsync result completes exceptionally after exceptional
2295 <     * completion of source
2296 <     */
2297 <    public void testThenAcceptAsync2() {
2298 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2299 <        IncAction r = new IncAction();
2300 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
1908 <        f.completeExceptionally(new CFException());
1909 <        checkCompletedWithWrappedCFException(g);
1910 <    }
2293 >    public void testAcceptEither_normalCompletion3() {
2294 >        for (ExecutionMode m : ExecutionMode.values())
2295 >        for (Integer v1 : new Integer[] { 1, null })
2296 >        for (Integer v2 : new Integer[] { 2, null })
2297 >    {
2298 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2299 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2300 >        final IncAction r = new IncAction();
2301  
2302 <    /**
2303 <     * thenAcceptAsync result completes exceptionally if action does
2304 <     */
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 <    }
2302 >        f.complete(v1);
2303 >        g.complete(v2);
2304 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2305  
2306 <    /**
2307 <     * thenAcceptAsync result completes exceptionally if source cancelled
2308 <     */
2309 <    public void testThenAcceptAsync4() {
2310 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2311 <        IncAction r = new IncAction();
2312 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2313 <        assertTrue(f.cancel(true));
1931 <        checkCompletedWithWrappedCancellationException(g);
1932 <    }
2306 >        checkCompletedNormally(h, null);
2307 >        checkCompletedNormally(f, v1);
2308 >        checkCompletedNormally(g, v2);
2309 >
2310 >        // unspecified behavior
2311 >        assertTrue(Objects.equals(r.value, inc(v1)) ||
2312 >                   Objects.equals(r.value, inc(v2)));
2313 >    }}
2314  
2315      /**
2316 <     * thenCombineAsync result completes normally after normal
2317 <     * completion of sources
2316 >     * acceptEither result completes exceptionally after exceptional
2317 >     * completion of either source
2318       */
2319 <    public void testThenCombineAsync() {
2320 <        CompletableFuture<Integer> f, g, h;
2319 >    public void testAcceptEither_exceptionalCompletion1() {
2320 >        for (ExecutionMode m : ExecutionMode.values())
2321 >        for (Integer v1 : new Integer[] { 1, null })
2322 >    {
2323 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2324 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2325 >        final IncAction r = new IncAction();
2326 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2327 >        final CFException ex = new CFException();
2328  
2329 <        f = new CompletableFuture<>();
2330 <        g = new CompletableFuture<>();
2331 <        h = f.thenCombineAsync(g, subtract);
1944 <        f.complete(3);
1945 <        checkIncomplete(h);
1946 <        g.complete(1);
1947 <        checkCompletedNormally(h, 2);
2329 >        f.completeExceptionally(ex);
2330 >        checkCompletedWithWrappedCFException(h, ex);
2331 >        g.complete(v1);
2332  
2333 <        f = new CompletableFuture<>();
2334 <        g = new CompletableFuture<>();
2335 <        h = f.thenCombineAsync(g, subtract);
2336 <        g.complete(1);
2337 <        checkIncomplete(h);
1954 <        f.complete(3);
1955 <        checkCompletedNormally(h, 2);
2333 >        assertEquals(0, r.invocationCount);
2334 >        checkCompletedNormally(g, v1);
2335 >        checkCompletedWithWrappedCFException(f, ex);
2336 >        checkCompletedWithWrappedCFException(h, ex);
2337 >    }}
2338  
2339 <        f = new CompletableFuture<>();
2340 <        g = new CompletableFuture<>();
2341 <        g.complete(1);
2342 <        f.complete(3);
2343 <        h = f.thenCombineAsync(g, subtract);
2344 <        checkCompletedNormally(h, 2);
2345 <    }
2339 >    public void testAcceptEither_exceptionalCompletion2() {
2340 >        for (ExecutionMode m : ExecutionMode.values())
2341 >        for (Integer v1 : new Integer[] { 1, null })
2342 >    {
2343 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2344 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2345 >        final IncAction r = new IncAction();
2346 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2347 >        final CFException ex = new CFException();
2348 >
2349 >        g.completeExceptionally(ex);
2350 >        checkCompletedWithWrappedCFException(h, ex);
2351 >        f.complete(v1);
2352 >
2353 >        assertEquals(0, r.invocationCount);
2354 >        checkCompletedNormally(f, v1);
2355 >        checkCompletedWithWrappedCFException(g, ex);
2356 >        checkCompletedWithWrappedCFException(h, ex);
2357 >    }}
2358 >
2359 >    public void testAcceptEither_exceptionalCompletion3() {
2360 >        for (ExecutionMode m : ExecutionMode.values())
2361 >        for (Integer v1 : new Integer[] { 1, null })
2362 >    {
2363 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2364 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2365 >        final IncAction r = new IncAction();
2366 >        final CFException ex = new CFException();
2367 >
2368 >        g.completeExceptionally(ex);
2369 >        f.complete(v1);
2370 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2371 >
2372 >        // unspecified behavior
2373 >        Integer v;
2374 >        try {
2375 >            assertNull(h.join());
2376 >            assertEquals(1, r.invocationCount);
2377 >            assertEquals(inc(v1), r.value);
2378 >        } catch (CompletionException ok) {
2379 >            checkCompletedWithWrappedCFException(h, ex);
2380 >            assertEquals(0, r.invocationCount);
2381 >        }
2382 >
2383 >        checkCompletedWithWrappedCFException(g, ex);
2384 >        checkCompletedNormally(f, v1);
2385 >    }}
2386 >
2387 >    public void testAcceptEither_exceptionalCompletion4() {
2388 >        for (ExecutionMode m : ExecutionMode.values())
2389 >        for (Integer v1 : new Integer[] { 1, null })
2390 >    {
2391 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2392 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2393 >        final IncAction r = new IncAction();
2394 >        final CFException ex = new CFException();
2395 >
2396 >        f.completeExceptionally(ex);
2397 >        g.complete(v1);
2398 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2399 >
2400 >        // unspecified behavior
2401 >        Integer v;
2402 >        try {
2403 >            assertNull(h.join());
2404 >            assertEquals(1, r.invocationCount);
2405 >            assertEquals(inc(v1), r.value);
2406 >        } catch (CompletionException ok) {
2407 >            checkCompletedWithWrappedCFException(h, ex);
2408 >            assertEquals(0, r.invocationCount);
2409 >        }
2410 >
2411 >        checkCompletedWithWrappedCFException(f, ex);
2412 >        checkCompletedNormally(g, v1);
2413 >    }}
2414  
2415      /**
2416 <     * thenCombineAsync result completes exceptionally after exceptional
1967 <     * completion of either source
2416 >     * acceptEither result completes exceptionally if action does
2417       */
2418 <    public void testThenCombineAsync2() {
2419 <        CompletableFuture<Integer> f, g, h;
2418 >    public void testAcceptEither_actionFailed1() {
2419 >        for (ExecutionMode m : ExecutionMode.values())
2420 >        for (Integer v1 : new Integer[] { 1, null })
2421 >        for (Integer v2 : new Integer[] { 2, null })
2422 >    {
2423 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2424 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2425 >        final FailingConsumer r = new FailingConsumer();
2426 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2427  
2428 <        f = new CompletableFuture<>();
1973 <        g = new CompletableFuture<>();
1974 <        h = f.thenCombineAsync(g, subtract);
1975 <        f.completeExceptionally(new CFException());
1976 <        checkIncomplete(h);
1977 <        g.complete(1);
2428 >        f.complete(v1);
2429          checkCompletedWithWrappedCFException(h);
2430 +        g.complete(v2);
2431 +        checkCompletedNormally(f, v1);
2432 +        checkCompletedNormally(g, v2);
2433 +    }}
2434  
2435 <        f = new CompletableFuture<>();
2436 <        g = new CompletableFuture<>();
2437 <        h = f.thenCombineAsync(g, subtract);
2438 <        g.completeExceptionally(new CFException());
2439 <        checkIncomplete(h);
2440 <        f.complete(3);
2441 <        checkCompletedWithWrappedCFException(h);
2435 >    public void testAcceptEither_actionFailed2() {
2436 >        for (ExecutionMode m : ExecutionMode.values())
2437 >        for (Integer v1 : new Integer[] { 1, null })
2438 >        for (Integer v2 : new Integer[] { 2, null })
2439 >    {
2440 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2441 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2442 >        final FailingConsumer r = new FailingConsumer();
2443 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2444  
2445 <        f = new CompletableFuture<>();
1989 <        g = new CompletableFuture<>();
1990 <        g.completeExceptionally(new CFException());
1991 <        f.complete(3);
1992 <        h = f.thenCombineAsync(g, subtract);
2445 >        g.complete(v2);
2446          checkCompletedWithWrappedCFException(h);
2447 <    }
2448 <
2449 <    /**
2450 <     * thenCombineAsync result completes exceptionally if action does
1998 <     */
1999 <    public void testThenCombineAsync3() {
2000 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2001 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2002 <        FailingBiFunction r = new FailingBiFunction();
2003 <        CompletableFuture<Integer> g = f.thenCombineAsync(f2, r);
2004 <        f.complete(one);
2005 <        checkIncomplete(g);
2006 <        assertFalse(r.ran);
2007 <        f2.complete(two);
2008 <        checkCompletedWithWrappedCFException(g);
2009 <        assertTrue(r.ran);
2010 <    }
2447 >        f.complete(v1);
2448 >        checkCompletedNormally(f, v1);
2449 >        checkCompletedNormally(g, v2);
2450 >    }}
2451  
2452      /**
2453 <     * thenCombineAsync result completes exceptionally if either source cancelled
2453 >     * acceptEither result completes exceptionally if either source cancelled
2454       */
2455 <    public void testThenCombineAsync4() {
2456 <        CompletableFuture<Integer> f, g, h;
2455 >    public void testAcceptEither_sourceCancelled1() {
2456 >        for (ExecutionMode m : ExecutionMode.values())
2457 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2458 >        for (Integer v1 : new Integer[] { 1, null })
2459 >    {
2460 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2461 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2462 >        final IncAction r = new IncAction();
2463 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2464  
2465 <        f = new CompletableFuture<>();
2019 <        g = new CompletableFuture<>();
2020 <        h = f.thenCombineAsync(g, subtract);
2021 <        assertTrue(f.cancel(true));
2022 <        checkIncomplete(h);
2023 <        g.complete(1);
2465 >        assertTrue(f.cancel(mayInterruptIfRunning));
2466          checkCompletedWithWrappedCancellationException(h);
2467 +        g.complete(v1);
2468  
2469 <        f = new CompletableFuture<>();
2470 <        g = new CompletableFuture<>();
2471 <        h = f.thenCombineAsync(g, subtract);
2029 <        assertTrue(g.cancel(true));
2030 <        checkIncomplete(h);
2031 <        f.complete(3);
2469 >        checkCancelled(f);
2470 >        assertEquals(0, r.invocationCount);
2471 >        checkCompletedNormally(g, v1);
2472          checkCompletedWithWrappedCancellationException(h);
2473 +    }}
2474  
2475 <        f = new CompletableFuture<>();
2476 <        g = new CompletableFuture<>();
2477 <        g.complete(3);
2478 <        assertTrue(f.cancel(true));
2479 <        h = f.thenCombineAsync(g, subtract);
2475 >    public void testAcceptEither_sourceCancelled2() {
2476 >        for (ExecutionMode m : ExecutionMode.values())
2477 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2478 >        for (Integer v1 : new Integer[] { 1, null })
2479 >    {
2480 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2481 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2482 >        final IncAction r = new IncAction();
2483 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2484 >
2485 >        assertTrue(g.cancel(mayInterruptIfRunning));
2486          checkCompletedWithWrappedCancellationException(h);
2487 +        f.complete(v1);
2488  
2489 <        f = new CompletableFuture<>();
2490 <        g = new CompletableFuture<>();
2491 <        f.complete(3);
2044 <        assertTrue(g.cancel(true));
2045 <        h = f.thenCombineAsync(g, subtract);
2489 >        checkCancelled(g);
2490 >        assertEquals(0, r.invocationCount);
2491 >        checkCompletedNormally(f, v1);
2492          checkCompletedWithWrappedCancellationException(h);
2493 <    }
2493 >    }}
2494  
2495 <    /**
2496 <     * applyToEitherAsync result completes normally after normal
2497 <     * completion of sources
2498 <     */
2499 <    public void testApplyToEitherAsync() {
2500 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2501 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2502 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
2057 <        f.complete(one);
2058 <        checkCompletedNormally(g, two);
2495 >    public void testAcceptEither_sourceCancelled3() {
2496 >        for (ExecutionMode m : ExecutionMode.values())
2497 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2498 >        for (Integer v1 : new Integer[] { 1, null })
2499 >    {
2500 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2501 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2502 >        final IncAction r = new IncAction();
2503  
2504 <        f = new CompletableFuture<>();
2505 <        f.complete(one);
2506 <        f2 = new CompletableFuture<>();
2063 <        g = f.applyToEitherAsync(f2, inc);
2064 <        checkCompletedNormally(g, two);
2065 <    }
2504 >        assertTrue(g.cancel(mayInterruptIfRunning));
2505 >        f.complete(v1);
2506 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2507  
2508 <    /**
2509 <     * applyToEitherAsync result completes exceptionally after exceptional
2510 <     * completion of source
2511 <     */
2512 <    public void testApplyToEitherAsync2() {
2513 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2514 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2515 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
2516 <        f.completeExceptionally(new CFException());
2517 <        checkCompletedWithWrappedCFException(g);
2508 >        // unspecified behavior
2509 >        Integer v;
2510 >        try {
2511 >            assertNull(h.join());
2512 >            assertEquals(1, r.invocationCount);
2513 >            assertEquals(inc(v1), r.value);
2514 >        } catch (CompletionException ok) {
2515 >            checkCompletedWithWrappedCancellationException(h);
2516 >            assertEquals(0, r.invocationCount);
2517 >        }
2518  
2519 <        f = new CompletableFuture<>();
2520 <        f2 = new CompletableFuture<>();
2521 <        f2.completeExceptionally(new CFException());
2081 <        g = f.applyToEitherAsync(f2, inc);
2082 <        f.complete(one);
2083 <        checkCompletedWithWrappedCFException(g);
2084 <    }
2519 >        checkCancelled(g);
2520 >        checkCompletedNormally(f, v1);
2521 >    }}
2522  
2523 <    /**
2524 <     * applyToEitherAsync result completes exceptionally if action does
2525 <     */
2526 <    public void testApplyToEitherAsync3() {
2527 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2528 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2529 <        FailingFunction r = new FailingFunction();
2530 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, r);
2094 <        f.complete(one);
2095 <        checkCompletedWithWrappedCFException(g);
2096 <    }
2523 >    public void testAcceptEither_sourceCancelled4() {
2524 >        for (ExecutionMode m : ExecutionMode.values())
2525 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2526 >        for (Integer v1 : new Integer[] { 1, null })
2527 >    {
2528 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2529 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2530 >        final IncAction r = new IncAction();
2531  
2532 <    /**
2533 <     * applyToEitherAsync result completes exceptionally if either source cancelled
2534 <     */
2101 <    public void testApplyToEitherAsync4() {
2102 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2103 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2104 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
2105 <        assertTrue(f.cancel(true));
2106 <        checkCompletedWithWrappedCancellationException(g);
2532 >        assertTrue(f.cancel(mayInterruptIfRunning));
2533 >        g.complete(v1);
2534 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2535  
2536 <        f = new CompletableFuture<>();
2537 <        f2 = new CompletableFuture<>();
2538 <        assertTrue(f2.cancel(true));
2539 <        g = f.applyToEitherAsync(f2, inc);
2540 <        checkCompletedWithWrappedCancellationException(g);
2541 <    }
2536 >        // unspecified behavior
2537 >        Integer v;
2538 >        try {
2539 >            assertNull(h.join());
2540 >            assertEquals(1, r.invocationCount);
2541 >            assertEquals(inc(v1), r.value);
2542 >        } catch (CompletionException ok) {
2543 >            checkCompletedWithWrappedCancellationException(h);
2544 >            assertEquals(0, r.invocationCount);
2545 >        }
2546 >
2547 >        checkCancelled(f);
2548 >        checkCompletedNormally(g, v1);
2549 >    }}
2550  
2551      /**
2552 <     * acceptEitherAsync result completes normally after normal
2553 <     * completion of sources
2552 >     * runAfterEither result completes normally after normal completion
2553 >     * of either source
2554       */
2555 <    public void testAcceptEitherAsync() {
2556 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2557 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2558 <        IncAction r = new IncAction();
2559 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
2560 <        f.complete(one);
2561 <        checkCompletedNormally(g, null);
2562 <        assertEquals(r.value, 2);
2555 >    public void testRunAfterEither_normalCompletion1() {
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 <        r = new IncAction();
2566 <        f = new CompletableFuture<>();
2567 <        f.complete(one);
2568 <        f2 = new CompletableFuture<>();
2132 <        g = f.acceptEitherAsync(f2, r);
2133 <        checkCompletedNormally(g, null);
2134 <        assertEquals(r.value, 2);
2135 <    }
2565 >        f.complete(v1);
2566 >        checkCompletedNormally(h, null);
2567 >        assertEquals(1, r.invocationCount);
2568 >        g.complete(v2);
2569  
2570 <    /**
2571 <     * acceptEitherAsync result completes exceptionally after exceptional
2572 <     * completion of source
2573 <     */
2574 <    public void testAcceptEitherAsync2() {
2142 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2143 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2144 <        IncAction r = new IncAction();
2145 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
2146 <        f.completeExceptionally(new CFException());
2147 <        checkCompletedWithWrappedCFException(g);
2570 >        checkCompletedNormally(f, v1);
2571 >        checkCompletedNormally(g, v2);
2572 >        checkCompletedNormally(h, null);
2573 >        assertEquals(1, r.invocationCount);
2574 >    }}
2575  
2576 <        r = new IncAction();
2577 <        f = new CompletableFuture<>();
2578 <        f2 = new CompletableFuture<>();
2579 <        f2.completeExceptionally(new CFException());
2580 <        g = f.acceptEitherAsync(f2, r);
2581 <        f.complete(one);
2582 <        checkCompletedWithWrappedCFException(g);
2583 <    }
2576 >    public void testRunAfterEither_normalCompletion2() {
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 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2585  
2586 <    /**
2587 <     * acceptEitherAsync result completes exceptionally if action does
2588 <     */
2589 <    public void testAcceptEitherAsync3() {
2162 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2163 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2164 <        FailingConsumer r = new FailingConsumer();
2165 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
2166 <        f.complete(one);
2167 <        checkCompletedWithWrappedCFException(g);
2168 <    }
2586 >        g.complete(v2);
2587 >        checkCompletedNormally(h, null);
2588 >        assertEquals(1, r.invocationCount);
2589 >        f.complete(v1);
2590  
2591 <    /**
2592 <     * acceptEitherAsync result completes exceptionally if either
2593 <     * source cancelled
2594 <     */
2595 <    public void testAcceptEitherAsync4() {
2175 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2176 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2177 <        IncAction r = new IncAction();
2178 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
2179 <        assertTrue(f.cancel(true));
2180 <        checkCompletedWithWrappedCancellationException(g);
2591 >        checkCompletedNormally(f, v1);
2592 >        checkCompletedNormally(g, v2);
2593 >        checkCompletedNormally(h, null);
2594 >        assertEquals(1, r.invocationCount);
2595 >        }}
2596  
2597 <        r = new IncAction();
2598 <        f = new CompletableFuture<>();
2599 <        f2 = new CompletableFuture<>();
2600 <        assertTrue(f2.cancel(true));
2601 <        g = f.acceptEitherAsync(f2, r);
2602 <        checkCompletedWithWrappedCancellationException(g);
2603 <    }
2597 >    public void testRunAfterEither_normalCompletion3() {
2598 >        for (ExecutionMode m : ExecutionMode.values())
2599 >        for (Integer v1 : new Integer[] { 1, null })
2600 >        for (Integer v2 : new Integer[] { 2, null })
2601 >    {
2602 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2603 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2604 >        final Noop r = new Noop();
2605  
2606 <    /**
2607 <     * runAfterEitherAsync result completes normally after normal
2608 <     * completion of sources
2193 <     */
2194 <    public void testRunAfterEitherAsync() {
2195 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2196 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2197 <        Noop r = new Noop();
2198 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
2199 <        f.complete(one);
2200 <        checkCompletedNormally(g, null);
2201 <        assertTrue(r.ran);
2606 >        f.complete(v1);
2607 >        g.complete(v2);
2608 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2609  
2610 <        r = new Noop();
2611 <        f = new CompletableFuture<>();
2612 <        f.complete(one);
2613 <        f2 = new CompletableFuture<>();
2614 <        g = f.runAfterEitherAsync(f2, r);
2208 <        checkCompletedNormally(g, null);
2209 <        assertTrue(r.ran);
2210 <    }
2610 >        checkCompletedNormally(h, null);
2611 >        checkCompletedNormally(f, v1);
2612 >        checkCompletedNormally(g, v2);
2613 >        assertEquals(1, r.invocationCount);
2614 >    }}
2615  
2616      /**
2617 <     * runAfterEitherAsync result completes exceptionally after exceptional
2618 <     * completion of source
2617 >     * runAfterEither result completes exceptionally after exceptional
2618 >     * completion of either source
2619       */
2620 <    public void testRunAfterEitherAsync2() {
2621 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2622 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2623 <        Noop r = new Noop();
2624 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
2625 <        f.completeExceptionally(new CFException());
2626 <        checkCompletedWithWrappedCFException(g);
2620 >    public void testRunAfterEither_exceptionalCompletion1() {
2621 >        for (ExecutionMode m : ExecutionMode.values())
2622 >        for (Integer v1 : new Integer[] { 1, null })
2623 >    {
2624 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2625 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2626 >        final Noop r = new Noop();
2627 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2628 >        final CFException ex = new CFException();
2629  
2630 <        r = new Noop();
2631 <        f = new CompletableFuture<>();
2632 <        f2 = new CompletableFuture<>();
2227 <        f2.completeExceptionally(new CFException());
2228 <        g = f.runAfterEitherAsync(f2, r);
2229 <        f.complete(one);
2230 <        checkCompletedWithWrappedCFException(g);
2231 <    }
2630 >        f.completeExceptionally(ex);
2631 >        checkCompletedWithWrappedCFException(h, ex);
2632 >        g.complete(v1);
2633  
2634 <    /**
2635 <     * runAfterEitherAsync result completes exceptionally if action does
2636 <     */
2637 <    public void testRunAfterEitherAsync3() {
2638 <        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 <    }
2634 >        assertEquals(0, r.invocationCount);
2635 >        checkCompletedNormally(g, v1);
2636 >        checkCompletedWithWrappedCFException(f, ex);
2637 >        checkCompletedWithWrappedCFException(h, ex);
2638 >    }}
2639  
2640 <    /**
2641 <     * runAfterEitherAsync result completes exceptionally if either
2642 <     * source cancelled
2643 <     */
2644 <    public void testRunAfterEitherAsync4() {
2645 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2646 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2647 <        Noop r = new Noop();
2648 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
2254 <        assertTrue(f.cancel(true));
2255 <        checkCompletedWithWrappedCancellationException(g);
2640 >    public void testRunAfterEither_exceptionalCompletion2() {
2641 >        for (ExecutionMode m : ExecutionMode.values())
2642 >        for (Integer v1 : new Integer[] { 1, null })
2643 >    {
2644 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2645 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2646 >        final Noop r = new Noop();
2647 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2648 >        final CFException ex = new CFException();
2649  
2650 <        r = new Noop();
2651 <        f = new CompletableFuture<>();
2652 <        f2 = new CompletableFuture<>();
2260 <        assertTrue(f2.cancel(true));
2261 <        g = f.runAfterEitherAsync(f2, r);
2262 <        checkCompletedWithWrappedCancellationException(g);
2263 <    }
2650 >        g.completeExceptionally(ex);
2651 >        checkCompletedWithWrappedCFException(h, ex);
2652 >        f.complete(v1);
2653  
2654 <    /**
2655 <     * thenComposeAsync result completes normally after normal
2656 <     * completion of source
2657 <     */
2658 <    public void testThenComposeAsync() {
2270 <        CompletableFuture<Integer> f, g;
2271 <        CompletableFutureInc r;
2654 >        assertEquals(0, r.invocationCount);
2655 >        checkCompletedNormally(f, v1);
2656 >        checkCompletedWithWrappedCFException(g, ex);
2657 >        checkCompletedWithWrappedCFException(h, ex);
2658 >    }}
2659  
2660 <        f = new CompletableFuture<>();
2661 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2662 <        f.complete(one);
2663 <        checkCompletedNormally(g, two);
2660 >    public void testRunAfterEither_exceptionalCompletion3() {
2661 >        for (ExecutionMode m : ExecutionMode.values())
2662 >        for (Integer v1 : new Integer[] { 1, null })
2663 >    {
2664 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2665 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2666 >        final Noop r = new Noop();
2667 >        final CFException ex = new CFException();
2668  
2669 <        f = new CompletableFuture<>();
2670 <        f.complete(one);
2671 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2281 <        checkCompletedNormally(g, two);
2282 <    }
2669 >        g.completeExceptionally(ex);
2670 >        f.complete(v1);
2671 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2672  
2673 <    /**
2674 <     * thenComposeAsync result completes exceptionally after
2675 <     * exceptional completion of source
2676 <     */
2677 <    public void testThenComposeAsync2() {
2678 <        CompletableFuture<Integer> f, g;
2679 <        CompletableFutureInc r;
2673 >        // unspecified behavior
2674 >        Integer v;
2675 >        try {
2676 >            assertNull(h.join());
2677 >            assertEquals(1, r.invocationCount);
2678 >        } catch (CompletionException ok) {
2679 >            checkCompletedWithWrappedCFException(h, ex);
2680 >            assertEquals(0, r.invocationCount);
2681 >        }
2682  
2683 <        f = new CompletableFuture<>();
2684 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2685 <        f.completeExceptionally(new CFException());
2295 <        checkCompletedWithWrappedCFException(g);
2296 <        assertFalse(r.ran);
2683 >        checkCompletedWithWrappedCFException(g, ex);
2684 >        checkCompletedNormally(f, v1);
2685 >    }}
2686  
2687 <        f = new CompletableFuture<>();
2688 <        f.completeExceptionally(new CFException());
2689 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2690 <        checkCompletedWithWrappedCFException(g);
2691 <        assertFalse(r.ran);
2692 <    }
2687 >    public void testRunAfterEither_exceptionalCompletion4() {
2688 >        for (ExecutionMode m : ExecutionMode.values())
2689 >        for (Integer v1 : new Integer[] { 1, null })
2690 >    {
2691 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2692 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2693 >        final Noop r = new Noop();
2694 >        final CFException ex = new CFException();
2695 >
2696 >        f.completeExceptionally(ex);
2697 >        g.complete(v1);
2698 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2699 >
2700 >        // unspecified behavior
2701 >        Integer v;
2702 >        try {
2703 >            assertNull(h.join());
2704 >            assertEquals(1, r.invocationCount);
2705 >        } catch (CompletionException ok) {
2706 >            checkCompletedWithWrappedCFException(h, ex);
2707 >            assertEquals(0, r.invocationCount);
2708 >        }
2709 >
2710 >        checkCompletedWithWrappedCFException(f, ex);
2711 >        checkCompletedNormally(g, v1);
2712 >    }}
2713  
2714      /**
2715 <     * thenComposeAsync result completes exceptionally if action does
2715 >     * runAfterEither result completes exceptionally if action does
2716       */
2717 <    public void testThenComposeAsync3() {
2718 <        CompletableFuture<Integer> f, g;
2719 <        FailingCompletableFutureFunction r;
2717 >    public void testRunAfterEither_actionFailed1() {
2718 >        for (ExecutionMode m : ExecutionMode.values())
2719 >        for (Integer v1 : new Integer[] { 1, null })
2720 >        for (Integer v2 : new Integer[] { 2, null })
2721 >    {
2722 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2723 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2724 >        final FailingNoop r = new FailingNoop();
2725 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2726  
2727 <        f = new CompletableFuture<>();
2728 <        g = f.thenComposeAsync(r = new FailingCompletableFutureFunction());
2729 <        f.complete(one);
2730 <        checkCompletedWithWrappedCFException(g);
2727 >        f.complete(v1);
2728 >        checkCompletedWithWrappedCFException(h);
2729 >        g.complete(v2);
2730 >        checkCompletedNormally(f, v1);
2731 >        checkCompletedNormally(g, v2);
2732 >    }}
2733  
2734 <        f = new CompletableFuture<>();
2735 <        f.complete(one);
2736 <        g = f.thenComposeAsync(r = new FailingCompletableFutureFunction());
2737 <        checkCompletedWithWrappedCFException(g);
2738 <    }
2734 >    public void testRunAfterEither_actionFailed2() {
2735 >        for (ExecutionMode m : ExecutionMode.values())
2736 >        for (Integer v1 : new Integer[] { 1, null })
2737 >        for (Integer v2 : new Integer[] { 2, null })
2738 >    {
2739 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2740 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2741 >        final FailingNoop r = new FailingNoop();
2742 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2743 >
2744 >        g.complete(v2);
2745 >        checkCompletedWithWrappedCFException(h);
2746 >        f.complete(v1);
2747 >        checkCompletedNormally(f, v1);
2748 >        checkCompletedNormally(g, v2);
2749 >    }}
2750  
2751      /**
2752 <     * thenComposeAsync result completes exceptionally if source cancelled
2752 >     * runAfterEither result completes exceptionally if either source cancelled
2753       */
2754 <    public void testThenComposeAsync4() {
2755 <        CompletableFuture<Integer> f, g;
2756 <        CompletableFutureInc r;
2754 >    public void testRunAfterEither_sourceCancelled1() {
2755 >        for (ExecutionMode m : ExecutionMode.values())
2756 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2757 >        for (Integer v1 : new Integer[] { 1, null })
2758 >    {
2759 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2760 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2761 >        final Noop r = new Noop();
2762 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2763  
2764 <        f = new CompletableFuture<>();
2765 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2766 <        assertTrue(f.cancel(true));
2333 <        checkCompletedWithWrappedCancellationException(g);
2764 >        assertTrue(f.cancel(mayInterruptIfRunning));
2765 >        checkCompletedWithWrappedCancellationException(h);
2766 >        g.complete(v1);
2767  
2768 <        f = new CompletableFuture<>();
2769 <        assertTrue(f.cancel(true));
2770 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2771 <        checkCompletedWithWrappedCancellationException(g);
2772 <    }
2768 >        checkCancelled(f);
2769 >        assertEquals(0, r.invocationCount);
2770 >        checkCompletedNormally(g, v1);
2771 >        checkCompletedWithWrappedCancellationException(h);
2772 >    }}
2773  
2774 <    // async with explicit executors
2774 >    public void testRunAfterEither_sourceCancelled2() {
2775 >        for (ExecutionMode m : ExecutionMode.values())
2776 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2777 >        for (Integer v1 : new Integer[] { 1, null })
2778 >    {
2779 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2780 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2781 >        final Noop r = new Noop();
2782 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2783 >
2784 >        assertTrue(g.cancel(mayInterruptIfRunning));
2785 >        checkCompletedWithWrappedCancellationException(h);
2786 >        f.complete(v1);
2787 >
2788 >        checkCancelled(g);
2789 >        assertEquals(0, r.invocationCount);
2790 >        checkCompletedNormally(f, v1);
2791 >        checkCompletedWithWrappedCancellationException(h);
2792 >    }}
2793 >
2794 >    public void testRunAfterEither_sourceCancelled3() {
2795 >        for (ExecutionMode m : ExecutionMode.values())
2796 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2797 >        for (Integer v1 : new Integer[] { 1, null })
2798 >    {
2799 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2800 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2801 >        final Noop r = new Noop();
2802 >
2803 >        assertTrue(g.cancel(mayInterruptIfRunning));
2804 >        f.complete(v1);
2805 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2806 >
2807 >        // unspecified behavior
2808 >        Integer v;
2809 >        try {
2810 >            assertNull(h.join());
2811 >            assertEquals(1, r.invocationCount);
2812 >        } catch (CompletionException ok) {
2813 >            checkCompletedWithWrappedCancellationException(h);
2814 >            assertEquals(0, r.invocationCount);
2815 >        }
2816 >
2817 >        checkCancelled(g);
2818 >        checkCompletedNormally(f, v1);
2819 >    }}
2820 >
2821 >    public void testRunAfterEither_sourceCancelled4() {
2822 >        for (ExecutionMode m : ExecutionMode.values())
2823 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2824 >        for (Integer v1 : new Integer[] { 1, null })
2825 >    {
2826 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2827 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2828 >        final Noop r = new Noop();
2829 >
2830 >        assertTrue(f.cancel(mayInterruptIfRunning));
2831 >        g.complete(v1);
2832 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2833 >
2834 >        // unspecified behavior
2835 >        Integer v;
2836 >        try {
2837 >            assertNull(h.join());
2838 >            assertEquals(1, r.invocationCount);
2839 >        } catch (CompletionException ok) {
2840 >            checkCompletedWithWrappedCancellationException(h);
2841 >            assertEquals(0, r.invocationCount);
2842 >        }
2843 >
2844 >        checkCancelled(f);
2845 >        checkCompletedNormally(g, v1);
2846 >    }}
2847  
2848      /**
2849 <     * thenRunAsync result completes normally after normal completion of source
2849 >     * thenCompose result completes normally after normal completion of source
2850       */
2851 <    public void testThenRunAsyncE() {
2852 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2853 <        Noop r = new Noop();
2854 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2855 <        f.complete(null);
2856 <        checkCompletedNormally(g, null);
2851 >    public void testThenCompose_normalCompletion() {
2852 >        for (ExecutionMode m : ExecutionMode.values())
2853 >        for (boolean createIncomplete : new boolean[] { true, false })
2854 >        for (Integer v1 : new Integer[] { 1, null })
2855 >    {
2856 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2857 >        final CompletableFutureInc r = new CompletableFutureInc();
2858 >        if (!createIncomplete) f.complete(v1);
2859 >        final CompletableFuture<Integer> g = f.thenCompose(r);
2860 >        if (createIncomplete) f.complete(v1);
2861  
2862 <        // reordered version
2863 <        f = new CompletableFuture<>();
2864 <        f.complete(null);
2865 <        r = new Noop();
2357 <        g = f.thenRunAsync(r, new ThreadExecutor());
2358 <        checkCompletedNormally(g, null);
2359 <    }
2862 >        checkCompletedNormally(g, inc(v1));
2863 >        checkCompletedNormally(f, v1);
2864 >        assertEquals(1, r.invocationCount);
2865 >    }}
2866  
2867      /**
2868 <     * thenRunAsync result completes exceptionally after exceptional
2868 >     * thenCompose result completes exceptionally after exceptional
2869       * completion of source
2870       */
2871 <    public void testThenRunAsync2E() {
2872 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2873 <        Noop r = new Noop();
2874 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2875 <        f.completeExceptionally(new CFException());
2876 <        try {
2877 <            g.join();
2878 <            shouldThrow();
2879 <        } catch (CompletionException success) {}
2880 <        checkCompletedWithWrappedCFException(g);
2881 <    }
2871 >    public void testThenCompose_exceptionalCompletion() {
2872 >        for (ExecutionMode m : ExecutionMode.values())
2873 >        for (boolean createIncomplete : new boolean[] { true, false })
2874 >    {
2875 >        final CFException ex = new CFException();
2876 >        final CompletableFutureInc r = new CompletableFutureInc();
2877 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2878 >        if (!createIncomplete) f.completeExceptionally(ex);
2879 >        final CompletableFuture<Integer> g = f.thenCompose(r);
2880 >        if (createIncomplete) f.completeExceptionally(ex);
2881 >
2882 >        checkCompletedWithWrappedCFException(g, ex);
2883 >        checkCompletedWithWrappedCFException(f, ex);
2884 >        assertEquals(0, r.invocationCount);
2885 >    }}
2886  
2887      /**
2888 <     * thenRunAsync result completes exceptionally if action does
2888 >     * thenCompose result completes exceptionally if action does
2889       */
2890 <    public void testThenRunAsync3E() {
2891 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2892 <        FailingNoop r = new FailingNoop();
2893 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2894 <        f.complete(null);
2890 >    public void testThenCompose_actionFailed() {
2891 >        for (ExecutionMode m : ExecutionMode.values())
2892 >        for (boolean createIncomplete : new boolean[] { true, false })
2893 >        for (Integer v1 : new Integer[] { 1, null })
2894 >    {
2895 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2896 >        final FailingCompletableFutureFunction r
2897 >            = new FailingCompletableFutureFunction();
2898 >        if (!createIncomplete) f.complete(v1);
2899 >        final CompletableFuture<Integer> g = f.thenCompose(r);
2900 >        if (createIncomplete) f.complete(v1);
2901 >
2902          checkCompletedWithWrappedCFException(g);
2903 <    }
2903 >        checkCompletedNormally(f, v1);
2904 >    }}
2905  
2906      /**
2907 <     * thenRunAsync result completes exceptionally if source cancelled
2907 >     * thenCompose result completes exceptionally if source cancelled
2908       */
2909 <    public void testThenRunAsync4E() {
2910 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2911 <        Noop r = new Noop();
2912 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2913 <        assertTrue(f.cancel(true));
2909 >    public void testThenCompose_sourceCancelled() {
2910 >        for (ExecutionMode m : ExecutionMode.values())
2911 >        for (boolean createIncomplete : new boolean[] { true, false })
2912 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2913 >    {
2914 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2915 >        final CompletableFutureInc r = new CompletableFutureInc();
2916 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2917 >        final CompletableFuture<Integer> g = f.thenCompose(r);
2918 >        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2919 >
2920          checkCompletedWithWrappedCancellationException(g);
2921 <    }
2921 >        checkCancelled(f);
2922 >    }}
2923 >
2924 >    // asyncs
2925  
2926      /**
2927       * thenApplyAsync result completes normally after normal completion of source
2928       */
2929 <    public void testThenApplyAsyncE() {
2929 >    public void testThenApplyAsync() {
2930          CompletableFuture<Integer> f = new CompletableFuture<>();
2931 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
2931 >        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
2932          f.complete(one);
2933          checkCompletedNormally(g, two);
2934      }
# Line 2410 | Line 2937 | public class CompletableFutureTest exten
2937       * thenApplyAsync result completes exceptionally after exceptional
2938       * completion of source
2939       */
2940 <    public void testThenApplyAsync2E() {
2940 >    public void testThenApplyAsync2() {
2941          CompletableFuture<Integer> f = new CompletableFuture<>();
2942 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
2942 >        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
2943          f.completeExceptionally(new CFException());
2944          checkCompletedWithWrappedCFException(g);
2945      }
# Line 2420 | Line 2947 | public class CompletableFutureTest exten
2947      /**
2948       * thenApplyAsync result completes exceptionally if action does
2949       */
2950 <    public void testThenApplyAsync3E() {
2950 >    public void testThenApplyAsync3() {
2951          CompletableFuture<Integer> f = new CompletableFuture<>();
2952          FailingFunction r = new FailingFunction();
2953 <        CompletableFuture<Integer> g = f.thenApplyAsync(r, new ThreadExecutor());
2953 >        CompletableFuture<Integer> g = f.thenApplyAsync(r);
2954          f.complete(null);
2955          checkCompletedWithWrappedCFException(g);
2956      }
# Line 2431 | Line 2958 | public class CompletableFutureTest exten
2958      /**
2959       * thenApplyAsync result completes exceptionally if source cancelled
2960       */
2961 <    public void testThenApplyAsync4E() {
2961 >    public void testThenApplyAsync4() {
2962          CompletableFuture<Integer> f = new CompletableFuture<>();
2963 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
2963 >        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
2964          assertTrue(f.cancel(true));
2965          checkCompletedWithWrappedCancellationException(g);
2966      }
# Line 2442 | Line 2969 | public class CompletableFutureTest exten
2969       * thenAcceptAsync result completes normally after normal
2970       * completion of source
2971       */
2972 <    public void testThenAcceptAsyncE() {
2972 >    public void testThenAcceptAsync() {
2973          CompletableFuture<Integer> f = new CompletableFuture<>();
2974          IncAction r = new IncAction();
2975 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2975 >        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2976          f.complete(one);
2977          checkCompletedNormally(g, null);
2978 <        assertEquals(r.value, 2);
2978 >        assertEquals(r.value, (Integer) 2);
2979      }
2980  
2981      /**
2982       * thenAcceptAsync result completes exceptionally after exceptional
2983       * completion of source
2984       */
2985 <    public void testThenAcceptAsync2E() {
2985 >    public void testThenAcceptAsync2() {
2986          CompletableFuture<Integer> f = new CompletableFuture<>();
2987          IncAction r = new IncAction();
2988 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2988 >        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2989          f.completeExceptionally(new CFException());
2990          checkCompletedWithWrappedCFException(g);
2991      }
# Line 2466 | Line 2993 | public class CompletableFutureTest exten
2993      /**
2994       * thenAcceptAsync result completes exceptionally if action does
2995       */
2996 <    public void testThenAcceptAsync3E() {
2996 >    public void testThenAcceptAsync3() {
2997          CompletableFuture<Integer> f = new CompletableFuture<>();
2998          FailingConsumer r = new FailingConsumer();
2999 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2999 >        CompletableFuture<Void> g = f.thenAcceptAsync(r);
3000          f.complete(null);
3001          checkCompletedWithWrappedCFException(g);
3002      }
# Line 2477 | Line 3004 | public class CompletableFutureTest exten
3004      /**
3005       * thenAcceptAsync result completes exceptionally if source cancelled
3006       */
3007 <    public void testThenAcceptAsync4E() {
3007 >    public void testThenAcceptAsync4() {
3008          CompletableFuture<Integer> f = new CompletableFuture<>();
3009          IncAction r = new IncAction();
3010 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3010 >        CompletableFuture<Void> g = f.thenAcceptAsync(r);
3011          assertTrue(f.cancel(true));
3012          checkCompletedWithWrappedCancellationException(g);
3013      }
3014  
3015 <    /**
2489 <     * thenCombineAsync result completes normally after normal
2490 <     * completion of sources
2491 <     */
2492 <    public void testThenCombineAsyncE() {
2493 <        CompletableFuture<Integer> f, g, h;
2494 <        ThreadExecutor e = new ThreadExecutor();
2495 <        int count = 0;
2496 <
2497 <        f = new CompletableFuture<>();
2498 <        g = new CompletableFuture<>();
2499 <        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());
2505 <
2506 <        f = new CompletableFuture<>();
2507 <        g = new CompletableFuture<>();
2508 <        h = f.thenCombineAsync(g, subtract, e);
2509 <        g.complete(1);
2510 <        checkIncomplete(h);
2511 <        f.complete(3);
2512 <        checkCompletedNormally(h, 2);
2513 <        assertEquals(++count, e.count.get());
2514 <
2515 <        f = new CompletableFuture<>();
2516 <        g = new CompletableFuture<>();
2517 <        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 <    }
2523 <
2524 <    /**
2525 <     * thenCombineAsync result completes exceptionally after exceptional
2526 <     * completion of either source
2527 <     */
2528 <    public void testThenCombineAsync2E() {
2529 <        CompletableFuture<Integer> f, g, h;
2530 <        ThreadExecutor e = new ThreadExecutor();
2531 <        int count = 0;
2532 <
2533 <        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);
2539 <        checkCompletedWithWrappedCFException(h);
2540 <
2541 <        f = new CompletableFuture<>();
2542 <        g = new CompletableFuture<>();
2543 <        h = f.thenCombineAsync(g, subtract, e);
2544 <        g.completeExceptionally(new CFException());
2545 <        checkIncomplete(h);
2546 <        f.complete(3);
2547 <        checkCompletedWithWrappedCFException(h);
2548 <
2549 <        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);
2555 <        checkCompletedWithWrappedCFException(h);
2556 <
2557 <        assertEquals(0, e.count.get());
2558 <    }
2559 <
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 <    }
2575 <
2576 <    /**
2577 <     * thenCombineAsync result completes exceptionally if either source cancelled
2578 <     */
2579 <    public void testThenCombineAsync4E() {
2580 <        CompletableFuture<Integer> f, g, h;
2581 <        ThreadExecutor e = new ThreadExecutor();
2582 <
2583 <        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);
2589 <        checkCompletedWithWrappedCancellationException(h);
2590 <
2591 <        f = new CompletableFuture<>();
2592 <        g = new CompletableFuture<>();
2593 <        h = f.thenCombineAsync(g, subtract, e);
2594 <        assertTrue(g.cancel(true));
2595 <        checkIncomplete(h);
2596 <        f.complete(3);
2597 <        checkCompletedWithWrappedCancellationException(h);
2598 <
2599 <        f = new CompletableFuture<>();
2600 <        g = new CompletableFuture<>();
2601 <        assertTrue(g.cancel(true));
2602 <        h = f.thenCombineAsync(g, subtract, e);
2603 <        checkIncomplete(h);
2604 <        f.complete(3);
2605 <        checkCompletedWithWrappedCancellationException(h);
2606 <
2607 <        f = new CompletableFuture<>();
2608 <        g = new CompletableFuture<>();
2609 <        assertTrue(f.cancel(true));
2610 <        assertTrue(g.cancel(true));
2611 <        h = f.thenCombineAsync(g, subtract, e);
2612 <        checkCompletedWithWrappedCancellationException(h);
2613 <
2614 <        assertEquals(0, e.count.get());
2615 <    }
3015 >    // async with explicit executors
3016  
3017      /**
3018 <     * applyToEitherAsync result completes normally after normal
2619 <     * completion of sources
3018 >     * thenApplyAsync result completes normally after normal completion of source
3019       */
3020 <    public void testApplyToEitherAsyncE() {
3020 >    public void testThenApplyAsyncE() {
3021          CompletableFuture<Integer> f = new CompletableFuture<>();
3022 <        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<>();
3022 >        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
3023          f.complete(one);
2630        f2 = new CompletableFuture<>();
2631        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
3024          checkCompletedNormally(g, two);
3025      }
3026  
3027      /**
3028 <     * applyToEitherAsync result completes exceptionally after exceptional
3028 >     * thenApplyAsync result completes exceptionally after exceptional
3029       * completion of source
3030       */
3031 <    public void testApplyToEitherAsync2E() {
3031 >    public void testThenApplyAsync2E() {
3032          CompletableFuture<Integer> f = new CompletableFuture<>();
3033 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2642 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
3033 >        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
3034          f.completeExceptionally(new CFException());
3035          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);
3036      }
3037  
3038      /**
3039 <     * applyToEitherAsync result completes exceptionally if action does
3039 >     * thenApplyAsync result completes exceptionally if action does
3040       */
3041 <    public void testApplyToEitherAsync3E() {
3041 >    public void testThenApplyAsync3E() {
3042          CompletableFuture<Integer> f = new CompletableFuture<>();
2659        CompletableFuture<Integer> f2 = new CompletableFuture<>();
3043          FailingFunction r = new FailingFunction();
3044 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, r, new ThreadExecutor());
3045 <        f.complete(one);
3044 >        CompletableFuture<Integer> g = f.thenApplyAsync(r, new ThreadExecutor());
3045 >        f.complete(null);
3046          checkCompletedWithWrappedCFException(g);
3047      }
3048  
3049      /**
3050 <     * applyToEitherAsync result completes exceptionally if either source cancelled
3050 >     * thenApplyAsync result completes exceptionally if source cancelled
3051       */
3052 <    public void testApplyToEitherAsync4E() {
3052 >    public void testThenApplyAsync4E() {
3053          CompletableFuture<Integer> f = new CompletableFuture<>();
3054 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2672 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
3054 >        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
3055          assertTrue(f.cancel(true));
3056          checkCompletedWithWrappedCancellationException(g);
2675
2676        f = new CompletableFuture<>();
2677        f2 = new CompletableFuture<>();
2678        assertTrue(f2.cancel(true));
2679        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2680        checkCompletedWithWrappedCancellationException(g);
3057      }
3058  
3059      /**
3060 <     * acceptEitherAsync result completes normally after normal
3061 <     * completion of sources
3060 >     * thenAcceptAsync result completes normally after normal
3061 >     * completion of source
3062       */
3063 <    public void testAcceptEitherAsyncE() {
3063 >    public void testThenAcceptAsyncE() {
3064          CompletableFuture<Integer> f = new CompletableFuture<>();
2689        CompletableFuture<Integer> f2 = new CompletableFuture<>();
3065          IncAction r = new IncAction();
3066 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2692 <        f.complete(one);
2693 <        checkCompletedNormally(g, null);
2694 <        assertEquals(r.value, 2);
2695 <
2696 <        r = new IncAction();
2697 <        f = new CompletableFuture<>();
3066 >        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3067          f.complete(one);
2699        f2 = new CompletableFuture<>();
2700        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
3068          checkCompletedNormally(g, null);
3069 <        assertEquals(r.value, 2);
3069 >        assertEquals(r.value, (Integer) 2);
3070      }
3071  
3072      /**
3073 <     * acceptEitherAsync result completes exceptionally after exceptional
3073 >     * thenAcceptAsync result completes exceptionally after exceptional
3074       * completion of source
3075       */
3076 <    public void testAcceptEitherAsync2E() {
3076 >    public void testThenAcceptAsync2E() {
3077          CompletableFuture<Integer> f = new CompletableFuture<>();
2711        CompletableFuture<Integer> f2 = new CompletableFuture<>();
3078          IncAction r = new IncAction();
3079 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
3079 >        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3080          f.completeExceptionally(new CFException());
3081          checkCompletedWithWrappedCFException(g);
2716
2717        r = new IncAction();
2718        f = new CompletableFuture<>();
2719        f2 = new CompletableFuture<>();
2720        f2.completeExceptionally(new CFException());
2721        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2722        f.complete(one);
2723        checkCompletedWithWrappedCFException(g);
3082      }
3083  
3084      /**
3085 <     * acceptEitherAsync result completes exceptionally if action does
3085 >     * thenAcceptAsync result completes exceptionally if action does
3086       */
3087 <    public void testAcceptEitherAsync3E() {
3087 >    public void testThenAcceptAsync3E() {
3088          CompletableFuture<Integer> f = new CompletableFuture<>();
2731        CompletableFuture<Integer> f2 = new CompletableFuture<>();
3089          FailingConsumer r = new FailingConsumer();
3090 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
3091 <        f.complete(one);
3090 >        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3091 >        f.complete(null);
3092          checkCompletedWithWrappedCFException(g);
3093      }
3094  
3095      /**
3096 <     * acceptEitherAsync result completes exceptionally if either
2740 <     * source cancelled
3096 >     * thenAcceptAsync result completes exceptionally if source cancelled
3097       */
3098 <    public void testAcceptEitherAsync4E() {
3098 >    public void testThenAcceptAsync4E() {
3099          CompletableFuture<Integer> f = new CompletableFuture<>();
2744        CompletableFuture<Integer> f2 = new CompletableFuture<>();
3100          IncAction r = new IncAction();
3101 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2747 <        assertTrue(f.cancel(true));
2748 <        checkCompletedWithWrappedCancellationException(g);
2749 <
2750 <        r = new IncAction();
2751 <        f = new CompletableFuture<>();
2752 <        f2 = new CompletableFuture<>();
2753 <        assertTrue(f2.cancel(true));
2754 <        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2755 <        checkCompletedWithWrappedCancellationException(g);
2756 <    }
2757 <
2758 <    /**
2759 <     * runAfterEitherAsync result completes normally after normal
2760 <     * completion of sources
2761 <     */
2762 <    public void testRunAfterEitherAsyncE() {
2763 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2764 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2765 <        Noop r = new Noop();
2766 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2767 <        f.complete(one);
2768 <        checkCompletedNormally(g, null);
2769 <        assertTrue(r.ran);
2770 <
2771 <        r = new Noop();
2772 <        f = new CompletableFuture<>();
2773 <        f.complete(one);
2774 <        f2 = new CompletableFuture<>();
2775 <        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2776 <        checkCompletedNormally(g, null);
2777 <        assertTrue(r.ran);
2778 <    }
2779 <
2780 <    /**
2781 <     * runAfterEitherAsync result completes exceptionally after exceptional
2782 <     * completion of source
2783 <     */
2784 <    public void testRunAfterEitherAsync2E() {
2785 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2786 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2787 <        Noop r = new Noop();
2788 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2789 <        f.completeExceptionally(new CFException());
2790 <        checkCompletedWithWrappedCFException(g);
2791 <
2792 <        r = new Noop();
2793 <        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);
2824 <
2825 <        r = new Noop();
2826 <        f = new CompletableFuture<>();
2827 <        f2 = new CompletableFuture<>();
2828 <        assertTrue(f2.cancel(true));
2829 <        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2830 <        checkCompletedWithWrappedCancellationException(g);
2831 <    }
2832 <
2833 <    /**
2834 <     * thenComposeAsync result completes normally after normal
2835 <     * completion of source
2836 <     */
2837 <    public void testThenComposeAsyncE() {
2838 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2839 <        CompletableFutureInc r = new CompletableFutureInc();
2840 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2841 <        f.complete(one);
2842 <        checkCompletedNormally(g, two);
2843 <    }
2844 <
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());
2854 <        checkCompletedWithWrappedCFException(g);
2855 <    }
2856 <
2857 <    /**
2858 <     * thenComposeAsync result completes exceptionally if action does
2859 <     */
2860 <    public void testThenComposeAsync3E() {
2861 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2862 <        FailingCompletableFutureFunction r = new FailingCompletableFutureFunction();
2863 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2864 <        f.complete(one);
2865 <        checkCompletedWithWrappedCFException(g);
2866 <    }
2867 <
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());
3101 >        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3102          assertTrue(f.cancel(true));
3103          checkCompletedWithWrappedCancellationException(g);
3104      }
# Line 3074 | Line 3301 | public class CompletableFutureTest exten
3301       * whenComplete action executes on normal completion, propagating
3302       * source result.
3303       */
3304 <    public void testWhenComplete1() {
3305 <        final AtomicInteger a = new AtomicInteger();
3306 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3307 <        CompletableFuture<Integer> g =
3308 <            f.whenComplete((Integer x, Throwable t) -> a.getAndIncrement());
3309 <        f.complete(three);
3310 <        checkCompletedNormally(f, three);
3311 <        checkCompletedNormally(g, three);
3312 <        assertEquals(a.get(), 1);
3313 <    }
3314 <
3315 <    /**
3316 <     * whenComplete action executes on exceptional completion, propagating
3317 <     * source result.
3318 <     */
3319 <    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 <    }
3304 >    public void testWhenComplete_normalCompletion1() {
3305 >        for (ExecutionMode m : ExecutionMode.values())
3306 >        for (boolean createIncomplete : new boolean[] { true, false })
3307 >        for (Integer v1 : new Integer[] { 1, null })
3308 >    {
3309 >        final AtomicInteger a = new AtomicInteger(0);
3310 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
3311 >        if (!createIncomplete) f.complete(v1);
3312 >        final CompletableFuture<Integer> g = m.whenComplete
3313 >            (f,
3314 >             (Integer x, Throwable t) -> {
3315 >                threadAssertSame(x, v1);
3316 >                threadAssertNull(t);
3317 >                a.getAndIncrement();
3318 >            });
3319 >        if (createIncomplete) f.complete(v1);
3320  
3321 <    /**
3322 <     * If a whenCompleteAsync action throws an exception when
3323 <     * triggered by a normal completion, it completes exceptionally
3324 <     */
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 <    }
3321 >        checkCompletedNormally(g, v1);
3322 >        checkCompletedNormally(f, v1);
3323 >        assertEquals(1, a.get());
3324 >    }}
3325  
3326      /**
3327 <     * whenCompleteAsync action executes on normal completion, propagating
3327 >     * whenComplete action executes on exceptional completion, propagating
3328       * source result.
3329       */
3330 <    public void testWhenCompleteAsync1e() {
3331 <        final AtomicInteger a = new AtomicInteger();
3332 <        ThreadExecutor exec = new ThreadExecutor();
3333 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3334 <        CompletableFuture<Integer> g =
3335 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement(),
3336 <                                exec);
3337 <        f.complete(three);
3338 <        checkCompletedNormally(f, three);
3339 <        checkCompletedNormally(g, three);
3340 <        assertEquals(a.get(), 1);
3341 <    }
3330 >    public void testWhenComplete_exceptionalCompletion() {
3331 >        for (ExecutionMode m : ExecutionMode.values())
3332 >        for (boolean createIncomplete : new boolean[] { true, false })
3333 >        for (Integer v1 : new Integer[] { 1, null })
3334 >    {
3335 >        final AtomicInteger a = new AtomicInteger(0);
3336 >        final CFException ex = new CFException();
3337 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
3338 >        if (!createIncomplete) f.completeExceptionally(ex);
3339 >        final CompletableFuture<Integer> g = m.whenComplete
3340 >            (f,
3341 >             (Integer x, Throwable t) -> {
3342 >                threadAssertNull(x);
3343 >                threadAssertSame(t, ex);
3344 >                a.getAndIncrement();
3345 >            });
3346 >        if (createIncomplete) f.completeExceptionally(ex);
3347 >        checkCompletedWithWrappedCFException(f, ex);
3348 >        checkCompletedWithWrappedCFException(g, ex);
3349 >        assertEquals(1, a.get());
3350 >    }}
3351  
3352      /**
3353 <     * whenCompleteAsync action executes on exceptional completion, propagating
3354 <     * source result.
3353 >     * whenComplete action executes on cancelled source, propagating
3354 >     * CancellationException.
3355       */
3356 <    public void testWhenCompleteAsync2e() {
3357 <        final AtomicInteger a = new AtomicInteger();
3358 <        ThreadExecutor exec = new ThreadExecutor();
3359 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3360 <        CompletableFuture<Integer> g =
3361 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement(),
3362 <                                exec);
3363 <        f.completeExceptionally(new CFException());
3364 <        checkCompletedWithWrappedCFException(f);
3365 <        checkCompletedWithWrappedCFException(g);
3366 <    }
3356 >    public void testWhenComplete_sourceCancelled() {
3357 >        for (ExecutionMode m : ExecutionMode.values())
3358 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3359 >        for (boolean createIncomplete : new boolean[] { true, false })
3360 >    {
3361 >        final AtomicInteger a = new AtomicInteger(0);
3362 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
3363 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
3364 >        final CompletableFuture<Integer> g = m.whenComplete
3365 >            (f,
3366 >             (Integer x, Throwable t) -> {
3367 >                threadAssertNull(x);
3368 >                threadAssertTrue(t instanceof CancellationException);
3369 >                a.getAndIncrement();
3370 >            });
3371 >        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
3372  
3373 <    /**
3374 <     * If a whenCompleteAsync action throws an exception when triggered
3375 <     * by a normal completion, it completes exceptionally
3376 <     */
3377 <    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 <    }
3373 >        //try { g.join(); } catch (Throwable t) { throw new Error(t); }
3374 >        checkCompletedWithWrappedCancellationException(g);
3375 >        checkCancelled(f);
3376 >        assertEquals(1, a.get());
3377 >    }}
3378  
3379      /**
3380 <     * handleAsync action completes normally with function value on
3381 <     * either normal or exceptional completion of source
3380 >     * If a whenComplete action throws an exception when triggered by
3381 >     * a normal completion, it completes exceptionally
3382       */
3383 <    public void testHandleAsync() {
3384 <        CompletableFuture<Integer> f, g;
3385 <        IntegerHandler r;
3386 <
3387 <        f = new CompletableFuture<>();
3388 <        g = f.handleAsync(r = new IntegerHandler());
3389 <        assertFalse(r.ran);
3390 <        f.completeExceptionally(new CFException());
3391 <        checkCompletedWithWrappedCFException(f);
3392 <        checkCompletedNormally(g, three);
3393 <        assertTrue(r.ran);
3394 <
3395 <        f = new CompletableFuture<>();
3396 <        g = f.handleAsync(r = new IntegerHandler());
3397 <        assertFalse(r.ran);
3398 <        f.completeExceptionally(new CFException());
3399 <        checkCompletedWithWrappedCFException(f);
3400 <        checkCompletedNormally(g, three);
3401 <        assertTrue(r.ran);
3402 <
3403 <        f = new CompletableFuture<>();
3404 <        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 <    }
3383 >    public void testWhenComplete_actionFailed() {
3384 >        for (boolean createIncomplete : new boolean[] { true, false })
3385 >        for (ExecutionMode m : ExecutionMode.values())
3386 >        for (Integer v1 : new Integer[] { 1, null })
3387 >    {
3388 >        final AtomicInteger a = new AtomicInteger(0);
3389 >        final CFException ex = new CFException();
3390 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
3391 >        if (!createIncomplete) f.complete(v1);
3392 >        final CompletableFuture<Integer> g = m.whenComplete
3393 >            (f,
3394 >             (Integer x, Throwable t) -> {
3395 >                threadAssertSame(x, v1);
3396 >                threadAssertNull(t);
3397 >                a.getAndIncrement();
3398 >                throw ex;
3399 >            });
3400 >        if (createIncomplete) f.complete(v1);
3401 >        checkCompletedNormally(f, v1);
3402 >        checkCompletedWithWrappedCFException(g, ex);
3403 >        assertEquals(1, a.get());
3404 >    }}
3405  
3406      /**
3407 <     * handleAsync action with Executor completes normally with
3408 <     * function value on either normal or exceptional completion of
3409 <     * source
3407 >     * If a whenComplete action throws an exception when triggered by
3408 >     * a source completion that also throws an exception, the source
3409 >     * exception takes precedence.
3410       */
3411 <    public void testHandleAsync2() {
3412 <        CompletableFuture<Integer> f, g;
3413 <        ThreadExecutor exec = new ThreadExecutor();
3414 <        IntegerHandler r;
3415 <
3416 <        f = new CompletableFuture<>();
3417 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3418 <        assertFalse(r.ran);
3419 <        f.completeExceptionally(new CFException());
3420 <        checkCompletedWithWrappedCFException(f);
3421 <        checkCompletedNormally(g, three);
3422 <        assertTrue(r.ran);
3423 <
3424 <        f = new CompletableFuture<>();
3425 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3426 <        assertFalse(r.ran);
3427 <        f.completeExceptionally(new CFException());
3428 <        checkCompletedWithWrappedCFException(f);
3429 <        checkCompletedNormally(g, three);
3430 <        assertTrue(r.ran);
3431 <
3432 <        f = new CompletableFuture<>();
3433 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3434 <        assertFalse(r.ran);
3435 <        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 <    }
3411 >    public void testWhenComplete_actionFailedSourceFailed() {
3412 >        for (boolean createIncomplete : new boolean[] { true, false })
3413 >        for (ExecutionMode m : ExecutionMode.values())
3414 >        for (Integer v1 : new Integer[] { 1, null })
3415 >    {
3416 >        final AtomicInteger a = new AtomicInteger(0);
3417 >        final CFException ex1 = new CFException();
3418 >        final CFException ex2 = new CFException();
3419 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
3420 >
3421 >        if (!createIncomplete) f.completeExceptionally(ex1);
3422 >        final CompletableFuture<Integer> g = m.whenComplete
3423 >            (f,
3424 >             (Integer x, Throwable t) -> {
3425 >                threadAssertSame(t, ex1);
3426 >                threadAssertNull(x);
3427 >                a.getAndIncrement();
3428 >                throw ex2;
3429 >            });
3430 >        if (createIncomplete) f.completeExceptionally(ex1);
3431 >
3432 >        checkCompletedWithWrappedCFException(f, ex1);
3433 >        checkCompletedWithWrappedCFException(g, ex1);
3434 >        assertEquals(1, a.get());
3435 >    }}
3436  
3437   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines