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.25 by jsr166, Sat Apr 20 23:28:35 2013 UTC vs.
Revision 1.77 by jsr166, Sat Jun 7 21:46:50 2014 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines