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.58 by jsr166, Mon Jun 2 23:10:08 2014 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines