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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines