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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines