ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/test/tck/CompletableFutureTest.java
(Generate patch)

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines