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.22 by jsr166, Mon Apr 8 20:46:59 2013 UTC vs.
Revision 1.90 by jsr166, Tue Jun 17 18:09:28 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 >    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 >
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 <    static final Supplier<Integer> supplyOne =
412 <        () -> Integer.valueOf(1);
413 <    static final Function<Integer, Integer> inc =
290 <        (Integer x) -> Integer.valueOf(x.intValue() + 1);
291 <    static final BiFunction<Integer, Integer, Integer> subtract =
292 <        (Integer x, Integer y) -> Integer.valueOf(x.intValue() - y.intValue());
293 <    static final class IncAction implements Consumer<Integer> {
294 <        int value;
295 <        public void accept(Integer x) { value = x.intValue() + 1; }
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 <    static final class SubtractAction implements BiConsumer<Integer, Integer> {
416 <        int value;
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 <    static final class Noop implements Runnable {
454 <        boolean ran;
455 <        public void run() { ran = true; }
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  
464 <    static final class FailingSupplier implements Supplier<Integer> {
465 <        boolean ran;
466 <        public Integer get() { ran = true; throw new CFException(); }
464 >    class Noop extends CheckedAction implements Runnable {
465 >        Noop(ExecutionMode m) { super(m); }
466 >        public void run() {
467 >            invoked();
468 >        }
469      }
470 <    static final class FailingConsumer implements Consumer<Integer> {
471 <        boolean ran;
472 <        public void accept(Integer x) { ran = true; throw new CFException(); }
470 >
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 FailingBiConsumer implements BiConsumer<Integer, Integer> {
481 <        boolean ran;
482 <        public void accept(Integer x, Integer y) { 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 FailingFunction implements Function<Integer, Integer> {
492 <        boolean ran;
493 <        public Integer apply(Integer x) { 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 FailingBiFunction implements BiFunction<Integer, Integer, Integer> {
503 <        boolean ran;
504 <        public Integer apply(Integer x, Integer y) { 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 FailingNoop implements Runnable {
514 <        boolean ran;
515 <        public void run() { 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 >
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;
1000 <
1001 <        f = new CompletableFuture<>();
1002 <        f.completeExceptionally(new CFException());
1003 <        g = f.handle(r = new IntegerHandler());
1004 <        assertTrue(r.ran);
1005 <        checkCompletedNormally(g, three);
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 <        g = f.handle(r = new IntegerHandler());
1084 <        assertFalse(r.ran);
1085 <        f.completeExceptionally(new CFException());
1086 <        checkCompletedNormally(g, three);
1087 <        assertTrue(r.ran);
1088 <
1089 <        f = new CompletableFuture<>();
1090 <        f.complete(one);
1091 <        g = f.handle(r = new IntegerHandler());
1092 <        assertTrue(r.ran);
1093 <        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 = new CompletableFuture<>();
1267 <        Noop r = new Noop();
1268 <        CompletableFuture<Void> g = f.thenRun(r);
1269 <        f.complete(null);
1270 <        checkCompletedNormally(g, null);
1271 <        // reordered version
1272 <        f = new CompletableFuture<>();
1273 <        f.complete(null);
1274 <        r = new Noop();
1275 <        g = f.thenRun(r);
1276 <        checkCompletedNormally(g, null);
1277 <    }
1265 >    public void testThenRun_normalCompletion() {
1266 >        for (ExecutionMode m : ExecutionMode.values())
1267 >        for (Integer v1 : new Integer[] { 1, null })
1268 >    {
1269 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1270 >        final Noop[] rs = new Noop[6];
1271 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1272 >
1273 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1274 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1275 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1276 >        checkIncomplete(h0);
1277 >        checkIncomplete(h1);
1278 >        checkIncomplete(h2);
1279 >        assertTrue(f.complete(v1));
1280 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1281 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1282 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1283 >
1284 >        checkCompletedNormally(h0, null);
1285 >        checkCompletedNormally(h1, null);
1286 >        checkCompletedNormally(h2, null);
1287 >        checkCompletedNormally(h3, null);
1288 >        checkCompletedNormally(h4, null);
1289 >        checkCompletedNormally(h5, null);
1290 >        checkCompletedNormally(f, v1);
1291 >        for (Noop r : rs) r.assertInvoked();
1292 >    }}
1293  
1294      /**
1295       * thenRun result completes exceptionally after exceptional
1296       * completion of source
1297       */
1298 <    public void testThenRun2() {
1299 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1300 <        Noop r = new Noop();
1301 <        CompletableFuture<Void> g = f.thenRun(r);
1302 <        f.completeExceptionally(new CFException());
1303 <        checkCompletedWithWrappedCFException(g);
1304 <    }
1298 >    public void testThenRun_exceptionalCompletion() {
1299 >        for (ExecutionMode m : ExecutionMode.values())
1300 >    {
1301 >        final CFException ex = new CFException();
1302 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1303 >        final Noop[] rs = new Noop[6];
1304 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1305 >
1306 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1307 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1308 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1309 >        checkIncomplete(h0);
1310 >        checkIncomplete(h1);
1311 >        checkIncomplete(h2);
1312 >        assertTrue(f.completeExceptionally(ex));
1313 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1314 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1315 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1316 >
1317 >        checkCompletedWithWrappedException(h0, ex);
1318 >        checkCompletedWithWrappedException(h1, ex);
1319 >        checkCompletedWithWrappedException(h2, ex);
1320 >        checkCompletedWithWrappedException(h3, ex);
1321 >        checkCompletedWithWrappedException(h4, ex);
1322 >        checkCompletedWithWrappedException(h5, ex);
1323 >        checkCompletedExceptionally(f, ex);
1324 >        for (Noop r : rs) r.assertNotInvoked();
1325 >    }}
1326  
1327      /**
1328 <     * thenRun result completes exceptionally if action does
1328 >     * thenRun result completes exceptionally if source cancelled
1329       */
1330 <    public void testThenRun3() {
1331 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1332 <        FailingNoop r = new FailingNoop();
1333 <        CompletableFuture<Void> g = f.thenRun(r);
1334 <        f.complete(null);
1335 <        checkCompletedWithWrappedCFException(g);
1336 <    }
1330 >    public void testThenRun_sourceCancelled() {
1331 >        for (ExecutionMode m : ExecutionMode.values())
1332 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1333 >    {
1334 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1335 >        final Noop[] rs = new Noop[6];
1336 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1337 >
1338 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1339 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1340 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1341 >        checkIncomplete(h0);
1342 >        checkIncomplete(h1);
1343 >        checkIncomplete(h2);
1344 >        assertTrue(f.cancel(mayInterruptIfRunning));
1345 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1346 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1347 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1348 >
1349 >        checkCompletedWithWrappedCancellationException(h0);
1350 >        checkCompletedWithWrappedCancellationException(h1);
1351 >        checkCompletedWithWrappedCancellationException(h2);
1352 >        checkCompletedWithWrappedCancellationException(h3);
1353 >        checkCompletedWithWrappedCancellationException(h4);
1354 >        checkCompletedWithWrappedCancellationException(h5);
1355 >        checkCancelled(f);
1356 >        for (Noop r : rs) r.assertNotInvoked();
1357 >    }}
1358  
1359      /**
1360 <     * thenRun result completes exceptionally if source cancelled
1360 >     * thenRun result completes exceptionally if action does
1361       */
1362 <    public void testThenRun4() {
1363 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1364 <        Noop r = new Noop();
1365 <        CompletableFuture<Void> g = f.thenRun(r);
1366 <        assertTrue(f.cancel(true));
1367 <        checkCompletedWithWrappedCancellationException(g);
1368 <    }
1362 >    public void testThenRun_actionFailed() {
1363 >        for (ExecutionMode m : ExecutionMode.values())
1364 >        for (Integer v1 : new Integer[] { 1, null })
1365 >    {
1366 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1367 >        final FailingRunnable[] rs = new FailingRunnable[6];
1368 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingRunnable(m);
1369 >
1370 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1371 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1372 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1373 >        final FailingRunnable r = new FailingRunnable(m);
1374 >        assertTrue(f.complete(v1));
1375 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1376 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1377 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1378 >
1379 >        checkCompletedWithWrappedCFException(h0);
1380 >        checkCompletedWithWrappedCFException(h1);
1381 >        checkCompletedWithWrappedCFException(h2);
1382 >        checkCompletedWithWrappedCFException(h3);
1383 >        checkCompletedWithWrappedCFException(h4);
1384 >        checkCompletedWithWrappedCFException(h5);
1385 >        checkCompletedNormally(f, v1);
1386 >    }}
1387  
1388      /**
1389       * thenApply result completes normally after normal completion of source
1390       */
1391 <    public void testThenApply() {
1392 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1393 <        CompletableFuture<Integer> g = f.thenApply(inc);
1394 <        f.complete(one);
1395 <        checkCompletedNormally(g, two);
1396 <    }
1391 >    public void testThenApply_normalCompletion() {
1392 >        for (ExecutionMode m : ExecutionMode.values())
1393 >        for (boolean createIncomplete : new boolean[] { true, false })
1394 >        for (Integer v1 : new Integer[] { 1, null })
1395 >    {
1396 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1397 >        final IncFunction r = new IncFunction(m);
1398 >        if (!createIncomplete) assertTrue(f.complete(v1));
1399 >        final CompletableFuture<Integer> g = m.thenApply(f, r);
1400 >        if (createIncomplete) {
1401 >            checkIncomplete(g);
1402 >            assertTrue(f.complete(v1));
1403 >        }
1404 >
1405 >        checkCompletedNormally(g, inc(v1));
1406 >        checkCompletedNormally(f, v1);
1407 >        r.assertValue(inc(v1));
1408 >    }}
1409  
1410      /**
1411       * thenApply result completes exceptionally after exceptional
1412       * completion of source
1413       */
1414 <    public void testThenApply2() {
1415 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1416 <        CompletableFuture<Integer> g = f.thenApply(inc);
1417 <        f.completeExceptionally(new CFException());
1418 <        checkCompletedWithWrappedCFException(g);
1419 <    }
1414 >    public void testThenApply_exceptionalCompletion() {
1415 >        for (ExecutionMode m : ExecutionMode.values())
1416 >        for (boolean createIncomplete : new boolean[] { true, false })
1417 >    {
1418 >        final CFException ex = new CFException();
1419 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1420 >        final IncFunction r = new IncFunction(m);
1421 >        if (!createIncomplete) f.completeExceptionally(ex);
1422 >        final CompletableFuture<Integer> g = m.thenApply(f, r);
1423 >        if (createIncomplete) {
1424 >            checkIncomplete(g);
1425 >            f.completeExceptionally(ex);
1426 >        }
1427  
1428 <    /**
1429 <     * thenApply result completes exceptionally if action does
1430 <     */
1431 <    public void testThenApply3() {
570 <        CompletableFuture<Integer> f = new CompletableFuture<>();
571 <        CompletableFuture<Integer> g = f.thenApply(new FailingFunction());
572 <        f.complete(one);
573 <        checkCompletedWithWrappedCFException(g);
574 <    }
1428 >        checkCompletedWithWrappedException(g, ex);
1429 >        checkCompletedExceptionally(f, ex);
1430 >        r.assertNotInvoked();
1431 >    }}
1432  
1433      /**
1434       * thenApply result completes exceptionally if source cancelled
1435       */
1436 <    public void testThenApply4() {
1437 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1438 <        CompletableFuture<Integer> g = f.thenApply(inc);
1439 <        assertTrue(f.cancel(true));
1436 >    public void testThenApply_sourceCancelled() {
1437 >        for (ExecutionMode m : ExecutionMode.values())
1438 >        for (boolean createIncomplete : new boolean[] { true, false })
1439 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1440 >    {
1441 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1442 >        final IncFunction r = new IncFunction(m);
1443 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1444 >        final CompletableFuture<Integer> g = m.thenApply(f, r);
1445 >        if (createIncomplete) {
1446 >            checkIncomplete(g);
1447 >            assertTrue(f.cancel(mayInterruptIfRunning));
1448 >        }
1449 >
1450          checkCompletedWithWrappedCancellationException(g);
1451 <    }
1451 >        checkCancelled(f);
1452 >        r.assertNotInvoked();
1453 >    }}
1454 >
1455 >    /**
1456 >     * thenApply result completes exceptionally if action does
1457 >     */
1458 >    public void testThenApply_actionFailed() {
1459 >        for (ExecutionMode m : ExecutionMode.values())
1460 >        for (boolean createIncomplete : new boolean[] { true, false })
1461 >        for (Integer v1 : new Integer[] { 1, null })
1462 >    {
1463 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1464 >        final FailingFunction r = new FailingFunction(m);
1465 >        if (!createIncomplete) assertTrue(f.complete(v1));
1466 >        final CompletableFuture<Integer> g = m.thenApply(f, r);
1467 >        if (createIncomplete) {
1468 >            checkIncomplete(g);
1469 >            assertTrue(f.complete(v1));
1470 >        }
1471 >
1472 >        checkCompletedWithWrappedCFException(g);
1473 >        checkCompletedNormally(f, v1);
1474 >    }}
1475  
1476      /**
1477       * thenAccept result completes normally after normal completion of source
1478       */
1479 <    public void testThenAccept() {
1480 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1481 <        IncAction r = new IncAction();
1482 <        CompletableFuture<Void> g = f.thenAccept(r);
1483 <        f.complete(one);
1479 >    public void testThenAccept_normalCompletion() {
1480 >        for (ExecutionMode m : ExecutionMode.values())
1481 >        for (boolean createIncomplete : new boolean[] { true, false })
1482 >        for (Integer v1 : new Integer[] { 1, null })
1483 >    {
1484 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1485 >        final NoopConsumer r = new NoopConsumer(m);
1486 >        if (!createIncomplete) assertTrue(f.complete(v1));
1487 >        final CompletableFuture<Void> g = m.thenAccept(f, r);
1488 >        if (createIncomplete) {
1489 >            checkIncomplete(g);
1490 >            assertTrue(f.complete(v1));
1491 >        }
1492 >
1493          checkCompletedNormally(g, null);
1494 <        assertEquals(r.value, 2);
1495 <    }
1494 >        r.assertValue(v1);
1495 >        checkCompletedNormally(f, v1);
1496 >    }}
1497  
1498      /**
1499       * thenAccept result completes exceptionally after exceptional
1500       * completion of source
1501       */
1502 <    public void testThenAccept2() {
1503 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1504 <        IncAction r = new IncAction();
1505 <        CompletableFuture<Void> g = f.thenAccept(r);
1506 <        f.completeExceptionally(new CFException());
1507 <        checkCompletedWithWrappedCFException(g);
1508 <    }
1502 >    public void testThenAccept_exceptionalCompletion() {
1503 >        for (ExecutionMode m : ExecutionMode.values())
1504 >        for (boolean createIncomplete : new boolean[] { true, false })
1505 >    {
1506 >        final CFException ex = new CFException();
1507 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1508 >        final NoopConsumer r = new NoopConsumer(m);
1509 >        if (!createIncomplete) f.completeExceptionally(ex);
1510 >        final CompletableFuture<Void> g = m.thenAccept(f, r);
1511 >        if (createIncomplete) {
1512 >            checkIncomplete(g);
1513 >            f.completeExceptionally(ex);
1514 >        }
1515  
1516 <    /**
1517 <     * thenAccept result completes exceptionally if action does
1518 <     */
1519 <    public void testThenAccept3() {
614 <        CompletableFuture<Integer> f = new CompletableFuture<>();
615 <        FailingConsumer r = new FailingConsumer();
616 <        CompletableFuture<Void> g = f.thenAccept(r);
617 <        f.complete(one);
618 <        checkCompletedWithWrappedCFException(g);
619 <        assertTrue(r.ran);
620 <    }
1516 >        checkCompletedWithWrappedException(g, ex);
1517 >        checkCompletedExceptionally(f, ex);
1518 >        r.assertNotInvoked();
1519 >    }}
1520  
1521      /**
1522       * thenAccept result completes exceptionally if source cancelled
1523       */
1524 <    public void testThenAccept4() {
1525 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1526 <        IncAction r = new IncAction();
1527 <        CompletableFuture<Void> g = f.thenAccept(r);
1528 <        assertTrue(f.cancel(true));
1524 >    public void testThenAccept_sourceCancelled() {
1525 >        for (ExecutionMode m : ExecutionMode.values())
1526 >        for (boolean createIncomplete : new boolean[] { true, false })
1527 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1528 >    {
1529 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1530 >        final NoopConsumer r = new NoopConsumer(m);
1531 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1532 >        final CompletableFuture<Void> g = m.thenAccept(f, r);
1533 >        if (createIncomplete) {
1534 >            checkIncomplete(g);
1535 >            assertTrue(f.cancel(mayInterruptIfRunning));
1536 >        }
1537 >
1538          checkCompletedWithWrappedCancellationException(g);
1539 <    }
1539 >        checkCancelled(f);
1540 >        r.assertNotInvoked();
1541 >    }}
1542 >
1543 >    /**
1544 >     * thenAccept result completes exceptionally if action does
1545 >     */
1546 >    public void testThenAccept_actionFailed() {
1547 >        for (ExecutionMode m : ExecutionMode.values())
1548 >        for (boolean createIncomplete : new boolean[] { true, false })
1549 >        for (Integer v1 : new Integer[] { 1, null })
1550 >    {
1551 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1552 >        final FailingConsumer r = new FailingConsumer(m);
1553 >        if (!createIncomplete) f.complete(v1);
1554 >        final CompletableFuture<Void> g = m.thenAccept(f, r);
1555 >        if (createIncomplete) {
1556 >            checkIncomplete(g);
1557 >            f.complete(v1);
1558 >        }
1559  
1560 +        checkCompletedWithWrappedCFException(g);
1561 +        checkCompletedNormally(f, v1);
1562 +    }}
1563  
1564      /**
1565       * thenCombine result completes normally after normal completion
1566       * of sources
1567       */
1568 <    public void testThenCombine() {
1569 <        CompletableFuture<Integer> f, g, h;
1570 <
1571 <        f = new CompletableFuture<>();
1572 <        g = new CompletableFuture<>();
1573 <        h = f.thenCombine(g, subtract);
1574 <        f.complete(3);
1575 <        checkIncomplete(h);
1576 <        g.complete(1);
1577 <        checkCompletedNormally(h, 2);
1578 <
1579 <        f = new CompletableFuture<>();
1580 <        g = new CompletableFuture<>();
1581 <        h = f.thenCombine(g, subtract);
1582 <        g.complete(1);
1583 <        checkIncomplete(h);
1584 <        f.complete(3);
1585 <        checkCompletedNormally(h, 2);
1586 <
1587 <        f = new CompletableFuture<>();
1588 <        g = new CompletableFuture<>();
1589 <        g.complete(1);
1590 <        f.complete(3);
1591 <        h = f.thenCombine(g, subtract);
1592 <        checkCompletedNormally(h, 2);
1593 <    }
1568 >    public void testThenCombine_normalCompletion() {
1569 >        for (ExecutionMode m : ExecutionMode.values())
1570 >        for (boolean fFirst : new boolean[] { true, false })
1571 >        for (Integer v1 : new Integer[] { 1, null })
1572 >        for (Integer v2 : new Integer[] { 2, null })
1573 >    {
1574 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1575 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1576 >        final SubtractFunction r1 = new SubtractFunction(m);
1577 >        final SubtractFunction r2 = new SubtractFunction(m);
1578 >        final SubtractFunction r3 = new SubtractFunction(m);
1579 >
1580 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1581 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1582 >        final Integer w1 =  fFirst ? v1 : v2;
1583 >        final Integer w2 = !fFirst ? v1 : v2;
1584 >
1585 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1586 >        assertTrue(fst.complete(w1));
1587 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1588 >        checkIncomplete(h1);
1589 >        checkIncomplete(h2);
1590 >        r1.assertNotInvoked();
1591 >        r2.assertNotInvoked();
1592 >        assertTrue(snd.complete(w2));
1593 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1594 >
1595 >        checkCompletedNormally(h1, subtract(v1, v2));
1596 >        checkCompletedNormally(h2, subtract(v1, v2));
1597 >        checkCompletedNormally(h3, subtract(v1, v2));
1598 >        r1.assertValue(subtract(v1, v2));
1599 >        r2.assertValue(subtract(v1, v2));
1600 >        r3.assertValue(subtract(v1, v2));
1601 >        checkCompletedNormally(f, v1);
1602 >        checkCompletedNormally(g, v2);
1603 >    }}
1604  
1605      /**
1606       * thenCombine result completes exceptionally after exceptional
1607       * completion of either source
1608       */
1609 <    public void testThenCombine2() {
1610 <        CompletableFuture<Integer> f, g, h;
1611 <
1612 <        f = new CompletableFuture<>();
1613 <        g = new CompletableFuture<>();
1614 <        h = f.thenCombine(g, subtract);
1615 <        f.completeExceptionally(new CFException());
1616 <        checkIncomplete(h);
1617 <        g.complete(1);
1618 <        checkCompletedWithWrappedCFException(h);
1619 <
1620 <        f = new CompletableFuture<>();
1621 <        g = new CompletableFuture<>();
1622 <        h = f.thenCombine(g, subtract);
1623 <        g.completeExceptionally(new CFException());
1624 <        checkIncomplete(h);
1625 <        f.complete(3);
1626 <        checkCompletedWithWrappedCFException(h);
1627 <
1628 <        f = new CompletableFuture<>();
1629 <        g = new CompletableFuture<>();
1630 <        f.complete(3);
1631 <        g.completeExceptionally(new CFException());
1632 <        h = f.thenCombine(g, subtract);
1633 <        checkCompletedWithWrappedCFException(h);
1634 <
1635 <        f = new CompletableFuture<>();
1636 <        g = new CompletableFuture<>();
1637 <        f.completeExceptionally(new CFException());
1638 <        g.complete(3);
1639 <        h = f.thenCombine(g, subtract);
1640 <        checkCompletedWithWrappedCFException(h);
1641 <    }
1609 >    public void testThenCombine_exceptionalCompletion() throws Throwable {
1610 >        for (ExecutionMode m : ExecutionMode.values())
1611 >        for (boolean fFirst : new boolean[] { true, false })
1612 >        for (boolean failFirst : new boolean[] { true, false })
1613 >        for (Integer v1 : new Integer[] { 1, null })
1614 >    {
1615 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1616 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1617 >        final CFException ex = new CFException();
1618 >        final SubtractFunction r1 = new SubtractFunction(m);
1619 >        final SubtractFunction r2 = new SubtractFunction(m);
1620 >        final SubtractFunction r3 = new SubtractFunction(m);
1621 >
1622 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1623 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1624 >        final Callable<Boolean> complete1 = failFirst ?
1625 >            () -> fst.completeExceptionally(ex) :
1626 >            () -> fst.complete(v1);
1627 >        final Callable<Boolean> complete2 = failFirst ?
1628 >            () -> snd.complete(v1) :
1629 >            () -> snd.completeExceptionally(ex);
1630 >
1631 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1632 >        assertTrue(complete1.call());
1633 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1634 >        checkIncomplete(h1);
1635 >        checkIncomplete(h2);
1636 >        assertTrue(complete2.call());
1637 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1638 >
1639 >        checkCompletedWithWrappedException(h1, ex);
1640 >        checkCompletedWithWrappedException(h2, ex);
1641 >        checkCompletedWithWrappedException(h3, ex);
1642 >        r1.assertNotInvoked();
1643 >        r2.assertNotInvoked();
1644 >        r3.assertNotInvoked();
1645 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1646 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
1647 >    }}
1648  
1649      /**
1650 <     * thenCombine result completes exceptionally if action does
1650 >     * thenCombine result completes exceptionally if either source cancelled
1651       */
1652 <    public void testThenCombine3() {
1653 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1654 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1655 <        FailingBiFunction r = new FailingBiFunction();
1656 <        CompletableFuture<Integer> g = f.thenCombine(f2, r);
1657 <        f.complete(one);
1658 <        checkIncomplete(g);
1659 <        assertFalse(r.ran);
1660 <        f2.complete(two);
1661 <        checkCompletedWithWrappedCFException(g);
1662 <        assertTrue(r.ran);
1663 <    }
1652 >    public void testThenCombine_sourceCancelled() throws Throwable {
1653 >        for (ExecutionMode m : ExecutionMode.values())
1654 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1655 >        for (boolean fFirst : new boolean[] { true, false })
1656 >        for (boolean failFirst : new boolean[] { true, false })
1657 >        for (Integer v1 : new Integer[] { 1, null })
1658 >    {
1659 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1660 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1661 >        final SubtractFunction r1 = new SubtractFunction(m);
1662 >        final SubtractFunction r2 = new SubtractFunction(m);
1663 >        final SubtractFunction r3 = new SubtractFunction(m);
1664 >
1665 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1666 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1667 >        final Callable<Boolean> complete1 = failFirst ?
1668 >            () -> fst.cancel(mayInterruptIfRunning) :
1669 >            () -> fst.complete(v1);
1670 >        final Callable<Boolean> complete2 = failFirst ?
1671 >            () -> snd.complete(v1) :
1672 >            () -> snd.cancel(mayInterruptIfRunning);
1673 >
1674 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1675 >        assertTrue(complete1.call());
1676 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1677 >        checkIncomplete(h1);
1678 >        checkIncomplete(h2);
1679 >        assertTrue(complete2.call());
1680 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1681 >
1682 >        checkCompletedWithWrappedCancellationException(h1);
1683 >        checkCompletedWithWrappedCancellationException(h2);
1684 >        checkCompletedWithWrappedCancellationException(h3);
1685 >        r1.assertNotInvoked();
1686 >        r2.assertNotInvoked();
1687 >        r3.assertNotInvoked();
1688 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1689 >        checkCancelled(failFirst ? fst : snd);
1690 >    }}
1691  
1692      /**
1693 <     * thenCombine result completes exceptionally if either source cancelled
1693 >     * thenCombine result completes exceptionally if action does
1694       */
1695 <    public void testThenCombine4() {
1696 <        CompletableFuture<Integer> f, g, h;
1697 <
1698 <        f = new CompletableFuture<>();
1699 <        g = new CompletableFuture<>();
1700 <        h = f.thenCombine(g, subtract);
1701 <        assertTrue(f.cancel(true));
1702 <        checkIncomplete(h);
1703 <        g.complete(1);
1704 <        checkCompletedWithWrappedCancellationException(h);
1705 <
1706 <        f = new CompletableFuture<>();
1707 <        g = new CompletableFuture<>();
1708 <        h = f.thenCombine(g, subtract);
1709 <        assertTrue(g.cancel(true));
1710 <        checkIncomplete(h);
1711 <        f.complete(3);
1712 <        checkCompletedWithWrappedCancellationException(h);
1713 <
1714 <        f = new CompletableFuture<>();
1715 <        g = new CompletableFuture<>();
1716 <        assertTrue(f.cancel(true));
1717 <        assertTrue(g.cancel(true));
1718 <        h = f.thenCombine(g, subtract);
1719 <        checkCompletedWithWrappedCancellationException(h);
1720 <    }
1695 >    public void testThenCombine_actionFailed() {
1696 >        for (ExecutionMode m : ExecutionMode.values())
1697 >        for (boolean fFirst : new boolean[] { true, false })
1698 >        for (Integer v1 : new Integer[] { 1, null })
1699 >        for (Integer v2 : new Integer[] { 2, null })
1700 >    {
1701 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1702 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1703 >        final FailingBiFunction r1 = new FailingBiFunction(m);
1704 >        final FailingBiFunction r2 = new FailingBiFunction(m);
1705 >        final FailingBiFunction r3 = new FailingBiFunction(m);
1706 >
1707 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1708 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1709 >        final Integer w1 =  fFirst ? v1 : v2;
1710 >        final Integer w2 = !fFirst ? v1 : v2;
1711 >
1712 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1713 >        assertTrue(fst.complete(w1));
1714 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1715 >        assertTrue(snd.complete(w2));
1716 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1717 >
1718 >        checkCompletedWithWrappedCFException(h1);
1719 >        checkCompletedWithWrappedCFException(h2);
1720 >        checkCompletedWithWrappedCFException(h3);
1721 >        r1.assertInvoked();
1722 >        r2.assertInvoked();
1723 >        r3.assertInvoked();
1724 >        checkCompletedNormally(f, v1);
1725 >        checkCompletedNormally(g, v2);
1726 >    }}
1727  
1728      /**
1729       * thenAcceptBoth result completes normally after normal
1730       * completion of sources
1731       */
1732 <    public void testThenAcceptBoth() {
1733 <        CompletableFuture<Integer> f, g;
1734 <        CompletableFuture<Void> h;
1735 <        SubtractAction r;
1736 <
1737 <        f = new CompletableFuture<>();
1738 <        g = new CompletableFuture<>();
1739 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
1740 <        f.complete(3);
1741 <        checkIncomplete(h);
1742 <        g.complete(1);
1743 <        checkCompletedNormally(h, null);
1744 <        assertEquals(r.value, 2);
1745 <
1746 <        f = new CompletableFuture<>();
1747 <        g = new CompletableFuture<>();
1748 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
1749 <        g.complete(1);
1750 <        checkIncomplete(h);
1751 <        f.complete(3);
1752 <        checkCompletedNormally(h, null);
1753 <        assertEquals(r.value, 2);
1754 <
1755 <        f = new CompletableFuture<>();
1756 <        g = new CompletableFuture<>();
1757 <        g.complete(1);
1758 <        f.complete(3);
1759 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
1760 <        checkCompletedNormally(h, null);
1761 <        assertEquals(r.value, 2);
1762 <    }
1732 >    public void testThenAcceptBoth_normalCompletion() {
1733 >        for (ExecutionMode m : ExecutionMode.values())
1734 >        for (boolean fFirst : new boolean[] { true, false })
1735 >        for (Integer v1 : new Integer[] { 1, null })
1736 >        for (Integer v2 : new Integer[] { 2, null })
1737 >    {
1738 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1739 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1740 >        final SubtractAction r1 = new SubtractAction(m);
1741 >        final SubtractAction r2 = new SubtractAction(m);
1742 >        final SubtractAction r3 = new SubtractAction(m);
1743 >
1744 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1745 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1746 >        final Integer w1 =  fFirst ? v1 : v2;
1747 >        final Integer w2 = !fFirst ? v1 : v2;
1748 >
1749 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1750 >        assertTrue(fst.complete(w1));
1751 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1752 >        checkIncomplete(h1);
1753 >        checkIncomplete(h2);
1754 >        r1.assertNotInvoked();
1755 >        r2.assertNotInvoked();
1756 >        assertTrue(snd.complete(w2));
1757 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1758 >
1759 >        checkCompletedNormally(h1, null);
1760 >        checkCompletedNormally(h2, null);
1761 >        checkCompletedNormally(h3, null);
1762 >        r1.assertValue(subtract(v1, v2));
1763 >        r2.assertValue(subtract(v1, v2));
1764 >        r3.assertValue(subtract(v1, v2));
1765 >        checkCompletedNormally(f, v1);
1766 >        checkCompletedNormally(g, v2);
1767 >    }}
1768  
1769      /**
1770       * thenAcceptBoth result completes exceptionally after exceptional
1771       * completion of either source
1772       */
1773 <    public void testThenAcceptBoth2() {
1774 <        CompletableFuture<Integer> f, g;
1775 <        CompletableFuture<Void> h;
1776 <        SubtractAction r;
1777 <
1778 <        f = new CompletableFuture<>();
1779 <        g = new CompletableFuture<>();
1780 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
1781 <        f.completeExceptionally(new CFException());
1782 <        checkIncomplete(h);
1783 <        g.complete(1);
1784 <        checkCompletedWithWrappedCFException(h);
1785 <
1786 <        f = new CompletableFuture<>();
1787 <        g = new CompletableFuture<>();
1788 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
1789 <        g.completeExceptionally(new CFException());
1790 <        checkIncomplete(h);
1791 <        f.complete(3);
1792 <        checkCompletedWithWrappedCFException(h);
1793 <
1794 <        f = new CompletableFuture<>();
1795 <        g = new CompletableFuture<>();
1796 <        f.complete(3);
1797 <        g.completeExceptionally(new CFException());
1798 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
1799 <        checkCompletedWithWrappedCFException(h);
1800 <
1801 <        f = new CompletableFuture<>();
1802 <        g = new CompletableFuture<>();
1803 <        f.completeExceptionally(new CFException());
1804 <        g.complete(3);
1805 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
1806 <        checkCompletedWithWrappedCFException(h);
1807 <    }
1773 >    public void testThenAcceptBoth_exceptionalCompletion() throws Throwable {
1774 >        for (ExecutionMode m : ExecutionMode.values())
1775 >        for (boolean fFirst : new boolean[] { true, false })
1776 >        for (boolean failFirst : new boolean[] { true, false })
1777 >        for (Integer v1 : new Integer[] { 1, null })
1778 >    {
1779 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1780 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1781 >        final CFException ex = new CFException();
1782 >        final SubtractAction r1 = new SubtractAction(m);
1783 >        final SubtractAction r2 = new SubtractAction(m);
1784 >        final SubtractAction r3 = new SubtractAction(m);
1785 >
1786 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1787 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1788 >        final Callable<Boolean> complete1 = failFirst ?
1789 >            () -> fst.completeExceptionally(ex) :
1790 >            () -> fst.complete(v1);
1791 >        final Callable<Boolean> complete2 = failFirst ?
1792 >            () -> snd.complete(v1) :
1793 >            () -> snd.completeExceptionally(ex);
1794 >
1795 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1796 >        assertTrue(complete1.call());
1797 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1798 >        checkIncomplete(h1);
1799 >        checkIncomplete(h2);
1800 >        assertTrue(complete2.call());
1801 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1802 >
1803 >        checkCompletedWithWrappedException(h1, ex);
1804 >        checkCompletedWithWrappedException(h2, ex);
1805 >        checkCompletedWithWrappedException(h3, ex);
1806 >        r1.assertNotInvoked();
1807 >        r2.assertNotInvoked();
1808 >        r3.assertNotInvoked();
1809 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1810 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
1811 >    }}
1812  
1813      /**
1814 <     * thenAcceptBoth result completes exceptionally if action does
1814 >     * thenAcceptBoth result completes exceptionally if either source cancelled
1815       */
1816 <    public void testThenAcceptBoth3() {
1817 <        CompletableFuture<Integer> f, g;
1818 <        CompletableFuture<Void> h;
1819 <        FailingBiConsumer r;
1820 <
1821 <        f = new CompletableFuture<>();
1822 <        g = new CompletableFuture<>();
1823 <        h = f.thenAcceptBoth(g, r = new FailingBiConsumer());
1824 <        f.complete(3);
1825 <        checkIncomplete(h);
1826 <        g.complete(1);
1827 <        checkCompletedWithWrappedCFException(h);
1828 <
1829 <        f = new CompletableFuture<>();
1830 <        g = new CompletableFuture<>();
1831 <        f.complete(3);
1832 <        g.complete(1);
1833 <        h = f.thenAcceptBoth(g, r = new FailingBiConsumer());
1834 <        checkCompletedWithWrappedCFException(h);
1835 <    }
1816 >    public void testThenAcceptBoth_sourceCancelled() throws Throwable {
1817 >        for (ExecutionMode m : ExecutionMode.values())
1818 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1819 >        for (boolean fFirst : new boolean[] { true, false })
1820 >        for (boolean failFirst : new boolean[] { true, false })
1821 >        for (Integer v1 : new Integer[] { 1, null })
1822 >    {
1823 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1824 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1825 >        final SubtractAction r1 = new SubtractAction(m);
1826 >        final SubtractAction r2 = new SubtractAction(m);
1827 >        final SubtractAction r3 = new SubtractAction(m);
1828 >
1829 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1830 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1831 >        final Callable<Boolean> complete1 = failFirst ?
1832 >            () -> fst.cancel(mayInterruptIfRunning) :
1833 >            () -> fst.complete(v1);
1834 >        final Callable<Boolean> complete2 = failFirst ?
1835 >            () -> snd.complete(v1) :
1836 >            () -> snd.cancel(mayInterruptIfRunning);
1837 >
1838 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1839 >        assertTrue(complete1.call());
1840 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1841 >        checkIncomplete(h1);
1842 >        checkIncomplete(h2);
1843 >        assertTrue(complete2.call());
1844 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1845 >
1846 >        checkCompletedWithWrappedCancellationException(h1);
1847 >        checkCompletedWithWrappedCancellationException(h2);
1848 >        checkCompletedWithWrappedCancellationException(h3);
1849 >        r1.assertNotInvoked();
1850 >        r2.assertNotInvoked();
1851 >        r3.assertNotInvoked();
1852 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1853 >        checkCancelled(failFirst ? fst : snd);
1854 >    }}
1855  
1856      /**
1857 <     * thenAcceptBoth result completes exceptionally if either source cancelled
1857 >     * thenAcceptBoth result completes exceptionally if action does
1858       */
1859 <    public void testThenAcceptBoth4() {
1860 <        CompletableFuture<Integer> f, g;
1861 <        CompletableFuture<Void> h;
1862 <        SubtractAction r;
1863 <
1864 <        f = new CompletableFuture<>();
1865 <        g = new CompletableFuture<>();
1866 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
1867 <        assertTrue(f.cancel(true));
1868 <        checkIncomplete(h);
1869 <        g.complete(1);
1870 <        checkCompletedWithWrappedCancellationException(h);
1871 <
1872 <        f = new CompletableFuture<>();
1873 <        g = new CompletableFuture<>();
1874 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
1875 <        assertTrue(g.cancel(true));
1876 <        checkIncomplete(h);
1877 <        f.complete(3);
1878 <        checkCompletedWithWrappedCancellationException(h);
1879 <
1880 <        f = new CompletableFuture<>();
1881 <        g = new CompletableFuture<>();
1882 <        f.complete(3);
1883 <        assertTrue(g.cancel(true));
1884 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
1885 <        checkCompletedWithWrappedCancellationException(h);
1886 <
1887 <        f = new CompletableFuture<>();
1888 <        g = new CompletableFuture<>();
1889 <        assertTrue(f.cancel(true));
1890 <        g.complete(3);
884 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
885 <        checkCompletedWithWrappedCancellationException(h);
886 <    }
1859 >    public void testThenAcceptBoth_actionFailed() {
1860 >        for (ExecutionMode m : ExecutionMode.values())
1861 >        for (boolean fFirst : new boolean[] { true, false })
1862 >        for (Integer v1 : new Integer[] { 1, null })
1863 >        for (Integer v2 : new Integer[] { 2, null })
1864 >    {
1865 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1866 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1867 >        final FailingBiConsumer r1 = new FailingBiConsumer(m);
1868 >        final FailingBiConsumer r2 = new FailingBiConsumer(m);
1869 >        final FailingBiConsumer r3 = new FailingBiConsumer(m);
1870 >
1871 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1872 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1873 >        final Integer w1 =  fFirst ? v1 : v2;
1874 >        final Integer w2 = !fFirst ? v1 : v2;
1875 >
1876 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1877 >        assertTrue(fst.complete(w1));
1878 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1879 >        assertTrue(snd.complete(w2));
1880 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1881 >
1882 >        checkCompletedWithWrappedCFException(h1);
1883 >        checkCompletedWithWrappedCFException(h2);
1884 >        checkCompletedWithWrappedCFException(h3);
1885 >        r1.assertInvoked();
1886 >        r2.assertInvoked();
1887 >        r3.assertInvoked();
1888 >        checkCompletedNormally(f, v1);
1889 >        checkCompletedNormally(g, v2);
1890 >    }}
1891  
1892      /**
1893       * runAfterBoth result completes normally after normal
1894       * completion of sources
1895       */
1896 <    public void testRunAfterBoth() {
1897 <        CompletableFuture<Integer> f, g;
1898 <        CompletableFuture<Void> h;
1899 <        Noop r;
1900 <
1901 <        f = new CompletableFuture<>();
1902 <        g = new CompletableFuture<>();
1903 <        h = f.runAfterBoth(g, r = new Noop());
1904 <        f.complete(3);
1905 <        checkIncomplete(h);
1906 <        g.complete(1);
1907 <        checkCompletedNormally(h, null);
1908 <        assertTrue(r.ran);
1909 <
1910 <        f = new CompletableFuture<>();
1911 <        g = new CompletableFuture<>();
1912 <        h = f.runAfterBoth(g, r = new Noop());
1913 <        g.complete(1);
1914 <        checkIncomplete(h);
1915 <        f.complete(3);
1916 <        checkCompletedNormally(h, null);
1917 <        assertTrue(r.ran);
1918 <
1919 <        f = new CompletableFuture<>();
1920 <        g = new CompletableFuture<>();
1921 <        g.complete(1);
1922 <        f.complete(3);
1923 <        h = f.runAfterBoth(g, r = new Noop());
1924 <        checkCompletedNormally(h, null);
1925 <        assertTrue(r.ran);
1926 <    }
1896 >    public void testRunAfterBoth_normalCompletion() {
1897 >        for (ExecutionMode m : ExecutionMode.values())
1898 >        for (boolean fFirst : new boolean[] { true, false })
1899 >        for (Integer v1 : new Integer[] { 1, null })
1900 >        for (Integer v2 : new Integer[] { 2, null })
1901 >    {
1902 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1903 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1904 >        final Noop r1 = new Noop(m);
1905 >        final Noop r2 = new Noop(m);
1906 >        final Noop r3 = new Noop(m);
1907 >
1908 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1909 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1910 >        final Integer w1 =  fFirst ? v1 : v2;
1911 >        final Integer w2 = !fFirst ? v1 : v2;
1912 >
1913 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
1914 >        assertTrue(fst.complete(w1));
1915 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
1916 >        checkIncomplete(h1);
1917 >        checkIncomplete(h2);
1918 >        r1.assertNotInvoked();
1919 >        r2.assertNotInvoked();
1920 >        assertTrue(snd.complete(w2));
1921 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
1922 >
1923 >        checkCompletedNormally(h1, null);
1924 >        checkCompletedNormally(h2, null);
1925 >        checkCompletedNormally(h3, null);
1926 >        r1.assertInvoked();
1927 >        r2.assertInvoked();
1928 >        r3.assertInvoked();
1929 >        checkCompletedNormally(f, v1);
1930 >        checkCompletedNormally(g, v2);
1931 >    }}
1932  
1933      /**
1934       * runAfterBoth result completes exceptionally after exceptional
1935       * completion of either source
1936       */
1937 <    public void testRunAfterBoth2() {
1938 <        CompletableFuture<Integer> f, g;
1939 <        CompletableFuture<Void> h;
1940 <        Noop r;
1941 <
1942 <        f = new CompletableFuture<>();
1943 <        g = new CompletableFuture<>();
1944 <        h = f.runAfterBoth(g, r = new Noop());
1945 <        f.completeExceptionally(new CFException());
1946 <        checkIncomplete(h);
1947 <        g.complete(1);
1948 <        checkCompletedWithWrappedCFException(h);
1949 <        assertFalse(r.ran);
1950 <
1951 <        f = new CompletableFuture<>();
1952 <        g = new CompletableFuture<>();
1953 <        h = f.runAfterBoth(g, r = new Noop());
1954 <        g.completeExceptionally(new CFException());
1955 <        checkIncomplete(h);
1956 <        f.complete(3);
1957 <        checkCompletedWithWrappedCFException(h);
1958 <        assertFalse(r.ran);
1959 <
1960 <        f = new CompletableFuture<>();
1961 <        g = new CompletableFuture<>();
1962 <        g.completeExceptionally(new CFException());
1963 <        f.complete(3);
1964 <        h = f.runAfterBoth(g, r = new Noop());
1965 <        checkCompletedWithWrappedCFException(h);
1966 <        assertFalse(r.ran);
1967 <
1968 <        f = new CompletableFuture<>();
1969 <        g = new CompletableFuture<>();
1970 <        f.completeExceptionally(new CFException());
1971 <        g.complete(1);
1972 <        h = f.runAfterBoth(g, r = new Noop());
1973 <        checkCompletedWithWrappedCFException(h);
1974 <        assertFalse(r.ran);
1975 <    }
1937 >    public void testRunAfterBoth_exceptionalCompletion() throws Throwable {
1938 >        for (ExecutionMode m : ExecutionMode.values())
1939 >        for (boolean fFirst : new boolean[] { true, false })
1940 >        for (boolean failFirst : new boolean[] { true, false })
1941 >        for (Integer v1 : new Integer[] { 1, null })
1942 >    {
1943 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1944 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1945 >        final CFException ex = new CFException();
1946 >        final Noop r1 = new Noop(m);
1947 >        final Noop r2 = new Noop(m);
1948 >        final Noop r3 = new Noop(m);
1949 >
1950 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1951 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1952 >        final Callable<Boolean> complete1 = failFirst ?
1953 >            () -> fst.completeExceptionally(ex) :
1954 >            () -> fst.complete(v1);
1955 >        final Callable<Boolean> complete2 = failFirst ?
1956 >            () -> snd.complete(v1) :
1957 >            () -> snd.completeExceptionally(ex);
1958 >
1959 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
1960 >        assertTrue(complete1.call());
1961 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
1962 >        checkIncomplete(h1);
1963 >        checkIncomplete(h2);
1964 >        assertTrue(complete2.call());
1965 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
1966 >
1967 >        checkCompletedWithWrappedException(h1, ex);
1968 >        checkCompletedWithWrappedException(h2, ex);
1969 >        checkCompletedWithWrappedException(h3, ex);
1970 >        r1.assertNotInvoked();
1971 >        r2.assertNotInvoked();
1972 >        r3.assertNotInvoked();
1973 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1974 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
1975 >    }}
1976  
1977      /**
1978 <     * runAfterBoth result completes exceptionally if action does
1978 >     * runAfterBoth result completes exceptionally if either source cancelled
1979       */
1980 <    public void testRunAfterBoth3() {
1981 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1982 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1983 <        FailingNoop r = new FailingNoop();
1984 <        CompletableFuture<Void> g = f.runAfterBoth(f2, r);
1985 <        f.complete(one);
1986 <        checkIncomplete(g);
1987 <        f2.complete(two);
1988 <        checkCompletedWithWrappedCFException(g);
1989 <    }
1980 >    public void testRunAfterBoth_sourceCancelled() throws Throwable {
1981 >        for (ExecutionMode m : ExecutionMode.values())
1982 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1983 >        for (boolean fFirst : new boolean[] { true, false })
1984 >        for (boolean failFirst : new boolean[] { true, false })
1985 >        for (Integer v1 : new Integer[] { 1, null })
1986 >    {
1987 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1988 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1989 >        final Noop r1 = new Noop(m);
1990 >        final Noop r2 = new Noop(m);
1991 >        final Noop r3 = new Noop(m);
1992 >
1993 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1994 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1995 >        final Callable<Boolean> complete1 = failFirst ?
1996 >            () -> fst.cancel(mayInterruptIfRunning) :
1997 >            () -> fst.complete(v1);
1998 >        final Callable<Boolean> complete2 = failFirst ?
1999 >            () -> snd.complete(v1) :
2000 >            () -> snd.cancel(mayInterruptIfRunning);
2001 >
2002 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2003 >        assertTrue(complete1.call());
2004 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2005 >        checkIncomplete(h1);
2006 >        checkIncomplete(h2);
2007 >        assertTrue(complete2.call());
2008 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2009 >
2010 >        checkCompletedWithWrappedCancellationException(h1);
2011 >        checkCompletedWithWrappedCancellationException(h2);
2012 >        checkCompletedWithWrappedCancellationException(h3);
2013 >        r1.assertNotInvoked();
2014 >        r2.assertNotInvoked();
2015 >        r3.assertNotInvoked();
2016 >        checkCompletedNormally(failFirst ? snd : fst, v1);
2017 >        checkCancelled(failFirst ? fst : snd);
2018 >    }}
2019  
2020      /**
2021 <     * runAfterBoth result completes exceptionally if either source cancelled
2021 >     * runAfterBoth result completes exceptionally if action does
2022       */
2023 <    public void testRunAfterBoth4() {
2024 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2025 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2026 <        Noop r = new Noop();
2027 <        CompletableFuture<Void> g = f.runAfterBoth(f2, r);
2028 <        assertTrue(f.cancel(true));
2029 <        f2.complete(two);
2030 <        checkCompletedWithWrappedCancellationException(g);
2031 <        f = new CompletableFuture<>();
2032 <        f2 = new CompletableFuture<>();
2033 <        r = new Noop();
2034 <        g = f.runAfterBoth(f2, r);
2035 <        f.complete(one);
2036 <        assertTrue(f2.cancel(true));
2037 <        checkCompletedWithWrappedCancellationException(g);
2038 <    }
2023 >    public void testRunAfterBoth_actionFailed() {
2024 >        for (ExecutionMode m : ExecutionMode.values())
2025 >        for (boolean fFirst : new boolean[] { true, false })
2026 >        for (Integer v1 : new Integer[] { 1, null })
2027 >        for (Integer v2 : new Integer[] { 2, null })
2028 >    {
2029 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2030 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2031 >        final FailingRunnable r1 = new FailingRunnable(m);
2032 >        final FailingRunnable r2 = new FailingRunnable(m);
2033 >        final FailingRunnable r3 = new FailingRunnable(m);
2034 >
2035 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
2036 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
2037 >        final Integer w1 =  fFirst ? v1 : v2;
2038 >        final Integer w2 = !fFirst ? v1 : v2;
2039 >
2040 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2041 >        assertTrue(fst.complete(w1));
2042 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2043 >        assertTrue(snd.complete(w2));
2044 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2045 >
2046 >        checkCompletedWithWrappedCFException(h1);
2047 >        checkCompletedWithWrappedCFException(h2);
2048 >        checkCompletedWithWrappedCFException(h3);
2049 >        r1.assertInvoked();
2050 >        r2.assertInvoked();
2051 >        r3.assertInvoked();
2052 >        checkCompletedNormally(f, v1);
2053 >        checkCompletedNormally(g, v2);
2054 >    }}
2055  
2056      /**
2057       * applyToEither result completes normally after normal completion
2058       * of either source
2059       */
2060 <    public void testApplyToEither() {
2061 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2062 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2063 <        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
2064 <        f.complete(one);
2065 <        checkCompletedNormally(g, two);
2066 <        f2.complete(one);
2067 <        checkCompletedNormally(g, two);
2068 <
2069 <        f = new CompletableFuture<>();
2070 <        f.complete(one);
2071 <        f2 = new CompletableFuture<>();
2072 <        g = f.applyToEither(f2, inc);
2073 <        checkCompletedNormally(g, two);
2074 <    }
2060 >    public void testApplyToEither_normalCompletion() {
2061 >        for (ExecutionMode m : ExecutionMode.values())
2062 >        for (Integer v1 : new Integer[] { 1, null })
2063 >        for (Integer v2 : new Integer[] { 2, null })
2064 >    {
2065 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2066 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2067 >        final IncFunction[] rs = new IncFunction[6];
2068 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2069 >
2070 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2071 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2072 >        checkIncomplete(h0);
2073 >        checkIncomplete(h1);
2074 >        rs[0].assertNotInvoked();
2075 >        rs[1].assertNotInvoked();
2076 >        f.complete(v1);
2077 >        checkCompletedNormally(h0, inc(v1));
2078 >        checkCompletedNormally(h1, inc(v1));
2079 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2080 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2081 >        checkCompletedNormally(h2, inc(v1));
2082 >        checkCompletedNormally(h3, inc(v1));
2083 >        g.complete(v2);
2084 >
2085 >        // unspecified behavior - both source completions available
2086 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2087 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2088 >        rs[4].assertValue(h4.join());
2089 >        rs[5].assertValue(h5.join());
2090 >        assertTrue(Objects.equals(inc(v1), h4.join()) ||
2091 >                   Objects.equals(inc(v2), h4.join()));
2092 >        assertTrue(Objects.equals(inc(v1), h5.join()) ||
2093 >                   Objects.equals(inc(v2), h5.join()));
2094 >
2095 >        checkCompletedNormally(f, v1);
2096 >        checkCompletedNormally(g, v2);
2097 >        checkCompletedNormally(h0, inc(v1));
2098 >        checkCompletedNormally(h1, inc(v1));
2099 >        checkCompletedNormally(h2, inc(v1));
2100 >        checkCompletedNormally(h3, inc(v1));
2101 >        for (int i = 0; i < 4; i++) rs[i].assertValue(inc(v1));
2102 >    }}
2103  
2104      /**
2105       * applyToEither result completes exceptionally after exceptional
2106       * completion of either source
2107       */
2108 <    public void testApplyToEither2() {
2109 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2110 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2111 <        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
2112 <        f.completeExceptionally(new CFException());
2113 <        f2.complete(one);
2114 <        checkCompletedWithWrappedCFException(g);
2108 >    public void testApplyToEither_exceptionalCompletion() {
2109 >        for (ExecutionMode m : ExecutionMode.values())
2110 >        for (Integer v1 : new Integer[] { 1, null })
2111 >    {
2112 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2113 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2114 >        final CFException ex = new CFException();
2115 >        final IncFunction[] rs = new IncFunction[6];
2116 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2117 >
2118 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2119 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2120 >        checkIncomplete(h0);
2121 >        checkIncomplete(h1);
2122 >        rs[0].assertNotInvoked();
2123 >        rs[1].assertNotInvoked();
2124 >        f.completeExceptionally(ex);
2125 >        checkCompletedWithWrappedException(h0, ex);
2126 >        checkCompletedWithWrappedException(h1, ex);
2127 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2128 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2129 >        checkCompletedWithWrappedException(h2, ex);
2130 >        checkCompletedWithWrappedException(h3, ex);
2131 >        g.complete(v1);
2132 >
2133 >        // unspecified behavior - both source completions available
2134 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2135 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2136 >        try {
2137 >            assertEquals(inc(v1), h4.join());
2138 >            rs[4].assertValue(inc(v1));
2139 >        } catch (CompletionException ok) {
2140 >            checkCompletedWithWrappedException(h4, ex);
2141 >            rs[4].assertNotInvoked();
2142 >        }
2143 >        try {
2144 >            assertEquals(inc(v1), h5.join());
2145 >            rs[5].assertValue(inc(v1));
2146 >        } catch (CompletionException ok) {
2147 >            checkCompletedWithWrappedException(h5, ex);
2148 >            rs[5].assertNotInvoked();
2149 >        }
2150  
2151 <        f = new CompletableFuture<>();
2152 <        f2 = new CompletableFuture<>();
2153 <        f2.completeExceptionally(new CFException());
2154 <        g = f.applyToEither(f2, inc);
2155 <        checkCompletedWithWrappedCFException(g);
2156 <    }
2151 >        checkCompletedExceptionally(f, ex);
2152 >        checkCompletedNormally(g, v1);
2153 >        checkCompletedWithWrappedException(h0, ex);
2154 >        checkCompletedWithWrappedException(h1, ex);
2155 >        checkCompletedWithWrappedException(h2, ex);
2156 >        checkCompletedWithWrappedException(h3, ex);
2157 >        checkCompletedWithWrappedException(h4, ex);
2158 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2159 >    }}
2160 >
2161 >    public void testApplyToEither_exceptionalCompletion2() {
2162 >        for (ExecutionMode m : ExecutionMode.values())
2163 >        for (boolean fFirst : new boolean[] { true, false })
2164 >        for (Integer v1 : new Integer[] { 1, null })
2165 >    {
2166 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2167 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2168 >        final CFException ex = new CFException();
2169 >        final IncFunction[] rs = new IncFunction[6];
2170 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2171 >
2172 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2173 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2174 >        assertTrue(fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2175 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2176 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2177 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2178  
2179 <    /**
2180 <     * applyToEither result completes exceptionally if action does
2181 <     */
2182 <    public void testApplyToEither3() {
2183 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2184 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2185 <        FailingFunction r = new FailingFunction();
2186 <        CompletableFuture<Integer> g = f.applyToEither(f2, r);
2187 <        f2.complete(two);
2188 <        checkCompletedWithWrappedCFException(g);
2189 <    }
2179 >        // unspecified behavior - both source completions available
2180 >        try {
2181 >            assertEquals(inc(v1), h0.join());
2182 >            rs[0].assertValue(inc(v1));
2183 >        } catch (CompletionException ok) {
2184 >            checkCompletedWithWrappedException(h0, ex);
2185 >            rs[0].assertNotInvoked();
2186 >        }
2187 >        try {
2188 >            assertEquals(inc(v1), h1.join());
2189 >            rs[1].assertValue(inc(v1));
2190 >        } catch (CompletionException ok) {
2191 >            checkCompletedWithWrappedException(h1, ex);
2192 >            rs[1].assertNotInvoked();
2193 >        }
2194 >        try {
2195 >            assertEquals(inc(v1), h2.join());
2196 >            rs[2].assertValue(inc(v1));
2197 >        } catch (CompletionException ok) {
2198 >            checkCompletedWithWrappedException(h2, ex);
2199 >            rs[2].assertNotInvoked();
2200 >        }
2201 >        try {
2202 >            assertEquals(inc(v1), h3.join());
2203 >            rs[3].assertValue(inc(v1));
2204 >        } catch (CompletionException ok) {
2205 >            checkCompletedWithWrappedException(h3, ex);
2206 >            rs[3].assertNotInvoked();
2207 >        }
2208  
2209 <    /**
2210 <     * applyToEither result completes exceptionally if either source cancelled
2211 <     */
1056 <    public void testApplyToEither4() {
1057 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1058 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1059 <        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
1060 <        assertTrue(f.cancel(true));
1061 <        checkCompletedWithWrappedCancellationException(g);
1062 <        f = new CompletableFuture<>();
1063 <        f2 = new CompletableFuture<>();
1064 <        assertTrue(f2.cancel(true));
1065 <        checkCompletedWithWrappedCancellationException(g);
1066 <    }
2209 >        checkCompletedNormally(f, v1);
2210 >        checkCompletedExceptionally(g, ex);
2211 >    }}
2212  
2213      /**
2214 <     * acceptEither result completes normally after normal completion
1070 <     * of either source
2214 >     * applyToEither result completes exceptionally if either source cancelled
2215       */
2216 <    public void testAcceptEither() {
2217 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2218 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2219 <        IncAction r = new IncAction();
2220 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
2221 <        f.complete(one);
2222 <        checkCompletedNormally(g, null);
2223 <        f2.complete(one);
2224 <        checkCompletedNormally(g, null);
2225 <        assertEquals(r.value, 2);
2226 <
2227 <        r = new IncAction();
2228 <        f = new CompletableFuture<>();
2229 <        f.complete(one);
2230 <        f2 = new CompletableFuture<>();
2231 <        g = f.acceptEither(f2, r);
2232 <        checkCompletedNormally(g, null);
2233 <        assertEquals(r.value, 2);
2234 <    }
2216 >    public void testApplyToEither_sourceCancelled() {
2217 >        for (ExecutionMode m : ExecutionMode.values())
2218 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2219 >        for (Integer v1 : new Integer[] { 1, null })
2220 >    {
2221 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2222 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2223 >        final IncFunction[] rs = new IncFunction[6];
2224 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2225 >
2226 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2227 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2228 >        checkIncomplete(h0);
2229 >        checkIncomplete(h1);
2230 >        rs[0].assertNotInvoked();
2231 >        rs[1].assertNotInvoked();
2232 >        f.cancel(mayInterruptIfRunning);
2233 >        checkCompletedWithWrappedCancellationException(h0);
2234 >        checkCompletedWithWrappedCancellationException(h1);
2235 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2236 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2237 >        checkCompletedWithWrappedCancellationException(h2);
2238 >        checkCompletedWithWrappedCancellationException(h3);
2239 >        g.complete(v1);
2240 >
2241 >        // unspecified behavior - both source completions available
2242 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2243 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2244 >        try {
2245 >            assertEquals(inc(v1), h4.join());
2246 >            rs[4].assertValue(inc(v1));
2247 >        } catch (CompletionException ok) {
2248 >            checkCompletedWithWrappedCancellationException(h4);
2249 >            rs[4].assertNotInvoked();
2250 >        }
2251 >        try {
2252 >            assertEquals(inc(v1), h5.join());
2253 >            rs[5].assertValue(inc(v1));
2254 >        } catch (CompletionException ok) {
2255 >            checkCompletedWithWrappedCancellationException(h5);
2256 >            rs[5].assertNotInvoked();
2257 >        }
2258  
2259 <    /**
2260 <     * acceptEither result completes exceptionally after exceptional
2261 <     * completion of either source
2262 <     */
2263 <    public void testAcceptEither2() {
2264 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2265 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2266 <        IncAction r = new IncAction();
2267 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
2268 <        f.completeExceptionally(new CFException());
2269 <        f2.complete(one);
2270 <        checkCompletedWithWrappedCFException(g);
2259 >        checkCancelled(f);
2260 >        checkCompletedNormally(g, v1);
2261 >        checkCompletedWithWrappedCancellationException(h0);
2262 >        checkCompletedWithWrappedCancellationException(h1);
2263 >        checkCompletedWithWrappedCancellationException(h2);
2264 >        checkCompletedWithWrappedCancellationException(h3);
2265 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2266 >    }}
2267 >
2268 >    public void testApplyToEither_sourceCancelled2() {
2269 >        for (ExecutionMode m : ExecutionMode.values())
2270 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2271 >        for (boolean fFirst : new boolean[] { true, false })
2272 >        for (Integer v1 : new Integer[] { 1, null })
2273 >    {
2274 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2275 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2276 >        final IncFunction[] rs = new IncFunction[6];
2277 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2278 >
2279 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2280 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2281 >        assertTrue(fFirst ? f.complete(v1) : g.cancel(mayInterruptIfRunning));
2282 >        assertTrue(!fFirst ? f.complete(v1) : g.cancel(mayInterruptIfRunning));
2283 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2284 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2285  
2286 <        r = new IncAction();
2287 <        f = new CompletableFuture<>();
2288 <        f2 = new CompletableFuture<>();
2289 <        f2.completeExceptionally(new CFException());
2290 <        g = f.acceptEither(f2, r);
2291 <        checkCompletedWithWrappedCFException(g);
2292 <    }
2286 >        // unspecified behavior - both source completions available
2287 >        try {
2288 >            assertEquals(inc(v1), h0.join());
2289 >            rs[0].assertValue(inc(v1));
2290 >        } catch (CompletionException ok) {
2291 >            checkCompletedWithWrappedCancellationException(h0);
2292 >            rs[0].assertNotInvoked();
2293 >        }
2294 >        try {
2295 >            assertEquals(inc(v1), h1.join());
2296 >            rs[1].assertValue(inc(v1));
2297 >        } catch (CompletionException ok) {
2298 >            checkCompletedWithWrappedCancellationException(h1);
2299 >            rs[1].assertNotInvoked();
2300 >        }
2301 >        try {
2302 >            assertEquals(inc(v1), h2.join());
2303 >            rs[2].assertValue(inc(v1));
2304 >        } catch (CompletionException ok) {
2305 >            checkCompletedWithWrappedCancellationException(h2);
2306 >            rs[2].assertNotInvoked();
2307 >        }
2308 >        try {
2309 >            assertEquals(inc(v1), h3.join());
2310 >            rs[3].assertValue(inc(v1));
2311 >        } catch (CompletionException ok) {
2312 >            checkCompletedWithWrappedCancellationException(h3);
2313 >            rs[3].assertNotInvoked();
2314 >        }
2315  
2316 <    /**
2317 <     * acceptEither result completes exceptionally if action does
2318 <     */
1116 <    public void testAcceptEither3() {
1117 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1118 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1119 <        FailingConsumer r = new FailingConsumer();
1120 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
1121 <        f2.complete(two);
1122 <        checkCompletedWithWrappedCFException(g);
1123 <    }
2316 >        checkCompletedNormally(f, v1);
2317 >        checkCancelled(g);
2318 >    }}
2319  
2320      /**
2321 <     * acceptEither result completes exceptionally if either source cancelled
2321 >     * applyToEither result completes exceptionally if action does
2322       */
2323 <    public void testAcceptEither4() {
2324 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2325 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2326 <        IncAction r = new IncAction();
2327 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
2328 <        assertTrue(f.cancel(true));
2329 <        checkCompletedWithWrappedCancellationException(g);
2330 <        f = new CompletableFuture<>();
2331 <        f2 = new CompletableFuture<>();
2332 <        assertTrue(f2.cancel(true));
2333 <        checkCompletedWithWrappedCancellationException(g);
2334 <    }
2335 <
2323 >    public void testApplyToEither_actionFailed() {
2324 >        for (ExecutionMode m : ExecutionMode.values())
2325 >        for (Integer v1 : new Integer[] { 1, null })
2326 >        for (Integer v2 : new Integer[] { 2, null })
2327 >    {
2328 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2329 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2330 >        final FailingFunction[] rs = new FailingFunction[6];
2331 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingFunction(m);
2332 >
2333 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2334 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2335 >        f.complete(v1);
2336 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2337 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2338 >        checkCompletedWithWrappedCFException(h0);
2339 >        checkCompletedWithWrappedCFException(h1);
2340 >        checkCompletedWithWrappedCFException(h2);
2341 >        checkCompletedWithWrappedCFException(h3);
2342 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2343 >
2344 >        g.complete(v2);
2345 >
2346 >        // unspecified behavior - both source completions available
2347 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2348 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2349 >
2350 >        checkCompletedWithWrappedCFException(h4);
2351 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2352 >                   Objects.equals(v2, rs[4].value));
2353 >        checkCompletedWithWrappedCFException(h5);
2354 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2355 >                   Objects.equals(v2, rs[5].value));
2356 >
2357 >        checkCompletedNormally(f, v1);
2358 >        checkCompletedNormally(g, v2);
2359 >    }}
2360  
2361      /**
2362 <     * runAfterEither result completes normally after normal completion
2362 >     * acceptEither result completes normally after normal completion
2363       * of either source
2364       */
2365 <    public void testRunAfterEither() {
2366 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2367 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2368 <        Noop r = new Noop();
2369 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
2370 <        f.complete(one);
2371 <        checkCompletedNormally(g, null);
2372 <        f2.complete(one);
2373 <        checkCompletedNormally(g, null);
2374 <        assertTrue(r.ran);
2375 <
2376 <        r = new Noop();
2377 <        f = new CompletableFuture<>();
2378 <        f.complete(one);
2379 <        f2 = new CompletableFuture<>();
2380 <        g = f.runAfterEither(f2, r);
2381 <        checkCompletedNormally(g, null);
2382 <        assertTrue(r.ran);
2383 <    }
2365 >    public void testAcceptEither_normalCompletion() {
2366 >        for (ExecutionMode m : ExecutionMode.values())
2367 >        for (Integer v1 : new Integer[] { 1, null })
2368 >        for (Integer v2 : new Integer[] { 2, null })
2369 >    {
2370 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2371 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2372 >        final NoopConsumer[] rs = new NoopConsumer[6];
2373 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2374 >
2375 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2376 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2377 >        checkIncomplete(h0);
2378 >        checkIncomplete(h1);
2379 >        rs[0].assertNotInvoked();
2380 >        rs[1].assertNotInvoked();
2381 >        f.complete(v1);
2382 >        checkCompletedNormally(h0, null);
2383 >        checkCompletedNormally(h1, null);
2384 >        rs[0].assertValue(v1);
2385 >        rs[1].assertValue(v1);
2386 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2387 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2388 >        checkCompletedNormally(h2, null);
2389 >        checkCompletedNormally(h3, null);
2390 >        rs[2].assertValue(v1);
2391 >        rs[3].assertValue(v1);
2392 >        g.complete(v2);
2393 >
2394 >        // unspecified behavior - both source completions available
2395 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2396 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2397 >        checkCompletedNormally(h4, null);
2398 >        checkCompletedNormally(h5, null);
2399 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2400 >                   Objects.equals(v2, rs[4].value));
2401 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2402 >                   Objects.equals(v2, rs[5].value));
2403 >
2404 >        checkCompletedNormally(f, v1);
2405 >        checkCompletedNormally(g, v2);
2406 >        checkCompletedNormally(h0, null);
2407 >        checkCompletedNormally(h1, null);
2408 >        checkCompletedNormally(h2, null);
2409 >        checkCompletedNormally(h3, null);
2410 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2411 >    }}
2412  
2413      /**
2414 <     * runAfterEither result completes exceptionally after exceptional
2414 >     * acceptEither result completes exceptionally after exceptional
2415       * completion of either source
2416       */
2417 <    public void testRunAfterEither2() {
2418 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2419 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2420 <        Noop r = new Noop();
2421 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
2422 <        f.completeExceptionally(new CFException());
2423 <        f2.complete(one);
2424 <        checkCompletedWithWrappedCFException(g);
2425 <
2426 <        r = new Noop();
2427 <        f = new CompletableFuture<>();
2428 <        f2 = new CompletableFuture<>();
2429 <        f2.completeExceptionally(new CFException());
2430 <        g = f.runAfterEither(f2, r);
2431 <        checkCompletedWithWrappedCFException(g);
2432 <    }
2433 <
2434 <    /**
2435 <     * runAfterEither result completes exceptionally if action does
2436 <     */
2437 <    public void testRunAfterEither3() {
2438 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2439 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2440 <        FailingNoop r = new FailingNoop();
2441 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
2442 <        f2.complete(two);
2443 <        checkCompletedWithWrappedCFException(g);
2444 <    }
2445 <
1199 <    /**
1200 <     * runAfterEither result completes exceptionally if either source cancelled
1201 <     */
1202 <    public void testRunAfterEither4() {
1203 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1204 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1205 <        Noop r = new Noop();
1206 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
1207 <        assertTrue(f.cancel(true));
1208 <        checkCompletedWithWrappedCancellationException(g);
1209 <        f = new CompletableFuture<>();
1210 <        f2 = new CompletableFuture<>();
1211 <        assertTrue(f2.cancel(true));
1212 <        checkCompletedWithWrappedCancellationException(g);
1213 <    }
1214 <
1215 <    /**
1216 <     * thenCompose result completes normally after normal completion of source
1217 <     */
1218 <    public void testThenCompose() {
1219 <        CompletableFuture<Integer> f, g;
1220 <        CompletableFutureInc r;
1221 <
1222 <        f = new CompletableFuture<>();
1223 <        g = f.thenCompose(r = new CompletableFutureInc());
1224 <        f.complete(one);
1225 <        checkCompletedNormally(g, two);
1226 <        assertTrue(r.ran);
1227 <
1228 <        f = new CompletableFuture<>();
1229 <        f.complete(one);
1230 <        g = f.thenCompose(r = new CompletableFutureInc());
1231 <        checkCompletedNormally(g, two);
1232 <        assertTrue(r.ran);
1233 <    }
1234 <
1235 <    /**
1236 <     * thenCompose result completes exceptionally after exceptional
1237 <     * completion of source
1238 <     */
1239 <    public void testThenCompose2() {
1240 <        CompletableFuture<Integer> f, g;
1241 <        CompletableFutureInc r;
1242 <
1243 <        f = new CompletableFuture<>();
1244 <        g = f.thenCompose(r = new CompletableFutureInc());
1245 <        f.completeExceptionally(new CFException());
1246 <        checkCompletedWithWrappedCFException(g);
1247 <
1248 <        f = new CompletableFuture<>();
1249 <        f.completeExceptionally(new CFException());
1250 <        g = f.thenCompose(r = new CompletableFutureInc());
1251 <        checkCompletedWithWrappedCFException(g);
1252 <    }
1253 <
1254 <    /**
1255 <     * thenCompose result completes exceptionally if action does
1256 <     */
1257 <    public void testThenCompose3() {
1258 <        CompletableFuture<Integer> f, g;
1259 <        FailingCompletableFutureFunction r;
1260 <
1261 <        f = new CompletableFuture<>();
1262 <        g = f.thenCompose(r = new FailingCompletableFutureFunction());
1263 <        f.complete(one);
1264 <        checkCompletedWithWrappedCFException(g);
1265 <
1266 <        f = new CompletableFuture<>();
1267 <        f.complete(one);
1268 <        g = f.thenCompose(r = new FailingCompletableFutureFunction());
1269 <        checkCompletedWithWrappedCFException(g);
1270 <    }
1271 <
1272 <    /**
1273 <     * thenCompose result completes exceptionally if source cancelled
1274 <     */
1275 <    public void testThenCompose4() {
1276 <        CompletableFuture<Integer> f, g;
1277 <        CompletableFutureInc r;
1278 <
1279 <        f = new CompletableFuture<>();
1280 <        g = f.thenCompose(r = new CompletableFutureInc());
1281 <        assertTrue(f.cancel(true));
1282 <        checkCompletedWithWrappedCancellationException(g);
1283 <
1284 <        f = new CompletableFuture<>();
1285 <        assertTrue(f.cancel(true));
1286 <        g = f.thenCompose(r = new CompletableFutureInc());
1287 <        checkCompletedWithWrappedCancellationException(g);
1288 <    }
1289 <
1290 <
1291 <    // asyncs
1292 <
1293 <    /**
1294 <     * thenRunAsync result completes normally after normal completion of source
1295 <     */
1296 <    public void testThenRunAsync() {
1297 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1298 <        Noop r = new Noop();
1299 <        CompletableFuture<Void> g = f.thenRunAsync(r);
1300 <        f.complete(null);
1301 <        checkCompletedNormally(g, null);
1302 <
1303 <        // reordered version
1304 <        f = new CompletableFuture<>();
1305 <        f.complete(null);
1306 <        r = new Noop();
1307 <        g = f.thenRunAsync(r);
1308 <        checkCompletedNormally(g, null);
1309 <    }
1310 <
1311 <    /**
1312 <     * thenRunAsync result completes exceptionally after exceptional
1313 <     * completion of source
1314 <     */
1315 <    public void testThenRunAsync2() {
1316 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1317 <        Noop r = new Noop();
1318 <        CompletableFuture<Void> g = f.thenRunAsync(r);
1319 <        f.completeExceptionally(new CFException());
2417 >    public void testAcceptEither_exceptionalCompletion() {
2418 >        for (ExecutionMode m : ExecutionMode.values())
2419 >        for (Integer v1 : new Integer[] { 1, null })
2420 >    {
2421 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2422 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2423 >        final CFException ex = new CFException();
2424 >        final NoopConsumer[] rs = new NoopConsumer[6];
2425 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2426 >
2427 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2428 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2429 >        checkIncomplete(h0);
2430 >        checkIncomplete(h1);
2431 >        rs[0].assertNotInvoked();
2432 >        rs[1].assertNotInvoked();
2433 >        f.completeExceptionally(ex);
2434 >        checkCompletedWithWrappedException(h0, ex);
2435 >        checkCompletedWithWrappedException(h1, ex);
2436 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2437 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2438 >        checkCompletedWithWrappedException(h2, ex);
2439 >        checkCompletedWithWrappedException(h3, ex);
2440 >
2441 >        g.complete(v1);
2442 >
2443 >        // unspecified behavior - both source completions available
2444 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2445 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2446          try {
2447 <            g.join();
2448 <            shouldThrow();
2449 <        } catch (Exception ok) {
2447 >            assertNull(h4.join());
2448 >            rs[4].assertValue(v1);
2449 >        } catch (CompletionException ok) {
2450 >            checkCompletedWithWrappedException(h4, ex);
2451 >            rs[4].assertNotInvoked();
2452 >        }
2453 >        try {
2454 >            assertNull(h5.join());
2455 >            rs[5].assertValue(v1);
2456 >        } catch (CompletionException ok) {
2457 >            checkCompletedWithWrappedException(h5, ex);
2458 >            rs[5].assertNotInvoked();
2459          }
1325        checkCompletedWithWrappedCFException(g);
1326    }
1327
1328    /**
1329     * thenRunAsync result completes exceptionally if action does
1330     */
1331    public void testThenRunAsync3() {
1332        CompletableFuture<Integer> f = new CompletableFuture<>();
1333        FailingNoop r = new FailingNoop();
1334        CompletableFuture<Void> g = f.thenRunAsync(r);
1335        f.complete(null);
1336        checkCompletedWithWrappedCFException(g);
1337    }
1338
1339    /**
1340     * thenRunAsync result completes exceptionally if source cancelled
1341     */
1342    public void testThenRunAsync4() {
1343        CompletableFuture<Integer> f = new CompletableFuture<>();
1344        Noop r = new Noop();
1345        CompletableFuture<Void> g = f.thenRunAsync(r);
1346        assertTrue(f.cancel(true));
1347        checkCompletedWithWrappedCancellationException(g);
1348    }
1349
1350    /**
1351     * thenApplyAsync result completes normally after normal completion of source
1352     */
1353    public void testThenApplyAsync() {
1354        CompletableFuture<Integer> f = new CompletableFuture<>();
1355        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
1356        f.complete(one);
1357        checkCompletedNormally(g, two);
1358    }
1359
1360    /**
1361     * thenApplyAsync result completes exceptionally after exceptional
1362     * completion of source
1363     */
1364    public void testThenApplyAsync2() {
1365        CompletableFuture<Integer> f = new CompletableFuture<>();
1366        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
1367        f.completeExceptionally(new CFException());
1368        checkCompletedWithWrappedCFException(g);
1369    }
2460  
2461 <    /**
2462 <     * thenApplyAsync result completes exceptionally if action does
2463 <     */
2464 <    public void testThenApplyAsync3() {
2465 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2466 <        FailingFunction r = new FailingFunction();
2467 <        CompletableFuture<Integer> g = f.thenApplyAsync(r);
2468 <        f.complete(null);
2469 <        checkCompletedWithWrappedCFException(g);
2470 <    }
2461 >        checkCompletedExceptionally(f, ex);
2462 >        checkCompletedNormally(g, v1);
2463 >        checkCompletedWithWrappedException(h0, ex);
2464 >        checkCompletedWithWrappedException(h1, ex);
2465 >        checkCompletedWithWrappedException(h2, ex);
2466 >        checkCompletedWithWrappedException(h3, ex);
2467 >        checkCompletedWithWrappedException(h4, ex);
2468 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2469 >    }}
2470 >
2471 >    public void testAcceptEither_exceptionalCompletion2() {
2472 >        for (ExecutionMode m : ExecutionMode.values())
2473 >        for (boolean fFirst : new boolean[] { true, false })
2474 >        for (Integer v1 : new Integer[] { 1, null })
2475 >    {
2476 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2477 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2478 >        final CFException ex = new CFException();
2479 >        final NoopConsumer[] rs = new NoopConsumer[6];
2480 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2481 >
2482 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2483 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2484 >        assertTrue(fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2485 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2486 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2487 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2488  
2489 <    /**
2490 <     * thenApplyAsync result completes exceptionally if source cancelled
2491 <     */
2492 <    public void testThenApplyAsync4() {
2493 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2494 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
2495 <        assertTrue(f.cancel(true));
2496 <        checkCompletedWithWrappedCancellationException(g);
2497 <    }
2489 >        // unspecified behavior - both source completions available
2490 >        try {
2491 >            assertEquals(null, h0.join());
2492 >            rs[0].assertValue(v1);
2493 >        } catch (CompletionException ok) {
2494 >            checkCompletedWithWrappedException(h0, ex);
2495 >            rs[0].assertNotInvoked();
2496 >        }
2497 >        try {
2498 >            assertEquals(null, h1.join());
2499 >            rs[1].assertValue(v1);
2500 >        } catch (CompletionException ok) {
2501 >            checkCompletedWithWrappedException(h1, ex);
2502 >            rs[1].assertNotInvoked();
2503 >        }
2504 >        try {
2505 >            assertEquals(null, h2.join());
2506 >            rs[2].assertValue(v1);
2507 >        } catch (CompletionException ok) {
2508 >            checkCompletedWithWrappedException(h2, ex);
2509 >            rs[2].assertNotInvoked();
2510 >        }
2511 >        try {
2512 >            assertEquals(null, h3.join());
2513 >            rs[3].assertValue(v1);
2514 >        } catch (CompletionException ok) {
2515 >            checkCompletedWithWrappedException(h3, ex);
2516 >            rs[3].assertNotInvoked();
2517 >        }
2518  
2519 <    /**
2520 <     * thenAcceptAsync result completes normally after normal
2521 <     * completion of source
1395 <     */
1396 <    public void testThenAcceptAsync() {
1397 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1398 <        IncAction r = new IncAction();
1399 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
1400 <        f.complete(one);
1401 <        checkCompletedNormally(g, null);
1402 <        assertEquals(r.value, 2);
1403 <    }
2519 >        checkCompletedNormally(f, v1);
2520 >        checkCompletedExceptionally(g, ex);
2521 >    }}
2522  
2523      /**
2524 <     * thenAcceptAsync result completes exceptionally after exceptional
1407 <     * completion of source
2524 >     * acceptEither result completes exceptionally if either source cancelled
2525       */
2526 <    public void testThenAcceptAsync2() {
2527 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2528 <        IncAction r = new IncAction();
2529 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2530 <        f.completeExceptionally(new CFException());
2531 <        checkCompletedWithWrappedCFException(g);
2532 <    }
2526 >    public void testAcceptEither_sourceCancelled() {
2527 >        for (ExecutionMode m : ExecutionMode.values())
2528 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2529 >        for (Integer v1 : new Integer[] { 1, null })
2530 >    {
2531 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2532 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2533 >        final NoopConsumer[] rs = new NoopConsumer[6];
2534 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2535 >
2536 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2537 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2538 >        checkIncomplete(h0);
2539 >        checkIncomplete(h1);
2540 >        rs[0].assertNotInvoked();
2541 >        rs[1].assertNotInvoked();
2542 >        f.cancel(mayInterruptIfRunning);
2543 >        checkCompletedWithWrappedCancellationException(h0);
2544 >        checkCompletedWithWrappedCancellationException(h1);
2545 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2546 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2547 >        checkCompletedWithWrappedCancellationException(h2);
2548 >        checkCompletedWithWrappedCancellationException(h3);
2549 >
2550 >        g.complete(v1);
2551 >
2552 >        // unspecified behavior - both source completions available
2553 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2554 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2555 >        try {
2556 >            assertNull(h4.join());
2557 >            rs[4].assertValue(v1);
2558 >        } catch (CompletionException ok) {
2559 >            checkCompletedWithWrappedCancellationException(h4);
2560 >            rs[4].assertNotInvoked();
2561 >        }
2562 >        try {
2563 >            assertNull(h5.join());
2564 >            rs[5].assertValue(v1);
2565 >        } catch (CompletionException ok) {
2566 >            checkCompletedWithWrappedCancellationException(h5);
2567 >            rs[5].assertNotInvoked();
2568 >        }
2569  
2570 <    /**
2571 <     * thenAcceptAsync result completes exceptionally if action does
2572 <     */
2573 <    public void testThenAcceptAsync3() {
2574 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2575 <        FailingConsumer r = new FailingConsumer();
2576 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2577 <        f.complete(null);
1425 <        checkCompletedWithWrappedCFException(g);
1426 <    }
2570 >        checkCancelled(f);
2571 >        checkCompletedNormally(g, v1);
2572 >        checkCompletedWithWrappedCancellationException(h0);
2573 >        checkCompletedWithWrappedCancellationException(h1);
2574 >        checkCompletedWithWrappedCancellationException(h2);
2575 >        checkCompletedWithWrappedCancellationException(h3);
2576 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2577 >    }}
2578  
2579      /**
2580 <     * thenAcceptAsync result completes exceptionally if source cancelled
2580 >     * acceptEither result completes exceptionally if action does
2581       */
2582 <    public void testThenAcceptAsync4() {
2583 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2584 <        IncAction r = new IncAction();
2585 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2586 <        assertTrue(f.cancel(true));
2587 <        checkCompletedWithWrappedCancellationException(g);
2588 <    }
2582 >    public void testAcceptEither_actionFailed() {
2583 >        for (ExecutionMode m : ExecutionMode.values())
2584 >        for (Integer v1 : new Integer[] { 1, null })
2585 >        for (Integer v2 : new Integer[] { 2, null })
2586 >    {
2587 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2588 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2589 >        final FailingConsumer[] rs = new FailingConsumer[6];
2590 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingConsumer(m);
2591 >
2592 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2593 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2594 >        f.complete(v1);
2595 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2596 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2597 >        checkCompletedWithWrappedCFException(h0);
2598 >        checkCompletedWithWrappedCFException(h1);
2599 >        checkCompletedWithWrappedCFException(h2);
2600 >        checkCompletedWithWrappedCFException(h3);
2601 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2602 >
2603 >        g.complete(v2);
2604 >
2605 >        // unspecified behavior - both source completions available
2606 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2607 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2608 >
2609 >        checkCompletedWithWrappedCFException(h4);
2610 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2611 >                   Objects.equals(v2, rs[4].value));
2612 >        checkCompletedWithWrappedCFException(h5);
2613 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2614 >                   Objects.equals(v2, rs[5].value));
2615 >
2616 >        checkCompletedNormally(f, v1);
2617 >        checkCompletedNormally(g, v2);
2618 >    }}
2619  
2620      /**
2621 <     * thenCombineAsync result completes normally after normal
2622 <     * completion of sources
2621 >     * runAfterEither result completes normally after normal completion
2622 >     * of either source
2623       */
2624 <    public void testThenCombineAsync() {
2625 <        CompletableFuture<Integer> f, g, h;
2626 <
2627 <        f = new CompletableFuture<>();
2628 <        g = new CompletableFuture<>();
2629 <        h = f.thenCombineAsync(g, subtract);
2630 <        f.complete(3);
2631 <        checkIncomplete(h);
2632 <        g.complete(1);
2633 <        checkCompletedNormally(h, 2);
2634 <
2635 <        f = new CompletableFuture<>();
2636 <        g = new CompletableFuture<>();
2637 <        h = f.thenCombineAsync(g, subtract);
2638 <        g.complete(1);
2639 <        checkIncomplete(h);
2640 <        f.complete(3);
2641 <        checkCompletedNormally(h, 2);
2642 <
2643 <        f = new CompletableFuture<>();
2644 <        g = new CompletableFuture<>();
2645 <        g.complete(1);
2646 <        f.complete(3);
2647 <        h = f.thenCombineAsync(g, subtract);
2648 <        checkCompletedNormally(h, 2);
2649 <    }
2624 >    public void testRunAfterEither_normalCompletion() {
2625 >        for (ExecutionMode m : ExecutionMode.values())
2626 >        for (Integer v1 : new Integer[] { 1, null })
2627 >        for (Integer v2 : new Integer[] { 2, null })
2628 >    {
2629 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2630 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2631 >        final Noop[] rs = new Noop[6];
2632 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2633 >
2634 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2635 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2636 >        checkIncomplete(h0);
2637 >        checkIncomplete(h1);
2638 >        rs[0].assertNotInvoked();
2639 >        rs[1].assertNotInvoked();
2640 >        f.complete(v1);
2641 >        checkCompletedNormally(h0, null);
2642 >        checkCompletedNormally(h1, null);
2643 >        rs[0].assertInvoked();
2644 >        rs[1].assertInvoked();
2645 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2646 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2647 >        checkCompletedNormally(h2, null);
2648 >        checkCompletedNormally(h3, null);
2649 >        rs[2].assertInvoked();
2650 >        rs[3].assertInvoked();
2651 >
2652 >        g.complete(v2);
2653 >
2654 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2655 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2656 >
2657 >        checkCompletedNormally(f, v1);
2658 >        checkCompletedNormally(g, v2);
2659 >        checkCompletedNormally(h0, null);
2660 >        checkCompletedNormally(h1, null);
2661 >        checkCompletedNormally(h2, null);
2662 >        checkCompletedNormally(h3, null);
2663 >        checkCompletedNormally(h4, null);
2664 >        checkCompletedNormally(h5, null);
2665 >        for (int i = 0; i < 6; i++) rs[i].assertInvoked();
2666 >    }}
2667  
2668      /**
2669 <     * thenCombineAsync result completes exceptionally after exceptional
2669 >     * runAfterEither result completes exceptionally after exceptional
2670       * completion of either source
2671       */
2672 <    public void testThenCombineAsync2() {
2673 <        CompletableFuture<Integer> f, g, h;
2674 <
2675 <        f = new CompletableFuture<>();
2676 <        g = new CompletableFuture<>();
2677 <        h = f.thenCombineAsync(g, subtract);
2678 <        f.completeExceptionally(new CFException());
2679 <        checkIncomplete(h);
2680 <        g.complete(1);
2681 <        checkCompletedWithWrappedCFException(h);
2682 <
2683 <        f = new CompletableFuture<>();
2684 <        g = new CompletableFuture<>();
2685 <        h = f.thenCombineAsync(g, subtract);
2686 <        g.completeExceptionally(new CFException());
2687 <        checkIncomplete(h);
2688 <        f.complete(3);
2689 <        checkCompletedWithWrappedCFException(h);
2690 <
2691 <        f = new CompletableFuture<>();
2692 <        g = new CompletableFuture<>();
2693 <        g.completeExceptionally(new CFException());
2694 <        f.complete(3);
2695 <        h = f.thenCombineAsync(g, subtract);
2696 <        checkCompletedWithWrappedCFException(h);
2697 <    }
2698 <
2699 <    /**
2700 <     * thenCombineAsync result completes exceptionally if action does
2701 <     */
2702 <    public void testThenCombineAsync3() {
2703 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2704 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2705 <        FailingBiFunction r = new FailingBiFunction();
2706 <        CompletableFuture<Integer> g = f.thenCombineAsync(f2, r);
2707 <        f.complete(one);
2708 <        checkIncomplete(g);
2709 <        assertFalse(r.ran);
2710 <        f2.complete(two);
2711 <        checkCompletedWithWrappedCFException(g);
2712 <        assertTrue(r.ran);
2713 <    }
2714 <
1517 <    /**
1518 <     * thenCombineAsync result completes exceptionally if either source cancelled
1519 <     */
1520 <    public void testThenCombineAsync4() {
1521 <        CompletableFuture<Integer> f, g, h;
1522 <
1523 <        f = new CompletableFuture<>();
1524 <        g = new CompletableFuture<>();
1525 <        h = f.thenCombineAsync(g, subtract);
1526 <        assertTrue(f.cancel(true));
1527 <        checkIncomplete(h);
1528 <        g.complete(1);
1529 <        checkCompletedWithWrappedCancellationException(h);
1530 <
1531 <        f = new CompletableFuture<>();
1532 <        g = new CompletableFuture<>();
1533 <        h = f.thenCombineAsync(g, subtract);
1534 <        assertTrue(g.cancel(true));
1535 <        checkIncomplete(h);
1536 <        f.complete(3);
1537 <        checkCompletedWithWrappedCancellationException(h);
1538 <
1539 <        f = new CompletableFuture<>();
1540 <        g = new CompletableFuture<>();
1541 <        g.complete(3);
1542 <        assertTrue(f.cancel(true));
1543 <        h = f.thenCombineAsync(g, subtract);
1544 <        checkCompletedWithWrappedCancellationException(h);
1545 <
1546 <        f = new CompletableFuture<>();
1547 <        g = new CompletableFuture<>();
1548 <        f.complete(3);
1549 <        assertTrue(g.cancel(true));
1550 <        h = f.thenCombineAsync(g, subtract);
1551 <        checkCompletedWithWrappedCancellationException(h);
1552 <    }
1553 <
1554 <    /**
1555 <     * thenAcceptBothAsync result completes normally after normal
1556 <     * completion of sources
1557 <     */
1558 <    public void testThenAcceptBothAsync() {
1559 <        CompletableFuture<Integer> f, g;
1560 <        CompletableFuture<Void> h;
1561 <        SubtractAction r;
1562 <
1563 <        f = new CompletableFuture<>();
1564 <        g = new CompletableFuture<>();
1565 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1566 <        f.complete(3);
1567 <        checkIncomplete(h);
1568 <        g.complete(1);
1569 <        checkCompletedNormally(h, null);
1570 <        assertEquals(r.value, 2);
1571 <
1572 <        f = new CompletableFuture<>();
1573 <        g = new CompletableFuture<>();
1574 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1575 <        g.complete(1);
1576 <        checkIncomplete(h);
1577 <        f.complete(3);
1578 <        checkCompletedNormally(h, null);
1579 <        assertEquals(r.value, 2);
1580 <
1581 <        f = new CompletableFuture<>();
1582 <        g = new CompletableFuture<>();
1583 <        g.complete(1);
1584 <        f.complete(3);
1585 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1586 <        checkCompletedNormally(h, null);
1587 <        assertEquals(r.value, 2);
1588 <    }
1589 <
1590 <    /**
1591 <     * thenAcceptBothAsync result completes exceptionally after exceptional
1592 <     * completion of source
1593 <     */
1594 <    public void testThenAcceptBothAsync2() {
1595 <        CompletableFuture<Integer> f, g;
1596 <        CompletableFuture<Void> h;
1597 <        SubtractAction r;
1598 <
1599 <        f = new CompletableFuture<>();
1600 <        g = new CompletableFuture<>();
1601 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1602 <        f.completeExceptionally(new CFException());
1603 <        checkIncomplete(h);
1604 <        g.complete(1);
1605 <        checkCompletedWithWrappedCFException(h);
1606 <
1607 <        f = new CompletableFuture<>();
1608 <        g = new CompletableFuture<>();
1609 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1610 <        g.completeExceptionally(new CFException());
1611 <        checkIncomplete(h);
1612 <        f.complete(3);
1613 <        checkCompletedWithWrappedCFException(h);
1614 <
1615 <        f = new CompletableFuture<>();
1616 <        g = new CompletableFuture<>();
1617 <        f.complete(3);
1618 <        g.completeExceptionally(new CFException());
1619 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1620 <        checkCompletedWithWrappedCFException(h);
1621 <
1622 <        f = new CompletableFuture<>();
1623 <        g = new CompletableFuture<>();
1624 <        f.completeExceptionally(new CFException());
1625 <        g.complete(3);
1626 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1627 <        checkCompletedWithWrappedCFException(h);
1628 <    }
1629 <
1630 <    /**
1631 <     * thenAcceptBothAsync result completes exceptionally if action does
1632 <     */
1633 <    public void testThenAcceptBothAsync3() {
1634 <        CompletableFuture<Integer> f, g;
1635 <        CompletableFuture<Void> h;
1636 <        FailingBiConsumer r;
1637 <
1638 <        f = new CompletableFuture<>();
1639 <        g = new CompletableFuture<>();
1640 <        h = f.thenAcceptBothAsync(g, r = new FailingBiConsumer());
1641 <        f.complete(3);
1642 <        checkIncomplete(h);
1643 <        g.complete(1);
1644 <        checkCompletedWithWrappedCFException(h);
1645 <
1646 <        f = new CompletableFuture<>();
1647 <        g = new CompletableFuture<>();
1648 <        f.complete(3);
1649 <        g.complete(1);
1650 <        h = f.thenAcceptBothAsync(g, r = new FailingBiConsumer());
1651 <        checkCompletedWithWrappedCFException(h);
1652 <    }
1653 <
1654 <    /**
1655 <     * thenAcceptBothAsync result completes exceptionally if either source cancelled
1656 <     */
1657 <    public void testThenAcceptBothAsync4() {
1658 <        CompletableFuture<Integer> f, g;
1659 <        CompletableFuture<Void> h;
1660 <        SubtractAction r;
1661 <
1662 <        f = new CompletableFuture<>();
1663 <        g = new CompletableFuture<>();
1664 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1665 <        assertTrue(f.cancel(true));
1666 <        checkIncomplete(h);
1667 <        g.complete(1);
1668 <        checkCompletedWithWrappedCancellationException(h);
1669 <
1670 <        f = new CompletableFuture<>();
1671 <        g = new CompletableFuture<>();
1672 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1673 <        assertTrue(g.cancel(true));
1674 <        checkIncomplete(h);
1675 <        f.complete(3);
1676 <        checkCompletedWithWrappedCancellationException(h);
1677 <
1678 <        f = new CompletableFuture<>();
1679 <        g = new CompletableFuture<>();
1680 <        f.complete(3);
1681 <        assertTrue(g.cancel(true));
1682 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1683 <        checkCompletedWithWrappedCancellationException(h);
1684 <
1685 <        f = new CompletableFuture<>();
1686 <        g = new CompletableFuture<>();
1687 <        assertTrue(f.cancel(true));
1688 <        g.complete(3);
1689 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1690 <        checkCompletedWithWrappedCancellationException(h);
1691 <    }
1692 <
1693 <    /**
1694 <     * runAfterBothAsync result completes normally after normal
1695 <     * completion of sources
1696 <     */
1697 <    public void testRunAfterBothAsync() {
1698 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1699 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1700 <        Noop r = new Noop();
1701 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r);
1702 <        f.complete(one);
1703 <        checkIncomplete(g);
1704 <        f2.complete(two);
1705 <        checkCompletedNormally(g, null);
1706 <        assertTrue(r.ran);
1707 <    }
1708 <
1709 <    /**
1710 <     * runAfterBothAsync result completes exceptionally after exceptional
1711 <     * completion of source
1712 <     */
1713 <    public void testRunAfterBothAsync2() {
1714 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1715 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1716 <        Noop r = new Noop();
1717 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r);
1718 <        f.completeExceptionally(new CFException());
1719 <        f2.complete(two);
1720 <        checkCompletedWithWrappedCFException(g);
1721 <
1722 <        r = new Noop();
1723 <        f = new CompletableFuture<>();
1724 <        f2 = new CompletableFuture<>();
1725 <        g = f.runAfterBothAsync(f2, r);
1726 <        f.complete(one);
1727 <        f2.completeExceptionally(new CFException());
1728 <        checkCompletedWithWrappedCFException(g);
1729 <    }
1730 <
1731 <    /**
1732 <     * runAfterBothAsync result completes exceptionally if action does
1733 <     */
1734 <    public void testRunAfterBothAsync3() {
1735 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1736 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1737 <        FailingNoop r = new FailingNoop();
1738 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r);
1739 <        f.complete(one);
1740 <        checkIncomplete(g);
1741 <        f2.complete(two);
1742 <        checkCompletedWithWrappedCFException(g);
1743 <    }
1744 <
1745 <    /**
1746 <     * runAfterBothAsync result completes exceptionally if either source cancelled
1747 <     */
1748 <    public void testRunAfterBothAsync4() {
1749 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1750 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1751 <        Noop r = new Noop();
1752 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r);
1753 <        assertTrue(f.cancel(true));
1754 <        f2.complete(two);
1755 <        checkCompletedWithWrappedCancellationException(g);
1756 <
1757 <        r = new Noop();
1758 <        f = new CompletableFuture<>();
1759 <        f2 = new CompletableFuture<>();
1760 <        g = f.runAfterBothAsync(f2, r);
1761 <        f.complete(one);
1762 <        assertTrue(f2.cancel(true));
1763 <        checkCompletedWithWrappedCancellationException(g);
1764 <    }
1765 <
1766 <    /**
1767 <     * applyToEitherAsync result completes normally after normal
1768 <     * completion of sources
1769 <     */
1770 <    public void testApplyToEitherAsync() {
1771 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1772 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1773 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
1774 <        f.complete(one);
1775 <        checkCompletedNormally(g, two);
1776 <
1777 <        f = new CompletableFuture<>();
1778 <        f.complete(one);
1779 <        f2 = new CompletableFuture<>();
1780 <        g = f.applyToEitherAsync(f2, inc);
1781 <        checkCompletedNormally(g, two);
1782 <    }
1783 <
1784 <    /**
1785 <     * applyToEitherAsync result completes exceptionally after exceptional
1786 <     * completion of source
1787 <     */
1788 <    public void testApplyToEitherAsync2() {
1789 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1790 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1791 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
1792 <        f.completeExceptionally(new CFException());
1793 <        checkCompletedWithWrappedCFException(g);
1794 <
1795 <        f = new CompletableFuture<>();
1796 <        f2 = new CompletableFuture<>();
1797 <        f2.completeExceptionally(new CFException());
1798 <        g = f.applyToEitherAsync(f2, inc);
1799 <        f.complete(one);
1800 <        checkCompletedWithWrappedCFException(g);
1801 <    }
1802 <
1803 <    /**
1804 <     * applyToEitherAsync result completes exceptionally if action does
1805 <     */
1806 <    public void testApplyToEitherAsync3() {
1807 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1808 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1809 <        FailingFunction r = new FailingFunction();
1810 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, r);
1811 <        f.complete(one);
1812 <        checkCompletedWithWrappedCFException(g);
1813 <    }
1814 <
1815 <    /**
1816 <     * applyToEitherAsync result completes exceptionally if either source cancelled
1817 <     */
1818 <    public void testApplyToEitherAsync4() {
1819 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1820 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1821 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
1822 <        assertTrue(f.cancel(true));
1823 <        checkCompletedWithWrappedCancellationException(g);
1824 <
1825 <        f = new CompletableFuture<>();
1826 <        f2 = new CompletableFuture<>();
1827 <        assertTrue(f2.cancel(true));
1828 <        g = f.applyToEitherAsync(f2, inc);
1829 <        checkCompletedWithWrappedCancellationException(g);
1830 <    }
1831 <
1832 <    /**
1833 <     * acceptEitherAsync result completes normally after normal
1834 <     * completion of sources
1835 <     */
1836 <    public void testAcceptEitherAsync() {
1837 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1838 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1839 <        IncAction r = new IncAction();
1840 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
1841 <        f.complete(one);
1842 <        checkCompletedNormally(g, null);
1843 <        assertEquals(r.value, 2);
1844 <
1845 <        r = new IncAction();
1846 <        f = new CompletableFuture<>();
1847 <        f.complete(one);
1848 <        f2 = new CompletableFuture<>();
1849 <        g = f.acceptEitherAsync(f2, r);
1850 <        checkCompletedNormally(g, null);
1851 <        assertEquals(r.value, 2);
1852 <    }
1853 <
1854 <    /**
1855 <     * acceptEitherAsync result completes exceptionally after exceptional
1856 <     * completion of source
1857 <     */
1858 <    public void testAcceptEitherAsync2() {
1859 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1860 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1861 <        IncAction r = new IncAction();
1862 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
1863 <        f.completeExceptionally(new CFException());
1864 <        checkCompletedWithWrappedCFException(g);
1865 <
1866 <        r = new IncAction();
1867 <        f = new CompletableFuture<>();
1868 <        f2 = new CompletableFuture<>();
1869 <        f2.completeExceptionally(new CFException());
1870 <        g = f.acceptEitherAsync(f2, r);
1871 <        f.complete(one);
1872 <        checkCompletedWithWrappedCFException(g);
1873 <    }
1874 <
1875 <    /**
1876 <     * acceptEitherAsync result completes exceptionally if action does
1877 <     */
1878 <    public void testAcceptEitherAsync3() {
1879 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1880 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1881 <        FailingConsumer r = new FailingConsumer();
1882 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
1883 <        f.complete(one);
1884 <        checkCompletedWithWrappedCFException(g);
1885 <    }
1886 <
1887 <    /**
1888 <     * acceptEitherAsync result completes exceptionally if either
1889 <     * source cancelled
1890 <     */
1891 <    public void testAcceptEitherAsync4() {
1892 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1893 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1894 <        IncAction r = new IncAction();
1895 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
1896 <        assertTrue(f.cancel(true));
1897 <        checkCompletedWithWrappedCancellationException(g);
1898 <
1899 <        r = new IncAction();
1900 <        f = new CompletableFuture<>();
1901 <        f2 = new CompletableFuture<>();
1902 <        assertTrue(f2.cancel(true));
1903 <        g = f.acceptEitherAsync(f2, r);
1904 <        checkCompletedWithWrappedCancellationException(g);
1905 <    }
1906 <
1907 <    /**
1908 <     * runAfterEitherAsync result completes normally after normal
1909 <     * completion of sources
1910 <     */
1911 <    public void testRunAfterEitherAsync() {
1912 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1913 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1914 <        Noop r = new Noop();
1915 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
1916 <        f.complete(one);
1917 <        checkCompletedNormally(g, null);
1918 <        assertTrue(r.ran);
1919 <
1920 <        r = new Noop();
1921 <        f = new CompletableFuture<>();
1922 <        f.complete(one);
1923 <        f2 = new CompletableFuture<>();
1924 <        g = f.runAfterEitherAsync(f2, r);
1925 <        checkCompletedNormally(g, null);
1926 <        assertTrue(r.ran);
1927 <    }
1928 <
1929 <    /**
1930 <     * runAfterEitherAsync result completes exceptionally after exceptional
1931 <     * completion of source
1932 <     */
1933 <    public void testRunAfterEitherAsync2() {
1934 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1935 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1936 <        Noop r = new Noop();
1937 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
1938 <        f.completeExceptionally(new CFException());
1939 <        checkCompletedWithWrappedCFException(g);
1940 <
1941 <        r = new Noop();
1942 <        f = new CompletableFuture<>();
1943 <        f2 = new CompletableFuture<>();
1944 <        f2.completeExceptionally(new CFException());
1945 <        g = f.runAfterEitherAsync(f2, r);
1946 <        f.complete(one);
1947 <        checkCompletedWithWrappedCFException(g);
1948 <    }
1949 <
1950 <    /**
1951 <     * runAfterEitherAsync result completes exceptionally if action does
1952 <     */
1953 <    public void testRunAfterEitherAsync3() {
1954 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1955 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1956 <        FailingNoop r = new FailingNoop();
1957 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
1958 <        f.complete(one);
1959 <        checkCompletedWithWrappedCFException(g);
1960 <    }
1961 <
1962 <    /**
1963 <     * runAfterEitherAsync result completes exceptionally if either
1964 <     * source cancelled
1965 <     */
1966 <    public void testRunAfterEitherAsync4() {
1967 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1968 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1969 <        Noop r = new Noop();
1970 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
1971 <        assertTrue(f.cancel(true));
1972 <        checkCompletedWithWrappedCancellationException(g);
1973 <
1974 <        r = new Noop();
1975 <        f = new CompletableFuture<>();
1976 <        f2 = new CompletableFuture<>();
1977 <        assertTrue(f2.cancel(true));
1978 <        g = f.runAfterEitherAsync(f2, r);
1979 <        checkCompletedWithWrappedCancellationException(g);
1980 <    }
1981 <
1982 <    /**
1983 <     * thenComposeAsync result completes normally after normal
1984 <     * completion of source
1985 <     */
1986 <    public void testThenComposeAsync() {
1987 <        CompletableFuture<Integer> f, g;
1988 <        CompletableFutureInc r;
1989 <
1990 <        f = new CompletableFuture<>();
1991 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
1992 <        f.complete(one);
1993 <        checkCompletedNormally(g, two);
1994 <
1995 <        f = new CompletableFuture<>();
1996 <        f.complete(one);
1997 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
1998 <        checkCompletedNormally(g, two);
1999 <    }
2000 <
2001 <    /**
2002 <     * thenComposeAsync result completes exceptionally after
2003 <     * exceptional completion of source
2004 <     */
2005 <    public void testThenComposeAsync2() {
2006 <        CompletableFuture<Integer> f, g;
2007 <        CompletableFutureInc r;
2008 <
2009 <        f = new CompletableFuture<>();
2010 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2011 <        f.completeExceptionally(new CFException());
2012 <        checkCompletedWithWrappedCFException(g);
2013 <        assertFalse(r.ran);
2014 <
2015 <        f = new CompletableFuture<>();
2016 <        f.completeExceptionally(new CFException());
2017 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2018 <        checkCompletedWithWrappedCFException(g);
2019 <        assertFalse(r.ran);
2020 <    }
2021 <
2022 <    /**
2023 <     * thenComposeAsync result completes exceptionally if action does
2024 <     */
2025 <    public void testThenComposeAsync3() {
2026 <        CompletableFuture<Integer> f, g;
2027 <        FailingCompletableFutureFunction r;
2028 <
2029 <        f = new CompletableFuture<>();
2030 <        g = f.thenComposeAsync(r = new FailingCompletableFutureFunction());
2031 <        f.complete(one);
2032 <        checkCompletedWithWrappedCFException(g);
2033 <
2034 <        f = new CompletableFuture<>();
2035 <        f.complete(one);
2036 <        g = f.thenComposeAsync(r = new FailingCompletableFutureFunction());
2037 <        checkCompletedWithWrappedCFException(g);
2038 <    }
2039 <
2040 <    /**
2041 <     * thenComposeAsync result completes exceptionally if source cancelled
2042 <     */
2043 <    public void testThenComposeAsync4() {
2044 <        CompletableFuture<Integer> f, g;
2045 <        CompletableFutureInc r;
2046 <
2047 <        f = new CompletableFuture<>();
2048 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2049 <        assertTrue(f.cancel(true));
2050 <        checkCompletedWithWrappedCancellationException(g);
2051 <
2052 <        f = new CompletableFuture<>();
2053 <        assertTrue(f.cancel(true));
2054 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2055 <        checkCompletedWithWrappedCancellationException(g);
2056 <    }
2057 <
2672 >    public void testRunAfterEither_exceptionalCompletion() {
2673 >        for (ExecutionMode m : ExecutionMode.values())
2674 >        for (Integer v1 : new Integer[] { 1, null })
2675 >    {
2676 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2677 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2678 >        final CFException ex = new CFException();
2679 >        final Noop[] rs = new Noop[6];
2680 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2681 >
2682 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2683 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2684 >        checkIncomplete(h0);
2685 >        checkIncomplete(h1);
2686 >        rs[0].assertNotInvoked();
2687 >        rs[1].assertNotInvoked();
2688 >        assertTrue(f.completeExceptionally(ex));
2689 >        checkCompletedWithWrappedException(h0, ex);
2690 >        checkCompletedWithWrappedException(h1, ex);
2691 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2692 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2693 >        checkCompletedWithWrappedException(h2, ex);
2694 >        checkCompletedWithWrappedException(h3, ex);
2695 >
2696 >        assertTrue(g.complete(v1));
2697 >
2698 >        // unspecified behavior - both source completions available
2699 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2700 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2701 >        try {
2702 >            assertNull(h4.join());
2703 >            rs[4].assertInvoked();
2704 >        } catch (CompletionException ok) {
2705 >            checkCompletedWithWrappedException(h4, ex);
2706 >            rs[4].assertNotInvoked();
2707 >        }
2708 >        try {
2709 >            assertNull(h5.join());
2710 >            rs[5].assertInvoked();
2711 >        } catch (CompletionException ok) {
2712 >            checkCompletedWithWrappedException(h5, ex);
2713 >            rs[5].assertNotInvoked();
2714 >        }
2715  
2716 <    // async with explicit executors
2716 >        checkCompletedExceptionally(f, ex);
2717 >        checkCompletedNormally(g, v1);
2718 >        checkCompletedWithWrappedException(h0, ex);
2719 >        checkCompletedWithWrappedException(h1, ex);
2720 >        checkCompletedWithWrappedException(h2, ex);
2721 >        checkCompletedWithWrappedException(h3, ex);
2722 >        checkCompletedWithWrappedException(h4, ex);
2723 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2724 >    }}
2725 >
2726 >    public void testRunAfterEither_exceptionalCompletion2() {
2727 >        for (ExecutionMode m : ExecutionMode.values())
2728 >        for (boolean fFirst : new boolean[] { true, false })
2729 >        for (Integer v1 : new Integer[] { 1, null })
2730 >    {
2731 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2732 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2733 >        final CFException ex = new CFException();
2734 >        final Noop[] rs = new Noop[6];
2735 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2736 >
2737 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2738 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2739 >        assertTrue( fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2740 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2741 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2742 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2743  
2744 <    /**
2745 <     * thenRunAsync result completes normally after normal completion of source
2746 <     */
2747 <    public void testThenRunAsyncE() {
2748 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2749 <        Noop r = new Noop();
2750 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2751 <        f.complete(null);
2752 <        checkCompletedNormally(g, null);
2744 >        // unspecified behavior - both source completions available
2745 >        try {
2746 >            assertEquals(null, h0.join());
2747 >            rs[0].assertInvoked();
2748 >        } catch (CompletionException ok) {
2749 >            checkCompletedWithWrappedException(h0, ex);
2750 >            rs[0].assertNotInvoked();
2751 >        }
2752 >        try {
2753 >            assertEquals(null, h1.join());
2754 >            rs[1].assertInvoked();
2755 >        } catch (CompletionException ok) {
2756 >            checkCompletedWithWrappedException(h1, ex);
2757 >            rs[1].assertNotInvoked();
2758 >        }
2759 >        try {
2760 >            assertEquals(null, h2.join());
2761 >            rs[2].assertInvoked();
2762 >        } catch (CompletionException ok) {
2763 >            checkCompletedWithWrappedException(h2, ex);
2764 >            rs[2].assertNotInvoked();
2765 >        }
2766 >        try {
2767 >            assertEquals(null, h3.join());
2768 >            rs[3].assertInvoked();
2769 >        } catch (CompletionException ok) {
2770 >            checkCompletedWithWrappedException(h3, ex);
2771 >            rs[3].assertNotInvoked();
2772 >        }
2773  
2774 <        // reordered version
2775 <        f = new CompletableFuture<>();
2776 <        f.complete(null);
2074 <        r = new Noop();
2075 <        g = f.thenRunAsync(r, new ThreadExecutor());
2076 <        checkCompletedNormally(g, null);
2077 <    }
2774 >        checkCompletedNormally(f, v1);
2775 >        checkCompletedExceptionally(g, ex);
2776 >    }}
2777  
2778      /**
2779 <     * thenRunAsync result completes exceptionally after exceptional
2081 <     * completion of source
2779 >     * runAfterEither result completes exceptionally if either source cancelled
2780       */
2781 <    public void testThenRunAsync2E() {
2782 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2783 <        Noop r = new Noop();
2784 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2785 <        f.completeExceptionally(new CFException());
2781 >    public void testRunAfterEither_sourceCancelled() {
2782 >        for (ExecutionMode m : ExecutionMode.values())
2783 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2784 >        for (Integer v1 : new Integer[] { 1, null })
2785 >    {
2786 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2787 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2788 >        final Noop[] rs = new Noop[6];
2789 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2790 >
2791 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2792 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2793 >        checkIncomplete(h0);
2794 >        checkIncomplete(h1);
2795 >        rs[0].assertNotInvoked();
2796 >        rs[1].assertNotInvoked();
2797 >        f.cancel(mayInterruptIfRunning);
2798 >        checkCompletedWithWrappedCancellationException(h0);
2799 >        checkCompletedWithWrappedCancellationException(h1);
2800 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2801 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2802 >        checkCompletedWithWrappedCancellationException(h2);
2803 >        checkCompletedWithWrappedCancellationException(h3);
2804 >
2805 >        assertTrue(g.complete(v1));
2806 >
2807 >        // unspecified behavior - both source completions available
2808 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2809 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2810          try {
2811 <            g.join();
2812 <            shouldThrow();
2813 <        } catch (Exception ok) {
2811 >            assertNull(h4.join());
2812 >            rs[4].assertInvoked();
2813 >        } catch (CompletionException ok) {
2814 >            checkCompletedWithWrappedCancellationException(h4);
2815 >            rs[4].assertNotInvoked();
2816 >        }
2817 >        try {
2818 >            assertNull(h5.join());
2819 >            rs[5].assertInvoked();
2820 >        } catch (CompletionException ok) {
2821 >            checkCompletedWithWrappedCancellationException(h5);
2822 >            rs[5].assertNotInvoked();
2823          }
2093        checkCompletedWithWrappedCFException(g);
2094    }
2824  
2825 <    /**
2826 <     * thenRunAsync result completes exceptionally if action does
2827 <     */
2828 <    public void testThenRunAsync3E() {
2829 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2830 <        FailingNoop r = new FailingNoop();
2831 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2832 <        f.complete(null);
2104 <        checkCompletedWithWrappedCFException(g);
2105 <    }
2825 >        checkCancelled(f);
2826 >        checkCompletedNormally(g, v1);
2827 >        checkCompletedWithWrappedCancellationException(h0);
2828 >        checkCompletedWithWrappedCancellationException(h1);
2829 >        checkCompletedWithWrappedCancellationException(h2);
2830 >        checkCompletedWithWrappedCancellationException(h3);
2831 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2832 >    }}
2833  
2834      /**
2835 <     * thenRunAsync result completes exceptionally if source cancelled
2835 >     * runAfterEither result completes exceptionally if action does
2836       */
2837 <    public void testThenRunAsync4E() {
2838 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2839 <        Noop r = new Noop();
2840 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2841 <        assertTrue(f.cancel(true));
2842 <        checkCompletedWithWrappedCancellationException(g);
2843 <    }
2837 >    public void testRunAfterEither_actionFailed() {
2838 >        for (ExecutionMode m : ExecutionMode.values())
2839 >        for (Integer v1 : new Integer[] { 1, null })
2840 >        for (Integer v2 : new Integer[] { 2, null })
2841 >    {
2842 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2843 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2844 >        final FailingRunnable[] rs = new FailingRunnable[6];
2845 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingRunnable(m);
2846 >
2847 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2848 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2849 >        assertTrue(f.complete(v1));
2850 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2851 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2852 >        checkCompletedWithWrappedCFException(h0);
2853 >        checkCompletedWithWrappedCFException(h1);
2854 >        checkCompletedWithWrappedCFException(h2);
2855 >        checkCompletedWithWrappedCFException(h3);
2856 >        for (int i = 0; i < 4; i++) rs[i].assertInvoked();
2857 >        assertTrue(g.complete(v2));
2858 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2859 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2860 >        checkCompletedWithWrappedCFException(h4);
2861 >        checkCompletedWithWrappedCFException(h5);
2862 >
2863 >        checkCompletedNormally(f, v1);
2864 >        checkCompletedNormally(g, v2);
2865 >        for (int i = 0; i < 6; i++) rs[i].assertInvoked();
2866 >    }}
2867  
2868      /**
2869 <     * thenApplyAsync result completes normally after normal completion of source
2869 >     * thenCompose result completes normally after normal completion of source
2870       */
2871 <    public void testThenApplyAsyncE() {
2872 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2873 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
2874 <        f.complete(one);
2875 <        checkCompletedNormally(g, two);
2876 <    }
2871 >    public void testThenCompose_normalCompletion() {
2872 >        for (ExecutionMode m : ExecutionMode.values())
2873 >        for (boolean createIncomplete : new boolean[] { true, false })
2874 >        for (Integer v1 : new Integer[] { 1, null })
2875 >    {
2876 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2877 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2878 >        if (!createIncomplete) assertTrue(f.complete(v1));
2879 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2880 >        if (createIncomplete) assertTrue(f.complete(v1));
2881 >
2882 >        checkCompletedNormally(g, inc(v1));
2883 >        checkCompletedNormally(f, v1);
2884 >        r.assertValue(v1);
2885 >    }}
2886  
2887      /**
2888 <     * thenApplyAsync result completes exceptionally after exceptional
2888 >     * thenCompose result completes exceptionally after exceptional
2889       * completion of source
2890       */
2891 <    public void testThenApplyAsync2E() {
2892 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2893 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
2894 <        f.completeExceptionally(new CFException());
2895 <        checkCompletedWithWrappedCFException(g);
2896 <    }
2891 >    public void testThenCompose_exceptionalCompletion() {
2892 >        for (ExecutionMode m : ExecutionMode.values())
2893 >        for (boolean createIncomplete : new boolean[] { true, false })
2894 >    {
2895 >        final CFException ex = new CFException();
2896 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2897 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2898 >        if (!createIncomplete) f.completeExceptionally(ex);
2899 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2900 >        if (createIncomplete) f.completeExceptionally(ex);
2901 >
2902 >        checkCompletedWithWrappedException(g, ex);
2903 >        checkCompletedExceptionally(f, ex);
2904 >        r.assertNotInvoked();
2905 >    }}
2906  
2907      /**
2908 <     * thenApplyAsync result completes exceptionally if action does
2141 <     */
2142 <    public void testThenApplyAsync3E() {
2143 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2144 <        FailingFunction r = new FailingFunction();
2145 <        CompletableFuture<Integer> g = f.thenApplyAsync(r, new ThreadExecutor());
2146 <        f.complete(null);
2147 <        checkCompletedWithWrappedCFException(g);
2148 <    }
2149 <
2150 <    /**
2151 <     * thenApplyAsync result completes exceptionally if source cancelled
2152 <     */
2153 <    public void testThenApplyAsync4E() {
2154 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2155 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
2156 <        assertTrue(f.cancel(true));
2157 <        checkCompletedWithWrappedCancellationException(g);
2158 <    }
2159 <
2160 <    /**
2161 <     * thenAcceptAsync result completes normally after normal
2162 <     * completion of source
2908 >     * thenCompose result completes exceptionally if action does
2909       */
2910 <    public void testThenAcceptAsyncE() {
2911 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2912 <        IncAction r = new IncAction();
2913 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2914 <        f.complete(one);
2915 <        checkCompletedNormally(g, null);
2916 <        assertEquals(r.value, 2);
2917 <    }
2910 >    public void testThenCompose_actionFailed() {
2911 >        for (ExecutionMode m : ExecutionMode.values())
2912 >        for (boolean createIncomplete : new boolean[] { true, false })
2913 >        for (Integer v1 : new Integer[] { 1, null })
2914 >    {
2915 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2916 >        final FailingCompletableFutureFunction r
2917 >            = new FailingCompletableFutureFunction(m);
2918 >        if (!createIncomplete) assertTrue(f.complete(v1));
2919 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2920 >        if (createIncomplete) assertTrue(f.complete(v1));
2921  
2173    /**
2174     * thenAcceptAsync result completes exceptionally after exceptional
2175     * completion of source
2176     */
2177    public void testThenAcceptAsync2E() {
2178        CompletableFuture<Integer> f = new CompletableFuture<>();
2179        IncAction r = new IncAction();
2180        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2181        f.completeExceptionally(new CFException());
2922          checkCompletedWithWrappedCFException(g);
2923 <    }
2923 >        checkCompletedNormally(f, v1);
2924 >    }}
2925  
2926      /**
2927 <     * thenAcceptAsync result completes exceptionally if action does
2927 >     * thenCompose result completes exceptionally if source cancelled
2928       */
2929 <    public void testThenAcceptAsync3E() {
2930 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2931 <        FailingConsumer r = new FailingConsumer();
2932 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2933 <        f.complete(null);
2934 <        checkCompletedWithWrappedCFException(g);
2935 <    }
2929 >    public void testThenCompose_sourceCancelled() {
2930 >        for (ExecutionMode m : ExecutionMode.values())
2931 >        for (boolean createIncomplete : new boolean[] { true, false })
2932 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2933 >    {
2934 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2935 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2936 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2937 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2938 >        if (createIncomplete) {
2939 >            checkIncomplete(g);
2940 >            assertTrue(f.cancel(mayInterruptIfRunning));
2941 >        }
2942  
2196    /**
2197     * thenAcceptAsync result completes exceptionally if source cancelled
2198     */
2199    public void testThenAcceptAsync4E() {
2200        CompletableFuture<Integer> f = new CompletableFuture<>();
2201        IncAction r = new IncAction();
2202        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2203        assertTrue(f.cancel(true));
2943          checkCompletedWithWrappedCancellationException(g);
2944 <    }
2945 <
2207 <    /**
2208 <     * thenCombineAsync result completes normally after normal
2209 <     * completion of sources
2210 <     */
2211 <    public void testThenCombineAsyncE() {
2212 <        CompletableFuture<Integer> f, g, h;
2213 <        ThreadExecutor e = new ThreadExecutor();
2214 <        int count = 0;
2215 <
2216 <        f = new CompletableFuture<>();
2217 <        g = new CompletableFuture<>();
2218 <        h = f.thenCombineAsync(g, subtract, e);
2219 <        f.complete(3);
2220 <        checkIncomplete(h);
2221 <        g.complete(1);
2222 <        checkCompletedNormally(h, 2);
2223 <        assertEquals(++count, e.count.get());
2224 <
2225 <        f = new CompletableFuture<>();
2226 <        g = new CompletableFuture<>();
2227 <        h = f.thenCombineAsync(g, subtract, e);
2228 <        g.complete(1);
2229 <        checkIncomplete(h);
2230 <        f.complete(3);
2231 <        checkCompletedNormally(h, 2);
2232 <        assertEquals(++count, e.count.get());
2233 <
2234 <        f = new CompletableFuture<>();
2235 <        g = new CompletableFuture<>();
2236 <        g.complete(1);
2237 <        f.complete(3);
2238 <        h = f.thenCombineAsync(g, subtract, e);
2239 <        checkCompletedNormally(h, 2);
2240 <        assertEquals(++count, e.count.get());
2241 <    }
2242 <
2243 <    /**
2244 <     * thenCombineAsync result completes exceptionally after exceptional
2245 <     * completion of either source
2246 <     */
2247 <    public void testThenCombineAsync2E() {
2248 <        CompletableFuture<Integer> f, g, h;
2249 <        ThreadExecutor e = new ThreadExecutor();
2250 <        int count = 0;
2251 <
2252 <        f = new CompletableFuture<>();
2253 <        g = new CompletableFuture<>();
2254 <        h = f.thenCombineAsync(g, subtract, e);
2255 <        f.completeExceptionally(new CFException());
2256 <        checkIncomplete(h);
2257 <        g.complete(1);
2258 <        checkCompletedWithWrappedCFException(h);
2259 <
2260 <        f = new CompletableFuture<>();
2261 <        g = new CompletableFuture<>();
2262 <        h = f.thenCombineAsync(g, subtract, e);
2263 <        g.completeExceptionally(new CFException());
2264 <        checkIncomplete(h);
2265 <        f.complete(3);
2266 <        checkCompletedWithWrappedCFException(h);
2267 <
2268 <        f = new CompletableFuture<>();
2269 <        g = new CompletableFuture<>();
2270 <        g.completeExceptionally(new CFException());
2271 <        h = f.thenCombineAsync(g, subtract, e);
2272 <        checkIncomplete(h);
2273 <        f.complete(3);
2274 <        checkCompletedWithWrappedCFException(h);
2275 <
2276 <        assertEquals(0, e.count.get());
2277 <    }
2278 <
2279 <    /**
2280 <     * thenCombineAsync result completes exceptionally if action does
2281 <     */
2282 <    public void testThenCombineAsync3E() {
2283 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2284 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2285 <        FailingBiFunction r = new FailingBiFunction();
2286 <        CompletableFuture<Integer> g = f.thenCombineAsync(f2, r, new ThreadExecutor());
2287 <        f.complete(one);
2288 <        checkIncomplete(g);
2289 <        assertFalse(r.ran);
2290 <        f2.complete(two);
2291 <        checkCompletedWithWrappedCFException(g);
2292 <        assertTrue(r.ran);
2293 <    }
2294 <
2295 <    /**
2296 <     * thenCombineAsync result completes exceptionally if either source cancelled
2297 <     */
2298 <    public void testThenCombineAsync4E() {
2299 <        CompletableFuture<Integer> f, g, h;
2300 <        ThreadExecutor e = new ThreadExecutor();
2301 <
2302 <        f = new CompletableFuture<>();
2303 <        g = new CompletableFuture<>();
2304 <        h = f.thenCombineAsync(g, subtract, e);
2305 <        assertTrue(f.cancel(true));
2306 <        checkIncomplete(h);
2307 <        g.complete(1);
2308 <        checkCompletedWithWrappedCancellationException(h);
2309 <
2310 <        f = new CompletableFuture<>();
2311 <        g = new CompletableFuture<>();
2312 <        h = f.thenCombineAsync(g, subtract, e);
2313 <        assertTrue(g.cancel(true));
2314 <        checkIncomplete(h);
2315 <        f.complete(3);
2316 <        checkCompletedWithWrappedCancellationException(h);
2317 <
2318 <        f = new CompletableFuture<>();
2319 <        g = new CompletableFuture<>();
2320 <        assertTrue(g.cancel(true));
2321 <        h = f.thenCombineAsync(g, subtract, e);
2322 <        checkIncomplete(h);
2323 <        f.complete(3);
2324 <        checkCompletedWithWrappedCancellationException(h);
2325 <
2326 <        f = new CompletableFuture<>();
2327 <        g = new CompletableFuture<>();
2328 <        assertTrue(f.cancel(true));
2329 <        assertTrue(g.cancel(true));
2330 <        h = f.thenCombineAsync(g, subtract, e);
2331 <        checkCompletedWithWrappedCancellationException(h);
2332 <
2333 <        assertEquals(0, e.count.get());
2334 <    }
2335 <
2336 <    /**
2337 <     * thenAcceptBothAsync result completes normally after normal
2338 <     * completion of sources
2339 <     */
2340 <    public void testThenAcceptBothAsyncE() {
2341 <        CompletableFuture<Integer> f, g;
2342 <        CompletableFuture<Void> h;
2343 <        SubtractAction r;
2344 <        ThreadExecutor e = new ThreadExecutor();
2345 <
2346 <        f = new CompletableFuture<>();
2347 <        g = new CompletableFuture<>();
2348 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2349 <        f.complete(3);
2350 <        checkIncomplete(h);
2351 <        g.complete(1);
2352 <        checkCompletedNormally(h, null);
2353 <        assertEquals(r.value, 2);
2354 <
2355 <        f = new CompletableFuture<>();
2356 <        g = new CompletableFuture<>();
2357 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2358 <        g.complete(1);
2359 <        checkIncomplete(h);
2360 <        f.complete(3);
2361 <        checkCompletedNormally(h, null);
2362 <        assertEquals(r.value, 2);
2363 <
2364 <        f = new CompletableFuture<>();
2365 <        g = new CompletableFuture<>();
2366 <        g.complete(1);
2367 <        f.complete(3);
2368 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2369 <        checkCompletedNormally(h, null);
2370 <        assertEquals(r.value, 2);
2371 <
2372 <        assertEquals(3, e.count.get());
2373 <    }
2374 <
2375 <    /**
2376 <     * thenAcceptBothAsync result completes exceptionally after exceptional
2377 <     * completion of source
2378 <     */
2379 <    public void testThenAcceptBothAsync2E() {
2380 <        CompletableFuture<Integer> f, g;
2381 <        CompletableFuture<Void> h;
2382 <        SubtractAction r;
2383 <        ThreadExecutor e = new ThreadExecutor();
2384 <
2385 <        f = new CompletableFuture<>();
2386 <        g = new CompletableFuture<>();
2387 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2388 <        f.completeExceptionally(new CFException());
2389 <        checkIncomplete(h);
2390 <        g.complete(1);
2391 <        checkCompletedWithWrappedCFException(h);
2392 <
2393 <        f = new CompletableFuture<>();
2394 <        g = new CompletableFuture<>();
2395 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2396 <        g.completeExceptionally(new CFException());
2397 <        checkIncomplete(h);
2398 <        f.complete(3);
2399 <        checkCompletedWithWrappedCFException(h);
2400 <
2401 <        f = new CompletableFuture<>();
2402 <        g = new CompletableFuture<>();
2403 <        f.complete(3);
2404 <        g.completeExceptionally(new CFException());
2405 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2406 <        checkCompletedWithWrappedCFException(h);
2407 <
2408 <        f = new CompletableFuture<>();
2409 <        g = new CompletableFuture<>();
2410 <        f.completeExceptionally(new CFException());
2411 <        g.complete(3);
2412 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2413 <        checkCompletedWithWrappedCFException(h);
2414 <
2415 <        assertEquals(0, e.count.get());
2416 <    }
2417 <
2418 <    /**
2419 <     * thenAcceptBothAsync result completes exceptionally if action does
2420 <     */
2421 <    public void testThenAcceptBothAsync3E() {
2422 <        CompletableFuture<Integer> f, g;
2423 <        CompletableFuture<Void> h;
2424 <        FailingBiConsumer r;
2425 <        ThreadExecutor e = new ThreadExecutor();
2426 <
2427 <        f = new CompletableFuture<>();
2428 <        g = new CompletableFuture<>();
2429 <        h = f.thenAcceptBothAsync(g, r = new FailingBiConsumer(), e);
2430 <        f.complete(3);
2431 <        checkIncomplete(h);
2432 <        g.complete(1);
2433 <        checkCompletedWithWrappedCFException(h);
2434 <
2435 <        f = new CompletableFuture<>();
2436 <        g = new CompletableFuture<>();
2437 <        f.complete(3);
2438 <        g.complete(1);
2439 <        h = f.thenAcceptBothAsync(g, r = new FailingBiConsumer(), e);
2440 <        checkCompletedWithWrappedCFException(h);
2441 <
2442 <        assertEquals(2, e.count.get());
2443 <    }
2444 <
2445 <    /**
2446 <     * thenAcceptBothAsync result completes exceptionally if either source cancelled
2447 <     */
2448 <    public void testThenAcceptBothAsync4E() {
2449 <        CompletableFuture<Integer> f, g;
2450 <        CompletableFuture<Void> h;
2451 <        SubtractAction r;
2452 <        ThreadExecutor e = new ThreadExecutor();
2453 <
2454 <        f = new CompletableFuture<>();
2455 <        g = new CompletableFuture<>();
2456 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2457 <        assertTrue(f.cancel(true));
2458 <        checkIncomplete(h);
2459 <        g.complete(1);
2460 <        checkCompletedWithWrappedCancellationException(h);
2461 <
2462 <        f = new CompletableFuture<>();
2463 <        g = new CompletableFuture<>();
2464 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2465 <        assertTrue(g.cancel(true));
2466 <        checkIncomplete(h);
2467 <        f.complete(3);
2468 <        checkCompletedWithWrappedCancellationException(h);
2469 <
2470 <        f = new CompletableFuture<>();
2471 <        g = new CompletableFuture<>();
2472 <        f.complete(3);
2473 <        assertTrue(g.cancel(true));
2474 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2475 <        checkCompletedWithWrappedCancellationException(h);
2476 <
2477 <        f = new CompletableFuture<>();
2478 <        g = new CompletableFuture<>();
2479 <        assertTrue(f.cancel(true));
2480 <        g.complete(3);
2481 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2482 <        checkCompletedWithWrappedCancellationException(h);
2944 >        checkCancelled(f);
2945 >    }}
2946  
2947 <        assertEquals(0, e.count.get());
2485 <    }
2947 >    // other static methods
2948  
2949      /**
2950 <     * runAfterBothAsync result completes normally after normal
2951 <     * completion of sources
2950 >     * allOf(no component futures) returns a future completed normally
2951 >     * with the value null
2952       */
2953 <    public void testRunAfterBothAsyncE() {
2954 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2955 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2494 <        Noop r = new Noop();
2495 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2496 <        f.complete(one);
2497 <        checkIncomplete(g);
2498 <        f2.complete(two);
2499 <        checkCompletedNormally(g, null);
2500 <        assertTrue(r.ran);
2953 >    public void testAllOf_empty() throws Exception {
2954 >        CompletableFuture<Void> f = CompletableFuture.allOf();
2955 >        checkCompletedNormally(f, null);
2956      }
2957  
2958      /**
2959 <     * runAfterBothAsync result completes exceptionally after exceptional
2960 <     * completion of source
2959 >     * allOf returns a future completed normally with the value null
2960 >     * when all components complete normally
2961       */
2962 <    public void testRunAfterBothAsync2E() {
2963 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2964 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2965 <        Noop r = new Noop();
2966 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2967 <        f.completeExceptionally(new CFException());
2968 <        f2.complete(two);
2969 <        checkCompletedWithWrappedCFException(g);
2970 <
2971 <        r = new Noop();
2972 <        f = new CompletableFuture<>();
2973 <        f2 = new CompletableFuture<>();
2974 <        g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2975 <        f.complete(one);
2976 <        f2.completeExceptionally(new CFException());
2522 <        checkCompletedWithWrappedCFException(g);
2962 >    public void testAllOf_normal() throws Exception {
2963 >        for (int k = 1; k < 10; k++) {
2964 >            CompletableFuture<Integer>[] fs
2965 >                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
2966 >            for (int i = 0; i < k; i++)
2967 >                fs[i] = new CompletableFuture<>();
2968 >            CompletableFuture<Void> f = CompletableFuture.allOf(fs);
2969 >            for (int i = 0; i < k; i++) {
2970 >                checkIncomplete(f);
2971 >                checkIncomplete(CompletableFuture.allOf(fs));
2972 >                fs[i].complete(one);
2973 >            }
2974 >            checkCompletedNormally(f, null);
2975 >            checkCompletedNormally(CompletableFuture.allOf(fs), null);
2976 >        }
2977      }
2978  
2979 <    /**
2980 <     * runAfterBothAsync result completes exceptionally if action does
2981 <     */
2982 <    public void testRunAfterBothAsync3E() {
2983 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2984 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2985 <        FailingNoop r = new FailingNoop();
2986 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2987 <        f.complete(one);
2988 <        checkIncomplete(g);
2989 <        f2.complete(two);
2990 <        checkCompletedWithWrappedCFException(g);
2979 >    public void testAllOf_backwards() throws Exception {
2980 >        for (int k = 1; k < 10; k++) {
2981 >            CompletableFuture<Integer>[] fs
2982 >                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
2983 >            for (int i = 0; i < k; i++)
2984 >                fs[i] = new CompletableFuture<>();
2985 >            CompletableFuture<Void> f = CompletableFuture.allOf(fs);
2986 >            for (int i = k - 1; i >= 0; i--) {
2987 >                checkIncomplete(f);
2988 >                checkIncomplete(CompletableFuture.allOf(fs));
2989 >                fs[i].complete(one);
2990 >            }
2991 >            checkCompletedNormally(f, null);
2992 >            checkCompletedNormally(CompletableFuture.allOf(fs), null);
2993 >        }
2994      }
2995  
2996 <    /**
2997 <     * runAfterBothAsync result completes exceptionally if either source cancelled
2998 <     */
2999 <    public void testRunAfterBothAsync4E() {
3000 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3001 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
3002 <        Noop r = new Noop();
3003 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
3004 <        assertTrue(f.cancel(true));
3005 <        f2.complete(two);
3006 <        checkCompletedWithWrappedCancellationException(g);
3007 <
3008 <        r = new Noop();
3009 <        f = new CompletableFuture<>();
3010 <        f2 = new CompletableFuture<>();
3011 <        g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
3012 <        f.complete(one);
3013 <        assertTrue(f2.cancel(true));
3014 <        checkCompletedWithWrappedCancellationException(g);
2996 >    public void testAllOf_exceptional() throws Exception {
2997 >        for (int k = 1; k < 10; k++) {
2998 >            CompletableFuture<Integer>[] fs
2999 >                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3000 >            CFException ex = new CFException();
3001 >            for (int i = 0; i < k; i++)
3002 >                fs[i] = new CompletableFuture<>();
3003 >            CompletableFuture<Void> f = CompletableFuture.allOf(fs);
3004 >            for (int i = 0; i < k; i++) {
3005 >                checkIncomplete(f);
3006 >                checkIncomplete(CompletableFuture.allOf(fs));
3007 >                if (i != k/2) {
3008 >                    fs[i].complete(i);
3009 >                    checkCompletedNormally(fs[i], i);
3010 >                } else {
3011 >                    fs[i].completeExceptionally(ex);
3012 >                    checkCompletedExceptionally(fs[i], ex);
3013 >                }
3014 >            }
3015 >            checkCompletedWithWrappedException(f, ex);
3016 >            checkCompletedWithWrappedException(CompletableFuture.allOf(fs), ex);
3017 >        }
3018      }
3019  
3020      /**
3021 <     * applyToEitherAsync result completes normally after normal
2562 <     * completion of sources
3021 >     * anyOf(no component futures) returns an incomplete future
3022       */
3023 <    public void testApplyToEitherAsyncE() {
3024 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3025 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
3026 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
3027 <        f.complete(one);
2569 <        checkCompletedNormally(g, two);
3023 >    public void testAnyOf_empty() throws Exception {
3024 >        for (Integer v1 : new Integer[] { 1, null })
3025 >    {
3026 >        CompletableFuture<Object> f = CompletableFuture.anyOf();
3027 >        checkIncomplete(f);
3028  
3029 <        f = new CompletableFuture<>();
3030 <        f.complete(one);
3031 <        f2 = new CompletableFuture<>();
2574 <        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2575 <        checkCompletedNormally(g, two);
2576 <    }
3029 >        f.complete(v1);
3030 >        checkCompletedNormally(f, v1);
3031 >    }}
3032  
3033      /**
3034 <     * applyToEitherAsync result completes exceptionally after exceptional
3035 <     * completion of source
3034 >     * anyOf returns a future completed normally with a value when
3035 >     * a component future does
3036       */
3037 <    public void testApplyToEitherAsync2E() {
3038 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3039 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
3040 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
3041 <        f.completeExceptionally(new CFException());
3042 <        checkCompletedWithWrappedCFException(g);
3043 <
3044 <        f = new CompletableFuture<>();
3045 <        f2 = new CompletableFuture<>();
3046 <        f2.completeExceptionally(new CFException());
3047 <        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
3048 <        f.complete(one);
3049 <        checkCompletedWithWrappedCFException(g);
3037 >    public void testAnyOf_normal() throws Exception {
3038 >        for (int k = 0; k < 10; k++) {
3039 >            CompletableFuture[] fs = new CompletableFuture[k];
3040 >            for (int i = 0; i < k; i++)
3041 >                fs[i] = new CompletableFuture<>();
3042 >            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3043 >            checkIncomplete(f);
3044 >            for (int i = 0; i < k; i++) {
3045 >                fs[i].complete(i);
3046 >                checkCompletedNormally(f, 0);
3047 >                int x = (int) CompletableFuture.anyOf(fs).join();
3048 >                assertTrue(0 <= x && x <= i);
3049 >            }
3050 >        }
3051      }
3052 <
3053 <    /**
3054 <     * applyToEitherAsync result completes exceptionally if action does
3055 <     */
3056 <    public void testApplyToEitherAsync3E() {
3057 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3058 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
3059 <        FailingFunction r = new FailingFunction();
3060 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, r, new ThreadExecutor());
3061 <        f.complete(one);
3062 <        checkCompletedWithWrappedCFException(g);
3052 >    public void testAnyOf_normal_backwards() throws Exception {
3053 >        for (int k = 0; k < 10; k++) {
3054 >            CompletableFuture[] fs = new CompletableFuture[k];
3055 >            for (int i = 0; i < k; i++)
3056 >                fs[i] = new CompletableFuture<>();
3057 >            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3058 >            checkIncomplete(f);
3059 >            for (int i = k - 1; i >= 0; i--) {
3060 >                fs[i].complete(i);
3061 >                checkCompletedNormally(f, k - 1);
3062 >                int x = (int) CompletableFuture.anyOf(fs).join();
3063 >                assertTrue(i <= x && x <= k - 1);
3064 >            }
3065 >        }
3066      }
3067  
3068      /**
3069 <     * applyToEitherAsync result completes exceptionally if either source cancelled
3069 >     * anyOf result completes exceptionally when any component does.
3070       */
3071 <    public void testApplyToEitherAsync4E() {
3072 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3073 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
3074 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
3075 <        assertTrue(f.cancel(true));
3076 <        checkCompletedWithWrappedCancellationException(g);
3077 <
3078 <        f = new CompletableFuture<>();
3079 <        f2 = new CompletableFuture<>();
3080 <        assertTrue(f2.cancel(true));
3081 <        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
3082 <        checkCompletedWithWrappedCancellationException(g);
3071 >    public void testAnyOf_exceptional() throws Exception {
3072 >        for (int k = 0; k < 10; k++) {
3073 >            CompletableFuture[] fs = new CompletableFuture[k];
3074 >            CFException[] exs = new CFException[k];
3075 >            for (int i = 0; i < k; i++) {
3076 >                fs[i] = new CompletableFuture<>();
3077 >                exs[i] = new CFException();
3078 >            }
3079 >            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3080 >            checkIncomplete(f);
3081 >            for (int i = 0; i < k; i++) {
3082 >                fs[i].completeExceptionally(exs[i]);
3083 >                checkCompletedWithWrappedException(f, exs[0]);
3084 >                checkCompletedWithWrappedCFException(CompletableFuture.anyOf(fs));
3085 >            }
3086 >        }
3087      }
3088  
3089 <    /**
3090 <     * acceptEitherAsync result completes normally after normal
3091 <     * completion of sources
3092 <     */
3093 <    public void testAcceptEitherAsyncE() {
3094 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3095 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
3096 <        IncAction r = new IncAction();
3097 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
3098 <        f.complete(one);
3099 <        checkCompletedNormally(g, null);
3100 <        assertEquals(r.value, 2);
3101 <
3102 <        r = new IncAction();
3103 <        f = new CompletableFuture<>();
3104 <        f.complete(one);
2642 <        f2 = new CompletableFuture<>();
2643 <        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2644 <        checkCompletedNormally(g, null);
2645 <        assertEquals(r.value, 2);
3089 >    public void testAnyOf_exceptional_backwards() throws Exception {
3090 >        for (int k = 0; k < 10; k++) {
3091 >            CompletableFuture[] fs = new CompletableFuture[k];
3092 >            CFException[] exs = new CFException[k];
3093 >            for (int i = 0; i < k; i++) {
3094 >                fs[i] = new CompletableFuture<>();
3095 >                exs[i] = new CFException();
3096 >            }
3097 >            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3098 >            checkIncomplete(f);
3099 >            for (int i = k - 1; i >= 0; i--) {
3100 >                fs[i].completeExceptionally(exs[i]);
3101 >                checkCompletedWithWrappedException(f, exs[k - 1]);
3102 >                checkCompletedWithWrappedCFException(CompletableFuture.anyOf(fs));
3103 >            }
3104 >        }
3105      }
3106  
3107      /**
3108 <     * acceptEitherAsync result completes exceptionally after exceptional
2650 <     * completion of source
3108 >     * Completion methods throw NullPointerException with null arguments
3109       */
3110 <    public void testAcceptEitherAsync2E() {
3110 >    public void testNPE() {
3111          CompletableFuture<Integer> f = new CompletableFuture<>();
3112 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
3113 <        IncAction r = new IncAction();
3114 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
3115 <        f.completeExceptionally(new CFException());
2658 <        checkCompletedWithWrappedCFException(g);
2659 <
2660 <        r = new IncAction();
2661 <        f = new CompletableFuture<>();
2662 <        f2 = new CompletableFuture<>();
2663 <        f2.completeExceptionally(new CFException());
2664 <        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2665 <        f.complete(one);
2666 <        checkCompletedWithWrappedCFException(g);
2667 <    }
3112 >        CompletableFuture<Integer> g = new CompletableFuture<>();
3113 >        CompletableFuture<Integer> nullFuture = (CompletableFuture<Integer>)null;
3114 >        CompletableFuture<?> h;
3115 >        ThreadExecutor exec = new ThreadExecutor();
3116  
3117 <    /**
3118 <     * acceptEitherAsync result completes exceptionally if action does
3119 <     */
3120 <    public void testAcceptEitherAsync3E() {
3121 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3122 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
3123 <        FailingConsumer r = new FailingConsumer();
3124 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
3125 <        f.complete(one);
3126 <        checkCompletedWithWrappedCFException(g);
3127 <    }
3117 >        Runnable[] throwingActions = {
3118 >            () -> CompletableFuture.supplyAsync(null),
3119 >            () -> CompletableFuture.supplyAsync(null, exec),
3120 >            () -> CompletableFuture.supplyAsync(new IntegerSupplier(ExecutionMode.DEFAULT, 42), null),
3121 >
3122 >            () -> CompletableFuture.runAsync(null),
3123 >            () -> CompletableFuture.runAsync(null, exec),
3124 >            () -> CompletableFuture.runAsync(() -> {}, null),
3125 >
3126 >            () -> f.completeExceptionally(null),
3127 >
3128 >            () -> f.thenApply(null),
3129 >            () -> f.thenApplyAsync(null),
3130 >            () -> f.thenApplyAsync((x) -> x, null),
3131 >            () -> f.thenApplyAsync(null, exec),
3132 >
3133 >            () -> f.thenAccept(null),
3134 >            () -> f.thenAcceptAsync(null),
3135 >            () -> f.thenAcceptAsync((x) -> {} , null),
3136 >            () -> f.thenAcceptAsync(null, exec),
3137 >
3138 >            () -> f.thenRun(null),
3139 >            () -> f.thenRunAsync(null),
3140 >            () -> f.thenRunAsync(() -> {} , null),
3141 >            () -> f.thenRunAsync(null, exec),
3142 >
3143 >            () -> f.thenCombine(g, null),
3144 >            () -> f.thenCombineAsync(g, null),
3145 >            () -> f.thenCombineAsync(g, null, exec),
3146 >            () -> f.thenCombine(nullFuture, (x, y) -> x),
3147 >            () -> f.thenCombineAsync(nullFuture, (x, y) -> x),
3148 >            () -> f.thenCombineAsync(nullFuture, (x, y) -> x, exec),
3149 >            () -> f.thenCombineAsync(g, (x, y) -> x, null),
3150 >
3151 >            () -> f.thenAcceptBoth(g, null),
3152 >            () -> f.thenAcceptBothAsync(g, null),
3153 >            () -> f.thenAcceptBothAsync(g, null, exec),
3154 >            () -> f.thenAcceptBoth(nullFuture, (x, y) -> {}),
3155 >            () -> f.thenAcceptBothAsync(nullFuture, (x, y) -> {}),
3156 >            () -> f.thenAcceptBothAsync(nullFuture, (x, y) -> {}, exec),
3157 >            () -> f.thenAcceptBothAsync(g, (x, y) -> {}, null),
3158 >
3159 >            () -> f.runAfterBoth(g, null),
3160 >            () -> f.runAfterBothAsync(g, null),
3161 >            () -> f.runAfterBothAsync(g, null, exec),
3162 >            () -> f.runAfterBoth(nullFuture, () -> {}),
3163 >            () -> f.runAfterBothAsync(nullFuture, () -> {}),
3164 >            () -> f.runAfterBothAsync(nullFuture, () -> {}, exec),
3165 >            () -> f.runAfterBothAsync(g, () -> {}, null),
3166 >
3167 >            () -> f.applyToEither(g, null),
3168 >            () -> f.applyToEitherAsync(g, null),
3169 >            () -> f.applyToEitherAsync(g, null, exec),
3170 >            () -> f.applyToEither(nullFuture, (x) -> x),
3171 >            () -> f.applyToEitherAsync(nullFuture, (x) -> x),
3172 >            () -> f.applyToEitherAsync(nullFuture, (x) -> x, exec),
3173 >            () -> f.applyToEitherAsync(g, (x) -> x, null),
3174 >
3175 >            () -> f.acceptEither(g, null),
3176 >            () -> f.acceptEitherAsync(g, null),
3177 >            () -> f.acceptEitherAsync(g, null, exec),
3178 >            () -> f.acceptEither(nullFuture, (x) -> {}),
3179 >            () -> f.acceptEitherAsync(nullFuture, (x) -> {}),
3180 >            () -> f.acceptEitherAsync(nullFuture, (x) -> {}, exec),
3181 >            () -> f.acceptEitherAsync(g, (x) -> {}, null),
3182 >
3183 >            () -> f.runAfterEither(g, null),
3184 >            () -> f.runAfterEitherAsync(g, null),
3185 >            () -> f.runAfterEitherAsync(g, null, exec),
3186 >            () -> f.runAfterEither(nullFuture, () -> {}),
3187 >            () -> f.runAfterEitherAsync(nullFuture, () -> {}),
3188 >            () -> f.runAfterEitherAsync(nullFuture, () -> {}, exec),
3189 >            () -> f.runAfterEitherAsync(g, () -> {}, null),
3190 >
3191 >            () -> f.thenCompose(null),
3192 >            () -> f.thenComposeAsync(null),
3193 >            () -> f.thenComposeAsync(new CompletableFutureInc(ExecutionMode.EXECUTOR), null),
3194 >            () -> f.thenComposeAsync(null, exec),
3195 >
3196 >            () -> f.exceptionally(null),
3197 >
3198 >            () -> f.handle(null),
3199 >
3200 >            () -> CompletableFuture.allOf((CompletableFuture<?>)null),
3201 >            () -> CompletableFuture.allOf((CompletableFuture<?>[])null),
3202 >            () -> CompletableFuture.allOf(f, null),
3203 >            () -> CompletableFuture.allOf(null, f),
3204 >
3205 >            () -> CompletableFuture.anyOf((CompletableFuture<?>)null),
3206 >            () -> CompletableFuture.anyOf((CompletableFuture<?>[])null),
3207 >            () -> CompletableFuture.anyOf(f, null),
3208 >            () -> CompletableFuture.anyOf(null, f),
3209  
3210 <    /**
3211 <     * acceptEitherAsync result completes exceptionally if either
2683 <     * source cancelled
2684 <     */
2685 <    public void testAcceptEitherAsync4E() {
2686 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2687 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2688 <        IncAction r = new IncAction();
2689 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2690 <        assertTrue(f.cancel(true));
2691 <        checkCompletedWithWrappedCancellationException(g);
3210 >            () -> f.obtrudeException(null),
3211 >        };
3212  
3213 <        r = new IncAction();
3214 <        f = new CompletableFuture<>();
2695 <        f2 = new CompletableFuture<>();
2696 <        assertTrue(f2.cancel(true));
2697 <        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2698 <        checkCompletedWithWrappedCancellationException(g);
3213 >        assertThrows(NullPointerException.class, throwingActions);
3214 >        assertEquals(0, exec.count.get());
3215      }
3216  
3217      /**
3218 <     * runAfterEitherAsync result completes normally after normal
2703 <     * completion of sources
3218 >     * toCompletableFuture returns this CompletableFuture.
3219       */
3220 <    public void testRunAfterEitherAsyncE() {
3220 >    public void testToCompletableFuture() {
3221          CompletableFuture<Integer> f = new CompletableFuture<>();
3222 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2708 <        Noop r = new Noop();
2709 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2710 <        f.complete(one);
2711 <        checkCompletedNormally(g, null);
2712 <        assertTrue(r.ran);
2713 <
2714 <        r = new Noop();
2715 <        f = new CompletableFuture<>();
2716 <        f.complete(one);
2717 <        f2 = new CompletableFuture<>();
2718 <        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2719 <        checkCompletedNormally(g, null);
2720 <        assertTrue(r.ran);
3222 >        assertSame(f, f.toCompletableFuture());
3223      }
3224  
3225 <    /**
2724 <     * runAfterEitherAsync result completes exceptionally after exceptional
2725 <     * completion of source
2726 <     */
2727 <    public void testRunAfterEitherAsync2E() {
2728 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2729 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2730 <        Noop r = new Noop();
2731 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2732 <        f.completeExceptionally(new CFException());
2733 <        checkCompletedWithWrappedCFException(g);
3225 >    //--- tests of implementation details; not part of official tck ---
3226  
3227 <        r = new Noop();
3228 <        f = new CompletableFuture<>();
3229 <        f2 = new CompletableFuture<>();
3230 <        f2.completeExceptionally(new CFException());
3231 <        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
3232 <        f.complete(one);
3233 <        checkCompletedWithWrappedCFException(g);
3227 >    Object resultOf(CompletableFuture<?> f) {
3228 >        try {
3229 >            java.lang.reflect.Field resultField
3230 >                = CompletableFuture.class.getDeclaredField("result");
3231 >            resultField.setAccessible(true);
3232 >            return resultField.get(f);
3233 >        } catch (Throwable t) { throw new AssertionError(t); }
3234      }
3235  
3236 <    /**
3237 <     * runAfterEitherAsync result completes exceptionally if action does
3238 <     */
3239 <    public void testRunAfterEitherAsync3E() {
3240 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3241 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
3242 <        FailingNoop r = new FailingNoop();
2751 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2752 <        f.complete(one);
2753 <        checkCompletedWithWrappedCFException(g);
2754 <    }
3236 >    public void testExceptionPropagationReusesResultObject() {
3237 >        if (!testImplementationDetails) return;
3238 >        for (ExecutionMode m : ExecutionMode.values())
3239 >    {
3240 >        final CFException ex = new CFException();
3241 >        final CompletableFuture<Integer> v42 = CompletableFuture.completedFuture(42);
3242 >        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
3243  
3244 <    /**
3245 <     * runAfterEitherAsync result completes exceptionally if either
2758 <     * source cancelled
2759 <     */
2760 <    public void testRunAfterEitherAsync4E() {
2761 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2762 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2763 <        Noop r = new Noop();
2764 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2765 <        assertTrue(f.cancel(true));
2766 <        checkCompletedWithWrappedCancellationException(g);
3244 >        List<Function<CompletableFuture<Integer>, CompletableFuture<?>>> funs
3245 >            = new ArrayList<>();
3246  
3247 <        r = new Noop();
3248 <        f = new CompletableFuture<>();
3249 <        f2 = new CompletableFuture<>();
2771 <        assertTrue(f2.cancel(true));
2772 <        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2773 <        checkCompletedWithWrappedCancellationException(g);
2774 <    }
3247 >        funs.add((y) -> m.thenRun(y, new Noop(m)));
3248 >        funs.add((y) -> m.thenAccept(y, new NoopConsumer(m)));
3249 >        funs.add((y) -> m.thenApply(y, new IncFunction(m)));
3250  
3251 <    /**
3252 <     * thenComposeAsync result completes normally after normal
3253 <     * completion of source
2779 <     */
2780 <    public void testThenComposeAsyncE() {
2781 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2782 <        CompletableFutureInc r = new CompletableFutureInc();
2783 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2784 <        f.complete(one);
2785 <        checkCompletedNormally(g, two);
2786 <    }
3251 >        funs.add((y) -> m.runAfterEither(y, incomplete, new Noop(m)));
3252 >        funs.add((y) -> m.acceptEither(y, incomplete, new NoopConsumer(m)));
3253 >        funs.add((y) -> m.applyToEither(y, incomplete, new IncFunction(m)));
3254  
3255 <    /**
3256 <     * thenComposeAsync result completes exceptionally after
3257 <     * exceptional completion of source
2791 <     */
2792 <    public void testThenComposeAsync2E() {
2793 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2794 <        CompletableFutureInc r = new CompletableFutureInc();
2795 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2796 <        f.completeExceptionally(new CFException());
2797 <        checkCompletedWithWrappedCFException(g);
2798 <    }
2799 <
2800 <    /**
2801 <     * thenComposeAsync result completes exceptionally if action does
2802 <     */
2803 <    public void testThenComposeAsync3E() {
2804 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2805 <        FailingCompletableFutureFunction r = new FailingCompletableFutureFunction();
2806 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2807 <        f.complete(one);
2808 <        checkCompletedWithWrappedCFException(g);
2809 <    }
3255 >        funs.add((y) -> m.runAfterBoth(y, v42, new Noop(m)));
3256 >        funs.add((y) -> m.thenAcceptBoth(y, v42, new SubtractAction(m)));
3257 >        funs.add((y) -> m.thenCombine(y, v42, new SubtractFunction(m)));
3258  
3259 <    /**
2812 <     * thenComposeAsync result completes exceptionally if source cancelled
2813 <     */
2814 <    public void testThenComposeAsync4E() {
2815 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2816 <        CompletableFutureInc r = new CompletableFutureInc();
2817 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2818 <        assertTrue(f.cancel(true));
2819 <        checkCompletedWithWrappedCancellationException(g);
2820 <    }
3259 >        funs.add((y) -> m.whenComplete(y, (Integer x, Throwable t) -> {}));
3260  
3261 <    // other static methods
3261 >        funs.add((y) -> m.thenCompose(y, new CompletableFutureInc(m)));
3262  
3263 <    /**
3264 <     * allOf(no component futures) returns a future completed normally
2826 <     * with the value null
2827 <     */
2828 <    public void testAllOf_empty() throws Exception {
2829 <        CompletableFuture<?> f = CompletableFuture.allOf();
2830 <        checkCompletedNormally(f, null);
2831 <    }
3263 >        funs.add((y) -> CompletableFuture.allOf(new CompletableFuture<?>[] {y, v42}));
3264 >        funs.add((y) -> CompletableFuture.anyOf(new CompletableFuture<?>[] {y, incomplete}));
3265  
3266 <    /**
3267 <     * allOf returns a future completed when all components complete
3268 <     */
3269 <    public void testAllOf() throws Exception {
3270 <        for (int k = 1; k < 20; ++k) {
3271 <            CompletableFuture<Integer>[] fs = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3272 <            for (int i = 0; i < k; ++i)
3273 <                fs[i] = new CompletableFuture<>();
3274 <            CompletableFuture<Void> f = CompletableFuture.allOf(fs);
2842 <            for (int i = 0; i < k; ++i) {
2843 <                checkIncomplete(f);
2844 <                fs[i].complete(one);
2845 <            }
2846 <            checkCompletedNormally(f, null);
3266 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3267 >                 fun : funs) {
3268 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3269 >            f.completeExceptionally(ex);
3270 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3271 >            checkCompletedWithWrappedException(src, ex);
3272 >            CompletableFuture<?> dep = fun.apply(src);
3273 >            checkCompletedWithWrappedException(dep, ex);
3274 >            assertSame(resultOf(src), resultOf(dep));
3275          }
2848    }
3276  
3277 <    /**
3278 <     * anyOf(no component futures) returns an incomplete future
3279 <     */
3280 <    public void testAnyOf_empty() throws Exception {
3281 <        CompletableFuture<?> f = CompletableFuture.anyOf();
3282 <        checkIncomplete(f);
3283 <    }
3284 <
3285 <    /**
2859 <     * anyOf returns a future completed when any components complete
2860 <     */
2861 <    public void testAnyOf() throws Exception {
2862 <        for (int k = 1; k < 20; ++k) {
2863 <            CompletableFuture[] fs = new CompletableFuture[k];
2864 <            for (int i = 0; i < k; ++i)
2865 <                fs[i] = new CompletableFuture<>();
2866 <            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
2867 <            checkIncomplete(f);
2868 <            for (int i = 0; i < k; ++i) {
2869 <                fs[i].complete(one);
2870 <                checkCompletedNormally(f, one);
2871 <            }
3277 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3278 >                 fun : funs) {
3279 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3280 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3281 >            CompletableFuture<?> dep = fun.apply(src);
3282 >            f.completeExceptionally(ex);
3283 >            checkCompletedWithWrappedException(src, ex);
3284 >            checkCompletedWithWrappedException(dep, ex);
3285 >            assertSame(resultOf(src), resultOf(dep));
3286          }
2873    }
2874
2875    /**
2876     * Completion methods throw NullPointerException with null arguments
2877     */
2878    public void testNPE() {
2879        CompletableFuture<Integer> f = new CompletableFuture<>();
2880        CompletableFuture<Integer> g = new CompletableFuture<>();
2881        CompletableFuture<Integer> nullFuture = (CompletableFuture<Integer>)null;
2882        CompletableFuture<?> h;
2883        ThreadExecutor exec = new ThreadExecutor();
3287  
3288 <        Runnable[] throwingActions = {
3289 <            () -> { CompletableFuture.supplyAsync(null); },
3290 <            () -> { CompletableFuture.supplyAsync(null, exec); },
3291 <            () -> { CompletableFuture.supplyAsync(supplyOne, null); },
3292 <
3293 <            () -> { CompletableFuture.runAsync(null); },
3294 <            () -> { CompletableFuture.runAsync(null, exec); },
3295 <            () -> { CompletableFuture.runAsync(() -> {}, null); },
3296 <
3297 <            () -> { f.completeExceptionally(null); },
3298 <
3299 <            () -> { f.thenApply(null); },
2897 <            () -> { f.thenApplyAsync(null); },
2898 <            () -> { f.thenApplyAsync((x) -> x, null); },
2899 <            () -> { f.thenApplyAsync(null, exec); },
2900 <
2901 <            () -> { f.thenAccept(null); },
2902 <            () -> { f.thenAcceptAsync(null); },
2903 <            () -> { f.thenAcceptAsync((x) -> { ; }, null); },
2904 <            () -> { f.thenAcceptAsync(null, exec); },
2905 <
2906 <            () -> { f.thenRun(null); },
2907 <            () -> { f.thenRunAsync(null); },
2908 <            () -> { f.thenRunAsync(() -> { ; }, null); },
2909 <            () -> { f.thenRunAsync(null, exec); },
2910 <
2911 <            () -> { f.thenCombine(g, null); },
2912 <            () -> { f.thenCombineAsync(g, null); },
2913 <            () -> { f.thenCombineAsync(g, null, exec); },
2914 <            () -> { f.thenCombine(nullFuture, (x, y) -> x); },
2915 <            () -> { f.thenCombineAsync(nullFuture, (x, y) -> x); },
2916 <            () -> { f.thenCombineAsync(nullFuture, (x, y) -> x, exec); },
2917 <            () -> { f.thenCombineAsync(g, (x, y) -> x, null); },
2918 <
2919 <            () -> { f.thenAcceptBoth(g, null); },
2920 <            () -> { f.thenAcceptBothAsync(g, null); },
2921 <            () -> { f.thenAcceptBothAsync(g, null, exec); },
2922 <            () -> { f.thenAcceptBoth(nullFuture, (x, y) -> {}); },
2923 <            () -> { f.thenAcceptBothAsync(nullFuture, (x, y) -> {}); },
2924 <            () -> { f.thenAcceptBothAsync(nullFuture, (x, y) -> {}, exec); },
2925 <            () -> { f.thenAcceptBothAsync(g, (x, y) -> {}, null); },
2926 <
2927 <            () -> { f.runAfterBoth(g, null); },
2928 <            () -> { f.runAfterBothAsync(g, null); },
2929 <            () -> { f.runAfterBothAsync(g, null, exec); },
2930 <            () -> { f.runAfterBoth(nullFuture, () -> {}); },
2931 <            () -> { f.runAfterBothAsync(nullFuture, () -> {}); },
2932 <            () -> { f.runAfterBothAsync(nullFuture, () -> {}, exec); },
2933 <            () -> { f.runAfterBothAsync(g, () -> {}, null); },
2934 <
2935 <            () -> { f.applyToEither(g, null); },
2936 <            () -> { f.applyToEitherAsync(g, null); },
2937 <            () -> { f.applyToEitherAsync(g, null, exec); },
2938 <            () -> { f.applyToEither(nullFuture, (x) -> x); },
2939 <            () -> { f.applyToEitherAsync(nullFuture, (x) -> x); },
2940 <            () -> { f.applyToEitherAsync(nullFuture, (x) -> x, exec); },
2941 <            () -> { f.applyToEitherAsync(g, (x) -> x, null); },
2942 <
2943 <            () -> { f.acceptEither(g, null); },
2944 <            () -> { f.acceptEitherAsync(g, null); },
2945 <            () -> { f.acceptEitherAsync(g, null, exec); },
2946 <            () -> { f.acceptEither(nullFuture, (x) -> {}); },
2947 <            () -> { f.acceptEitherAsync(nullFuture, (x) -> {}); },
2948 <            () -> { f.acceptEitherAsync(nullFuture, (x) -> {}, exec); },
2949 <            () -> { f.acceptEitherAsync(g, (x) -> {}, null); },
2950 <
2951 <            () -> { f.runAfterEither(g, null); },
2952 <            () -> { f.runAfterEitherAsync(g, null); },
2953 <            () -> { f.runAfterEitherAsync(g, null, exec); },
2954 <            () -> { f.runAfterEither(nullFuture, () -> {}); },
2955 <            () -> { f.runAfterEitherAsync(nullFuture, () -> {}); },
2956 <            () -> { f.runAfterEitherAsync(nullFuture, () -> {}, exec); },
2957 <            () -> { f.runAfterEitherAsync(g, () -> {}, null); },
2958 <
2959 <            () -> { f.thenCompose(null); },
2960 <            () -> { f.thenComposeAsync(null); },
2961 <            () -> { f.thenComposeAsync(new CompletableFutureInc(), null); },
2962 <            () -> { f.thenComposeAsync(null, exec); },
2963 <
2964 <            () -> { f.exceptionally(null); },
2965 <
2966 <            () -> { f.handle(null); },
2967 <
2968 <            () -> { CompletableFuture.allOf((CompletableFuture<?>)null); },
2969 <            () -> { CompletableFuture.allOf((CompletableFuture<?>[])null); },
2970 <            () -> { CompletableFuture.allOf(f, null); },
2971 <            () -> { CompletableFuture.allOf(null, f); },
2972 <
2973 <            () -> { CompletableFuture.anyOf((CompletableFuture<?>)null); },
2974 <            () -> { CompletableFuture.anyOf((CompletableFuture<?>[])null); },
2975 <            () -> { CompletableFuture.anyOf(f, null); },
2976 <            () -> { CompletableFuture.anyOf(null, f); },
2977 <        };
3288 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3289 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3290 >                 fun : funs) {
3291 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3292 >            f.cancel(mayInterruptIfRunning);
3293 >            checkCancelled(f);
3294 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3295 >            checkCompletedWithWrappedCancellationException(src);
3296 >            CompletableFuture<?> dep = fun.apply(src);
3297 >            checkCompletedWithWrappedCancellationException(dep);
3298 >            assertSame(resultOf(src), resultOf(dep));
3299 >        }
3300  
3301 <        assertThrows(NullPointerException.class, throwingActions);
3302 <        assertEquals(0, exec.count.get());
3303 <    }
3301 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3302 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3303 >                 fun : funs) {
3304 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3305 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3306 >            CompletableFuture<?> dep = fun.apply(src);
3307 >            f.cancel(mayInterruptIfRunning);
3308 >            checkCancelled(f);
3309 >            checkCompletedWithWrappedCancellationException(src);
3310 >            checkCompletedWithWrappedCancellationException(dep);
3311 >            assertSame(resultOf(src), resultOf(dep));
3312 >        }
3313 >    }}
3314  
3315   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines