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.44 by jsr166, Mon Jun 2 06:06:30 2014 UTC vs.
Revision 1.70 by jsr166, Fri Jun 6 19:48:38 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;
363 >    class NoopConsumer extends CheckedIntegerAction
364 >        implements Consumer<Integer>
365 >    {
366 >        NoopConsumer(ExecutionMode m) { super(m); }
367          public void accept(Integer x) {
368 <            invocationCount++;
369 <            value = inc(x);
368 >            invoked();
369 >            value = x;
370          }
371      }
372 <    static final class IncFunction implements Function<Integer,Integer> {
373 <        int invocationCount = 0;
374 <        Integer value;
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.
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.
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 <        int invocationCount = 0;
410 >
411 >    class Noop extends CheckedAction implements Runnable {
412 >        Noop(ExecutionMode m) { super(m); }
413          public void run() {
414 <            invocationCount++;
414 >            invoked();
415          }
416      }
417  
418 <    static final class FailingSupplier implements Supplier<Integer> {
419 <        int invocationCount = 0;
418 >    class FailingSupplier extends CheckedAction
419 >        implements Supplier<Integer>
420 >    {
421 >        FailingSupplier(ExecutionMode m) { super(m); }
422          public Integer get() {
423 <            invocationCount++;
423 >            invoked();
424              throw new CFException();
425          }
426      }
427 <    static final class FailingConsumer implements Consumer<Integer> {
428 <        int invocationCount = 0;
427 >
428 >    class FailingConsumer extends CheckedIntegerAction
429 >        implements Consumer<Integer>
430 >    {
431 >        FailingConsumer(ExecutionMode m) { super(m); }
432          public void accept(Integer x) {
433 <            invocationCount++;
433 >            invoked();
434 >            value = x;
435              throw new CFException();
436          }
437      }
438 <    static final class FailingBiConsumer implements BiConsumer<Integer, Integer> {
439 <        int invocationCount = 0;
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 <            invocationCount++;
444 >            invoked();
445 >            value = subtract(x, y);
446              throw new CFException();
447          }
448      }
449 <    static final class FailingFunction implements Function<Integer, Integer> {
450 <        int invocationCount = 0;
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 <            invocationCount++;
455 >            invoked();
456 >            value = x;
457              throw new CFException();
458          }
459      }
460 <    static final class FailingBiFunction implements BiFunction<Integer, Integer, Integer> {
461 <        int invocationCount = 0;
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 <            invocationCount++;
466 >            invoked();
467 >            value = subtract(x, y);
468              throw new CFException();
469          }
470      }
471 <    static final class FailingNoop implements Runnable {
472 <        int invocationCount = 0;
471 >
472 >    class FailingRunnable extends CheckedAction implements Runnable {
473 >        FailingRunnable(ExecutionMode m) { super(m); }
474          public void run() {
475 <            invocationCount++;
475 >            invoked();
476              throw new CFException();
477          }
478      }
479  
480 <    static final class CompletableFutureInc
481 <        implements Function<Integer, CompletableFuture<Integer>> {
482 <        int invocationCount = 0;
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 <            invocationCount++;
486 >            invoked();
487 >            value = x;
488              CompletableFuture<Integer> f = new CompletableFuture<>();
489              f.complete(inc(x));
490              return f;
491          }
492      }
493  
494 <    static final class FailingCompletableFutureFunction
495 <        implements Function<Integer, CompletableFuture<Integer>> {
496 <        int invocationCount = 0;
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 <            invocationCount++;
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();
450 <        }
451 <    }
452 <
453 <    static final class ExceptionToInteger implements Function<Throwable, Integer> {
454 <        public Integer apply(Throwable x) { return Integer.valueOf(3); }
455 <    }
456 <
457 <    static final class IntegerHandler implements BiFunction<Integer, Throwable, Integer> {
458 <        int invocationCount = 0;
459 <        public Integer apply(Integer x, Throwable t) {
460 <            invocationCount++;
461 <            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 484 | 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 496 | 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              }
515        },
516
517 //             /** Experimental way to do more testing */
518 //         REVERSE_DEFAULT {
519 //             public <T,U> CompletableFuture<Void> runAfterBoth
520 //                 (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
521 //                 return g.runAfterBoth(f, a);
522 //             }
523 //             public <T,U> CompletableFuture<Void> thenAcceptBoth
524 //                 (CompletableFuture<T> f,
525 //                  CompletionStage<? extends U> g,
526 //                  BiConsumer<? super T,? super U> a) {
527 //                 return DEFAULT.thenAcceptBoth(f, g, a);
528 //             }
529 //         },
530
531        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 545 | 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 557 | 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              }
576        },
577
578 //         REVERSE_DEFAULT_ASYNC {
579 //             public <T,U> CompletableFuture<Void> runAfterBoth
580 //                 (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
581 //                 return f.runAfterBothAsync(g, a);
582 //             }
583 //             public <T,U> CompletableFuture<Void> thenAcceptBoth
584 //                 (CompletableFuture<T> f,
585 //                  CompletionStage<? extends U> g,
586 //                  BiConsumer<? super T,? super U> a) {
587 //                 return DEFAULT_ASYNC.thenAcceptBoth(f, g, a);
588 //             }
589 //         },
590
591        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 605 | Line 722 | public class CompletableFutureTest exten
722                   BiFunction<? super T,? super U,? extends V> a) {
723                  return f.thenCombineAsync(g, a, new ThreadExecutor());
724              }
608            public <T,U> CompletableFuture<U> applyToEither
609                (CompletableFuture<T> f,
610                 CompletionStage<? extends T> g,
611                 Function<? super T,U> a) {
612                return f.applyToEitherAsync(g, a, new ThreadExecutor());
613            }
614            public <T> CompletableFuture<Void> acceptEither
615                (CompletableFuture<T> f,
616                 CompletionStage<? extends T> g,
617                 Consumer<? super T> a) {
618                return f.acceptEitherAsync(g, a, new ThreadExecutor());
619            }
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 645 | Line 770 | public class CompletableFutureTest exten
770              (CompletableFuture<T> f,
771               CompletionStage<? extends U> g,
772               BiFunction<? super T,? super U,? extends V> a);
648        public abstract <T,U> CompletableFuture<U> applyToEither
649            (CompletableFuture<T> f,
650             CompletionStage<? extends T> g,
651             Function<? super T,U> a);
652        public abstract <T> CompletableFuture<Void> acceptEither
653            (CompletableFuture<T> f,
654             CompletionStage<? extends T> g,
655             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  
668    }
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 <        assertEquals(1, r.invocationCount);
700 <        assertEquals(1, r.invocationCount);
701 <        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 <        assertEquals(0, r.invocationCount);
890 <        f.completeExceptionally(new CFException());
891 <        checkCompletedNormally(g, three);
892 <        assertEquals(1, r.invocationCount);
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 <        assertEquals(1, r.invocationCount);
714 <        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 <        assertEquals(0, r.invocationCount);
919 <        f.complete(one);
920 <        assertEquals(1, r.invocationCount);
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 <        assertEquals(1, r.invocationCount);
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());
743        assertEquals(1, r.invocationCount);
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 <        assertEquals(1, r.invocationCount);
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);
775 <        checkCompletedNormally(f, one);
776 <    }
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 <        assertEquals(1, r.invocationCount);
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 <        assertEquals(1, r.invocationCount);
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  
804        f = new CompletableFuture<>();
805        f.complete(null);
806        g = f.thenRun(r = new Noop());
1084          checkCompletedNormally(g, null);
1085 <        assertEquals(1, r.invocationCount);
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 <        assertEquals(0, r.invocationCount);
1103 <
1104 <        f = new CompletableFuture<>();
1105 <        f.completeExceptionally(new CFException());
828 <        g = f.thenRun(r = new Noop());
829 <        checkCompletedWithWrappedCFException(g);
830 <        assertEquals(0, r.invocationCount);
831 <    }
832 <
833 <    /**
834 <     * thenRun result completes exceptionally if action does
835 <     */
836 <    public void testThenRun3() {
837 <        CompletableFuture<Integer> f;
838 <        CompletableFuture<Void> g;
839 <        FailingNoop r;
840 <
841 <        f = new CompletableFuture<>();
842 <        g = f.thenRun(r = new FailingNoop());
843 <        f.complete(null);
844 <        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);
850 <    }
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);
1124 <
1125 <        f = new CompletableFuture<>();
1126 <        assertTrue(f.cancel(true));
1127 <        g = f.thenRun(r = new Noop());
868 <        checkCompletedWithWrappedCancellationException(g);
869 <    }
870 <
871 <    /**
872 <     * thenApply result completes normally after normal completion of source
873 <     */
874 <    public void testThenApply() {
875 <        CompletableFuture<Integer> f = new CompletableFuture<>();
876 <        CompletableFuture<Integer> g = f.thenApply(inc);
877 <        f.complete(one);
878 <        checkCompletedNormally(g, two);
879 <    }
880 <
881 <    /**
882 <     * thenApply result completes exceptionally after exceptional
883 <     * completion of source
884 <     */
885 <    public void testThenApply2() {
886 <        CompletableFuture<Integer> f = new CompletableFuture<>();
887 <        CompletableFuture<Integer> g = f.thenApply(inc);
888 <        f.completeExceptionally(new CFException());
889 <        checkCompletedWithWrappedCFException(g);
890 <    }
891 <
892 <    /**
893 <     * thenApply result completes exceptionally if action does
894 <     */
895 <    public void testThenApply3() {
896 <        CompletableFuture<Integer> f = new CompletableFuture<>();
897 <        CompletableFuture<Integer> g = f.thenApply(new FailingFunction());
898 <        f.complete(one);
899 <        checkCompletedWithWrappedCFException(g);
900 <    }
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  
902    /**
903     * thenApply result completes exceptionally if source cancelled
904     */
905    public void testThenApply4() {
906        CompletableFuture<Integer> f = new CompletableFuture<>();
907        CompletableFuture<Integer> g = f.thenApply(inc);
908        assertTrue(f.cancel(true));
1129          checkCompletedWithWrappedCancellationException(g);
1130 <    }
1131 <
1132 <    /**
913 <     * thenAccept result completes normally after normal completion of source
914 <     */
915 <    public void testThenAccept() {
916 <        CompletableFuture<Integer> f = new CompletableFuture<>();
917 <        IncAction r = new IncAction();
918 <        CompletableFuture<Void> g = f.thenAccept(r);
919 <        f.complete(one);
920 <        checkCompletedNormally(g, null);
921 <        assertEquals(r.value, (Integer) 2);
922 <    }
1130 >        checkCancelled(f);
1131 >        r.assertNotInvoked();
1132 >    }}
1133  
1134      /**
1135 <     * thenAccept result completes exceptionally after exceptional
926 <     * completion of source
1135 >     * thenRun result completes exceptionally if action does
1136       */
1137 <    public void testThenAccept2() {
1138 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1139 <        IncAction r = new IncAction();
1140 <        CompletableFuture<Void> g = f.thenAccept(r);
1141 <        f.completeExceptionally(new CFException());
1142 <        checkCompletedWithWrappedCFException(g);
1143 <    }
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  
936    /**
937     * thenAccept result completes exceptionally if action does
938     */
939    public void testThenAccept3() {
940        CompletableFuture<Integer> f = new CompletableFuture<>();
941        FailingConsumer r = new FailingConsumer();
942        CompletableFuture<Void> g = f.thenAccept(r);
943        f.complete(one);
1151          checkCompletedWithWrappedCFException(g);
1152 <        assertEquals(1, r.invocationCount);
1153 <    }
947 <
948 <    /**
949 <     * thenAccept result completes exceptionally if source cancelled
950 <     */
951 <    public void testThenAccept4() {
952 <        CompletableFuture<Integer> f = new CompletableFuture<>();
953 <        IncAction r = new IncAction();
954 <        CompletableFuture<Void> g = f.thenAccept(r);
955 <        assertTrue(f.cancel(true));
956 <        checkCompletedWithWrappedCancellationException(g);
957 <    }
1152 >        checkCompletedNormally(f, v1);
1153 >    }}
1154  
1155      /**
1156 <     * thenCombine result completes normally after normal completion
961 <     * of sources
1156 >     * thenApply result completes normally after normal completion of source
1157       */
1158 <    public void testThenCombine_normalCompletion1() {
964 <        for (boolean createIncomplete : new boolean[] { true, false })
965 <        for (boolean fFirst : new boolean[] { true, false })
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 <        for (Integer v2 : new Integer[] { 2, null }) {
969 <
1162 >    {
1163          final CompletableFuture<Integer> f = new CompletableFuture<>();
1164 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1165 <        final SubtractFunction r = new SubtractFunction();
1166 <        CompletableFuture<Integer> h = null;
1167 <        if (createIncomplete) h = m.thenCombine(f, g, r);
1168 <
976 <        if (fFirst)
977 <            f.complete(v1);
978 <        else
979 <            g.complete(v2);
980 <        if (createIncomplete) checkIncomplete(h);
981 <        assertEquals(0, r.invocationCount);
982 <        if (!fFirst)
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 <        else
985 <            g.complete(v2);
986 <        if (!createIncomplete) h = m.thenCombine(f, g, r);
1170 >        }
1171  
1172 <        checkCompletedNormally(h, subtract(v1, v2));
1172 >        checkCompletedNormally(g, inc(v1));
1173          checkCompletedNormally(f, v1);
1174 <        checkCompletedNormally(g, v2);
1175 <        assertEquals(1, r.invocationCount);
992 <        }
993 <    }
1174 >        r.assertValue(inc(v1));
1175 >    }}
1176  
1177      /**
1178 <     * thenCombine result completes exceptionally after exceptional
1179 <     * completion of either source
1178 >     * thenApply result completes exceptionally after exceptional
1179 >     * completion of source
1180       */
1181 <    public void testThenCombine_exceptionalCompletion1() {
1181 >    public void testThenApply_exceptionalCompletion() {
1182          for (ExecutionMode m : ExecutionMode.values())
1183 <        for (Integer v1 : new Integer[] { 1, null }) {
1184 <
1003 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1004 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1005 <        final SubtractFunction r = new SubtractFunction();
1006 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1183 >        for (boolean createIncomplete : new boolean[] { true, false })
1184 >    {
1185          final CFException ex = new CFException();
1008
1009        f.completeExceptionally(ex);
1010        checkIncomplete(h);
1011        g.complete(v1);
1012
1013        checkCompletedWithWrappedCFException(h, ex);
1014        checkCompletedWithWrappedCFException(f, ex);
1015        assertEquals(0, r.invocationCount);
1016        checkCompletedNormally(g, v1);
1017        }
1018    }
1019
1020    public void testThenCombine_exceptionalCompletion2() {
1021        for (ExecutionMode m : ExecutionMode.values())
1022        for (Integer v1 : new Integer[] { 1, null }) {
1023
1186          final CompletableFuture<Integer> f = new CompletableFuture<>();
1187 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1188 <        final SubtractFunction r = new SubtractFunction();
1189 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1190 <        final CFException ex = new CFException();
1191 <
1192 <        g.completeExceptionally(ex);
1031 <        checkIncomplete(h);
1032 <        f.complete(v1);
1033 <
1034 <        checkCompletedWithWrappedCFException(h, ex);
1035 <        checkCompletedWithWrappedCFException(g, ex);
1036 <        assertEquals(0, r.invocationCount);
1037 <        checkCompletedNormally(f, v1);
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          }
1039    }
1194  
1041    public void testThenCombine_exceptionalCompletion3() {
1042        for (ExecutionMode m : ExecutionMode.values())
1043        for (Integer v1 : new Integer[] { 1, null }) {
1044
1045        final CompletableFuture<Integer> f = new CompletableFuture<>();
1046        final CompletableFuture<Integer> g = new CompletableFuture<>();
1047        final SubtractFunction r = new SubtractFunction();
1048        final CFException ex = new CFException();
1049
1050        g.completeExceptionally(ex);
1051        f.complete(v1);
1052        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1053
1054        checkCompletedWithWrappedCFException(h, ex);
1195          checkCompletedWithWrappedCFException(g, ex);
1196 <        assertEquals(0, r.invocationCount);
1197 <        checkCompletedNormally(f, v1);
1198 <        }
1059 <    }
1196 >        checkCompletedWithWrappedCFException(f, ex);
1197 >        r.assertNotInvoked();
1198 >    }}
1199  
1200 <    public void testThenCombine_exceptionalCompletion4() {
1200 >    /**
1201 >     * thenApply result completes exceptionally if source cancelled
1202 >     */
1203 >    public void testThenApply_sourceCancelled() {
1204          for (ExecutionMode m : ExecutionMode.values())
1205 <        for (Integer v1 : new Integer[] { 1, null }) {
1206 <
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 CompletableFuture<Integer> g = new CompletableFuture<>();
1210 <        final SubtractFunction r = new SubtractFunction();
1211 <        final CFException ex = new CFException();
1212 <
1213 <        f.completeExceptionally(ex);
1214 <        g.complete(v1);
1072 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1073 <
1074 <        checkCompletedWithWrappedCFException(h, ex);
1075 <        checkCompletedWithWrappedCFException(f, ex);
1076 <        assertEquals(0, r.invocationCount);
1077 <        checkCompletedNormally(g, v1);
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 <    }
1216 >
1217 >        checkCompletedWithWrappedCancellationException(g);
1218 >        checkCancelled(f);
1219 >        r.assertNotInvoked();
1220 >    }}
1221  
1222      /**
1223 <     * thenCombine result completes exceptionally if action does
1223 >     * thenApply result completes exceptionally if action does
1224       */
1225 <    public void testThenCombine_actionFailed1() {
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 }) {
1088 <
1229 >    {
1230          final CompletableFuture<Integer> f = new CompletableFuture<>();
1231 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1232 <        final FailingBiFunction r = new FailingBiFunction();
1233 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1234 <
1235 <        f.complete(v1);
1236 <        checkIncomplete(h);
1237 <        g.complete(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 >        }
1238  
1239 <        checkCompletedWithWrappedCFException(h);
1239 >        checkCompletedWithWrappedCFException(g);
1240          checkCompletedNormally(f, v1);
1241 <        checkCompletedNormally(g, v2);
1101 <        }
1102 <    }
1241 >    }}
1242  
1243 <    public void testThenCombine_actionFailed2() {
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 }) {
1108 <
1250 >    {
1251          final CompletableFuture<Integer> f = new CompletableFuture<>();
1252 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1253 <        final FailingBiFunction r = new FailingBiFunction();
1254 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1255 <
1256 <        g.complete(v2);
1257 <        checkIncomplete(h);
1258 <        f.complete(v1);
1252 >        final NoopConsumer r = new NoopConsumer(m);
1253 >        if (!createIncomplete) f.complete(v1);
1254 >        final CompletableFuture<Void> g = m.thenAccept(f, r);
1255 >        if (createIncomplete) {
1256 >            checkIncomplete(g);
1257 >            f.complete(v1);
1258 >        }
1259  
1260 <        checkCompletedWithWrappedCFException(h);
1260 >        checkCompletedNormally(g, null);
1261 >        r.assertValue(v1);
1262          checkCompletedNormally(f, v1);
1263 <        checkCompletedNormally(g, v2);
1121 <        }
1122 <    }
1263 >    }}
1264  
1265      /**
1266 <     * thenCombine result completes exceptionally if either source cancelled
1266 >     * thenAccept result completes exceptionally after exceptional
1267 >     * completion of source
1268       */
1269 <    public void testThenCombine_sourceCancelled1() {
1269 >    public void testThenAccept_exceptionalCompletion() {
1270          for (ExecutionMode m : ExecutionMode.values())
1271 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1272 <        for (Integer v1 : new Integer[] { 1, null }) {
1273 <
1271 >        for (boolean createIncomplete : new boolean[] { true, false })
1272 >    {
1273 >        final CFException ex = new CFException();
1274          final CompletableFuture<Integer> f = new CompletableFuture<>();
1275 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1276 <        final SubtractFunction r = new SubtractFunction();
1277 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1278 <
1279 <        assertTrue(f.cancel(mayInterruptIfRunning));
1280 <        checkIncomplete(h);
1139 <        g.complete(v1);
1140 <
1141 <        checkCompletedWithWrappedCancellationException(h);
1142 <        checkCancelled(f);
1143 <        assertEquals(0, r.invocationCount);
1144 <        checkCompletedNormally(g, v1);
1275 >        final NoopConsumer r = new NoopConsumer(m);
1276 >        if (!createIncomplete) f.completeExceptionally(ex);
1277 >        final CompletableFuture<Void> g = m.thenAccept(f, r);
1278 >        if (createIncomplete) {
1279 >            checkIncomplete(g);
1280 >            f.completeExceptionally(ex);
1281          }
1146    }
1282  
1283 <    public void testThenCombine_sourceCancelled2() {
1284 <        for (ExecutionMode m : ExecutionMode.values())
1285 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1286 <        for (Integer v1 : new Integer[] { 1, null }) {
1152 <
1153 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1154 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1155 <        final SubtractFunction r = new SubtractFunction();
1156 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1157 <
1158 <        assertTrue(g.cancel(mayInterruptIfRunning));
1159 <        checkIncomplete(h);
1160 <        f.complete(v1);
1161 <
1162 <        checkCompletedWithWrappedCancellationException(h);
1163 <        checkCancelled(g);
1164 <        assertEquals(0, r.invocationCount);
1165 <        checkCompletedNormally(f, v1);
1166 <        }
1167 <    }
1283 >        checkCompletedWithWrappedCFException(g, ex);
1284 >        checkCompletedWithWrappedCFException(f, ex);
1285 >        r.assertNotInvoked();
1286 >    }}
1287  
1288 <    public void testThenCombine_sourceCancelled3() {
1288 >    /**
1289 >     * thenAccept result completes exceptionally if source cancelled
1290 >     */
1291 >    public void testThenAccept_sourceCancelled() {
1292          for (ExecutionMode m : ExecutionMode.values())
1293 +        for (boolean createIncomplete : new boolean[] { true, false })
1294          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1295 <        for (Integer v1 : new Integer[] { 1, null }) {
1173 <
1295 >    {
1296          final CompletableFuture<Integer> f = new CompletableFuture<>();
1297 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1298 <        final SubtractFunction r = new SubtractFunction();
1299 <
1300 <        assertTrue(g.cancel(mayInterruptIfRunning));
1301 <        f.complete(v1);
1302 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1181 <
1182 <        checkCompletedWithWrappedCancellationException(h);
1183 <        checkCancelled(g);
1184 <        assertEquals(0, r.invocationCount);
1185 <        checkCompletedNormally(f, v1);
1297 >        final NoopConsumer r = new NoopConsumer(m);
1298 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1299 >        final CompletableFuture<Void> g = m.thenAccept(f, r);
1300 >        if (createIncomplete) {
1301 >            checkIncomplete(g);
1302 >            assertTrue(f.cancel(mayInterruptIfRunning));
1303          }
1187    }
1188
1189    public void testThenCombine_sourceCancelled4() {
1190        for (ExecutionMode m : ExecutionMode.values())
1191        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1192        for (Integer v1 : new Integer[] { 1, null }) {
1193
1194        final CompletableFuture<Integer> f = new CompletableFuture<>();
1195        final CompletableFuture<Integer> g = new CompletableFuture<>();
1196        final SubtractFunction r = new SubtractFunction();
1197
1198        assertTrue(f.cancel(mayInterruptIfRunning));
1199        g.complete(v1);
1200        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1304  
1305 <        checkCompletedWithWrappedCancellationException(h);
1305 >        checkCompletedWithWrappedCancellationException(g);
1306          checkCancelled(f);
1307 <        assertEquals(0, r.invocationCount);
1308 <        checkCompletedNormally(g, v1);
1206 <        }
1207 <    }
1307 >        r.assertNotInvoked();
1308 >    }}
1309  
1310      /**
1311 <     * thenAcceptBoth result completes normally after normal
1211 <     * completion of sources
1311 >     * thenAccept result completes exceptionally if action does
1312       */
1313 <    public void testThenAcceptBoth_normalCompletion1() {
1313 >    public void testThenAccept_actionFailed() {
1314          for (ExecutionMode m : ExecutionMode.values())
1315 +        for (boolean createIncomplete : new boolean[] { true, false })
1316          for (Integer v1 : new Integer[] { 1, null })
1317 <        for (Integer v2 : new Integer[] { 2, null }) {
1217 <
1317 >    {
1318          final CompletableFuture<Integer> f = new CompletableFuture<>();
1319 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1320 <        final SubtractAction r = new SubtractAction();
1321 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1322 <
1323 <        f.complete(v1);
1324 <        checkIncomplete(h);
1225 <        assertEquals(0, r.invocationCount);
1226 <        g.complete(v2);
1227 <
1228 <        checkCompletedNormally(h, null);
1229 <        assertEquals(r.value, subtract(v1, v2));
1230 <        checkCompletedNormally(f, v1);
1231 <        checkCompletedNormally(g, v2);
1319 >        final FailingConsumer r = new FailingConsumer(m);
1320 >        if (!createIncomplete) f.complete(v1);
1321 >        final CompletableFuture<Void> g = m.thenAccept(f, r);
1322 >        if (createIncomplete) {
1323 >            checkIncomplete(g);
1324 >            f.complete(v1);
1325          }
1233    }
1234
1235    public void testThenAcceptBoth_normalCompletion2() {
1236        for (ExecutionMode m : ExecutionMode.values())
1237        for (Integer v1 : new Integer[] { 1, null })
1238        for (Integer v2 : new Integer[] { 2, null }) {
1326  
1327 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1241 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1242 <        final SubtractAction r = new SubtractAction();
1243 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1244 <
1245 <        g.complete(v2);
1246 <        checkIncomplete(h);
1247 <        assertEquals(0, r.invocationCount);
1248 <        f.complete(v1);
1249 <
1250 <        checkCompletedNormally(h, null);
1251 <        assertEquals(r.value, subtract(v1, v2));
1327 >        checkCompletedWithWrappedCFException(g);
1328          checkCompletedNormally(f, v1);
1329 <        checkCompletedNormally(g, v2);
1254 <        }
1255 <    }
1329 >    }}
1330  
1331 <    public void testThenAcceptBoth_normalCompletion3() {
1331 >    /**
1332 >     * thenCombine result completes normally after normal completion
1333 >     * of sources
1334 >     */
1335 >    public void testThenCombine_normalCompletion() {
1336          for (ExecutionMode m : ExecutionMode.values())
1337 +        for (boolean createIncomplete : new boolean[] { true, false })
1338 +        for (boolean fFirst : new boolean[] { true, false })
1339          for (Integer v1 : new Integer[] { 1, null })
1340 <        for (Integer v2 : new Integer[] { 2, null }) {
1341 <
1340 >        for (Integer v2 : new Integer[] { 2, null })
1341 >    {
1342          final CompletableFuture<Integer> f = new CompletableFuture<>();
1343          final CompletableFuture<Integer> g = new CompletableFuture<>();
1344 <        final SubtractAction r = new SubtractAction();
1265 <
1266 <        g.complete(v2);
1267 <        f.complete(v1);
1268 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1344 >        final SubtractFunction r = new SubtractFunction(m);
1345  
1346 <        checkCompletedNormally(h, null);
1347 <        assertEquals(r.value, subtract(v1, v2));
1348 <        checkCompletedNormally(f, v1);
1349 <        checkCompletedNormally(g, v2);
1346 >        if (fFirst) f.complete(v1); else g.complete(v2);
1347 >        if (!createIncomplete)
1348 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1349 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1350 >        if (createIncomplete) {
1351 >            checkIncomplete(h);
1352 >            r.assertNotInvoked();
1353 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1354          }
1275    }
1276
1277    public void testThenAcceptBoth_normalCompletion4() {
1278        for (ExecutionMode m : ExecutionMode.values())
1279        for (Integer v1 : new Integer[] { 1, null })
1280        for (Integer v2 : new Integer[] { 2, null }) {
1281
1282        final CompletableFuture<Integer> f = new CompletableFuture<>();
1283        final CompletableFuture<Integer> g = new CompletableFuture<>();
1284        final SubtractAction r = new SubtractAction();
1285
1286        f.complete(v1);
1287        g.complete(v2);
1288        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1355  
1356 <        checkCompletedNormally(h, null);
1291 <        assertEquals(r.value, subtract(v1, v2));
1356 >        checkCompletedNormally(h, subtract(v1, v2));
1357          checkCompletedNormally(f, v1);
1358          checkCompletedNormally(g, v2);
1359 <        }
1360 <    }
1359 >        r.assertValue(subtract(v1, v2));
1360 >    }}
1361  
1362      /**
1363 <     * thenAcceptBoth result completes exceptionally after exceptional
1363 >     * thenCombine result completes exceptionally after exceptional
1364       * completion of either source
1365       */
1366 <    public void testThenAcceptBoth_exceptionalCompletion1() {
1366 >    public void testThenCombine_exceptionalCompletion() {
1367          for (ExecutionMode m : ExecutionMode.values())
1368 <        for (Integer v1 : new Integer[] { 1, null }) {
1369 <
1368 >        for (boolean createIncomplete : new boolean[] { true, false })
1369 >        for (boolean fFirst : new boolean[] { true, false })
1370 >        for (Integer v1 : new Integer[] { 1, null })
1371 >    {
1372          final CompletableFuture<Integer> f = new CompletableFuture<>();
1373          final CompletableFuture<Integer> g = new CompletableFuture<>();
1307        final SubtractAction r = new SubtractAction();
1308        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1374          final CFException ex = new CFException();
1375 +        final SubtractFunction r = new SubtractFunction(m);
1376  
1377 <        f.completeExceptionally(ex);
1378 <        checkIncomplete(h);
1379 <        g.complete(v1);
1380 <
1381 <        checkCompletedWithWrappedCFException(h, ex);
1382 <        checkCompletedWithWrappedCFException(f, ex);
1383 <        assertEquals(0, r.invocationCount);
1318 <        checkCompletedNormally(g, v1);
1377 >        (fFirst ? f : g).complete(v1);
1378 >        if (!createIncomplete)
1379 >            (!fFirst ? f : g).completeExceptionally(ex);
1380 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1381 >        if (createIncomplete) {
1382 >            checkIncomplete(h);
1383 >            (!fFirst ? f : g).completeExceptionally(ex);
1384          }
1320    }
1321
1322    public void testThenAcceptBoth_exceptionalCompletion2() {
1323        for (ExecutionMode m : ExecutionMode.values())
1324        for (Integer v1 : new Integer[] { 1, null }) {
1325
1326        final CompletableFuture<Integer> f = new CompletableFuture<>();
1327        final CompletableFuture<Integer> g = new CompletableFuture<>();
1328        final SubtractAction r = new SubtractAction();
1329        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1330        final CFException ex = new CFException();
1331
1332        g.completeExceptionally(ex);
1333        checkIncomplete(h);
1334        f.complete(v1);
1385  
1386          checkCompletedWithWrappedCFException(h, ex);
1387 <        checkCompletedWithWrappedCFException(g, ex);
1388 <        assertEquals(0, r.invocationCount);
1389 <        checkCompletedNormally(f, v1);
1390 <        }
1341 <    }
1387 >        r.assertNotInvoked();
1388 >        checkCompletedNormally(fFirst ? f : g, v1);
1389 >        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1390 >    }}
1391  
1392 <    public void testThenAcceptBoth_exceptionalCompletion3() {
1392 >    /**
1393 >     * thenCombine result completes exceptionally if either source cancelled
1394 >     */
1395 >    public void testThenCombine_sourceCancelled() {
1396          for (ExecutionMode m : ExecutionMode.values())
1397 <        for (Integer v1 : new Integer[] { 1, null }) {
1398 <
1397 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1398 >        for (boolean createIncomplete : new boolean[] { true, false })
1399 >        for (boolean fFirst : new boolean[] { true, false })
1400 >        for (Integer v1 : new Integer[] { 1, null })
1401 >    {
1402          final CompletableFuture<Integer> f = new CompletableFuture<>();
1403          final CompletableFuture<Integer> g = new CompletableFuture<>();
1404 <        final SubtractAction r = new SubtractAction();
1350 <        final CFException ex = new CFException();
1404 >        final SubtractFunction r = new SubtractFunction(m);
1405  
1406 <        g.completeExceptionally(ex);
1407 <        f.complete(v1);
1408 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1409 <
1410 <        checkCompletedWithWrappedCFException(h, ex);
1411 <        checkCompletedWithWrappedCFException(g, ex);
1412 <        assertEquals(0, r.invocationCount);
1359 <        checkCompletedNormally(f, v1);
1406 >        (fFirst ? f : g).complete(v1);
1407 >        if (!createIncomplete)
1408 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1409 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1410 >        if (createIncomplete) {
1411 >            checkIncomplete(h);
1412 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1413          }
1361    }
1362
1363    public void testThenAcceptBoth_exceptionalCompletion4() {
1364        for (ExecutionMode m : ExecutionMode.values())
1365        for (Integer v1 : new Integer[] { 1, null }) {
1366
1367        final CompletableFuture<Integer> f = new CompletableFuture<>();
1368        final CompletableFuture<Integer> g = new CompletableFuture<>();
1369        final SubtractAction r = new SubtractAction();
1370        final CFException ex = new CFException();
1371
1372        f.completeExceptionally(ex);
1373        g.complete(v1);
1374        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1414  
1415 <        checkCompletedWithWrappedCFException(h, ex);
1416 <        checkCompletedWithWrappedCFException(f, ex);
1417 <        assertEquals(0, r.invocationCount);
1418 <        checkCompletedNormally(g, v1);
1419 <        }
1381 <    }
1415 >        checkCompletedWithWrappedCancellationException(h);
1416 >        checkCancelled(!fFirst ? f : g);
1417 >        r.assertNotInvoked();
1418 >        checkCompletedNormally(fFirst ? f : g, v1);
1419 >    }}
1420  
1421      /**
1422 <     * thenAcceptBoth result completes exceptionally if action does
1422 >     * thenCombine result completes exceptionally if action does
1423       */
1424 <    public void testThenAcceptBoth_actionFailed1() {
1424 >    public void testThenCombine_actionFailed() {
1425          for (ExecutionMode m : ExecutionMode.values())
1426 +        for (boolean fFirst : new boolean[] { true, false })
1427          for (Integer v1 : new Integer[] { 1, null })
1428 <        for (Integer v2 : new Integer[] { 2, null }) {
1429 <
1428 >        for (Integer v2 : new Integer[] { 2, null })
1429 >    {
1430          final CompletableFuture<Integer> f = new CompletableFuture<>();
1431          final CompletableFuture<Integer> g = new CompletableFuture<>();
1432 <        final FailingBiConsumer r = new FailingBiConsumer();
1433 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1432 >        final FailingBiFunction r = new FailingBiFunction(m);
1433 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1434  
1435 <        f.complete(v1);
1436 <        checkIncomplete(h);
1437 <        g.complete(v2);
1435 >        if (fFirst) {
1436 >            f.complete(v1);
1437 >            g.complete(v2);
1438 >        } else {
1439 >            g.complete(v2);
1440 >            f.complete(v1);
1441 >        }
1442  
1443          checkCompletedWithWrappedCFException(h);
1444          checkCompletedNormally(f, v1);
1445          checkCompletedNormally(g, v2);
1446 <        }
1404 <    }
1446 >    }}
1447  
1448 <    public void testThenAcceptBoth_actionFailed2() {
1448 >    /**
1449 >     * thenAcceptBoth result completes normally after normal
1450 >     * completion of sources
1451 >     */
1452 >    public void testThenAcceptBoth_normalCompletion() {
1453          for (ExecutionMode m : ExecutionMode.values())
1454 +        for (boolean createIncomplete : new boolean[] { true, false })
1455 +        for (boolean fFirst : new boolean[] { true, false })
1456          for (Integer v1 : new Integer[] { 1, null })
1457 <        for (Integer v2 : new Integer[] { 2, null }) {
1458 <
1457 >        for (Integer v2 : new Integer[] { 2, null })
1458 >    {
1459          final CompletableFuture<Integer> f = new CompletableFuture<>();
1460          final CompletableFuture<Integer> g = new CompletableFuture<>();
1461 <        final FailingBiConsumer r = new FailingBiConsumer();
1414 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1461 >        final SubtractAction r = new SubtractAction(m);
1462  
1463 <        g.complete(v2);
1464 <        checkIncomplete(h);
1465 <        f.complete(v1);
1463 >        if (fFirst) f.complete(v1); else g.complete(v2);
1464 >        if (!createIncomplete)
1465 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1466 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1467 >        if (createIncomplete) {
1468 >            checkIncomplete(h);
1469 >            r.assertNotInvoked();
1470 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1471 >        }
1472  
1473 <        checkCompletedWithWrappedCFException(h);
1473 >        checkCompletedNormally(h, null);
1474 >        r.assertValue(subtract(v1, v2));
1475          checkCompletedNormally(f, v1);
1476          checkCompletedNormally(g, v2);
1477 <        }
1424 <    }
1477 >    }}
1478  
1479      /**
1480 <     * thenAcceptBoth result completes exceptionally if either source cancelled
1480 >     * thenAcceptBoth result completes exceptionally after exceptional
1481 >     * completion of either source
1482       */
1483 <    public void testThenAcceptBoth_sourceCancelled1() {
1483 >    public void testThenAcceptBoth_exceptionalCompletion() {
1484          for (ExecutionMode m : ExecutionMode.values())
1485 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1486 <        for (Integer v1 : new Integer[] { 1, null }) {
1487 <
1485 >        for (boolean createIncomplete : new boolean[] { true, false })
1486 >        for (boolean fFirst : new boolean[] { true, false })
1487 >        for (Integer v1 : new Integer[] { 1, null })
1488 >    {
1489          final CompletableFuture<Integer> f = new CompletableFuture<>();
1490          final CompletableFuture<Integer> g = new CompletableFuture<>();
1491 <        final SubtractAction r = new SubtractAction();
1492 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1438 <
1439 <        assertTrue(f.cancel(mayInterruptIfRunning));
1440 <        checkIncomplete(h);
1441 <        g.complete(v1);
1442 <
1443 <        checkCompletedWithWrappedCancellationException(h);
1444 <        checkCancelled(f);
1445 <        assertEquals(0, r.invocationCount);
1446 <        checkCompletedNormally(g, v1);
1447 <        }
1448 <    }
1449 <
1450 <    public void testThenAcceptBoth_sourceCancelled2() {
1451 <        for (ExecutionMode m : ExecutionMode.values())
1452 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1453 <        for (Integer v1 : new Integer[] { 1, null }) {
1491 >        final CFException ex = new CFException();
1492 >        final SubtractAction r = new SubtractAction(m);
1493  
1494 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1495 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1496 <        final SubtractAction r = new SubtractAction();
1494 >        (fFirst ? f : g).complete(v1);
1495 >        if (!createIncomplete)
1496 >            (!fFirst ? f : g).completeExceptionally(ex);
1497          final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1498 <
1499 <        assertTrue(g.cancel(mayInterruptIfRunning));
1500 <        checkIncomplete(h);
1462 <        f.complete(v1);
1463 <
1464 <        checkCompletedWithWrappedCancellationException(h);
1465 <        checkCancelled(g);
1466 <        assertEquals(0, r.invocationCount);
1467 <        checkCompletedNormally(f, v1);
1498 >        if (createIncomplete) {
1499 >            checkIncomplete(h);
1500 >            (!fFirst ? f : g).completeExceptionally(ex);
1501          }
1469    }
1470
1471    public void testThenAcceptBoth_sourceCancelled3() {
1472        for (ExecutionMode m : ExecutionMode.values())
1473        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1474        for (Integer v1 : new Integer[] { 1, null }) {
1475
1476        final CompletableFuture<Integer> f = new CompletableFuture<>();
1477        final CompletableFuture<Integer> g = new CompletableFuture<>();
1478        final SubtractAction r = new SubtractAction();
1479
1480        assertTrue(g.cancel(mayInterruptIfRunning));
1481        f.complete(v1);
1482        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1502  
1503 <        checkCompletedWithWrappedCancellationException(h);
1504 <        checkCancelled(g);
1505 <        assertEquals(0, r.invocationCount);
1506 <        checkCompletedNormally(f, v1);
1507 <        }
1489 <    }
1503 >        checkCompletedWithWrappedCFException(h, ex);
1504 >        r.assertNotInvoked();
1505 >        checkCompletedNormally(fFirst ? f : g, v1);
1506 >        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1507 >    }}
1508  
1509 <    public void testThenAcceptBoth_sourceCancelled4() {
1509 >    /**
1510 >     * thenAcceptBoth result completes exceptionally if either source cancelled
1511 >     */
1512 >    public void testThenAcceptBoth_sourceCancelled() {
1513          for (ExecutionMode m : ExecutionMode.values())
1514          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1515 <        for (Integer v1 : new Integer[] { 1, null }) {
1516 <
1515 >        for (boolean createIncomplete : new boolean[] { true, false })
1516 >        for (boolean fFirst : new boolean[] { true, false })
1517 >        for (Integer v1 : new Integer[] { 1, null })
1518 >    {
1519          final CompletableFuture<Integer> f = new CompletableFuture<>();
1520          final CompletableFuture<Integer> g = new CompletableFuture<>();
1521 <        final SubtractAction r = new SubtractAction();
1521 >        final SubtractAction r = new SubtractAction(m);
1522  
1523 <        assertTrue(f.cancel(mayInterruptIfRunning));
1524 <        g.complete(v1);
1523 >        (fFirst ? f : g).complete(v1);
1524 >        if (!createIncomplete)
1525 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1526          final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1527 +        if (createIncomplete) {
1528 +            checkIncomplete(h);
1529 +            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1530 +        }
1531  
1532          checkCompletedWithWrappedCancellationException(h);
1533 <        checkCancelled(f);
1534 <        assertEquals(0, r.invocationCount);
1535 <        checkCompletedNormally(g, v1);
1536 <        }
1509 <    }
1533 >        checkCancelled(!fFirst ? f : g);
1534 >        r.assertNotInvoked();
1535 >        checkCompletedNormally(fFirst ? f : g, v1);
1536 >    }}
1537  
1538      /**
1539 <     * runAfterBoth result completes normally after normal
1513 <     * completion of sources
1539 >     * thenAcceptBoth result completes exceptionally if action does
1540       */
1541 <    public void testRunAfterBoth_normalCompletion1() {
1541 >    public void testThenAcceptBoth_actionFailed() {
1542          for (ExecutionMode m : ExecutionMode.values())
1543 +        for (boolean fFirst : new boolean[] { true, false })
1544          for (Integer v1 : new Integer[] { 1, null })
1545 <        for (Integer v2 : new Integer[] { 2, null }) {
1546 <
1545 >        for (Integer v2 : new Integer[] { 2, null })
1546 >    {
1547          final CompletableFuture<Integer> f = new CompletableFuture<>();
1548          final CompletableFuture<Integer> g = new CompletableFuture<>();
1549 <        final Noop r = new Noop();
1550 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1524 <
1525 <        f.complete(v1);
1526 <        checkIncomplete(h);
1527 <        assertEquals(0, r.invocationCount);
1528 <        g.complete(v2);
1549 >        final FailingBiConsumer r = new FailingBiConsumer(m);
1550 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1551  
1552 <        checkCompletedNormally(h, null);
1553 <        assertEquals(1, r.invocationCount);
1554 <        checkCompletedNormally(f, v1);
1555 <        checkCompletedNormally(g, v2);
1552 >        if (fFirst) {
1553 >            f.complete(v1);
1554 >            g.complete(v2);
1555 >        } else {
1556 >            g.complete(v2);
1557 >            f.complete(v1);
1558          }
1535    }
1559  
1560 <    public void testRunAfterBoth_normalCompletion2() {
1538 <        for (ExecutionMode m : ExecutionMode.values())
1539 <        for (Integer v1 : new Integer[] { 1, null })
1540 <        for (Integer v2 : new Integer[] { 2, null }) {
1541 <
1542 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1543 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1544 <        final Noop r = new Noop();
1545 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1546 <
1547 <        g.complete(v2);
1548 <        checkIncomplete(h);
1549 <        assertEquals(0, r.invocationCount);
1550 <        f.complete(v1);
1551 <
1552 <        checkCompletedNormally(h, null);
1553 <        assertEquals(1, r.invocationCount);
1560 >        checkCompletedWithWrappedCFException(h);
1561          checkCompletedNormally(f, v1);
1562          checkCompletedNormally(g, v2);
1563 <        }
1557 <    }
1563 >    }}
1564  
1565 <    public void testRunAfterBoth_normalCompletion3() {
1565 >    /**
1566 >     * runAfterBoth result completes normally after normal
1567 >     * completion of sources
1568 >     */
1569 >    public void testRunAfterBoth_normalCompletion() {
1570          for (ExecutionMode m : ExecutionMode.values())
1571 +        for (boolean createIncomplete : new boolean[] { true, false })
1572 +        for (boolean fFirst : new boolean[] { true, false })
1573          for (Integer v1 : new Integer[] { 1, null })
1574 <        for (Integer v2 : new Integer[] { 2, null }) {
1575 <
1574 >        for (Integer v2 : new Integer[] { 2, null })
1575 >    {
1576          final CompletableFuture<Integer> f = new CompletableFuture<>();
1577          final CompletableFuture<Integer> g = new CompletableFuture<>();
1578 <        final Noop r = new Noop();
1578 >        final Noop r = new Noop(m);
1579  
1580 <        g.complete(v2);
1581 <        f.complete(v1);
1580 >        if (fFirst) f.complete(v1); else g.complete(v2);
1581 >        if (!createIncomplete)
1582 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1583          final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1584 <
1585 <        checkCompletedNormally(h, null);
1586 <        assertEquals(1, r.invocationCount);
1587 <        checkCompletedNormally(f, v1);
1575 <        checkCompletedNormally(g, v2);
1584 >        if (createIncomplete) {
1585 >            checkIncomplete(h);
1586 >            r.assertNotInvoked();
1587 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1588          }
1577    }
1578
1579    public void testRunAfterBoth_normalCompletion4() {
1580        for (ExecutionMode m : ExecutionMode.values())
1581        for (Integer v1 : new Integer[] { 1, null })
1582        for (Integer v2 : new Integer[] { 2, null }) {
1583
1584        final CompletableFuture<Integer> f = new CompletableFuture<>();
1585        final CompletableFuture<Integer> g = new CompletableFuture<>();
1586        final Noop r = new Noop();
1587
1588        f.complete(v1);
1589        g.complete(v2);
1590        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1589  
1590          checkCompletedNormally(h, null);
1591 <        assertEquals(1, r.invocationCount);
1591 >        r.assertInvoked();
1592          checkCompletedNormally(f, v1);
1593          checkCompletedNormally(g, v2);
1594 <        }
1597 <    }
1594 >    }}
1595  
1596      /**
1597       * runAfterBoth result completes exceptionally after exceptional
1598       * completion of either source
1599       */
1600 <    public void testRunAfterBoth_exceptionalCompletion1() {
1604 <        for (ExecutionMode m : ExecutionMode.values())
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 Noop r = new Noop();
1610 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1611 <        final CFException ex = new CFException();
1612 <
1613 <        f.completeExceptionally(ex);
1614 <        checkIncomplete(h);
1615 <        g.complete(v1);
1616 <
1617 <        checkCompletedWithWrappedCFException(h, ex);
1618 <        checkCompletedWithWrappedCFException(f, ex);
1619 <        assertEquals(0, r.invocationCount);
1620 <        checkCompletedNormally(g, v1);
1621 <        }
1622 <    }
1623 <
1624 <    public void testRunAfterBoth_exceptionalCompletion2() {
1625 <        for (ExecutionMode m : ExecutionMode.values())
1626 <        for (Integer v1 : new Integer[] { 1, null }) {
1627 <
1628 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1629 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1630 <        final Noop r = new Noop();
1631 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1632 <        final CFException ex = new CFException();
1633 <
1634 <        g.completeExceptionally(ex);
1635 <        checkIncomplete(h);
1636 <        f.complete(v1);
1637 <
1638 <        checkCompletedWithWrappedCFException(h, ex);
1639 <        checkCompletedWithWrappedCFException(g, ex);
1640 <        assertEquals(0, r.invocationCount);
1641 <        checkCompletedNormally(f, v1);
1642 <        }
1643 <    }
1644 <
1645 <    public void testRunAfterBoth_exceptionalCompletion3() {
1600 >    public void testRunAfterBoth_exceptionalCompletion() {
1601          for (ExecutionMode m : ExecutionMode.values())
1602 <        for (Integer v1 : new Integer[] { 1, null }) {
1603 <
1602 >        for (boolean createIncomplete : new boolean[] { true, false })
1603 >        for (boolean fFirst : new boolean[] { true, false })
1604 >        for (Integer v1 : new Integer[] { 1, null })
1605 >    {
1606          final CompletableFuture<Integer> f = new CompletableFuture<>();
1607          final CompletableFuture<Integer> g = new CompletableFuture<>();
1651        final Noop r = new Noop();
1608          final CFException ex = new CFException();
1609 +        final Noop r = new Noop(m);
1610  
1611 <        g.completeExceptionally(ex);
1612 <        f.complete(v1);
1611 >        (fFirst ? f : g).complete(v1);
1612 >        if (!createIncomplete)
1613 >            (!fFirst ? f : g).completeExceptionally(ex);
1614          final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1615 <
1616 <        checkCompletedWithWrappedCFException(h, ex);
1617 <        checkCompletedWithWrappedCFException(g, ex);
1660 <        assertEquals(0, r.invocationCount);
1661 <        checkCompletedNormally(f, v1);
1615 >        if (createIncomplete) {
1616 >            checkIncomplete(h);
1617 >            (!fFirst ? f : g).completeExceptionally(ex);
1618          }
1663    }
1664
1665    public void testRunAfterBoth_exceptionalCompletion4() {
1666        for (ExecutionMode m : ExecutionMode.values())
1667        for (Integer v1 : new Integer[] { 1, null }) {
1668
1669        final CompletableFuture<Integer> f = new CompletableFuture<>();
1670        final CompletableFuture<Integer> g = new CompletableFuture<>();
1671        final Noop r = new Noop();
1672        final CFException ex = new CFException();
1673
1674        f.completeExceptionally(ex);
1675        g.complete(v1);
1676        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1619  
1620          checkCompletedWithWrappedCFException(h, ex);
1621 <        checkCompletedWithWrappedCFException(f, ex);
1622 <        assertEquals(0, r.invocationCount);
1623 <        checkCompletedNormally(g, v1);
1624 <        }
1683 <    }
1621 >        r.assertNotInvoked();
1622 >        checkCompletedNormally(fFirst ? f : g, v1);
1623 >        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1624 >    }}
1625  
1626      /**
1627 <     * runAfterBoth result completes exceptionally if action does
1627 >     * runAfterBoth result completes exceptionally if either source cancelled
1628       */
1629 <    public void testRunAfterBoth_actionFailed1() {
1629 >    public void testRunAfterBoth_sourceCancelled() {
1630          for (ExecutionMode m : ExecutionMode.values())
1631 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1632 +        for (boolean createIncomplete : new boolean[] { true, false })
1633 +        for (boolean fFirst : new boolean[] { true, false })
1634          for (Integer v1 : new Integer[] { 1, null })
1635 <        for (Integer v2 : new Integer[] { 2, null }) {
1692 <
1635 >    {
1636          final CompletableFuture<Integer> f = new CompletableFuture<>();
1637          final CompletableFuture<Integer> g = new CompletableFuture<>();
1638 <        final FailingNoop r = new FailingNoop();
1696 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1638 >        final Noop r = new Noop(m);
1639  
1698        f.complete(v1);
1699        checkIncomplete(h);
1700        g.complete(v2);
1640  
1641 <        checkCompletedWithWrappedCFException(h);
1642 <        checkCompletedNormally(f, v1);
1643 <        checkCompletedNormally(g, v2);
1705 <        }
1706 <    }
1707 <
1708 <    public void testRunAfterBoth_actionFailed2() {
1709 <        for (ExecutionMode m : ExecutionMode.values())
1710 <        for (Integer v1 : new Integer[] { 1, null })
1711 <        for (Integer v2 : new Integer[] { 2, null }) {
1712 <
1713 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1714 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1715 <        final FailingNoop r = new FailingNoop();
1641 >        (fFirst ? f : g).complete(v1);
1642 >        if (!createIncomplete)
1643 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1644          final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1645 <
1646 <        g.complete(v2);
1647 <        checkIncomplete(h);
1720 <        f.complete(v1);
1721 <
1722 <        checkCompletedWithWrappedCFException(h);
1723 <        checkCompletedNormally(f, v1);
1724 <        checkCompletedNormally(g, v2);
1645 >        if (createIncomplete) {
1646 >            checkIncomplete(h);
1647 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1648          }
1726    }
1727
1728    /**
1729     * runAfterBoth result completes exceptionally if either source cancelled
1730     */
1731    public void testRunAfterBoth_sourceCancelled1() {
1732        for (ExecutionMode m : ExecutionMode.values())
1733        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1734        for (Integer v1 : new Integer[] { 1, null }) {
1735
1736        final CompletableFuture<Integer> f = new CompletableFuture<>();
1737        final CompletableFuture<Integer> g = new CompletableFuture<>();
1738        final Noop r = new Noop();
1739        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1740
1741        assertTrue(f.cancel(mayInterruptIfRunning));
1742        checkIncomplete(h);
1743        g.complete(v1);
1649  
1650          checkCompletedWithWrappedCancellationException(h);
1651 <        checkCancelled(f);
1652 <        assertEquals(0, r.invocationCount);
1653 <        checkCompletedNormally(g, v1);
1654 <        }
1750 <    }
1651 >        checkCancelled(!fFirst ? f : g);
1652 >        r.assertNotInvoked();
1653 >        checkCompletedNormally(fFirst ? f : g, v1);
1654 >    }}
1655  
1656 <    public void testRunAfterBoth_sourceCancelled2() {
1656 >    /**
1657 >     * runAfterBoth result completes exceptionally if action does
1658 >     */
1659 >    public void testRunAfterBoth_actionFailed() {
1660          for (ExecutionMode m : ExecutionMode.values())
1661 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1662 <        for (Integer v1 : new Integer[] { 1, null }) {
1663 <
1661 >        for (boolean fFirst : new boolean[] { true, false })
1662 >        for (Integer v1 : new Integer[] { 1, null })
1663 >        for (Integer v2 : new Integer[] { 2, null })
1664 >    {
1665          final CompletableFuture<Integer> f = new CompletableFuture<>();
1666          final CompletableFuture<Integer> g = new CompletableFuture<>();
1667 <        final Noop r = new Noop();
1668 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1667 >        final FailingRunnable r1 = new FailingRunnable(m);
1668 >        final FailingRunnable r2 = new FailingRunnable(m);
1669  
1670 <        assertTrue(g.cancel(mayInterruptIfRunning));
1671 <        checkIncomplete(h);
1672 <        f.complete(v1);
1673 <
1674 <        checkCompletedWithWrappedCancellationException(h);
1675 <        checkCancelled(g);
1676 <        assertEquals(0, r.invocationCount);
1769 <        checkCompletedNormally(f, v1);
1670 >        CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
1671 >        if (fFirst) {
1672 >            f.complete(v1);
1673 >            g.complete(v2);
1674 >        } else {
1675 >            g.complete(v2);
1676 >            f.complete(v1);
1677          }
1678 <    }
1772 <
1773 <    public void testRunAfterBoth_sourceCancelled3() {
1774 <        for (ExecutionMode m : ExecutionMode.values())
1775 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1776 <        for (Integer v1 : new Integer[] { 1, null }) {
1777 <
1778 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1779 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1780 <        final Noop r = new Noop();
1781 <
1782 <        assertTrue(g.cancel(mayInterruptIfRunning));
1783 <        f.complete(v1);
1784 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1678 >        CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
1679  
1680 <        checkCompletedWithWrappedCancellationException(h);
1681 <        checkCancelled(g);
1788 <        assertEquals(0, r.invocationCount);
1680 >        checkCompletedWithWrappedCFException(h1);
1681 >        checkCompletedWithWrappedCFException(h2);
1682          checkCompletedNormally(f, v1);
1683 <        }
1684 <    }
1792 <
1793 <    public void testRunAfterBoth_sourceCancelled4() {
1794 <        for (ExecutionMode m : ExecutionMode.values())
1795 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1796 <        for (Integer v1 : new Integer[] { 1, null }) {
1797 <
1798 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1799 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1800 <        final Noop r = new Noop();
1801 <
1802 <        assertTrue(f.cancel(mayInterruptIfRunning));
1803 <        g.complete(v1);
1804 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1805 <
1806 <        checkCompletedWithWrappedCancellationException(h);
1807 <        checkCancelled(f);
1808 <        assertEquals(0, r.invocationCount);
1809 <        checkCompletedNormally(g, v1);
1810 <        }
1811 <    }
1683 >        checkCompletedNormally(g, v2);
1684 >    }}
1685  
1686      /**
1687       * applyToEither result completes normally after normal completion
1688       * of either source
1689       */
1690 <    public void testApplyToEither_normalCompletion1() {
1690 >    public void testApplyToEither_normalCompletion() {
1691          for (ExecutionMode m : ExecutionMode.values())
1692          for (Integer v1 : new Integer[] { 1, null })
1693 <        for (Integer v2 : new Integer[] { 2, null }) {
1694 <
1693 >        for (Integer v2 : new Integer[] { 2, null })
1694 >    {
1695          final CompletableFuture<Integer> f = new CompletableFuture<>();
1696          final CompletableFuture<Integer> g = new CompletableFuture<>();
1697 <        final IncFunction r = new IncFunction();
1698 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1697 >        final IncFunction[] rs = new IncFunction[6];
1698 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1699  
1700 +        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
1701 +        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
1702 +        checkIncomplete(h0);
1703 +        checkIncomplete(h1);
1704 +        rs[0].assertNotInvoked();
1705 +        rs[1].assertNotInvoked();
1706          f.complete(v1);
1707 <        checkCompletedNormally(h, inc(v1));
1707 >        checkCompletedNormally(h0, inc(v1));
1708 >        checkCompletedNormally(h1, inc(v1));
1709 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
1710 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
1711 >        checkCompletedNormally(h2, inc(v1));
1712 >        checkCompletedNormally(h3, inc(v1));
1713          g.complete(v2);
1714  
1715 <        checkCompletedNormally(f, v1);
1716 <        checkCompletedNormally(g, v2);
1717 <        checkCompletedNormally(h, inc(v1));
1718 <        }
1719 <    }
1720 <
1721 <    public void testApplyToEither_normalCompletion2() {
1722 <        for (ExecutionMode m : ExecutionMode.values())
1723 <        for (Integer v1 : new Integer[] { 1, null })
1840 <        for (Integer v2 : new Integer[] { 2, null }) {
1841 <
1842 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1843 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1844 <        final IncFunction r = new IncFunction();
1845 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1846 <
1847 <        g.complete(v2);
1848 <        checkCompletedNormally(h, inc(v2));
1849 <        f.complete(v1);
1715 >        // unspecified behavior - both source completions available
1716 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
1717 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
1718 >        rs[4].assertValue(h4.join());
1719 >        rs[5].assertValue(h5.join());
1720 >        assertTrue(Objects.equals(inc(v1), h4.join()) ||
1721 >                   Objects.equals(inc(v2), h4.join()));
1722 >        assertTrue(Objects.equals(inc(v1), h5.join()) ||
1723 >                   Objects.equals(inc(v2), h5.join()));
1724  
1725          checkCompletedNormally(f, v1);
1726          checkCompletedNormally(g, v2);
1727 <        checkCompletedNormally(h, inc(v2));
1728 <        }
1729 <    }
1730 <    public void testApplyToEither_normalCompletion3() {
1731 <        for (ExecutionMode m : ExecutionMode.values())
1732 <        for (Integer v1 : new Integer[] { 1, null })
1859 <        for (Integer v2 : new Integer[] { 2, null }) {
1860 <
1861 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1862 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1863 <        final IncFunction r = new IncFunction();
1864 <
1865 <        f.complete(v1);
1866 <        g.complete(v2);
1867 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1868 <
1869 <        checkCompletedNormally(f, v1);
1870 <        checkCompletedNormally(g, v2);
1871 <
1872 <        // unspecified behavior
1873 <        assertTrue(Objects.equals(h.join(), inc(v1)) ||
1874 <                   Objects.equals(h.join(), inc(v2)));
1875 <        assertEquals(1, r.invocationCount);
1876 <        }
1877 <    }
1727 >        checkCompletedNormally(h0, inc(v1));
1728 >        checkCompletedNormally(h1, inc(v1));
1729 >        checkCompletedNormally(h2, inc(v1));
1730 >        checkCompletedNormally(h3, inc(v1));
1731 >        for (int i = 0; i < 4; i++) rs[i].assertValue(inc(v1));
1732 >    }}
1733  
1734      /**
1735       * applyToEither result completes exceptionally after exceptional
1736       * completion of either source
1737       */
1738 <    public void testApplyToEither_exceptionalCompletion1() {
1738 >    public void testApplyToEither_exceptionalCompletion() {
1739          for (ExecutionMode m : ExecutionMode.values())
1740 <        for (Integer v1 : new Integer[] { 1, null }) {
1741 <
1740 >        for (Integer v1 : new Integer[] { 1, null })
1741 >    {
1742          final CompletableFuture<Integer> f = new CompletableFuture<>();
1743          final CompletableFuture<Integer> g = new CompletableFuture<>();
1889        final IncFunction r = new IncFunction();
1890        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1744          final CFException ex = new CFException();
1745 +        final IncFunction[] rs = new IncFunction[6];
1746 +        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1747  
1748 +        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
1749 +        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
1750 +        checkIncomplete(h0);
1751 +        checkIncomplete(h1);
1752 +        rs[0].assertNotInvoked();
1753 +        rs[1].assertNotInvoked();
1754          f.completeExceptionally(ex);
1755 <        checkCompletedWithWrappedCFException(h, ex);
1755 >        checkCompletedWithWrappedCFException(h0, ex);
1756 >        checkCompletedWithWrappedCFException(h1, ex);
1757 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
1758 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
1759 >        checkCompletedWithWrappedCFException(h2, ex);
1760 >        checkCompletedWithWrappedCFException(h3, ex);
1761          g.complete(v1);
1762  
1763 <        assertEquals(0, r.invocationCount);
1764 <        checkCompletedNormally(g, v1);
1765 <        checkCompletedWithWrappedCFException(f, ex);
1766 <        checkCompletedWithWrappedCFException(h, ex);
1763 >        // unspecified behavior - both source completions available
1764 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
1765 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
1766 >        try {
1767 >            assertEquals(inc(v1), h4.join());
1768 >            rs[4].assertValue(inc(v1));
1769 >        } catch (CompletionException ok) {
1770 >            checkCompletedWithWrappedCFException(h4, ex);
1771 >            rs[4].assertNotInvoked();
1772          }
1773 <    }
1773 >        try {
1774 >            assertEquals(inc(v1), h5.join());
1775 >            rs[5].assertValue(inc(v1));
1776 >        } catch (CompletionException ok) {
1777 >            checkCompletedWithWrappedCFException(h5, ex);
1778 >            rs[5].assertNotInvoked();
1779 >        }
1780 >
1781 >        checkCompletedWithWrappedCFException(f, ex);
1782 >        checkCompletedNormally(g, v1);
1783 >        checkCompletedWithWrappedCFException(h0, ex);
1784 >        checkCompletedWithWrappedCFException(h1, ex);
1785 >        checkCompletedWithWrappedCFException(h2, ex);
1786 >        checkCompletedWithWrappedCFException(h3, ex);
1787 >        checkCompletedWithWrappedCFException(h4, ex);
1788 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
1789 >    }}
1790  
1791      public void testApplyToEither_exceptionalCompletion2() {
1792          for (ExecutionMode m : ExecutionMode.values())
1793 <        for (Integer v1 : new Integer[] { 1, null }) {
1794 <
1793 >        for (boolean fFirst : new boolean[] { true, false })
1794 >        for (Integer v1 : new Integer[] { 1, null })
1795 >    {
1796          final CompletableFuture<Integer> f = new CompletableFuture<>();
1797          final CompletableFuture<Integer> g = new CompletableFuture<>();
1910        final IncFunction r = new IncFunction();
1911        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1798          final CFException ex = new CFException();
1799 +        final IncFunction[] rs = new IncFunction[6];
1800 +        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1801  
1802 <        g.completeExceptionally(ex);
1803 <        checkCompletedWithWrappedCFException(h, ex);
1804 <        f.complete(v1);
1805 <
1806 <        assertEquals(0, r.invocationCount);
1807 <        checkCompletedNormally(f, v1);
1808 <        checkCompletedWithWrappedCFException(g, ex);
1809 <        checkCompletedWithWrappedCFException(h, ex);
1802 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
1803 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
1804 >        if (fFirst) {
1805 >            f.complete(v1);
1806 >            g.completeExceptionally(ex);
1807 >        } else {
1808 >            g.completeExceptionally(ex);
1809 >            f.complete(v1);
1810          }
1811 <    }
1812 <
1925 <    public void testApplyToEither_exceptionalCompletion3() {
1926 <        for (ExecutionMode m : ExecutionMode.values())
1927 <        for (Integer v1 : new Integer[] { 1, null }) {
1928 <
1929 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1930 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1931 <        final IncFunction r = new IncFunction();
1932 <        final CFException ex = new CFException();
1811 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
1812 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
1813  
1814 <        g.completeExceptionally(ex);
1935 <        f.complete(v1);
1936 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1937 <
1938 <        // unspecified behavior
1939 <        Integer v;
1814 >        // unspecified behavior - both source completions available
1815          try {
1816 <            assertEquals(h.join(), inc(v1));
1817 <            assertEquals(1, r.invocationCount);
1816 >            assertEquals(inc(v1), h0.join());
1817 >            rs[0].assertValue(inc(v1));
1818          } catch (CompletionException ok) {
1819 <            checkCompletedWithWrappedCFException(h, ex);
1820 <            assertEquals(0, r.invocationCount);
1819 >            checkCompletedWithWrappedCFException(h0, ex);
1820 >            rs[0].assertNotInvoked();
1821          }
1947
1948        checkCompletedWithWrappedCFException(g, ex);
1949        checkCompletedNormally(f, v1);
1950        }
1951    }
1952
1953    public void testApplyToEither_exceptionalCompletion4() {
1954        for (ExecutionMode m : ExecutionMode.values())
1955        for (Integer v1 : new Integer[] { 1, null }) {
1956
1957        final CompletableFuture<Integer> f = new CompletableFuture<>();
1958        final CompletableFuture<Integer> g = new CompletableFuture<>();
1959        final IncFunction r = new IncFunction();
1960        final CFException ex = new CFException();
1961
1962        f.completeExceptionally(ex);
1963        g.complete(v1);
1964        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1965
1966        // unspecified behavior
1967        Integer v;
1822          try {
1823 <            assertEquals(h.join(), inc(v1));
1824 <            assertEquals(1, r.invocationCount);
1823 >            assertEquals(inc(v1), h1.join());
1824 >            rs[1].assertValue(inc(v1));
1825          } catch (CompletionException ok) {
1826 <            checkCompletedWithWrappedCFException(h, ex);
1827 <            assertEquals(0, r.invocationCount);
1826 >            checkCompletedWithWrappedCFException(h1, ex);
1827 >            rs[1].assertNotInvoked();
1828          }
1829 <
1830 <        checkCompletedWithWrappedCFException(f, ex);
1831 <        checkCompletedNormally(g, v1);
1829 >        try {
1830 >            assertEquals(inc(v1), h2.join());
1831 >            rs[2].assertValue(inc(v1));
1832 >        } catch (CompletionException ok) {
1833 >            checkCompletedWithWrappedCFException(h2, ex);
1834 >            rs[2].assertNotInvoked();
1835          }
1836 <    }
1837 <
1838 <    /**
1839 <     * applyToEither result completes exceptionally if action does
1840 <     */
1841 <    public void testApplyToEither_actionFailed1() {
1985 <        for (ExecutionMode m : ExecutionMode.values())
1986 <        for (Integer v1 : new Integer[] { 1, null })
1987 <        for (Integer v2 : new Integer[] { 2, null }) {
1988 <
1989 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1990 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1991 <        final FailingFunction r = new FailingFunction();
1992 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1993 <
1994 <        f.complete(v1);
1995 <        checkCompletedWithWrappedCFException(h);
1996 <        g.complete(v2);
1997 <        checkCompletedNormally(f, v1);
1998 <        checkCompletedNormally(g, v2);
1836 >        try {
1837 >            assertEquals(inc(v1), h3.join());
1838 >            rs[3].assertValue(inc(v1));
1839 >        } catch (CompletionException ok) {
1840 >            checkCompletedWithWrappedCFException(h3, ex);
1841 >            rs[3].assertNotInvoked();
1842          }
2000    }
1843  
2002    public void testApplyToEither_actionFailed2() {
2003        for (ExecutionMode m : ExecutionMode.values())
2004        for (Integer v1 : new Integer[] { 1, null })
2005        for (Integer v2 : new Integer[] { 2, null }) {
2006
2007        final CompletableFuture<Integer> f = new CompletableFuture<>();
2008        final CompletableFuture<Integer> g = new CompletableFuture<>();
2009        final FailingFunction r = new FailingFunction();
2010        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2011
2012        g.complete(v2);
2013        checkCompletedWithWrappedCFException(h);
2014        f.complete(v1);
1844          checkCompletedNormally(f, v1);
1845 <        checkCompletedNormally(g, v2);
1846 <        }
2018 <    }
1845 >        checkCompletedWithWrappedCFException(g, ex);
1846 >    }}
1847  
1848      /**
1849       * applyToEither result completes exceptionally if either source cancelled
1850       */
1851 <    public void testApplyToEither_sourceCancelled1() {
1851 >    public void testApplyToEither_sourceCancelled() {
1852          for (ExecutionMode m : ExecutionMode.values())
1853          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1854 <        for (Integer v1 : new Integer[] { 1, null }) {
1855 <
1854 >        for (Integer v1 : new Integer[] { 1, null })
1855 >    {
1856          final CompletableFuture<Integer> f = new CompletableFuture<>();
1857          final CompletableFuture<Integer> g = new CompletableFuture<>();
1858 <        final IncFunction r = new IncFunction();
1859 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1858 >        final IncFunction[] rs = new IncFunction[6];
1859 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1860  
1861 <        assertTrue(f.cancel(mayInterruptIfRunning));
1862 <        checkCompletedWithWrappedCancellationException(h);
1861 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
1862 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
1863 >        checkIncomplete(h0);
1864 >        checkIncomplete(h1);
1865 >        rs[0].assertNotInvoked();
1866 >        rs[1].assertNotInvoked();
1867 >        f.cancel(mayInterruptIfRunning);
1868 >        checkCompletedWithWrappedCancellationException(h0);
1869 >        checkCompletedWithWrappedCancellationException(h1);
1870 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
1871 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
1872 >        checkCompletedWithWrappedCancellationException(h2);
1873 >        checkCompletedWithWrappedCancellationException(h3);
1874          g.complete(v1);
1875  
1876 +        // unspecified behavior - both source completions available
1877 +        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
1878 +        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
1879 +        try {
1880 +            assertEquals(inc(v1), h4.join());
1881 +            rs[4].assertValue(inc(v1));
1882 +        } catch (CompletionException ok) {
1883 +            checkCompletedWithWrappedCancellationException(h4);
1884 +            rs[4].assertNotInvoked();
1885 +        }
1886 +        try {
1887 +            assertEquals(inc(v1), h5.join());
1888 +            rs[5].assertValue(inc(v1));
1889 +        } catch (CompletionException ok) {
1890 +            checkCompletedWithWrappedCancellationException(h5);
1891 +            rs[5].assertNotInvoked();
1892 +        }
1893 +
1894          checkCancelled(f);
2038        assertEquals(0, r.invocationCount);
1895          checkCompletedNormally(g, v1);
1896 <        checkCompletedWithWrappedCancellationException(h);
1897 <        }
1898 <    }
1896 >        checkCompletedWithWrappedCancellationException(h0);
1897 >        checkCompletedWithWrappedCancellationException(h1);
1898 >        checkCompletedWithWrappedCancellationException(h2);
1899 >        checkCompletedWithWrappedCancellationException(h3);
1900 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
1901 >    }}
1902  
1903      public void testApplyToEither_sourceCancelled2() {
1904          for (ExecutionMode m : ExecutionMode.values())
1905          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1906 <        for (Integer v1 : new Integer[] { 1, null }) {
1907 <
1906 >        for (boolean fFirst : new boolean[] { true, false })
1907 >        for (Integer v1 : new Integer[] { 1, null })
1908 >    {
1909          final CompletableFuture<Integer> f = new CompletableFuture<>();
1910          final CompletableFuture<Integer> g = new CompletableFuture<>();
1911 <        final IncFunction r = new IncFunction();
1912 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2053 <
2054 <        assertTrue(g.cancel(mayInterruptIfRunning));
2055 <        checkCompletedWithWrappedCancellationException(h);
2056 <        f.complete(v1);
1911 >        final IncFunction[] rs = new IncFunction[6];
1912 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1913  
1914 <        checkCancelled(g);
1915 <        assertEquals(0, r.invocationCount);
1916 <        checkCompletedNormally(f, v1);
1917 <        checkCompletedWithWrappedCancellationException(h);
1914 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
1915 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
1916 >        if (fFirst) {
1917 >            f.complete(v1);
1918 >            g.cancel(mayInterruptIfRunning);
1919 >        } else {
1920 >            g.cancel(mayInterruptIfRunning);
1921 >            f.complete(v1);
1922          }
1923 <    }
1924 <
2065 <    public void testApplyToEither_sourceCancelled3() {
2066 <        for (ExecutionMode m : ExecutionMode.values())
2067 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2068 <        for (Integer v1 : new Integer[] { 1, null }) {
1923 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
1924 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
1925  
1926 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2071 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2072 <        final IncFunction r = new IncFunction();
2073 <
2074 <        assertTrue(g.cancel(mayInterruptIfRunning));
2075 <        f.complete(v1);
2076 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2077 <
2078 <        // unspecified behavior
2079 <        Integer v;
1926 >        // unspecified behavior - both source completions available
1927          try {
1928 <            assertEquals(h.join(), inc(v1));
1929 <            assertEquals(1, r.invocationCount);
1928 >            assertEquals(inc(v1), h0.join());
1929 >            rs[0].assertValue(inc(v1));
1930          } catch (CompletionException ok) {
1931 <            checkCompletedWithWrappedCancellationException(h);
1932 <            assertEquals(0, r.invocationCount);
1931 >            checkCompletedWithWrappedCancellationException(h0);
1932 >            rs[0].assertNotInvoked();
1933          }
1934 <
1935 <        checkCancelled(g);
1936 <        checkCompletedNormally(f, v1);
1934 >        try {
1935 >            assertEquals(inc(v1), h1.join());
1936 >            rs[1].assertValue(inc(v1));
1937 >        } catch (CompletionException ok) {
1938 >            checkCompletedWithWrappedCancellationException(h1);
1939 >            rs[1].assertNotInvoked();
1940          }
2091    }
2092
2093    public void testApplyToEither_sourceCancelled4() {
2094        for (ExecutionMode m : ExecutionMode.values())
2095        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2096        for (Integer v1 : new Integer[] { 1, null }) {
2097
2098        final CompletableFuture<Integer> f = new CompletableFuture<>();
2099        final CompletableFuture<Integer> g = new CompletableFuture<>();
2100        final IncFunction r = new IncFunction();
2101
2102        assertTrue(f.cancel(mayInterruptIfRunning));
2103        g.complete(v1);
2104        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2105
2106        // unspecified behavior
2107        Integer v;
1941          try {
1942 <            assertEquals(h.join(), inc(v1));
1943 <            assertEquals(1, r.invocationCount);
1942 >            assertEquals(inc(v1), h2.join());
1943 >            rs[2].assertValue(inc(v1));
1944          } catch (CompletionException ok) {
1945 <            checkCompletedWithWrappedCancellationException(h);
1946 <            assertEquals(0, r.invocationCount);
1945 >            checkCompletedWithWrappedCancellationException(h2);
1946 >            rs[2].assertNotInvoked();
1947          }
1948 <
1949 <        checkCancelled(f);
1950 <        checkCompletedNormally(g, v1);
1948 >        try {
1949 >            assertEquals(inc(v1), h3.join());
1950 >            rs[3].assertValue(inc(v1));
1951 >        } catch (CompletionException ok) {
1952 >            checkCompletedWithWrappedCancellationException(h3);
1953 >            rs[3].assertNotInvoked();
1954          }
1955 <    }
1955 >
1956 >        checkCompletedNormally(f, v1);
1957 >        checkCancelled(g);
1958 >    }}
1959  
1960      /**
1961 <     * acceptEither result completes normally after normal completion
2123 <     * of either source
1961 >     * applyToEither result completes exceptionally if action does
1962       */
1963 <    public void testAcceptEither_normalCompletion1() {
1963 >    public void testApplyToEither_actionFailed() {
1964          for (ExecutionMode m : ExecutionMode.values())
1965          for (Integer v1 : new Integer[] { 1, null })
1966 <        for (Integer v2 : new Integer[] { 2, null }) {
1967 <
1966 >        for (Integer v2 : new Integer[] { 2, null })
1967 >    {
1968          final CompletableFuture<Integer> f = new CompletableFuture<>();
1969          final CompletableFuture<Integer> g = new CompletableFuture<>();
1970 <        final IncAction r = new IncAction();
1971 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
1970 >        final FailingFunction[] rs = new FailingFunction[6];
1971 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingFunction(m);
1972  
1973 +        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
1974 +        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
1975          f.complete(v1);
1976 <        checkCompletedNormally(h, null);
1977 <        assertEquals(r.value, inc(v1));
1978 <        g.complete(v2);
1976 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
1977 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
1978 >        checkCompletedWithWrappedCFException(h0);
1979 >        checkCompletedWithWrappedCFException(h1);
1980 >        checkCompletedWithWrappedCFException(h2);
1981 >        checkCompletedWithWrappedCFException(h3);
1982 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
1983  
1984 <        checkCompletedNormally(f, v1);
2141 <        checkCompletedNormally(g, v2);
2142 <        checkCompletedNormally(h, null);
2143 <        }
2144 <    }
2145 <
2146 <    public void testAcceptEither_normalCompletion2() {
2147 <        for (ExecutionMode m : ExecutionMode.values())
2148 <        for (Integer v1 : new Integer[] { 1, null })
2149 <        for (Integer v2 : new Integer[] { 2, null }) {
1984 >        g.complete(v2);
1985  
1986 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1987 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1988 <        final IncAction r = new IncAction();
2154 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
1986 >        // unspecified behavior - both source completions available
1987 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
1988 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
1989  
1990 <        g.complete(v2);
1991 <        checkCompletedNormally(h, null);
1992 <        assertEquals(r.value, inc(v2));
1993 <        f.complete(v1);
1990 >        checkCompletedWithWrappedCFException(h4);
1991 >        assertTrue(Objects.equals(v1, rs[4].value) ||
1992 >                   Objects.equals(v2, rs[4].value));
1993 >        checkCompletedWithWrappedCFException(h5);
1994 >        assertTrue(Objects.equals(v1, rs[5].value) ||
1995 >                   Objects.equals(v2, rs[5].value));
1996  
1997          checkCompletedNormally(f, v1);
1998          checkCompletedNormally(g, v2);
1999 <        checkCompletedNormally(h, null);
2000 <        }
2001 <    }
2002 <    public void testAcceptEither_normalCompletion3() {
1999 >    }}
2000 >
2001 >    /**
2002 >     * acceptEither result completes normally after normal completion
2003 >     * of either source
2004 >     */
2005 >    public void testAcceptEither_normalCompletion() {
2006          for (ExecutionMode m : ExecutionMode.values())
2007          for (Integer v1 : new Integer[] { 1, null })
2008 <        for (Integer v2 : new Integer[] { 2, null }) {
2009 <
2008 >        for (Integer v2 : new Integer[] { 2, null })
2009 >    {
2010          final CompletableFuture<Integer> f = new CompletableFuture<>();
2011          final CompletableFuture<Integer> g = new CompletableFuture<>();
2012 <        final IncAction r = new IncAction();
2013 <
2014 <        f.complete(v1);
2015 <        g.complete(v2);
2016 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2012 >        final NoopConsumer[] rs = new NoopConsumer[6];
2013 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2014 >
2015 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2016 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2017 >        checkIncomplete(h0);
2018 >        checkIncomplete(h1);
2019 >        rs[0].assertNotInvoked();
2020 >        rs[1].assertNotInvoked();
2021 >        f.complete(v1);
2022 >        checkCompletedNormally(h0, null);
2023 >        checkCompletedNormally(h1, null);
2024 >        rs[0].assertValue(v1);
2025 >        rs[1].assertValue(v1);
2026 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2027 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2028 >        checkCompletedNormally(h2, null);
2029 >        checkCompletedNormally(h3, null);
2030 >        rs[2].assertValue(v1);
2031 >        rs[3].assertValue(v1);
2032 >        g.complete(v2);
2033 >
2034 >        // unspecified behavior - both source completions available
2035 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2036 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2037 >        checkCompletedNormally(h4, null);
2038 >        checkCompletedNormally(h5, null);
2039 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2040 >                   Objects.equals(v2, rs[4].value));
2041 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2042 >                   Objects.equals(v2, rs[5].value));
2043  
2179        checkCompletedNormally(h, null);
2044          checkCompletedNormally(f, v1);
2045          checkCompletedNormally(g, v2);
2046 <
2047 <        // unspecified behavior
2048 <        assertTrue(Objects.equals(r.value, inc(v1)) ||
2049 <                   Objects.equals(r.value, inc(v2)));
2050 <        }
2051 <    }
2046 >        checkCompletedNormally(h0, null);
2047 >        checkCompletedNormally(h1, null);
2048 >        checkCompletedNormally(h2, null);
2049 >        checkCompletedNormally(h3, null);
2050 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2051 >    }}
2052  
2053      /**
2054       * acceptEither result completes exceptionally after exceptional
2055       * completion of either source
2056       */
2057 <    public void testAcceptEither_exceptionalCompletion1() {
2057 >    public void testAcceptEither_exceptionalCompletion() {
2058          for (ExecutionMode m : ExecutionMode.values())
2059 <        for (Integer v1 : new Integer[] { 1, null }) {
2060 <
2059 >        for (Integer v1 : new Integer[] { 1, null })
2060 >    {
2061          final CompletableFuture<Integer> f = new CompletableFuture<>();
2062          final CompletableFuture<Integer> g = new CompletableFuture<>();
2199        final IncAction r = new IncAction();
2200        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2063          final CFException ex = new CFException();
2064 +        final NoopConsumer[] rs = new NoopConsumer[6];
2065 +        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2066  
2067 +        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2068 +        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2069 +        checkIncomplete(h0);
2070 +        checkIncomplete(h1);
2071 +        rs[0].assertNotInvoked();
2072 +        rs[1].assertNotInvoked();
2073          f.completeExceptionally(ex);
2074 <        checkCompletedWithWrappedCFException(h, ex);
2074 >        checkCompletedWithWrappedCFException(h0, ex);
2075 >        checkCompletedWithWrappedCFException(h1, ex);
2076 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2077 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2078 >        checkCompletedWithWrappedCFException(h2, ex);
2079 >        checkCompletedWithWrappedCFException(h3, ex);
2080 >
2081          g.complete(v1);
2082  
2083 <        assertEquals(0, r.invocationCount);
2084 <        checkCompletedNormally(g, v1);
2085 <        checkCompletedWithWrappedCFException(f, ex);
2086 <        checkCompletedWithWrappedCFException(h, ex);
2083 >        // unspecified behavior - both source completions available
2084 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2085 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2086 >        try {
2087 >            assertNull(h4.join());
2088 >            rs[4].assertValue(v1);
2089 >        } catch (CompletionException ok) {
2090 >            checkCompletedWithWrappedCFException(h4, ex);
2091 >            rs[4].assertNotInvoked();
2092          }
2093 <    }
2093 >        try {
2094 >            assertNull(h5.join());
2095 >            rs[5].assertValue(v1);
2096 >        } catch (CompletionException ok) {
2097 >            checkCompletedWithWrappedCFException(h5, ex);
2098 >            rs[5].assertNotInvoked();
2099 >        }
2100 >
2101 >        checkCompletedWithWrappedCFException(f, ex);
2102 >        checkCompletedNormally(g, v1);
2103 >        checkCompletedWithWrappedCFException(h0, ex);
2104 >        checkCompletedWithWrappedCFException(h1, ex);
2105 >        checkCompletedWithWrappedCFException(h2, ex);
2106 >        checkCompletedWithWrappedCFException(h3, ex);
2107 >        checkCompletedWithWrappedCFException(h4, ex);
2108 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2109 >    }}
2110  
2111      public void testAcceptEither_exceptionalCompletion2() {
2112          for (ExecutionMode m : ExecutionMode.values())
2113 <        for (Integer v1 : new Integer[] { 1, null }) {
2114 <
2113 >        for (boolean fFirst : new boolean[] { true, false })
2114 >        for (Integer v1 : new Integer[] { 1, null })
2115 >    {
2116          final CompletableFuture<Integer> f = new CompletableFuture<>();
2117          final CompletableFuture<Integer> g = new CompletableFuture<>();
2220        final IncAction r = new IncAction();
2221        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2118          final CFException ex = new CFException();
2119 +        final NoopConsumer[] rs = new NoopConsumer[6];
2120 +        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2121  
2122 <        g.completeExceptionally(ex);
2123 <        checkCompletedWithWrappedCFException(h, ex);
2124 <        f.complete(v1);
2125 <
2126 <        assertEquals(0, r.invocationCount);
2127 <        checkCompletedNormally(f, v1);
2128 <        checkCompletedWithWrappedCFException(g, ex);
2129 <        checkCompletedWithWrappedCFException(h, ex);
2122 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2123 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2124 >        if (fFirst) {
2125 >            f.complete(v1);
2126 >            g.completeExceptionally(ex);
2127 >        } else {
2128 >            g.completeExceptionally(ex);
2129 >            f.complete(v1);
2130          }
2131 <    }
2132 <
2235 <    public void testAcceptEither_exceptionalCompletion3() {
2236 <        for (ExecutionMode m : ExecutionMode.values())
2237 <        for (Integer v1 : new Integer[] { 1, null }) {
2131 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2132 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2133  
2134 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2240 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2241 <        final IncAction r = new IncAction();
2242 <        final CFException ex = new CFException();
2243 <
2244 <        g.completeExceptionally(ex);
2245 <        f.complete(v1);
2246 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2247 <
2248 <        // unspecified behavior
2249 <        Integer v;
2134 >        // unspecified behavior - both source completions available
2135          try {
2136 <            assertEquals(h.join(), null);
2137 <            assertEquals(1, r.invocationCount);
2253 <            assertEquals(inc(v1), r.value);
2136 >            assertEquals(null, h0.join());
2137 >            rs[0].assertValue(v1);
2138          } catch (CompletionException ok) {
2139 <            checkCompletedWithWrappedCFException(h, ex);
2140 <            assertEquals(0, r.invocationCount);
2257 <        }
2258 <
2259 <        checkCompletedWithWrappedCFException(g, ex);
2260 <        checkCompletedNormally(f, v1);
2139 >            checkCompletedWithWrappedCFException(h0, ex);
2140 >            rs[0].assertNotInvoked();
2141          }
2262    }
2263
2264    public void testAcceptEither_exceptionalCompletion4() {
2265        for (ExecutionMode m : ExecutionMode.values())
2266        for (Integer v1 : new Integer[] { 1, null }) {
2267
2268        final CompletableFuture<Integer> f = new CompletableFuture<>();
2269        final CompletableFuture<Integer> g = new CompletableFuture<>();
2270        final IncAction r = new IncAction();
2271        final CFException ex = new CFException();
2272
2273        f.completeExceptionally(ex);
2274        g.complete(v1);
2275        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2276
2277        // unspecified behavior
2278        Integer v;
2142          try {
2143 <            assertEquals(h.join(), null);
2144 <            assertEquals(1, r.invocationCount);
2282 <            assertEquals(inc(v1), r.value);
2143 >            assertEquals(null, h1.join());
2144 >            rs[1].assertValue(v1);
2145          } catch (CompletionException ok) {
2146 <            checkCompletedWithWrappedCFException(h, ex);
2147 <            assertEquals(0, r.invocationCount);
2146 >            checkCompletedWithWrappedCFException(h1, ex);
2147 >            rs[1].assertNotInvoked();
2148          }
2149 <
2150 <        checkCompletedWithWrappedCFException(f, ex);
2151 <        checkCompletedNormally(g, v1);
2149 >        try {
2150 >            assertEquals(null, h2.join());
2151 >            rs[2].assertValue(v1);
2152 >        } catch (CompletionException ok) {
2153 >            checkCompletedWithWrappedCFException(h2, ex);
2154 >            rs[2].assertNotInvoked();
2155          }
2156 <    }
2157 <
2158 <    /**
2159 <     * acceptEither result completes exceptionally if action does
2160 <     */
2161 <    public void testAcceptEither_actionFailed1() {
2297 <        for (ExecutionMode m : ExecutionMode.values())
2298 <        for (Integer v1 : new Integer[] { 1, null })
2299 <        for (Integer v2 : new Integer[] { 2, null }) {
2300 <
2301 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2302 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2303 <        final FailingConsumer r = new FailingConsumer();
2304 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2305 <
2306 <        f.complete(v1);
2307 <        checkCompletedWithWrappedCFException(h);
2308 <        g.complete(v2);
2309 <        checkCompletedNormally(f, v1);
2310 <        checkCompletedNormally(g, v2);
2156 >        try {
2157 >            assertEquals(null, h3.join());
2158 >            rs[3].assertValue(v1);
2159 >        } catch (CompletionException ok) {
2160 >            checkCompletedWithWrappedCFException(h3, ex);
2161 >            rs[3].assertNotInvoked();
2162          }
2312    }
2313
2314    public void testAcceptEither_actionFailed2() {
2315        for (ExecutionMode m : ExecutionMode.values())
2316        for (Integer v1 : new Integer[] { 1, null })
2317        for (Integer v2 : new Integer[] { 2, null }) {
2163  
2319        final CompletableFuture<Integer> f = new CompletableFuture<>();
2320        final CompletableFuture<Integer> g = new CompletableFuture<>();
2321        final FailingConsumer r = new FailingConsumer();
2322        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2323
2324        g.complete(v2);
2325        checkCompletedWithWrappedCFException(h);
2326        f.complete(v1);
2164          checkCompletedNormally(f, v1);
2165 <        checkCompletedNormally(g, v2);
2166 <        }
2330 <    }
2165 >        checkCompletedWithWrappedCFException(g, ex);
2166 >    }}
2167  
2168      /**
2169       * acceptEither result completes exceptionally if either source cancelled
2170       */
2171 <    public void testAcceptEither_sourceCancelled1() {
2336 <        for (ExecutionMode m : ExecutionMode.values())
2337 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2338 <        for (Integer v1 : new Integer[] { 1, null }) {
2339 <
2340 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2341 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2342 <        final IncAction r = new IncAction();
2343 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2344 <
2345 <        assertTrue(f.cancel(mayInterruptIfRunning));
2346 <        checkCompletedWithWrappedCancellationException(h);
2347 <        g.complete(v1);
2348 <
2349 <        checkCancelled(f);
2350 <        assertEquals(0, r.invocationCount);
2351 <        checkCompletedNormally(g, v1);
2352 <        checkCompletedWithWrappedCancellationException(h);
2353 <        }
2354 <    }
2355 <
2356 <    public void testAcceptEither_sourceCancelled2() {
2171 >    public void testAcceptEither_sourceCancelled() {
2172          for (ExecutionMode m : ExecutionMode.values())
2173          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2174 <        for (Integer v1 : new Integer[] { 1, null }) {
2175 <
2174 >        for (Integer v1 : new Integer[] { 1, null })
2175 >    {
2176          final CompletableFuture<Integer> f = new CompletableFuture<>();
2177          final CompletableFuture<Integer> g = new CompletableFuture<>();
2178 <        final IncAction r = new IncAction();
2179 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2365 <
2366 <        assertTrue(g.cancel(mayInterruptIfRunning));
2367 <        checkCompletedWithWrappedCancellationException(h);
2368 <        f.complete(v1);
2369 <
2370 <        checkCancelled(g);
2371 <        assertEquals(0, r.invocationCount);
2372 <        checkCompletedNormally(f, v1);
2373 <        checkCompletedWithWrappedCancellationException(h);
2374 <        }
2375 <    }
2376 <
2377 <    public void testAcceptEither_sourceCancelled3() {
2378 <        for (ExecutionMode m : ExecutionMode.values())
2379 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2380 <        for (Integer v1 : new Integer[] { 1, null }) {
2178 >        final NoopConsumer[] rs = new NoopConsumer[6];
2179 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2180  
2181 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2182 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2183 <        final IncAction r = new IncAction();
2181 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2182 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2183 >        checkIncomplete(h0);
2184 >        checkIncomplete(h1);
2185 >        rs[0].assertNotInvoked();
2186 >        rs[1].assertNotInvoked();
2187 >        f.cancel(mayInterruptIfRunning);
2188 >        checkCompletedWithWrappedCancellationException(h0);
2189 >        checkCompletedWithWrappedCancellationException(h1);
2190 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2191 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2192 >        checkCompletedWithWrappedCancellationException(h2);
2193 >        checkCompletedWithWrappedCancellationException(h3);
2194  
2195 <        assertTrue(g.cancel(mayInterruptIfRunning));
2387 <        f.complete(v1);
2388 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2195 >        g.complete(v1);
2196  
2197 <        // unspecified behavior
2198 <        Integer v;
2197 >        // unspecified behavior - both source completions available
2198 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2199 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2200          try {
2201 <            assertEquals(h.join(), null);
2202 <            assertEquals(1, r.invocationCount);
2395 <            assertEquals(inc(v1), r.value);
2201 >            assertNull(h4.join());
2202 >            rs[4].assertValue(v1);
2203          } catch (CompletionException ok) {
2204 <            checkCompletedWithWrappedCancellationException(h);
2205 <            assertEquals(0, r.invocationCount);
2204 >            checkCompletedWithWrappedCancellationException(h4);
2205 >            rs[4].assertNotInvoked();
2206          }
2400
2401        checkCancelled(g);
2402        checkCompletedNormally(f, v1);
2403        }
2404    }
2405
2406    public void testAcceptEither_sourceCancelled4() {
2407        for (ExecutionMode m : ExecutionMode.values())
2408        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2409        for (Integer v1 : new Integer[] { 1, null }) {
2410
2411        final CompletableFuture<Integer> f = new CompletableFuture<>();
2412        final CompletableFuture<Integer> g = new CompletableFuture<>();
2413        final IncAction r = new IncAction();
2414
2415        assertTrue(f.cancel(mayInterruptIfRunning));
2416        g.complete(v1);
2417        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2418
2419        // unspecified behavior
2420        Integer v;
2207          try {
2208 <            assertEquals(h.join(), null);
2209 <            assertEquals(1, r.invocationCount);
2424 <            assertEquals(inc(v1), r.value);
2208 >            assertNull(h5.join());
2209 >            rs[5].assertValue(v1);
2210          } catch (CompletionException ok) {
2211 <            checkCompletedWithWrappedCancellationException(h);
2212 <            assertEquals(0, r.invocationCount);
2211 >            checkCompletedWithWrappedCancellationException(h5);
2212 >            rs[5].assertNotInvoked();
2213          }
2214  
2215          checkCancelled(f);
2216          checkCompletedNormally(g, v1);
2217 <        }
2218 <    }
2217 >        checkCompletedWithWrappedCancellationException(h0);
2218 >        checkCompletedWithWrappedCancellationException(h1);
2219 >        checkCompletedWithWrappedCancellationException(h2);
2220 >        checkCompletedWithWrappedCancellationException(h3);
2221 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2222 >    }}
2223  
2224      /**
2225 <     * runAfterEither result completes normally after normal completion
2437 <     * of either source
2225 >     * acceptEither result completes exceptionally if action does
2226       */
2227 <    public void testRunAfterEither_normalCompletion1() {
2227 >    public void testAcceptEither_actionFailed() {
2228          for (ExecutionMode m : ExecutionMode.values())
2229          for (Integer v1 : new Integer[] { 1, null })
2230 <        for (Integer v2 : new Integer[] { 2, null }) {
2231 <
2230 >        for (Integer v2 : new Integer[] { 2, null })
2231 >    {
2232          final CompletableFuture<Integer> f = new CompletableFuture<>();
2233          final CompletableFuture<Integer> g = new CompletableFuture<>();
2234 <        final Noop r = new Noop();
2235 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2234 >        final FailingConsumer[] rs = new FailingConsumer[6];
2235 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingConsumer(m);
2236  
2237 +        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2238 +        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2239          f.complete(v1);
2240 <        checkCompletedNormally(h, null);
2241 <        assertEquals(1, r.invocationCount);
2242 <        g.complete(v2);
2243 <
2244 <        checkCompletedNormally(f, v1);
2245 <        checkCompletedNormally(g, v2);
2246 <        checkCompletedNormally(h, null);
2457 <        assertEquals(1, r.invocationCount);
2458 <        }
2459 <    }
2240 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2241 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2242 >        checkCompletedWithWrappedCFException(h0);
2243 >        checkCompletedWithWrappedCFException(h1);
2244 >        checkCompletedWithWrappedCFException(h2);
2245 >        checkCompletedWithWrappedCFException(h3);
2246 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2247  
2248 <    public void testRunAfterEither_normalCompletion2() {
2462 <        for (ExecutionMode m : ExecutionMode.values())
2463 <        for (Integer v1 : new Integer[] { 1, null })
2464 <        for (Integer v2 : new Integer[] { 2, null }) {
2248 >        g.complete(v2);
2249  
2250 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2251 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2252 <        final Noop r = new Noop();
2469 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2250 >        // unspecified behavior - both source completions available
2251 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2252 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2253  
2254 <        g.complete(v2);
2255 <        checkCompletedNormally(h, null);
2256 <        assertEquals(1, r.invocationCount);
2257 <        f.complete(v1);
2254 >        checkCompletedWithWrappedCFException(h4);
2255 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2256 >                   Objects.equals(v2, rs[4].value));
2257 >        checkCompletedWithWrappedCFException(h5);
2258 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2259 >                   Objects.equals(v2, rs[5].value));
2260  
2261          checkCompletedNormally(f, v1);
2262          checkCompletedNormally(g, v2);
2263 <        checkCompletedNormally(h, null);
2264 <        assertEquals(1, r.invocationCount);
2265 <        }
2266 <    }
2267 <    public void testRunAfterEither_normalCompletion3() {
2263 >    }}
2264 >
2265 >    /**
2266 >     * runAfterEither result completes normally after normal completion
2267 >     * of either source
2268 >     */
2269 >    public void testRunAfterEither_normalCompletion() {
2270          for (ExecutionMode m : ExecutionMode.values())
2271          for (Integer v1 : new Integer[] { 1, null })
2272 <        for (Integer v2 : new Integer[] { 2, null }) {
2273 <
2272 >        for (Integer v2 : new Integer[] { 2, null })
2273 >    {
2274          final CompletableFuture<Integer> f = new CompletableFuture<>();
2275          final CompletableFuture<Integer> g = new CompletableFuture<>();
2276 <        final Noop r = new Noop();
2276 >        final Noop[] rs = new Noop[6];
2277 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2278  
2279 +        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2280 +        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2281 +        checkIncomplete(h0);
2282 +        checkIncomplete(h1);
2283 +        rs[0].assertNotInvoked();
2284 +        rs[1].assertNotInvoked();
2285          f.complete(v1);
2286 +        checkCompletedNormally(h0, null);
2287 +        checkCompletedNormally(h1, null);
2288 +        rs[0].assertInvoked();
2289 +        rs[1].assertInvoked();
2290 +        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2291 +        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2292 +        checkCompletedNormally(h2, null);
2293 +        checkCompletedNormally(h3, null);
2294 +        rs[2].assertInvoked();
2295 +        rs[3].assertInvoked();
2296 +
2297          g.complete(v2);
2493        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2298  
2299 <        checkCompletedNormally(h, null);
2299 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2300 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2301 >
2302          checkCompletedNormally(f, v1);
2303          checkCompletedNormally(g, v2);
2304 <        assertEquals(1, r.invocationCount);
2305 <        }
2306 <    }
2304 >        checkCompletedNormally(h0, null);
2305 >        checkCompletedNormally(h1, null);
2306 >        checkCompletedNormally(h2, null);
2307 >        checkCompletedNormally(h3, null);
2308 >        checkCompletedNormally(h4, null);
2309 >        checkCompletedNormally(h5, null);
2310 >        for (int i = 0; i < 6; i++) rs[i].assertInvoked();
2311 >    }}
2312  
2313      /**
2314       * runAfterEither result completes exceptionally after exceptional
2315       * completion of either source
2316       */
2317 <    public void testRunAfterEither_exceptionalCompletion1() {
2317 >    public void testRunAfterEither_exceptionalCompletion() {
2318          for (ExecutionMode m : ExecutionMode.values())
2319 <        for (Integer v1 : new Integer[] { 1, null }) {
2320 <
2319 >        for (Integer v1 : new Integer[] { 1, null })
2320 >    {
2321          final CompletableFuture<Integer> f = new CompletableFuture<>();
2322          final CompletableFuture<Integer> g = new CompletableFuture<>();
2512        final Noop r = new Noop();
2513        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2323          final CFException ex = new CFException();
2324 +        final Noop[] rs = new Noop[6];
2325 +        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2326  
2327 +        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2328 +        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2329 +        checkIncomplete(h0);
2330 +        checkIncomplete(h1);
2331 +        rs[0].assertNotInvoked();
2332 +        rs[1].assertNotInvoked();
2333          f.completeExceptionally(ex);
2334 <        checkCompletedWithWrappedCFException(h, ex);
2334 >        checkCompletedWithWrappedCFException(h0, ex);
2335 >        checkCompletedWithWrappedCFException(h1, ex);
2336 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2337 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2338 >        checkCompletedWithWrappedCFException(h2, ex);
2339 >        checkCompletedWithWrappedCFException(h3, ex);
2340 >
2341          g.complete(v1);
2342  
2343 <        assertEquals(0, r.invocationCount);
2344 <        checkCompletedNormally(g, v1);
2345 <        checkCompletedWithWrappedCFException(f, ex);
2346 <        checkCompletedWithWrappedCFException(h, ex);
2343 >        // unspecified behavior - both source completions available
2344 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2345 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2346 >        try {
2347 >            assertNull(h4.join());
2348 >            rs[4].assertInvoked();
2349 >        } catch (CompletionException ok) {
2350 >            checkCompletedWithWrappedCFException(h4, ex);
2351 >            rs[4].assertNotInvoked();
2352          }
2353 <    }
2353 >        try {
2354 >            assertNull(h5.join());
2355 >            rs[5].assertInvoked();
2356 >        } catch (CompletionException ok) {
2357 >            checkCompletedWithWrappedCFException(h5, ex);
2358 >            rs[5].assertNotInvoked();
2359 >        }
2360 >
2361 >        checkCompletedWithWrappedCFException(f, ex);
2362 >        checkCompletedNormally(g, v1);
2363 >        checkCompletedWithWrappedCFException(h0, ex);
2364 >        checkCompletedWithWrappedCFException(h1, ex);
2365 >        checkCompletedWithWrappedCFException(h2, ex);
2366 >        checkCompletedWithWrappedCFException(h3, ex);
2367 >        checkCompletedWithWrappedCFException(h4, ex);
2368 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2369 >    }}
2370  
2371      public void testRunAfterEither_exceptionalCompletion2() {
2372          for (ExecutionMode m : ExecutionMode.values())
2373 <        for (Integer v1 : new Integer[] { 1, null }) {
2374 <
2373 >        for (boolean fFirst : new boolean[] { true, false })
2374 >        for (Integer v1 : new Integer[] { 1, null })
2375 >    {
2376          final CompletableFuture<Integer> f = new CompletableFuture<>();
2377          final CompletableFuture<Integer> g = new CompletableFuture<>();
2533        final Noop r = new Noop();
2534        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2378          final CFException ex = new CFException();
2379 +        final Noop[] rs = new Noop[6];
2380 +        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2381  
2382 <        g.completeExceptionally(ex);
2383 <        checkCompletedWithWrappedCFException(h, ex);
2384 <        f.complete(v1);
2385 <
2386 <        assertEquals(0, r.invocationCount);
2387 <        checkCompletedNormally(f, v1);
2388 <        checkCompletedWithWrappedCFException(g, ex);
2389 <        checkCompletedWithWrappedCFException(h, ex);
2382 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2383 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2384 >        if (fFirst) {
2385 >            f.complete(v1);
2386 >            g.completeExceptionally(ex);
2387 >        } else {
2388 >            g.completeExceptionally(ex);
2389 >            f.complete(v1);
2390          }
2391 <    }
2391 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2392 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2393  
2394 <    public void testRunAfterEither_exceptionalCompletion3() {
2549 <        for (ExecutionMode m : ExecutionMode.values())
2550 <        for (Integer v1 : new Integer[] { 1, null }) {
2551 <
2552 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2553 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2554 <        final Noop r = new Noop();
2555 <        final CFException ex = new CFException();
2556 <
2557 <        g.completeExceptionally(ex);
2558 <        f.complete(v1);
2559 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2560 <
2561 <        // unspecified behavior
2562 <        Integer v;
2394 >        // unspecified behavior - both source completions available
2395          try {
2396 <            assertEquals(h.join(), null);
2397 <            assertEquals(1, r.invocationCount);
2396 >            assertEquals(null, h0.join());
2397 >            rs[0].assertInvoked();
2398          } catch (CompletionException ok) {
2399 <            checkCompletedWithWrappedCFException(h, ex);
2400 <            assertEquals(0, r.invocationCount);
2569 <        }
2570 <
2571 <        checkCompletedWithWrappedCFException(g, ex);
2572 <        checkCompletedNormally(f, v1);
2399 >            checkCompletedWithWrappedCFException(h0, ex);
2400 >            rs[0].assertNotInvoked();
2401          }
2574    }
2575
2576    public void testRunAfterEither_exceptionalCompletion4() {
2577        for (ExecutionMode m : ExecutionMode.values())
2578        for (Integer v1 : new Integer[] { 1, null }) {
2579
2580        final CompletableFuture<Integer> f = new CompletableFuture<>();
2581        final CompletableFuture<Integer> g = new CompletableFuture<>();
2582        final Noop r = new Noop();
2583        final CFException ex = new CFException();
2584
2585        f.completeExceptionally(ex);
2586        g.complete(v1);
2587        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2588
2589        // unspecified behavior
2590        Integer v;
2402          try {
2403 <            assertEquals(h.join(), null);
2404 <            assertEquals(1, r.invocationCount);
2403 >            assertEquals(null, h1.join());
2404 >            rs[1].assertInvoked();
2405          } catch (CompletionException ok) {
2406 <            checkCompletedWithWrappedCFException(h, ex);
2407 <            assertEquals(0, r.invocationCount);
2406 >            checkCompletedWithWrappedCFException(h1, ex);
2407 >            rs[1].assertNotInvoked();
2408          }
2409 <
2410 <        checkCompletedWithWrappedCFException(f, ex);
2411 <        checkCompletedNormally(g, v1);
2409 >        try {
2410 >            assertEquals(null, h2.join());
2411 >            rs[2].assertInvoked();
2412 >        } catch (CompletionException ok) {
2413 >            checkCompletedWithWrappedCFException(h2, ex);
2414 >            rs[2].assertNotInvoked();
2415          }
2416 <    }
2417 <
2418 <    /**
2419 <     * runAfterEither result completes exceptionally if action does
2420 <     */
2421 <    public void testRunAfterEither_actionFailed1() {
2608 <        for (ExecutionMode m : ExecutionMode.values())
2609 <        for (Integer v1 : new Integer[] { 1, null })
2610 <        for (Integer v2 : new Integer[] { 2, null }) {
2611 <
2612 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2613 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2614 <        final FailingNoop r = new FailingNoop();
2615 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2616 <
2617 <        f.complete(v1);
2618 <        checkCompletedWithWrappedCFException(h);
2619 <        g.complete(v2);
2620 <        checkCompletedNormally(f, v1);
2621 <        checkCompletedNormally(g, v2);
2416 >        try {
2417 >            assertEquals(null, h3.join());
2418 >            rs[3].assertInvoked();
2419 >        } catch (CompletionException ok) {
2420 >            checkCompletedWithWrappedCFException(h3, ex);
2421 >            rs[3].assertNotInvoked();
2422          }
2623    }
2624
2625    public void testRunAfterEither_actionFailed2() {
2626        for (ExecutionMode m : ExecutionMode.values())
2627        for (Integer v1 : new Integer[] { 1, null })
2628        for (Integer v2 : new Integer[] { 2, null }) {
2629
2630        final CompletableFuture<Integer> f = new CompletableFuture<>();
2631        final CompletableFuture<Integer> g = new CompletableFuture<>();
2632        final FailingNoop r = new FailingNoop();
2633        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2423  
2635        g.complete(v2);
2636        checkCompletedWithWrappedCFException(h);
2637        f.complete(v1);
2424          checkCompletedNormally(f, v1);
2425 <        checkCompletedNormally(g, v2);
2426 <        }
2641 <    }
2425 >        checkCompletedWithWrappedCFException(g, ex);
2426 >    }}
2427  
2428      /**
2429       * runAfterEither result completes exceptionally if either source cancelled
2430       */
2431 <    public void testRunAfterEither_sourceCancelled1() {
2647 <        for (ExecutionMode m : ExecutionMode.values())
2648 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2649 <        for (Integer v1 : new Integer[] { 1, null }) {
2650 <
2651 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2652 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2653 <        final Noop r = new Noop();
2654 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2655 <
2656 <        assertTrue(f.cancel(mayInterruptIfRunning));
2657 <        checkCompletedWithWrappedCancellationException(h);
2658 <        g.complete(v1);
2659 <
2660 <        checkCancelled(f);
2661 <        assertEquals(0, r.invocationCount);
2662 <        checkCompletedNormally(g, v1);
2663 <        checkCompletedWithWrappedCancellationException(h);
2664 <        }
2665 <    }
2666 <
2667 <    public void testRunAfterEither_sourceCancelled2() {
2431 >    public void testRunAfterEither_sourceCancelled() {
2432          for (ExecutionMode m : ExecutionMode.values())
2433          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2434 <        for (Integer v1 : new Integer[] { 1, null }) {
2435 <
2434 >        for (Integer v1 : new Integer[] { 1, null })
2435 >    {
2436          final CompletableFuture<Integer> f = new CompletableFuture<>();
2437          final CompletableFuture<Integer> g = new CompletableFuture<>();
2438 <        final Noop r = new Noop();
2439 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2676 <
2677 <        assertTrue(g.cancel(mayInterruptIfRunning));
2678 <        checkCompletedWithWrappedCancellationException(h);
2679 <        f.complete(v1);
2680 <
2681 <        checkCancelled(g);
2682 <        assertEquals(0, r.invocationCount);
2683 <        checkCompletedNormally(f, v1);
2684 <        checkCompletedWithWrappedCancellationException(h);
2685 <        }
2686 <    }
2438 >        final Noop[] rs = new Noop[6];
2439 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2440  
2441 <    public void testRunAfterEither_sourceCancelled3() {
2442 <        for (ExecutionMode m : ExecutionMode.values())
2443 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2444 <        for (Integer v1 : new Integer[] { 1, null }) {
2441 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2442 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2443 >        checkIncomplete(h0);
2444 >        checkIncomplete(h1);
2445 >        rs[0].assertNotInvoked();
2446 >        rs[1].assertNotInvoked();
2447 >        f.cancel(mayInterruptIfRunning);
2448 >        checkCompletedWithWrappedCancellationException(h0);
2449 >        checkCompletedWithWrappedCancellationException(h1);
2450 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2451 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2452 >        checkCompletedWithWrappedCancellationException(h2);
2453 >        checkCompletedWithWrappedCancellationException(h3);
2454  
2455 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2694 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2695 <        final Noop r = new Noop();
2696 <
2697 <        assertTrue(g.cancel(mayInterruptIfRunning));
2698 <        f.complete(v1);
2699 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2455 >        g.complete(v1);
2456  
2457 <        // unspecified behavior
2458 <        Integer v;
2457 >        // unspecified behavior - both source completions available
2458 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2459 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2460          try {
2461 <            assertEquals(h.join(), null);
2462 <            assertEquals(1, r.invocationCount);
2461 >            assertNull(h4.join());
2462 >            rs[4].assertInvoked();
2463          } catch (CompletionException ok) {
2464 <            checkCompletedWithWrappedCancellationException(h);
2465 <            assertEquals(0, r.invocationCount);
2709 <        }
2710 <
2711 <        checkCancelled(g);
2712 <        checkCompletedNormally(f, v1);
2464 >            checkCompletedWithWrappedCancellationException(h4);
2465 >            rs[4].assertNotInvoked();
2466          }
2714    }
2715
2716    public void testRunAfterEither_sourceCancelled4() {
2717        for (ExecutionMode m : ExecutionMode.values())
2718        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2719        for (Integer v1 : new Integer[] { 1, null }) {
2720
2721        final CompletableFuture<Integer> f = new CompletableFuture<>();
2722        final CompletableFuture<Integer> g = new CompletableFuture<>();
2723        final Noop r = new Noop();
2724
2725        assertTrue(f.cancel(mayInterruptIfRunning));
2726        g.complete(v1);
2727        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2728
2729        // unspecified behavior
2730        Integer v;
2467          try {
2468 <            assertEquals(h.join(), null);
2469 <            assertEquals(1, r.invocationCount);
2468 >            assertNull(h5.join());
2469 >            rs[5].assertInvoked();
2470          } catch (CompletionException ok) {
2471 <            checkCompletedWithWrappedCancellationException(h);
2472 <            assertEquals(0, r.invocationCount);
2471 >            checkCompletedWithWrappedCancellationException(h5);
2472 >            rs[5].assertNotInvoked();
2473          }
2474  
2475          checkCancelled(f);
2476          checkCompletedNormally(g, v1);
2477 <        }
2478 <    }
2477 >        checkCompletedWithWrappedCancellationException(h0);
2478 >        checkCompletedWithWrappedCancellationException(h1);
2479 >        checkCompletedWithWrappedCancellationException(h2);
2480 >        checkCompletedWithWrappedCancellationException(h3);
2481 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2482 >    }}
2483  
2484      /**
2485 <     * thenCompose result completes normally after normal completion of source
2485 >     * runAfterEither result completes exceptionally if action does
2486       */
2487 <    public void testThenCompose_normalCompletion1() {
2487 >    public void testRunAfterEither_actionFailed() {
2488          for (ExecutionMode m : ExecutionMode.values())
2489 <        for (Integer v1 : new Integer[] { 1, null }) {
2490 <
2489 >        for (Integer v1 : new Integer[] { 1, null })
2490 >        for (Integer v2 : new Integer[] { 2, null })
2491 >    {
2492          final CompletableFuture<Integer> f = new CompletableFuture<>();
2493 <        final CompletableFutureInc r = new CompletableFutureInc();
2494 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2493 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2494 >        final FailingRunnable[] rs = new FailingRunnable[6];
2495 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingRunnable(m);
2496 >
2497 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2498 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2499          f.complete(v1);
2500 <        checkCompletedNormally(g, inc(v1));
2500 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2501 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2502 >        checkCompletedWithWrappedCFException(h0);
2503 >        checkCompletedWithWrappedCFException(h1);
2504 >        checkCompletedWithWrappedCFException(h2);
2505 >        checkCompletedWithWrappedCFException(h3);
2506 >        for (int i = 0; i < 4; i++) rs[i].assertInvoked();
2507 >        g.complete(v2);
2508 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2509 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2510 >        checkCompletedWithWrappedCFException(h4);
2511 >        checkCompletedWithWrappedCFException(h5);
2512 >
2513          checkCompletedNormally(f, v1);
2514 <        assertEquals(1, r.invocationCount);
2515 <        }
2516 <    }
2514 >        checkCompletedNormally(g, v2);
2515 >        for (int i = 0; i < 6; i++) rs[i].assertInvoked();
2516 >    }}
2517  
2518 <    public void testThenCompose_normalCompletion2() {
2518 >    /**
2519 >     * thenCompose result completes normally after normal completion of source
2520 >     */
2521 >    public void testThenCompose_normalCompletion() {
2522          for (ExecutionMode m : ExecutionMode.values())
2523 <        for (Integer v1 : new Integer[] { 1, null }) {
2524 <
2523 >        for (boolean createIncomplete : new boolean[] { true, false })
2524 >        for (Integer v1 : new Integer[] { 1, null })
2525 >    {
2526          final CompletableFuture<Integer> f = new CompletableFuture<>();
2527 <        final CompletableFutureInc r = new CompletableFutureInc();
2528 <        f.complete(v1);
2529 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2527 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2528 >        if (!createIncomplete) f.complete(v1);
2529 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2530 >        if (createIncomplete) f.complete(v1);
2531 >
2532          checkCompletedNormally(g, inc(v1));
2533          checkCompletedNormally(f, v1);
2534 <        assertEquals(1, r.invocationCount);
2535 <        }
2773 <    }
2534 >        r.assertValue(v1);
2535 >    }}
2536  
2537      /**
2538       * thenCompose result completes exceptionally after exceptional
2539       * completion of source
2540       */
2541 <    public void testThenCompose_exceptionalCompletion1() {
2542 <        for (ExecutionMode m : ExecutionMode.values()) {
2543 <
2541 >    public void testThenCompose_exceptionalCompletion() {
2542 >        for (ExecutionMode m : ExecutionMode.values())
2543 >        for (boolean createIncomplete : new boolean[] { true, false })
2544 >    {
2545          final CFException ex = new CFException();
2546 <        final CompletableFutureInc r = new CompletableFutureInc();
2546 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2547          final CompletableFuture<Integer> f = new CompletableFuture<>();
2548 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2549 <        f.completeExceptionally(ex);
2550 <        checkCompletedWithWrappedCFException(g, ex);
2788 <        checkCompletedWithWrappedCFException(f, ex);
2789 <        }
2790 <    }
2791 <
2792 <    public void testThenCompose_exceptionalCompletion2() {
2793 <        for (ExecutionMode m : ExecutionMode.values()) {
2548 >        if (!createIncomplete) f.completeExceptionally(ex);
2549 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2550 >        if (createIncomplete) f.completeExceptionally(ex);
2551  
2795        final CFException ex = new CFException();
2796        final CompletableFuture<Integer> f = new CompletableFuture<>();
2797        f.completeExceptionally(ex);
2798        final CompletableFutureInc r = new CompletableFutureInc();
2799        final CompletableFuture<Integer> g = f.thenCompose(r);
2552          checkCompletedWithWrappedCFException(g, ex);
2553          checkCompletedWithWrappedCFException(f, ex);
2554 <        }
2555 <    }
2554 >        r.assertNotInvoked();
2555 >    }}
2556  
2557      /**
2558       * thenCompose result completes exceptionally if action does
2559       */
2560 <    public void testThenCompose_actionFailed1() {
2560 >    public void testThenCompose_actionFailed() {
2561          for (ExecutionMode m : ExecutionMode.values())
2562 <        for (Integer v1 : new Integer[] { 1, null }) {
2563 <
2562 >        for (boolean createIncomplete : new boolean[] { true, false })
2563 >        for (Integer v1 : new Integer[] { 1, null })
2564 >    {
2565          final CompletableFuture<Integer> f = new CompletableFuture<>();
2566          final FailingCompletableFutureFunction r
2567 <            = new FailingCompletableFutureFunction();
2568 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2569 <        f.complete(v1);
2570 <        checkCompletedWithWrappedCFException(g);
2818 <        checkCompletedNormally(f, v1);
2819 <        }
2820 <    }
2821 <
2822 <    public void testThenCompose_actionFailed2() {
2823 <        for (ExecutionMode m : ExecutionMode.values())
2824 <        for (Integer v1 : new Integer[] { 1, null }) {
2567 >            = new FailingCompletableFutureFunction(m);
2568 >        if (!createIncomplete) f.complete(v1);
2569 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2570 >        if (createIncomplete) f.complete(v1);
2571  
2826        final CompletableFuture<Integer> f = new CompletableFuture<>();
2827        f.complete(v1);
2828        final FailingCompletableFutureFunction r
2829            = new FailingCompletableFutureFunction();
2830        final CompletableFuture<Integer> g = f.thenCompose(r);
2572          checkCompletedWithWrappedCFException(g);
2573          checkCompletedNormally(f, v1);
2574 <        }
2834 <    }
2574 >    }}
2575  
2576      /**
2577       * thenCompose result completes exceptionally if source cancelled
2578       */
2579 <    public void testThenCompose_sourceCancelled1() {
2579 >    public void testThenCompose_sourceCancelled() {
2580          for (ExecutionMode m : ExecutionMode.values())
2581 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false }) {
2582 <
2581 >        for (boolean createIncomplete : new boolean[] { true, false })
2582 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2583 >    {
2584          final CompletableFuture<Integer> f = new CompletableFuture<>();
2585 <        final CompletableFutureInc r = new CompletableFutureInc();
2586 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2587 <        assertTrue(f.cancel(mayInterruptIfRunning));
2588 <        checkCompletedWithWrappedCancellationException(g);
2589 <        checkCancelled(f);
2585 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2586 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2587 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2588 >        if (createIncomplete) {
2589 >            checkIncomplete(g);
2590 >            assertTrue(f.cancel(mayInterruptIfRunning));
2591          }
2850    }
2592  
2852    public void testThenCompose_sourceCancelled2() {
2853        for (ExecutionMode m : ExecutionMode.values())
2854        for (boolean mayInterruptIfRunning : new boolean[] { true, false }) {
2855
2856        final CompletableFuture<Integer> f = new CompletableFuture<>();
2857        assertTrue(f.cancel(mayInterruptIfRunning));
2858        final CompletableFutureInc r = new CompletableFutureInc();
2859        final CompletableFuture<Integer> g = f.thenCompose(r);
2593          checkCompletedWithWrappedCancellationException(g);
2594          checkCancelled(f);
2595 <        }
2863 <    }
2864 <
2865 <    // asyncs
2866 <
2867 <    /**
2868 <     * thenRunAsync result completes normally after normal completion of source
2869 <     */
2870 <    public void testThenRunAsync() {
2871 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2872 <        Noop r = new Noop();
2873 <        CompletableFuture<Void> g = f.thenRunAsync(r);
2874 <        f.complete(null);
2875 <        checkCompletedNormally(g, null);
2876 <
2877 <        // reordered version
2878 <        f = new CompletableFuture<>();
2879 <        f.complete(null);
2880 <        r = new Noop();
2881 <        g = f.thenRunAsync(r);
2882 <        checkCompletedNormally(g, null);
2883 <    }
2884 <
2885 <    /**
2886 <     * thenRunAsync result completes exceptionally after exceptional
2887 <     * completion of source
2888 <     */
2889 <    public void testThenRunAsync2() {
2890 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2891 <        Noop r = new Noop();
2892 <        CompletableFuture<Void> g = f.thenRunAsync(r);
2893 <        f.completeExceptionally(new CFException());
2894 <        try {
2895 <            g.join();
2896 <            shouldThrow();
2897 <        } catch (CompletionException success) {}
2898 <        checkCompletedWithWrappedCFException(g);
2899 <    }
2900 <
2901 <    /**
2902 <     * thenRunAsync result completes exceptionally if action does
2903 <     */
2904 <    public void testThenRunAsync3() {
2905 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2906 <        FailingNoop r = new FailingNoop();
2907 <        CompletableFuture<Void> g = f.thenRunAsync(r);
2908 <        f.complete(null);
2909 <        checkCompletedWithWrappedCFException(g);
2910 <    }
2911 <
2912 <    /**
2913 <     * thenRunAsync result completes exceptionally if source cancelled
2914 <     */
2915 <    public void testThenRunAsync4() {
2916 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2917 <        Noop r = new Noop();
2918 <        CompletableFuture<Void> g = f.thenRunAsync(r);
2919 <        assertTrue(f.cancel(true));
2920 <        checkCompletedWithWrappedCancellationException(g);
2921 <    }
2922 <
2923 <    /**
2924 <     * thenApplyAsync result completes normally after normal completion of source
2925 <     */
2926 <    public void testThenApplyAsync() {
2927 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2928 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
2929 <        f.complete(one);
2930 <        checkCompletedNormally(g, two);
2931 <    }
2932 <
2933 <    /**
2934 <     * thenApplyAsync result completes exceptionally after exceptional
2935 <     * completion of source
2936 <     */
2937 <    public void testThenApplyAsync2() {
2938 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2939 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
2940 <        f.completeExceptionally(new CFException());
2941 <        checkCompletedWithWrappedCFException(g);
2942 <    }
2943 <
2944 <    /**
2945 <     * thenApplyAsync result completes exceptionally if action does
2946 <     */
2947 <    public void testThenApplyAsync3() {
2948 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2949 <        FailingFunction r = new FailingFunction();
2950 <        CompletableFuture<Integer> g = f.thenApplyAsync(r);
2951 <        f.complete(null);
2952 <        checkCompletedWithWrappedCFException(g);
2953 <    }
2954 <
2955 <    /**
2956 <     * thenApplyAsync result completes exceptionally if source cancelled
2957 <     */
2958 <    public void testThenApplyAsync4() {
2959 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2960 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
2961 <        assertTrue(f.cancel(true));
2962 <        checkCompletedWithWrappedCancellationException(g);
2963 <    }
2964 <
2965 <    /**
2966 <     * thenAcceptAsync result completes normally after normal
2967 <     * completion of source
2968 <     */
2969 <    public void testThenAcceptAsync() {
2970 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2971 <        IncAction r = new IncAction();
2972 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2973 <        f.complete(one);
2974 <        checkCompletedNormally(g, null);
2975 <        assertEquals(r.value, (Integer) 2);
2976 <    }
2977 <
2978 <    /**
2979 <     * thenAcceptAsync result completes exceptionally after exceptional
2980 <     * completion of source
2981 <     */
2982 <    public void testThenAcceptAsync2() {
2983 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2984 <        IncAction r = new IncAction();
2985 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2986 <        f.completeExceptionally(new CFException());
2987 <        checkCompletedWithWrappedCFException(g);
2988 <    }
2989 <
2990 <    /**
2991 <     * thenAcceptAsync result completes exceptionally if action does
2992 <     */
2993 <    public void testThenAcceptAsync3() {
2994 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2995 <        FailingConsumer r = new FailingConsumer();
2996 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2997 <        f.complete(null);
2998 <        checkCompletedWithWrappedCFException(g);
2999 <    }
3000 <
3001 <    /**
3002 <     * thenAcceptAsync result completes exceptionally if source cancelled
3003 <     */
3004 <    public void testThenAcceptAsync4() {
3005 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3006 <        IncAction r = new IncAction();
3007 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
3008 <        assertTrue(f.cancel(true));
3009 <        checkCompletedWithWrappedCancellationException(g);
3010 <    }
3011 <
3012 <    // async with explicit executors
3013 <
3014 <    /**
3015 <     * thenRunAsync result completes normally after normal completion of source
3016 <     */
3017 <    public void testThenRunAsyncE() {
3018 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3019 <        Noop r = new Noop();
3020 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
3021 <        f.complete(null);
3022 <        checkCompletedNormally(g, null);
3023 <
3024 <        // reordered version
3025 <        f = new CompletableFuture<>();
3026 <        f.complete(null);
3027 <        r = new Noop();
3028 <        g = f.thenRunAsync(r, new ThreadExecutor());
3029 <        checkCompletedNormally(g, null);
3030 <    }
3031 <
3032 <    /**
3033 <     * thenRunAsync result completes exceptionally after exceptional
3034 <     * completion of source
3035 <     */
3036 <    public void testThenRunAsync2E() {
3037 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3038 <        Noop r = new Noop();
3039 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
3040 <        f.completeExceptionally(new CFException());
3041 <        try {
3042 <            g.join();
3043 <            shouldThrow();
3044 <        } catch (CompletionException success) {}
3045 <        checkCompletedWithWrappedCFException(g);
3046 <    }
3047 <
3048 <    /**
3049 <     * thenRunAsync result completes exceptionally if action does
3050 <     */
3051 <    public void testThenRunAsync3E() {
3052 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3053 <        FailingNoop r = new FailingNoop();
3054 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
3055 <        f.complete(null);
3056 <        checkCompletedWithWrappedCFException(g);
3057 <    }
3058 <
3059 <    /**
3060 <     * thenRunAsync result completes exceptionally if source cancelled
3061 <     */
3062 <    public void testThenRunAsync4E() {
3063 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3064 <        Noop r = new Noop();
3065 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
3066 <        assertTrue(f.cancel(true));
3067 <        checkCompletedWithWrappedCancellationException(g);
3068 <    }
3069 <
3070 <    /**
3071 <     * thenApplyAsync result completes normally after normal completion of source
3072 <     */
3073 <    public void testThenApplyAsyncE() {
3074 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3075 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
3076 <        f.complete(one);
3077 <        checkCompletedNormally(g, two);
3078 <    }
3079 <
3080 <    /**
3081 <     * thenApplyAsync result completes exceptionally after exceptional
3082 <     * completion of source
3083 <     */
3084 <    public void testThenApplyAsync2E() {
3085 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3086 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
3087 <        f.completeExceptionally(new CFException());
3088 <        checkCompletedWithWrappedCFException(g);
3089 <    }
3090 <
3091 <    /**
3092 <     * thenApplyAsync result completes exceptionally if action does
3093 <     */
3094 <    public void testThenApplyAsync3E() {
3095 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3096 <        FailingFunction r = new FailingFunction();
3097 <        CompletableFuture<Integer> g = f.thenApplyAsync(r, new ThreadExecutor());
3098 <        f.complete(null);
3099 <        checkCompletedWithWrappedCFException(g);
3100 <    }
3101 <
3102 <    /**
3103 <     * thenApplyAsync result completes exceptionally if source cancelled
3104 <     */
3105 <    public void testThenApplyAsync4E() {
3106 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3107 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
3108 <        assertTrue(f.cancel(true));
3109 <        checkCompletedWithWrappedCancellationException(g);
3110 <    }
3111 <
3112 <    /**
3113 <     * thenAcceptAsync result completes normally after normal
3114 <     * completion of source
3115 <     */
3116 <    public void testThenAcceptAsyncE() {
3117 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3118 <        IncAction r = new IncAction();
3119 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3120 <        f.complete(one);
3121 <        checkCompletedNormally(g, null);
3122 <        assertEquals(r.value, (Integer) 2);
3123 <    }
3124 <
3125 <    /**
3126 <     * thenAcceptAsync result completes exceptionally after exceptional
3127 <     * completion of source
3128 <     */
3129 <    public void testThenAcceptAsync2E() {
3130 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3131 <        IncAction r = new IncAction();
3132 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3133 <        f.completeExceptionally(new CFException());
3134 <        checkCompletedWithWrappedCFException(g);
3135 <    }
3136 <
3137 <    /**
3138 <     * thenAcceptAsync result completes exceptionally if action does
3139 <     */
3140 <    public void testThenAcceptAsync3E() {
3141 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3142 <        FailingConsumer r = new FailingConsumer();
3143 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3144 <        f.complete(null);
3145 <        checkCompletedWithWrappedCFException(g);
3146 <    }
3147 <
3148 <    /**
3149 <     * thenAcceptAsync result completes exceptionally if source cancelled
3150 <     */
3151 <    public void testThenAcceptAsync4E() {
3152 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3153 <        IncAction r = new IncAction();
3154 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3155 <        assertTrue(f.cancel(true));
3156 <        checkCompletedWithWrappedCancellationException(g);
3157 <    }
2595 >    }}
2596  
2597      // other static methods
2598  
# Line 3173 | Line 2611 | public class CompletableFutureTest exten
2611       */
2612      public void testAllOf_normal() throws Exception {
2613          for (int k = 1; k < 20; ++k) {
2614 <            CompletableFuture<Integer>[] fs = (CompletableFuture<Integer>[]) new CompletableFuture[k];
2614 >            CompletableFuture<Integer>[] fs
2615 >                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
2616              for (int i = 0; i < k; ++i)
2617                  fs[i] = new CompletableFuture<>();
2618              CompletableFuture<Void> f = CompletableFuture.allOf(fs);
# Line 3187 | Line 2626 | public class CompletableFutureTest exten
2626          }
2627      }
2628  
2629 +    public void testAllOf_backwards() throws Exception {
2630 +        for (int k = 1; k < 20; ++k) {
2631 +            CompletableFuture<Integer>[] fs
2632 +                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
2633 +            for (int i = 0; i < k; ++i)
2634 +                fs[i] = new CompletableFuture<>();
2635 +            CompletableFuture<Void> f = CompletableFuture.allOf(fs);
2636 +            for (int i = k - 1; i >= 0; i--) {
2637 +                checkIncomplete(f);
2638 +                checkIncomplete(CompletableFuture.allOf(fs));
2639 +                fs[i].complete(one);
2640 +            }
2641 +            checkCompletedNormally(f, null);
2642 +            checkCompletedNormally(CompletableFuture.allOf(fs), null);
2643 +        }
2644 +    }
2645 +
2646      /**
2647       * anyOf(no component futures) returns an incomplete future
2648       */
# Line 3245 | Line 2701 | public class CompletableFutureTest exten
2701          Runnable[] throwingActions = {
2702              () -> CompletableFuture.supplyAsync(null),
2703              () -> CompletableFuture.supplyAsync(null, exec),
2704 <            () -> CompletableFuture.supplyAsync(supplyOne, null),
2704 >            () -> CompletableFuture.supplyAsync(new IntegerSupplier(ExecutionMode.DEFAULT, 42), null),
2705  
2706              () -> CompletableFuture.runAsync(null),
2707              () -> CompletableFuture.runAsync(null, exec),
# Line 3318 | Line 2774 | public class CompletableFutureTest exten
2774  
2775              () -> f.thenCompose(null),
2776              () -> f.thenComposeAsync(null),
2777 <            () -> f.thenComposeAsync(new CompletableFutureInc(), null),
2777 >            () -> f.thenComposeAsync(new CompletableFutureInc(ExecutionMode.EXECUTOR), null),
2778              () -> f.thenComposeAsync(null, exec),
2779  
2780              () -> f.exceptionally(null),
# Line 3355 | Line 2811 | public class CompletableFutureTest exten
2811       * source result.
2812       */
2813      public void testWhenComplete_normalCompletion1() {
3358        for (boolean createIncomplete : new boolean[] { true, false })
2814          for (ExecutionMode m : ExecutionMode.values())
2815 <        for (Integer v1 : new Integer[] { 1, null }) {
2816 <
2817 <        final AtomicInteger a = new AtomicInteger();
2815 >        for (boolean createIncomplete : new boolean[] { true, false })
2816 >        for (Integer v1 : new Integer[] { 1, null })
2817 >    {
2818 >        final AtomicInteger a = new AtomicInteger(0);
2819          final CompletableFuture<Integer> f = new CompletableFuture<>();
2820          if (!createIncomplete) f.complete(v1);
2821 <        final CompletableFuture<Integer> g =
2822 <            m.whenComplete(f,
2823 <                           (Integer x, Throwable t) -> {
2824 <                               threadAssertSame(x, v1);
2825 <                               threadAssertNull(t);
2826 <                               a.getAndIncrement();
2827 <                           });
2821 >        final CompletableFuture<Integer> g = m.whenComplete
2822 >            (f,
2823 >             (Integer x, Throwable t) -> {
2824 >                threadAssertSame(x, v1);
2825 >                threadAssertNull(t);
2826 >                a.getAndIncrement();
2827 >            });
2828          if (createIncomplete) f.complete(v1);
2829 <        checkCompletedNormally(f, v1);
2829 >
2830          checkCompletedNormally(g, v1);
2831 <        assertEquals(a.get(), 1);
2832 <        }
2833 <    }
2831 >        checkCompletedNormally(f, v1);
2832 >        assertEquals(1, a.get());
2833 >    }}
2834  
2835      /**
2836       * whenComplete action executes on exceptional completion, propagating
2837       * source result.
2838       */
2839      public void testWhenComplete_exceptionalCompletion() {
3384        for (boolean createIncomplete : new boolean[] { true, false })
2840          for (ExecutionMode m : ExecutionMode.values())
2841 <        for (Integer v1 : new Integer[] { 1, null }) {
2842 <
2843 <        final AtomicInteger a = new AtomicInteger();
2841 >        for (boolean createIncomplete : new boolean[] { true, false })
2842 >        for (Integer v1 : new Integer[] { 1, null })
2843 >    {
2844 >        final AtomicInteger a = new AtomicInteger(0);
2845          final CFException ex = new CFException();
2846          final CompletableFuture<Integer> f = new CompletableFuture<>();
2847          if (!createIncomplete) f.completeExceptionally(ex);
# Line 3399 | Line 2855 | public class CompletableFutureTest exten
2855          if (createIncomplete) f.completeExceptionally(ex);
2856          checkCompletedWithWrappedCFException(f, ex);
2857          checkCompletedWithWrappedCFException(g, ex);
2858 <        assertEquals(a.get(), 1);
2859 <        }
2860 <    }
2858 >        assertEquals(1, a.get());
2859 >    }}
2860 >
2861 >    /**
2862 >     * whenComplete action executes on cancelled source, propagating
2863 >     * CancellationException.
2864 >     */
2865 >    public void testWhenComplete_sourceCancelled() {
2866 >        for (ExecutionMode m : ExecutionMode.values())
2867 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2868 >        for (boolean createIncomplete : new boolean[] { true, false })
2869 >    {
2870 >        final AtomicInteger a = new AtomicInteger(0);
2871 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2872 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2873 >        final CompletableFuture<Integer> g = m.whenComplete
2874 >            (f,
2875 >             (Integer x, Throwable t) -> {
2876 >                threadAssertNull(x);
2877 >                threadAssertTrue(t instanceof CancellationException);
2878 >                a.getAndIncrement();
2879 >            });
2880 >        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2881 >
2882 >        //try { g.join(); } catch (Throwable t) { throw new Error(t); }
2883 >        checkCompletedWithWrappedCancellationException(g);
2884 >        checkCancelled(f);
2885 >        assertEquals(1, a.get());
2886 >    }}
2887  
2888      /**
2889       * If a whenComplete action throws an exception when triggered by
# Line 3410 | Line 2892 | public class CompletableFutureTest exten
2892      public void testWhenComplete_actionFailed() {
2893          for (boolean createIncomplete : new boolean[] { true, false })
2894          for (ExecutionMode m : ExecutionMode.values())
2895 <        for (Integer v1 : new Integer[] { 1, null }) {
2896 <
2895 >        for (Integer v1 : new Integer[] { 1, null })
2896 >    {
2897 >        final AtomicInteger a = new AtomicInteger(0);
2898          final CFException ex = new CFException();
2899          final CompletableFuture<Integer> f = new CompletableFuture<>();
2900          if (!createIncomplete) f.complete(v1);
# Line 3420 | Line 2903 | public class CompletableFutureTest exten
2903               (Integer x, Throwable t) -> {
2904                  threadAssertSame(x, v1);
2905                  threadAssertNull(t);
2906 +                a.getAndIncrement();
2907                  throw ex;
2908              });
2909          if (createIncomplete) f.complete(v1);
2910          checkCompletedNormally(f, v1);
2911          checkCompletedWithWrappedCFException(g, ex);
2912 <        }
2913 <    }
2912 >        assertEquals(1, a.get());
2913 >    }}
2914  
2915      /**
2916       * If a whenComplete action throws an exception when triggered by
# Line 3436 | Line 2920 | public class CompletableFutureTest exten
2920      public void testWhenComplete_actionFailedSourceFailed() {
2921          for (boolean createIncomplete : new boolean[] { true, false })
2922          for (ExecutionMode m : ExecutionMode.values())
2923 <        for (Integer v1 : new Integer[] { 1, null }) {
2924 <
2923 >        for (Integer v1 : new Integer[] { 1, null })
2924 >    {
2925 >        final AtomicInteger a = new AtomicInteger(0);
2926          final CFException ex1 = new CFException();
2927          final CFException ex2 = new CFException();
2928          final CompletableFuture<Integer> f = new CompletableFuture<>();
# Line 3448 | Line 2933 | public class CompletableFutureTest exten
2933               (Integer x, Throwable t) -> {
2934                  threadAssertSame(t, ex1);
2935                  threadAssertNull(x);
2936 +                a.getAndIncrement();
2937                  throw ex2;
2938              });
2939          if (createIncomplete) f.completeExceptionally(ex1);
2940  
2941          checkCompletedWithWrappedCFException(f, ex1);
2942          checkCompletedWithWrappedCFException(g, ex1);
2943 <        }
2944 <    }
3459 <
3460 <    /**
3461 <     * handleAsync action completes normally with function value on
3462 <     * either normal or exceptional completion of source
3463 <     */
3464 <    public void testHandleAsync() {
3465 <        CompletableFuture<Integer> f, g;
3466 <        IntegerHandler r;
3467 <
3468 <        f = new CompletableFuture<>();
3469 <        g = f.handleAsync(r = new IntegerHandler());
3470 <        assertEquals(0, r.invocationCount);
3471 <        f.completeExceptionally(new CFException());
3472 <        checkCompletedWithWrappedCFException(f);
3473 <        checkCompletedNormally(g, three);
3474 <        assertEquals(1, r.invocationCount);
3475 <
3476 <        f = new CompletableFuture<>();
3477 <        g = f.handleAsync(r = new IntegerHandler());
3478 <        assertEquals(0, r.invocationCount);
3479 <        f.completeExceptionally(new CFException());
3480 <        checkCompletedWithWrappedCFException(f);
3481 <        checkCompletedNormally(g, three);
3482 <        assertEquals(1, r.invocationCount);
3483 <
3484 <        f = new CompletableFuture<>();
3485 <        g = f.handleAsync(r = new IntegerHandler());
3486 <        assertEquals(0, r.invocationCount);
3487 <        f.complete(one);
3488 <        checkCompletedNormally(f, one);
3489 <        checkCompletedNormally(g, two);
3490 <        assertEquals(1, r.invocationCount);
3491 <
3492 <        f = new CompletableFuture<>();
3493 <        g = f.handleAsync(r = new IntegerHandler());
3494 <        assertEquals(0, r.invocationCount);
3495 <        f.complete(one);
3496 <        checkCompletedNormally(f, one);
3497 <        checkCompletedNormally(g, two);
3498 <        assertEquals(1, r.invocationCount);
3499 <    }
3500 <
3501 <    /**
3502 <     * handleAsync action with Executor completes normally with
3503 <     * function value on either normal or exceptional completion of
3504 <     * source
3505 <     */
3506 <    public void testHandleAsync2() {
3507 <        CompletableFuture<Integer> f, g;
3508 <        ThreadExecutor exec = new ThreadExecutor();
3509 <        IntegerHandler r;
3510 <
3511 <        f = new CompletableFuture<>();
3512 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3513 <        assertEquals(0, r.invocationCount);
3514 <        f.completeExceptionally(new CFException());
3515 <        checkCompletedWithWrappedCFException(f);
3516 <        checkCompletedNormally(g, three);
3517 <        assertEquals(1, r.invocationCount);
3518 <
3519 <        f = new CompletableFuture<>();
3520 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3521 <        assertEquals(0, r.invocationCount);
3522 <        f.completeExceptionally(new CFException());
3523 <        checkCompletedWithWrappedCFException(f);
3524 <        checkCompletedNormally(g, three);
3525 <        assertEquals(1, r.invocationCount);
3526 <
3527 <        f = new CompletableFuture<>();
3528 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3529 <        assertEquals(0, r.invocationCount);
3530 <        f.complete(one);
3531 <        checkCompletedNormally(f, one);
3532 <        checkCompletedNormally(g, two);
3533 <        assertEquals(1, r.invocationCount);
3534 <
3535 <        f = new CompletableFuture<>();
3536 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3537 <        assertEquals(0, r.invocationCount);
3538 <        f.complete(one);
3539 <        checkCompletedNormally(f, one);
3540 <        checkCompletedNormally(g, two);
3541 <        assertEquals(1, r.invocationCount);
3542 <    }
2943 >        assertEquals(1, a.get());
2944 >    }}
2945  
2946   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines