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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines