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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines