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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines