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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines