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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines