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.37 by jsr166, Sun Jun 1 23:20:19 2014 UTC vs.
Revision 1.64 by jsr166, Fri Jun 6 17:08:48 2014 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines