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.28 by jsr166, Sun Jul 14 16:34:49 2013 UTC vs.
Revision 1.47 by jsr166, Mon Jun 2 18:21:34 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.TimeoutException;
21   import java.util.concurrent.atomic.AtomicInteger;
22   import static java.util.concurrent.TimeUnit.MILLISECONDS;
# Line 102 | Line 103 | public class CompletableFutureTest exten
103          assertTrue(f.toString().contains("[Completed exceptionally]"));
104      }
105  
106 +    void checkCompletedWithWrappedCFException(CompletableFuture<?> f,
107 +                                              CFException ex) {
108 +        try {
109 +            f.get(LONG_DELAY_MS, MILLISECONDS);
110 +            shouldThrow();
111 +        } catch (ExecutionException success) {
112 +            assertSame(ex, success.getCause());
113 +        } catch (Throwable fail) { threadUnexpectedException(fail); }
114 +        try {
115 +            f.join();
116 +            shouldThrow();
117 +        } catch (CompletionException success) {
118 +            assertSame(ex, success.getCause());
119 +        }
120 +        try {
121 +            f.getNow(null);
122 +            shouldThrow();
123 +        } catch (CompletionException success) {
124 +            assertSame(ex, success.getCause());
125 +        }
126 +        try {
127 +            f.get();
128 +            shouldThrow();
129 +        } catch (ExecutionException success) {
130 +            assertSame(ex, success.getCause());
131 +        } catch (Throwable fail) { threadUnexpectedException(fail); }
132 +        assertTrue(f.isDone());
133 +        assertFalse(f.isCancelled());
134 +        assertTrue(f.toString().contains("[Completed exceptionally]"));
135 +    }
136 +
137      void checkCancelled(CompletableFuture<?> f) {
138          try {
139              f.get(LONG_DELAY_MS, MILLISECONDS);
# Line 215 | Line 247 | public class CompletableFutureTest exten
247          f = new CompletableFuture<>();
248          f.obtrudeValue(three);
249          checkCompletedNormally(f, three);
250 +        f.obtrudeValue(null);
251 +        checkCompletedNormally(f, null);
252          f = new CompletableFuture<>();
253          f.completeExceptionally(new CFException());
254          f.obtrudeValue(four);
# Line 247 | Line 281 | public class CompletableFutureTest exten
281       */
282      public void testGetNumberOfDependents() {
283          CompletableFuture<Integer> f = new CompletableFuture<>();
284 <        assertEquals(f.getNumberOfDependents(), 0);
284 >        assertEquals(0, f.getNumberOfDependents());
285          CompletableFuture g = f.thenRun(new Noop());
286 <        assertEquals(f.getNumberOfDependents(), 1);
287 <        assertEquals(g.getNumberOfDependents(), 0);
286 >        assertEquals(1, f.getNumberOfDependents());
287 >        assertEquals(0, g.getNumberOfDependents());
288          CompletableFuture h = f.thenRun(new Noop());
289 <        assertEquals(f.getNumberOfDependents(), 2);
289 >        assertEquals(2, f.getNumberOfDependents());
290          f.complete(1);
291          checkCompletedNormally(g, null);
292 <        assertEquals(f.getNumberOfDependents(), 0);
293 <        assertEquals(g.getNumberOfDependents(), 0);
292 >        assertEquals(0, f.getNumberOfDependents());
293 >        assertEquals(0, g.getNumberOfDependents());
294      }
295  
296      /**
# Line 286 | Line 320 | public class CompletableFutureTest exten
320  
321      // Choose non-commutative actions for better coverage
322  
323 +    // A non-commutative function that handles and produces null values as well.
324 +    static Integer subtract(Integer x, Integer y) {
325 +        return (x == null && y == null) ? null :
326 +            ((x == null) ? 42 : x.intValue())
327 +            - ((y == null) ? 99 : y.intValue());
328 +    }
329 +
330 +    // A function that handles and produces null values as well.
331 +    static Integer inc(Integer x) {
332 +        return (x == null) ? null : x + 1;
333 +    }
334 +
335      static final Supplier<Integer> supplyOne =
336          () -> Integer.valueOf(1);
337      static final Function<Integer, Integer> inc =
338          (Integer x) -> Integer.valueOf(x.intValue() + 1);
339      static final BiFunction<Integer, Integer, Integer> subtract =
340 <        (Integer x, Integer y) -> Integer.valueOf(x.intValue() - y.intValue());
340 >        (Integer x, Integer y) -> subtract(x, y);
341      static final class IncAction implements Consumer<Integer> {
342 <        int value;
343 <        public void accept(Integer x) { value = x.intValue() + 1; }
342 >        int invocationCount = 0;
343 >        Integer value;
344 >        public void accept(Integer x) {
345 >            invocationCount++;
346 >            value = inc(x);
347 >        }
348 >    }
349 >    static final class IncFunction implements Function<Integer,Integer> {
350 >        int invocationCount = 0;
351 >        Integer value;
352 >        public Integer apply(Integer x) {
353 >            invocationCount++;
354 >            return value = inc(x);
355 >        }
356      }
357      static final class SubtractAction implements BiConsumer<Integer, Integer> {
358 <        int value;
358 >        int invocationCount = 0;
359 >        Integer value;
360 >        // Check this action was invoked exactly once when result is computed.
361          public void accept(Integer x, Integer y) {
362 <            value = x.intValue() - y.intValue();
362 >            invocationCount++;
363 >            value = subtract(x, y);
364 >        }
365 >    }
366 >    static final class SubtractFunction implements BiFunction<Integer, Integer, Integer> {
367 >        int invocationCount = 0;
368 >        Integer value;
369 >        // Check this action was invoked exactly once when result is computed.
370 >        public Integer apply(Integer x, Integer y) {
371 >            invocationCount++;
372 >            return value = subtract(x, y);
373          }
374      }
375      static final class Noop implements Runnable {
376 <        boolean ran;
377 <        public void run() { ran = true; }
376 >        int invocationCount = 0;
377 >        public void run() {
378 >            invocationCount++;
379 >        }
380      }
381  
382      static final class FailingSupplier implements Supplier<Integer> {
383 <        boolean ran;
384 <        public Integer get() { ran = true; throw new CFException(); }
383 >        int invocationCount = 0;
384 >        public Integer get() {
385 >            invocationCount++;
386 >            throw new CFException();
387 >        }
388      }
389      static final class FailingConsumer implements Consumer<Integer> {
390 <        boolean ran;
391 <        public void accept(Integer x) { ran = true; throw new CFException(); }
390 >        int invocationCount = 0;
391 >        public void accept(Integer x) {
392 >            invocationCount++;
393 >            throw new CFException();
394 >        }
395      }
396      static final class FailingBiConsumer implements BiConsumer<Integer, Integer> {
397 <        boolean ran;
398 <        public void accept(Integer x, Integer y) { ran = true; throw new CFException(); }
397 >        int invocationCount = 0;
398 >        public void accept(Integer x, Integer y) {
399 >            invocationCount++;
400 >            throw new CFException();
401 >        }
402      }
403      static final class FailingFunction implements Function<Integer, Integer> {
404 <        boolean ran;
405 <        public Integer apply(Integer x) { ran = true; throw new CFException(); }
404 >        int invocationCount = 0;
405 >        public Integer apply(Integer x) {
406 >            invocationCount++;
407 >            throw new CFException();
408 >        }
409      }
410      static final class FailingBiFunction implements BiFunction<Integer, Integer, Integer> {
411 <        boolean ran;
412 <        public Integer apply(Integer x, Integer y) { ran = true; throw new CFException(); }
411 >        int invocationCount = 0;
412 >        public Integer apply(Integer x, Integer y) {
413 >            invocationCount++;
414 >            throw new CFException();
415 >        }
416      }
417      static final class FailingNoop implements Runnable {
418 <        boolean ran;
419 <        public void run() { ran = true; throw new CFException(); }
418 >        int invocationCount = 0;
419 >        public void run() {
420 >            invocationCount++;
421 >            throw new CFException();
422 >        }
423      }
424  
425      static final class CompletableFutureInc
426          implements Function<Integer, CompletableFuture<Integer>> {
427 <        boolean ran;
427 >        int invocationCount = 0;
428          public CompletableFuture<Integer> apply(Integer x) {
429 <            ran = true;
429 >            invocationCount++;
430              CompletableFuture<Integer> f = new CompletableFuture<>();
431 <            f.complete(Integer.valueOf(x.intValue() + 1));
431 >            f.complete(inc(x));
432              return f;
433          }
434      }
435  
436      static final class FailingCompletableFutureFunction
437          implements Function<Integer, CompletableFuture<Integer>> {
438 <        boolean ran;
438 >        int invocationCount = 0;
439          public CompletableFuture<Integer> apply(Integer x) {
440 <            ran = true; throw new CFException();
440 >            invocationCount++;
441 >            throw new CFException();
442          }
443      }
444  
# Line 361 | Line 452 | public class CompletableFutureTest exten
452          }
453      }
454  
455 <    static final class ExceptionToInteger implements Function<Throwable, Integer> {
456 <        public Integer apply(Throwable x) { return Integer.valueOf(3); }
457 <    }
455 >    /**
456 >     * Permits the testing of parallel code for the 3 different
457 >     * execution modes without repeating all the testing code.
458 >     */
459 >    enum ExecutionMode {
460 >        DEFAULT {
461 >            public <T> CompletableFuture<Void> thenRun
462 >                (CompletableFuture<T> f, Runnable a) {
463 >                return f.thenRun(a);
464 >            }
465 >            public <T> CompletableFuture<Void> thenAccept
466 >                (CompletableFuture<T> f, Consumer<? super T> a) {
467 >                return f.thenAccept(a);
468 >            }
469 >            public <T,U> CompletableFuture<U> thenApply
470 >                (CompletableFuture<T> f, Function<? super T,U> a) {
471 >                return f.thenApply(a);
472 >            }
473 >            public <T,U> CompletableFuture<U> thenCompose
474 >                (CompletableFuture<T> f,
475 >                 Function<? super T,? extends CompletionStage<U>> a) {
476 >                return f.thenCompose(a);
477 >            }
478 >            public <T,U> CompletableFuture<U> handle
479 >                (CompletableFuture<T> f,
480 >                 BiFunction<? super T,Throwable,? extends U> a) {
481 >                return f.handle(a);
482 >            }
483 >            public <T> CompletableFuture<T> whenComplete
484 >                (CompletableFuture<T> f,
485 >                 BiConsumer<? super T,? super Throwable> a) {
486 >                return f.whenComplete(a);
487 >            }
488 >            public <T,U> CompletableFuture<Void> runAfterBoth
489 >                (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
490 >                return f.runAfterBoth(g, a);
491 >            }
492 >            public <T,U> CompletableFuture<Void> thenAcceptBoth
493 >                (CompletableFuture<T> f,
494 >                 CompletionStage<? extends U> g,
495 >                 BiConsumer<? super T,? super U> a) {
496 >                return f.thenAcceptBoth(g, a);
497 >            }
498 >            public <T,U,V> CompletableFuture<V> thenCombine
499 >                (CompletableFuture<T> f,
500 >                 CompletionStage<? extends U> g,
501 >                 BiFunction<? super T,? super U,? extends V> a) {
502 >                return f.thenCombine(g, a);
503 >            }
504 >            public <T> CompletableFuture<Void> runAfterEither
505 >                (CompletableFuture<T> f,
506 >                 CompletionStage<?> g,
507 >                 java.lang.Runnable a) {
508 >                return f.runAfterEither(g, a);
509 >            }
510 >            public <T> CompletableFuture<Void> acceptEither
511 >                (CompletableFuture<T> f,
512 >                 CompletionStage<? extends T> g,
513 >                 Consumer<? super T> a) {
514 >                return f.acceptEither(g, a);
515 >            }
516 >            public <T,U> CompletableFuture<U> applyToEither
517 >                (CompletableFuture<T> f,
518 >                 CompletionStage<? extends T> g,
519 >                 Function<? super T,U> a) {
520 >                return f.applyToEither(g, a);
521 >            }
522 >        },
523  
524 <    static final class IntegerHandler implements BiFunction<Integer, Throwable, Integer> {
525 <        boolean ran;
526 <        public Integer apply(Integer x, Throwable t) {
527 <            ran = true;
528 <            return (t == null) ? two : three;
529 <        }
524 >        DEFAULT_ASYNC {
525 >            public <T> CompletableFuture<Void> thenRun
526 >                (CompletableFuture<T> f, Runnable a) {
527 >                return f.thenRunAsync(a);
528 >            }
529 >            public <T> CompletableFuture<Void> thenAccept
530 >                (CompletableFuture<T> f, Consumer<? super T> a) {
531 >                return f.thenAcceptAsync(a);
532 >            }
533 >            public <T,U> CompletableFuture<U> thenApply
534 >                (CompletableFuture<T> f, Function<? super T,U> a) {
535 >                return f.thenApplyAsync(a);
536 >            }
537 >            public <T,U> CompletableFuture<U> thenCompose
538 >                (CompletableFuture<T> f,
539 >                 Function<? super T,? extends CompletionStage<U>> a) {
540 >                return f.thenComposeAsync(a);
541 >            }
542 >            public <T,U> CompletableFuture<U> handle
543 >                (CompletableFuture<T> f,
544 >                 BiFunction<? super T,Throwable,? extends U> a) {
545 >                return f.handleAsync(a);
546 >            }
547 >            public <T> CompletableFuture<T> whenComplete
548 >                (CompletableFuture<T> f,
549 >                 BiConsumer<? super T,? super Throwable> a) {
550 >                return f.whenCompleteAsync(a);
551 >            }
552 >            public <T,U> CompletableFuture<Void> runAfterBoth
553 >                (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
554 >                return f.runAfterBothAsync(g, a);
555 >            }
556 >            public <T,U> CompletableFuture<Void> thenAcceptBoth
557 >                (CompletableFuture<T> f,
558 >                 CompletionStage<? extends U> g,
559 >                 BiConsumer<? super T,? super U> a) {
560 >                return f.thenAcceptBothAsync(g, a);
561 >            }
562 >            public <T,U,V> CompletableFuture<V> thenCombine
563 >                (CompletableFuture<T> f,
564 >                 CompletionStage<? extends U> g,
565 >                 BiFunction<? super T,? super U,? extends V> a) {
566 >                return f.thenCombineAsync(g, a);
567 >            }
568 >            public <T> CompletableFuture<Void> runAfterEither
569 >                (CompletableFuture<T> f,
570 >                 CompletionStage<?> g,
571 >                 java.lang.Runnable a) {
572 >                return f.runAfterEitherAsync(g, a);
573 >            }
574 >            public <T> CompletableFuture<Void> acceptEither
575 >                (CompletableFuture<T> f,
576 >                 CompletionStage<? extends T> g,
577 >                 Consumer<? super T> a) {
578 >                return f.acceptEitherAsync(g, a);
579 >            }
580 >            public <T,U> CompletableFuture<U> applyToEither
581 >                (CompletableFuture<T> f,
582 >                 CompletionStage<? extends T> g,
583 >                 Function<? super T,U> a) {
584 >                return f.applyToEitherAsync(g, a);
585 >            }
586 >        },
587 >
588 >        EXECUTOR {
589 >            public <T> CompletableFuture<Void> thenRun
590 >                (CompletableFuture<T> f, Runnable a) {
591 >                return f.thenRunAsync(a, new ThreadExecutor());
592 >            }
593 >            public <T> CompletableFuture<Void> thenAccept
594 >                (CompletableFuture<T> f, Consumer<? super T> a) {
595 >                return f.thenAcceptAsync(a, new ThreadExecutor());
596 >            }
597 >            public <T,U> CompletableFuture<U> thenApply
598 >                (CompletableFuture<T> f, Function<? super T,U> a) {
599 >                return f.thenApplyAsync(a, new ThreadExecutor());
600 >            }
601 >            public <T,U> CompletableFuture<U> thenCompose
602 >                (CompletableFuture<T> f,
603 >                 Function<? super T,? extends CompletionStage<U>> a) {
604 >                return f.thenComposeAsync(a, new ThreadExecutor());
605 >            }
606 >            public <T,U> CompletableFuture<U> handle
607 >                (CompletableFuture<T> f,
608 >                 BiFunction<? super T,Throwable,? extends U> a) {
609 >                return f.handleAsync(a, new ThreadExecutor());
610 >            }
611 >            public <T> CompletableFuture<T> whenComplete
612 >                (CompletableFuture<T> f,
613 >                 BiConsumer<? super T,? super Throwable> a) {
614 >                return f.whenCompleteAsync(a, new ThreadExecutor());
615 >            }
616 >            public <T,U> CompletableFuture<Void> runAfterBoth
617 >                (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
618 >                return f.runAfterBothAsync(g, a, new ThreadExecutor());
619 >            }
620 >            public <T,U> CompletableFuture<Void> thenAcceptBoth
621 >                (CompletableFuture<T> f,
622 >                 CompletionStage<? extends U> g,
623 >                 BiConsumer<? super T,? super U> a) {
624 >                return f.thenAcceptBothAsync(g, a, new ThreadExecutor());
625 >            }
626 >            public <T,U,V> CompletableFuture<V> thenCombine
627 >                (CompletableFuture<T> f,
628 >                 CompletionStage<? extends U> g,
629 >                 BiFunction<? super T,? super U,? extends V> a) {
630 >                return f.thenCombineAsync(g, a, new ThreadExecutor());
631 >            }
632 >            public <T> CompletableFuture<Void> runAfterEither
633 >                (CompletableFuture<T> f,
634 >                 CompletionStage<?> g,
635 >                 java.lang.Runnable a) {
636 >                return f.runAfterEitherAsync(g, a, new ThreadExecutor());
637 >            }
638 >            public <T> CompletableFuture<Void> acceptEither
639 >                (CompletableFuture<T> f,
640 >                 CompletionStage<? extends T> g,
641 >                 Consumer<? super T> a) {
642 >                return f.acceptEitherAsync(g, a, new ThreadExecutor());
643 >            }
644 >            public <T,U> CompletableFuture<U> applyToEither
645 >                (CompletableFuture<T> f,
646 >                 CompletionStage<? extends T> g,
647 >                 Function<? super T,U> a) {
648 >                return f.applyToEitherAsync(g, a, new ThreadExecutor());
649 >            }
650 >        };
651 >
652 >        public abstract <T> CompletableFuture<Void> thenRun
653 >            (CompletableFuture<T> f, Runnable a);
654 >        public abstract <T> CompletableFuture<Void> thenAccept
655 >            (CompletableFuture<T> f, Consumer<? super T> a);
656 >        public abstract <T,U> CompletableFuture<U> thenApply
657 >            (CompletableFuture<T> f, Function<? super T,U> a);
658 >        public abstract <T,U> CompletableFuture<U> thenCompose
659 >            (CompletableFuture<T> f,
660 >             Function<? super T,? extends CompletionStage<U>> a);
661 >        public abstract <T,U> CompletableFuture<U> handle
662 >            (CompletableFuture<T> f,
663 >             BiFunction<? super T,Throwable,? extends U> a);
664 >        public abstract <T> CompletableFuture<T> whenComplete
665 >            (CompletableFuture<T> f,
666 >             BiConsumer<? super T,? super Throwable> a);
667 >        public abstract <T,U> CompletableFuture<Void> runAfterBoth
668 >            (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a);
669 >        public abstract <T,U> CompletableFuture<Void> thenAcceptBoth
670 >            (CompletableFuture<T> f,
671 >             CompletionStage<? extends U> g,
672 >             BiConsumer<? super T,? super U> a);
673 >        public abstract <T,U,V> CompletableFuture<V> thenCombine
674 >            (CompletableFuture<T> f,
675 >             CompletionStage<? extends U> g,
676 >             BiFunction<? super T,? super U,? extends V> a);
677 >        public abstract <T> CompletableFuture<Void> runAfterEither
678 >            (CompletableFuture<T> f,
679 >             CompletionStage<?> g,
680 >             java.lang.Runnable a);
681 >        public abstract <T> CompletableFuture<Void> acceptEither
682 >            (CompletableFuture<T> f,
683 >             CompletionStage<? extends T> g,
684 >             Consumer<? super T> a);
685 >        public abstract <T,U> CompletableFuture<U> applyToEither
686 >            (CompletableFuture<T> f,
687 >             CompletionStage<? extends T> g,
688 >             Function<? super T,U> a);
689      }
690  
691      /**
692 <     * exceptionally action completes with function value on source
693 <     * exception;  otherwise with source value
694 <     */
695 <    public void testExceptionally() {
696 <        CompletableFuture<Integer> f = new CompletableFuture<>();
697 <        ExceptionToInteger r = new ExceptionToInteger();
698 <        CompletableFuture<Integer> g = f.exceptionally(r);
699 <        f.completeExceptionally(new CFException());
700 <        checkCompletedNormally(g, three);
692 >     * exceptionally action is not invoked when source completes
693 >     * normally, and source result is propagated
694 >     */
695 >    public void testExceptionally_normalCompletion() {
696 >        for (boolean createIncomplete : new boolean[] { true, false })
697 >        for (Integer v1 : new Integer[] { 1, null })
698 >    {
699 >        final AtomicInteger a = new AtomicInteger(0);
700 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
701 >        if (!createIncomplete) f.complete(v1);
702 >        final CompletableFuture<Integer> g = f.exceptionally
703 >            ((Throwable t) -> {
704 >                // Should not be called
705 >                a.getAndIncrement();
706 >                throw new AssertionError();
707 >            });
708 >        if (createIncomplete) f.complete(v1);
709 >
710 >        checkCompletedNormally(g, v1);
711 >        checkCompletedNormally(f, v1);
712 >        assertEquals(0, a.get());
713 >    }}
714  
387        f = new CompletableFuture<>();
388        r = new ExceptionToInteger();
389        g = f.exceptionally(r);
390        f.complete(one);
391        checkCompletedNormally(g, one);
392    }
715  
716      /**
717 <     * handle action completes normally with function value on either
718 <     * normal or exceptional completion of source
717 >     * exceptionally action completes with function value on source
718 >     * exception
719       */
720 <    public void testHandle() {
721 <        CompletableFuture<Integer> f, g;
722 <        IntegerHandler r;
720 >    public void testExceptionally_exceptionalCompletion() {
721 >        for (boolean createIncomplete : new boolean[] { true, false })
722 >        for (Integer v1 : new Integer[] { 1, null })
723 >    {
724 >        final AtomicInteger a = new AtomicInteger(0);
725 >        final CFException ex = new CFException();
726 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
727 >        if (!createIncomplete) f.completeExceptionally(ex);
728 >        final CompletableFuture<Integer> g = f.exceptionally
729 >            ((Throwable t) -> {
730 >                threadAssertSame(t, ex);
731 >                a.getAndIncrement();
732 >                return v1;
733 >            });
734 >        if (createIncomplete) f.completeExceptionally(ex);
735 >
736 >        checkCompletedNormally(g, v1);
737 >        assertEquals(1, a.get());
738 >    }}
739 >
740 >    public void testExceptionally_exceptionalCompletionActionFailed() {
741 >        for (boolean createIncomplete : new boolean[] { true, false })
742 >        for (Integer v1 : new Integer[] { 1, null })
743 >    {
744 >        final AtomicInteger a = new AtomicInteger(0);
745 >        final CFException ex1 = new CFException();
746 >        final CFException ex2 = new CFException();
747 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
748 >        if (!createIncomplete) f.completeExceptionally(ex1);
749 >        final CompletableFuture<Integer> g = f.exceptionally
750 >            ((Throwable t) -> {
751 >                threadAssertSame(t, ex1);
752 >                a.getAndIncrement();
753 >                throw ex2;
754 >            });
755 >        if (createIncomplete) f.completeExceptionally(ex1);
756 >
757 >        checkCompletedWithWrappedCFException(g, ex2);
758 >        assertEquals(1, a.get());
759 >    }}
760 >
761 >    /**
762 >     * handle action completes normally with function value on normal
763 >     * completion of source
764 >     */
765 >    public void testHandle_normalCompletion() {
766 >        for (ExecutionMode m : ExecutionMode.values())
767 >        for (boolean createIncomplete : new boolean[] { true, false })
768 >        for (Integer v1 : new Integer[] { 1, null })
769 >    {
770 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
771 >        final AtomicInteger a = new AtomicInteger(0);
772 >        if (!createIncomplete) f.complete(v1);
773 >        final CompletableFuture<Integer> g = m.handle
774 >            (f,
775 >             (Integer x, Throwable t) -> {
776 >                threadAssertSame(x, v1);
777 >                threadAssertNull(t);
778 >                a.getAndIncrement();
779 >                return inc(v1);
780 >            });
781 >        if (createIncomplete) f.complete(v1);
782 >
783 >        checkCompletedNormally(g, inc(v1));
784 >        checkCompletedNormally(f, v1);
785 >        assertEquals(1, a.get());
786 >    }}
787  
788 <        f = new CompletableFuture<>();
789 <        f.completeExceptionally(new CFException());
790 <        g = f.handle(r = new IntegerHandler());
791 <        assertTrue(r.ran);
792 <        checkCompletedNormally(g, three);
793 <
794 <        f = new CompletableFuture<>();
795 <        g = f.handle(r = new IntegerHandler());
796 <        assertFalse(r.ran);
797 <        f.completeExceptionally(new CFException());
798 <        checkCompletedNormally(g, three);
799 <        assertTrue(r.ran);
788 >    /**
789 >     * handle action completes normally with function value on
790 >     * exceptional completion of source
791 >     */
792 >    public void testHandle_exceptionalCompletion() {
793 >        for (ExecutionMode m : ExecutionMode.values())
794 >        for (boolean createIncomplete : new boolean[] { true, false })
795 >        for (Integer v1 : new Integer[] { 1, null })
796 >    {
797 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
798 >        final AtomicInteger a = new AtomicInteger(0);
799 >        final CFException ex = new CFException();
800 >        if (!createIncomplete) f.completeExceptionally(ex);
801 >        final CompletableFuture<Integer> g = m.handle
802 >            (f,
803 >             (Integer x, Throwable t) -> {
804 >                threadAssertNull(x);
805 >                threadAssertSame(t, ex);
806 >                a.getAndIncrement();
807 >                return v1;
808 >            });
809 >        if (createIncomplete) f.completeExceptionally(ex);
810 >
811 >        checkCompletedNormally(g, v1);
812 >        checkCompletedWithWrappedCFException(f, ex);
813 >        assertEquals(1, a.get());
814 >    }}
815 >
816 >    /**
817 >     * handle action completes normally with function value on
818 >     * cancelled source
819 >     */
820 >    public void testHandle_sourceCancelled() {
821 >        for (ExecutionMode m : ExecutionMode.values())
822 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
823 >        for (boolean createIncomplete : new boolean[] { true, false })
824 >        for (Integer v1 : new Integer[] { 1, null })
825 >    {
826 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
827 >        final AtomicInteger a = new AtomicInteger(0);
828 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
829 >        final CompletableFuture<Integer> g = m.handle
830 >            (f,
831 >             (Integer x, Throwable t) -> {
832 >                threadAssertNull(x);
833 >                threadAssertTrue(t instanceof CancellationException);
834 >                a.getAndIncrement();
835 >                return v1;
836 >            });
837 >        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
838  
839 <        f = new CompletableFuture<>();
840 <        f.complete(one);
841 <        g = f.handle(r = new IntegerHandler());
842 <        assertTrue(r.ran);
419 <        checkCompletedNormally(g, two);
839 >        checkCompletedNormally(g, v1);
840 >        checkCancelled(f);
841 >        assertEquals(1, a.get());
842 >    }}
843  
844 <        f = new CompletableFuture<>();
845 <        g = f.handle(r = new IntegerHandler());
846 <        assertFalse(r.ran);
847 <        f.complete(one);
848 <        assertTrue(r.ran);
849 <        checkCompletedNormally(g, two);
850 <    }
844 >    /**
845 >     * handle result completes exceptionally if action does
846 >     */
847 >    public void testHandle_sourceFailedActionFailed() {
848 >        for (ExecutionMode m : ExecutionMode.values())
849 >        for (boolean createIncomplete : new boolean[] { true, false })
850 >    {
851 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
852 >        final AtomicInteger a = new AtomicInteger(0);
853 >        final CFException ex1 = new CFException();
854 >        final CFException ex2 = new CFException();
855 >        if (!createIncomplete) f.completeExceptionally(ex1);
856 >        final CompletableFuture<Integer> g = m.handle
857 >            (f,
858 >             (Integer x, Throwable t) -> {
859 >                threadAssertNull(x);
860 >                threadAssertSame(ex1, t);
861 >                a.getAndIncrement();
862 >                throw ex2;
863 >            });
864 >        if (createIncomplete) f.completeExceptionally(ex1);
865 >
866 >        checkCompletedWithWrappedCFException(g, ex2);
867 >        checkCompletedWithWrappedCFException(f, ex1);
868 >        assertEquals(1, a.get());
869 >    }}
870 >
871 >    public void testHandle_sourceCompletedNormallyActionFailed() {
872 >        for (ExecutionMode m : ExecutionMode.values())
873 >        for (boolean createIncomplete : new boolean[] { true, false })
874 >        for (Integer v1 : new Integer[] { 1, null })
875 >    {
876 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
877 >        final AtomicInteger a = new AtomicInteger(0);
878 >        final CFException ex = new CFException();
879 >        if (!createIncomplete) f.complete(v1);
880 >        final CompletableFuture<Integer> g = m.handle
881 >            (f,
882 >             (Integer x, Throwable t) -> {
883 >                threadAssertSame(x, v1);
884 >                threadAssertNull(t);
885 >                a.getAndIncrement();
886 >                throw ex;
887 >            });
888 >        if (createIncomplete) f.complete(v1);
889 >
890 >        checkCompletedWithWrappedCFException(g, ex);
891 >        checkCompletedNormally(f, v1);
892 >        assertEquals(1, a.get());
893 >    }}
894  
895      /**
896       * runAsync completes after running Runnable
# Line 433 | Line 899 | public class CompletableFutureTest exten
899          Noop r = new Noop();
900          CompletableFuture<Void> f = CompletableFuture.runAsync(r);
901          assertNull(f.join());
902 <        assertTrue(r.ran);
902 >        assertEquals(1, r.invocationCount);
903          checkCompletedNormally(f, null);
904      }
905  
# Line 445 | Line 911 | public class CompletableFutureTest exten
911          ThreadExecutor exec = new ThreadExecutor();
912          CompletableFuture<Void> f = CompletableFuture.runAsync(r, exec);
913          assertNull(f.join());
914 <        assertTrue(r.ran);
914 >        assertEquals(1, r.invocationCount);
915          checkCompletedNormally(f, null);
916          assertEquals(1, exec.count.get());
917      }
# Line 457 | Line 923 | public class CompletableFutureTest exten
923          FailingNoop r = new FailingNoop();
924          CompletableFuture<Void> f = CompletableFuture.runAsync(r);
925          checkCompletedWithWrappedCFException(f);
926 <        assertTrue(r.ran);
926 >        assertEquals(1, r.invocationCount);
927      }
928  
929      /**
# Line 487 | Line 953 | public class CompletableFutureTest exten
953          FailingSupplier r = new FailingSupplier();
954          CompletableFuture<Integer> f = CompletableFuture.supplyAsync(r);
955          checkCompletedWithWrappedCFException(f);
956 <        assertTrue(r.ran);
956 >        assertEquals(1, r.invocationCount);
957      }
958  
959      // seq completion methods
# Line 504 | Line 970 | public class CompletableFutureTest exten
970          g = f.thenRun(r = new Noop());
971          f.complete(null);
972          checkCompletedNormally(g, null);
973 <        assertTrue(r.ran);
973 >        assertEquals(1, r.invocationCount);
974  
975          f = new CompletableFuture<>();
976          f.complete(null);
977          g = f.thenRun(r = new Noop());
978          checkCompletedNormally(g, null);
979 <        assertTrue(r.ran);
979 >        assertEquals(1, r.invocationCount);
980      }
981  
982      /**
# Line 526 | Line 992 | public class CompletableFutureTest exten
992          g = f.thenRun(r = new Noop());
993          f.completeExceptionally(new CFException());
994          checkCompletedWithWrappedCFException(g);
995 <        assertFalse(r.ran);
995 >        assertEquals(0, r.invocationCount);
996  
997          f = new CompletableFuture<>();
998          f.completeExceptionally(new CFException());
999          g = f.thenRun(r = new Noop());
1000          checkCompletedWithWrappedCFException(g);
1001 <        assertFalse(r.ran);
1001 >        assertEquals(0, r.invocationCount);
1002      }
1003  
1004      /**
# Line 623 | Line 1089 | public class CompletableFutureTest exten
1089          CompletableFuture<Void> g = f.thenAccept(r);
1090          f.complete(one);
1091          checkCompletedNormally(g, null);
1092 <        assertEquals(r.value, 2);
1092 >        assertEquals(r.value, (Integer) 2);
1093      }
1094  
1095      /**
# Line 647 | Line 1113 | public class CompletableFutureTest exten
1113          CompletableFuture<Void> g = f.thenAccept(r);
1114          f.complete(one);
1115          checkCompletedWithWrappedCFException(g);
1116 <        assertTrue(r.ran);
1116 >        assertEquals(1, r.invocationCount);
1117      }
1118  
1119      /**
# Line 665 | Line 1131 | public class CompletableFutureTest exten
1131       * thenCombine result completes normally after normal completion
1132       * of sources
1133       */
1134 <    public void testThenCombine() {
1135 <        CompletableFuture<Integer> f, g, h;
1136 <
1137 <        f = new CompletableFuture<>();
1138 <        g = new CompletableFuture<>();
1139 <        h = f.thenCombine(g, subtract);
1140 <        f.complete(3);
1141 <        checkIncomplete(h);
1142 <        g.complete(1);
1143 <        checkCompletedNormally(h, 2);
1144 <
1145 <        f = new CompletableFuture<>();
1146 <        g = new CompletableFuture<>();
1147 <        h = f.thenCombine(g, subtract);
1148 <        g.complete(1);
1149 <        checkIncomplete(h);
1150 <        f.complete(3);
1151 <        checkCompletedNormally(h, 2);
1152 <
1153 <        f = new CompletableFuture<>();
1154 <        g = new CompletableFuture<>();
1155 <        g.complete(1);
1156 <        f.complete(3);
1157 <        h = f.thenCombine(g, subtract);
1158 <        checkCompletedNormally(h, 2);
1159 <    }
1134 >    public void testThenCombine_normalCompletion1() {
1135 >        for (boolean createIncomplete : new boolean[] { true, false })
1136 >        for (boolean fFirst : new boolean[] { true, false })
1137 >        for (ExecutionMode m : ExecutionMode.values())
1138 >        for (Integer v1 : new Integer[] { 1, null })
1139 >        for (Integer v2 : new Integer[] { 2, null })
1140 >    {
1141 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1142 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1143 >        final SubtractFunction r = new SubtractFunction();
1144 >        CompletableFuture<Integer> h = null;
1145 >        if (createIncomplete) h = m.thenCombine(f, g, r);
1146 >
1147 >        if (fFirst)
1148 >            f.complete(v1);
1149 >        else
1150 >            g.complete(v2);
1151 >        if (createIncomplete) checkIncomplete(h);
1152 >        assertEquals(0, r.invocationCount);
1153 >        if (!fFirst)
1154 >            f.complete(v1);
1155 >        else
1156 >            g.complete(v2);
1157 >        if (!createIncomplete) h = m.thenCombine(f, g, r);
1158 >
1159 >        checkCompletedNormally(h, subtract(v1, v2));
1160 >        checkCompletedNormally(f, v1);
1161 >        checkCompletedNormally(g, v2);
1162 >        assertEquals(1, r.invocationCount);
1163 >    }}
1164  
1165      /**
1166       * thenCombine result completes exceptionally after exceptional
1167       * completion of either source
1168       */
1169 <    public void testThenCombine2() {
1170 <        CompletableFuture<Integer> f, g, h;
1171 <
1172 <        f = new CompletableFuture<>();
1173 <        g = new CompletableFuture<>();
1174 <        h = f.thenCombine(g, subtract);
1175 <        f.completeExceptionally(new CFException());
1176 <        checkIncomplete(h);
1177 <        g.complete(1);
1178 <        checkCompletedWithWrappedCFException(h);
1179 <
1180 <        f = new CompletableFuture<>();
1181 <        g = new CompletableFuture<>();
1182 <        h = f.thenCombine(g, subtract);
1183 <        g.completeExceptionally(new CFException());
1184 <        checkIncomplete(h);
1185 <        f.complete(3);
1186 <        checkCompletedWithWrappedCFException(h);
1187 <
1188 <        f = new CompletableFuture<>();
1189 <        g = new CompletableFuture<>();
1190 <        f.complete(3);
1191 <        g.completeExceptionally(new CFException());
1192 <        h = f.thenCombine(g, subtract);
1193 <        checkCompletedWithWrappedCFException(h);
1194 <
1195 <        f = new CompletableFuture<>();
1196 <        g = new CompletableFuture<>();
1197 <        f.completeExceptionally(new CFException());
1198 <        g.complete(3);
1199 <        h = f.thenCombine(g, subtract);
1200 <        checkCompletedWithWrappedCFException(h);
1201 <    }
1169 >    public void testThenCombine_exceptionalCompletion1() {
1170 >        for (ExecutionMode m : ExecutionMode.values())
1171 >        for (Integer v1 : new Integer[] { 1, null })
1172 >    {
1173 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1174 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1175 >        final SubtractFunction r = new SubtractFunction();
1176 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1177 >        final CFException ex = new CFException();
1178 >
1179 >        f.completeExceptionally(ex);
1180 >        checkIncomplete(h);
1181 >        g.complete(v1);
1182 >
1183 >        checkCompletedWithWrappedCFException(h, ex);
1184 >        checkCompletedWithWrappedCFException(f, ex);
1185 >        assertEquals(0, r.invocationCount);
1186 >        checkCompletedNormally(g, v1);
1187 >    }}
1188 >
1189 >    public void testThenCombine_exceptionalCompletion2() {
1190 >        for (ExecutionMode m : ExecutionMode.values())
1191 >        for (Integer v1 : new Integer[] { 1, null })
1192 >    {
1193 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1194 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1195 >        final SubtractFunction r = new SubtractFunction();
1196 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1197 >        final CFException ex = new CFException();
1198 >
1199 >        g.completeExceptionally(ex);
1200 >        checkIncomplete(h);
1201 >        f.complete(v1);
1202 >
1203 >        checkCompletedWithWrappedCFException(h, ex);
1204 >        checkCompletedWithWrappedCFException(g, ex);
1205 >        assertEquals(0, r.invocationCount);
1206 >        checkCompletedNormally(f, v1);
1207 >    }}
1208 >
1209 >    public void testThenCombine_exceptionalCompletion3() {
1210 >        for (ExecutionMode m : ExecutionMode.values())
1211 >        for (Integer v1 : new Integer[] { 1, null })
1212 >    {
1213 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1214 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1215 >        final SubtractFunction r = new SubtractFunction();
1216 >        final CFException ex = new CFException();
1217 >
1218 >        g.completeExceptionally(ex);
1219 >        f.complete(v1);
1220 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1221 >
1222 >        checkCompletedWithWrappedCFException(h, ex);
1223 >        checkCompletedWithWrappedCFException(g, ex);
1224 >        assertEquals(0, r.invocationCount);
1225 >        checkCompletedNormally(f, v1);
1226 >    }}
1227 >
1228 >    public void testThenCombine_exceptionalCompletion4() {
1229 >        for (ExecutionMode m : ExecutionMode.values())
1230 >        for (Integer v1 : new Integer[] { 1, null })
1231 >    {
1232 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1233 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1234 >        final SubtractFunction r = new SubtractFunction();
1235 >        final CFException ex = new CFException();
1236 >
1237 >        f.completeExceptionally(ex);
1238 >        g.complete(v1);
1239 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1240 >
1241 >        checkCompletedWithWrappedCFException(h, ex);
1242 >        checkCompletedWithWrappedCFException(f, ex);
1243 >        assertEquals(0, r.invocationCount);
1244 >        checkCompletedNormally(g, v1);
1245 >    }}
1246  
1247      /**
1248       * thenCombine result completes exceptionally if action does
1249       */
1250 <    public void testThenCombine3() {
1251 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1252 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1253 <        FailingBiFunction r = new FailingBiFunction();
1254 <        CompletableFuture<Integer> g = f.thenCombine(f2, r);
1255 <        f.complete(one);
1256 <        checkIncomplete(g);
1257 <        assertFalse(r.ran);
1258 <        f2.complete(two);
1259 <        checkCompletedWithWrappedCFException(g);
1260 <        assertTrue(r.ran);
1261 <    }
1250 >    public void testThenCombine_actionFailed1() {
1251 >        for (ExecutionMode m : ExecutionMode.values())
1252 >        for (Integer v1 : new Integer[] { 1, null })
1253 >        for (Integer v2 : new Integer[] { 2, null })
1254 >    {
1255 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1256 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1257 >        final FailingBiFunction r = new FailingBiFunction();
1258 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1259 >
1260 >        f.complete(v1);
1261 >        checkIncomplete(h);
1262 >        g.complete(v2);
1263 >
1264 >        checkCompletedWithWrappedCFException(h);
1265 >        checkCompletedNormally(f, v1);
1266 >        checkCompletedNormally(g, v2);
1267 >    }}
1268 >
1269 >    public void testThenCombine_actionFailed2() {
1270 >        for (ExecutionMode m : ExecutionMode.values())
1271 >        for (Integer v1 : new Integer[] { 1, null })
1272 >        for (Integer v2 : new Integer[] { 2, null })
1273 >    {
1274 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1275 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1276 >        final FailingBiFunction r = new FailingBiFunction();
1277 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1278 >
1279 >        g.complete(v2);
1280 >        checkIncomplete(h);
1281 >        f.complete(v1);
1282 >
1283 >        checkCompletedWithWrappedCFException(h);
1284 >        checkCompletedNormally(f, v1);
1285 >        checkCompletedNormally(g, v2);
1286 >    }}
1287  
1288      /**
1289       * thenCombine result completes exceptionally if either source cancelled
1290       */
1291 <    public void testThenCombine4() {
1292 <        CompletableFuture<Integer> f, g, h;
1291 >    public void testThenCombine_sourceCancelled1() {
1292 >        for (ExecutionMode m : ExecutionMode.values())
1293 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1294 >        for (Integer v1 : new Integer[] { 1, null })
1295 >    {
1296 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1297 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1298 >        final SubtractFunction r = new SubtractFunction();
1299 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1300  
1301 <        f = new CompletableFuture<>();
756 <        g = new CompletableFuture<>();
757 <        h = f.thenCombine(g, subtract);
758 <        assertTrue(f.cancel(true));
1301 >        assertTrue(f.cancel(mayInterruptIfRunning));
1302          checkIncomplete(h);
1303 <        g.complete(1);
761 <        checkCompletedWithWrappedCancellationException(h);
1303 >        g.complete(v1);
1304  
763        f = new CompletableFuture<>();
764        g = new CompletableFuture<>();
765        h = f.thenCombine(g, subtract);
766        assertTrue(g.cancel(true));
767        checkIncomplete(h);
768        f.complete(3);
1305          checkCompletedWithWrappedCancellationException(h);
1306 +        checkCancelled(f);
1307 +        assertEquals(0, r.invocationCount);
1308 +        checkCompletedNormally(g, v1);
1309 +    }}
1310 +
1311 +    public void testThenCombine_sourceCancelled2() {
1312 +        for (ExecutionMode m : ExecutionMode.values())
1313 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1314 +        for (Integer v1 : new Integer[] { 1, null })
1315 +    {
1316 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
1317 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
1318 +        final SubtractFunction r = new SubtractFunction();
1319 +        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1320 +
1321 +        assertTrue(g.cancel(mayInterruptIfRunning));
1322 +        checkIncomplete(h);
1323 +        f.complete(v1);
1324 +
1325 +        checkCompletedWithWrappedCancellationException(h);
1326 +        checkCancelled(g);
1327 +        assertEquals(0, r.invocationCount);
1328 +        checkCompletedNormally(f, v1);
1329 +    }}
1330 +
1331 +    public void testThenCombine_sourceCancelled3() {
1332 +        for (ExecutionMode m : ExecutionMode.values())
1333 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1334 +        for (Integer v1 : new Integer[] { 1, null })
1335 +    {
1336 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
1337 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
1338 +        final SubtractFunction r = new SubtractFunction();
1339 +
1340 +        assertTrue(g.cancel(mayInterruptIfRunning));
1341 +        f.complete(v1);
1342 +        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1343 +
1344 +        checkCompletedWithWrappedCancellationException(h);
1345 +        checkCancelled(g);
1346 +        assertEquals(0, r.invocationCount);
1347 +        checkCompletedNormally(f, v1);
1348 +    }}
1349 +
1350 +    public void testThenCombine_sourceCancelled4() {
1351 +        for (ExecutionMode m : ExecutionMode.values())
1352 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1353 +        for (Integer v1 : new Integer[] { 1, null })
1354 +    {
1355 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
1356 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
1357 +        final SubtractFunction r = new SubtractFunction();
1358 +
1359 +        assertTrue(f.cancel(mayInterruptIfRunning));
1360 +        g.complete(v1);
1361 +        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1362  
771        f = new CompletableFuture<>();
772        g = new CompletableFuture<>();
773        assertTrue(f.cancel(true));
774        assertTrue(g.cancel(true));
775        h = f.thenCombine(g, subtract);
1363          checkCompletedWithWrappedCancellationException(h);
1364 <    }
1364 >        checkCancelled(f);
1365 >        assertEquals(0, r.invocationCount);
1366 >        checkCompletedNormally(g, v1);
1367 >    }}
1368  
1369      /**
1370       * thenAcceptBoth result completes normally after normal
1371       * completion of sources
1372       */
1373 <    public void testThenAcceptBoth() {
1374 <        CompletableFuture<Integer> f, g;
1375 <        CompletableFuture<Void> h;
1376 <        SubtractAction r;
1373 >    public void testThenAcceptBoth_normalCompletion1() {
1374 >        for (ExecutionMode m : ExecutionMode.values())
1375 >        for (Integer v1 : new Integer[] { 1, null })
1376 >        for (Integer v2 : new Integer[] { 2, null })
1377 >    {
1378 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1379 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1380 >        final SubtractAction r = new SubtractAction();
1381 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1382  
1383 <        f = new CompletableFuture<>();
789 <        g = new CompletableFuture<>();
790 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
791 <        f.complete(3);
1383 >        f.complete(v1);
1384          checkIncomplete(h);
1385 <        g.complete(1);
1385 >        assertEquals(0, r.invocationCount);
1386 >        g.complete(v2);
1387 >
1388          checkCompletedNormally(h, null);
1389 <        assertEquals(r.value, 2);
1389 >        assertEquals(subtract(v1, v2), r.value);
1390 >        checkCompletedNormally(f, v1);
1391 >        checkCompletedNormally(g, v2);
1392 >    }}
1393 >
1394 >    public void testThenAcceptBoth_normalCompletion2() {
1395 >        for (ExecutionMode m : ExecutionMode.values())
1396 >        for (Integer v1 : new Integer[] { 1, null })
1397 >        for (Integer v2 : new Integer[] { 2, null })
1398 >    {
1399 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1400 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1401 >        final SubtractAction r = new SubtractAction();
1402 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1403  
1404 <        f = new CompletableFuture<>();
798 <        g = new CompletableFuture<>();
799 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
800 <        g.complete(1);
1404 >        g.complete(v2);
1405          checkIncomplete(h);
1406 <        f.complete(3);
1406 >        assertEquals(0, r.invocationCount);
1407 >        f.complete(v1);
1408 >
1409          checkCompletedNormally(h, null);
1410 <        assertEquals(r.value, 2);
1410 >        assertEquals(subtract(v1, v2), r.value);
1411 >        checkCompletedNormally(f, v1);
1412 >        checkCompletedNormally(g, v2);
1413 >    }}
1414 >
1415 >    public void testThenAcceptBoth_normalCompletion3() {
1416 >        for (ExecutionMode m : ExecutionMode.values())
1417 >        for (Integer v1 : new Integer[] { 1, null })
1418 >        for (Integer v2 : new Integer[] { 2, null })
1419 >    {
1420 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1421 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1422 >        final SubtractAction r = new SubtractAction();
1423 >
1424 >        g.complete(v2);
1425 >        f.complete(v1);
1426 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1427  
806        f = new CompletableFuture<>();
807        g = new CompletableFuture<>();
808        g.complete(1);
809        f.complete(3);
810        h = f.thenAcceptBoth(g, r = new SubtractAction());
1428          checkCompletedNormally(h, null);
1429 <        assertEquals(r.value, 2);
1430 <    }
1429 >        assertEquals(subtract(v1, v2), r.value);
1430 >        checkCompletedNormally(f, v1);
1431 >        checkCompletedNormally(g, v2);
1432 >    }}
1433 >
1434 >    public void testThenAcceptBoth_normalCompletion4() {
1435 >        for (ExecutionMode m : ExecutionMode.values())
1436 >        for (Integer v1 : new Integer[] { 1, null })
1437 >        for (Integer v2 : new Integer[] { 2, null })
1438 >    {
1439 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1440 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1441 >        final SubtractAction r = new SubtractAction();
1442 >
1443 >        f.complete(v1);
1444 >        g.complete(v2);
1445 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1446 >
1447 >        checkCompletedNormally(h, null);
1448 >        assertEquals(subtract(v1, v2), r.value);
1449 >        checkCompletedNormally(f, v1);
1450 >        checkCompletedNormally(g, v2);
1451 >    }}
1452  
1453      /**
1454       * thenAcceptBoth result completes exceptionally after exceptional
1455       * completion of either source
1456       */
1457 <    public void testThenAcceptBoth2() {
1458 <        CompletableFuture<Integer> f, g;
1459 <        CompletableFuture<Void> h;
1460 <        SubtractAction r;
1461 <
1462 <        f = new CompletableFuture<>();
1463 <        g = new CompletableFuture<>();
1464 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
1465 <        f.completeExceptionally(new CFException());
1466 <        checkIncomplete(h);
1467 <        g.complete(1);
1468 <        checkCompletedWithWrappedCFException(h);
1469 <
1470 <        f = new CompletableFuture<>();
1471 <        g = new CompletableFuture<>();
1472 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
1473 <        g.completeExceptionally(new CFException());
1474 <        checkIncomplete(h);
1475 <        f.complete(3);
1476 <        checkCompletedWithWrappedCFException(h);
1477 <
1478 <        f = new CompletableFuture<>();
1479 <        g = new CompletableFuture<>();
1480 <        f.complete(3);
1481 <        g.completeExceptionally(new CFException());
1482 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
1483 <        checkCompletedWithWrappedCFException(h);
1484 <
1485 <        f = new CompletableFuture<>();
1486 <        g = new CompletableFuture<>();
1487 <        f.completeExceptionally(new CFException());
1488 <        g.complete(3);
1489 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
1490 <        checkCompletedWithWrappedCFException(h);
1491 <    }
1457 >    public void testThenAcceptBoth_exceptionalCompletion1() {
1458 >        for (ExecutionMode m : ExecutionMode.values())
1459 >        for (Integer v1 : new Integer[] { 1, null })
1460 >    {
1461 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1462 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1463 >        final SubtractAction r = new SubtractAction();
1464 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1465 >        final CFException ex = new CFException();
1466 >
1467 >        f.completeExceptionally(ex);
1468 >        checkIncomplete(h);
1469 >        g.complete(v1);
1470 >
1471 >        checkCompletedWithWrappedCFException(h, ex);
1472 >        checkCompletedWithWrappedCFException(f, ex);
1473 >        assertEquals(0, r.invocationCount);
1474 >        checkCompletedNormally(g, v1);
1475 >    }}
1476 >
1477 >    public void testThenAcceptBoth_exceptionalCompletion2() {
1478 >        for (ExecutionMode m : ExecutionMode.values())
1479 >        for (Integer v1 : new Integer[] { 1, null })
1480 >    {
1481 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1482 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1483 >        final SubtractAction r = new SubtractAction();
1484 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1485 >        final CFException ex = new CFException();
1486 >
1487 >        g.completeExceptionally(ex);
1488 >        checkIncomplete(h);
1489 >        f.complete(v1);
1490 >
1491 >        checkCompletedWithWrappedCFException(h, ex);
1492 >        checkCompletedWithWrappedCFException(g, ex);
1493 >        assertEquals(0, r.invocationCount);
1494 >        checkCompletedNormally(f, v1);
1495 >    }}
1496 >
1497 >    public void testThenAcceptBoth_exceptionalCompletion3() {
1498 >        for (ExecutionMode m : ExecutionMode.values())
1499 >        for (Integer v1 : new Integer[] { 1, null })
1500 >    {
1501 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1502 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1503 >        final SubtractAction r = new SubtractAction();
1504 >        final CFException ex = new CFException();
1505 >
1506 >        g.completeExceptionally(ex);
1507 >        f.complete(v1);
1508 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1509 >
1510 >        checkCompletedWithWrappedCFException(h, ex);
1511 >        checkCompletedWithWrappedCFException(g, ex);
1512 >        assertEquals(0, r.invocationCount);
1513 >        checkCompletedNormally(f, v1);
1514 >    }}
1515 >
1516 >    public void testThenAcceptBoth_exceptionalCompletion4() {
1517 >        for (ExecutionMode m : ExecutionMode.values())
1518 >        for (Integer v1 : new Integer[] { 1, null })
1519 >    {
1520 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1521 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1522 >        final SubtractAction r = new SubtractAction();
1523 >        final CFException ex = new CFException();
1524 >
1525 >        f.completeExceptionally(ex);
1526 >        g.complete(v1);
1527 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1528 >
1529 >        checkCompletedWithWrappedCFException(h, ex);
1530 >        checkCompletedWithWrappedCFException(f, ex);
1531 >        assertEquals(0, r.invocationCount);
1532 >        checkCompletedNormally(g, v1);
1533 >    }}
1534  
1535      /**
1536       * thenAcceptBoth result completes exceptionally if action does
1537       */
1538 <    public void testThenAcceptBoth3() {
1539 <        CompletableFuture<Integer> f, g;
1540 <        CompletableFuture<Void> h;
1541 <        FailingBiConsumer r;
1542 <
1543 <        f = new CompletableFuture<>();
1544 <        g = new CompletableFuture<>();
1545 <        h = f.thenAcceptBoth(g, r = new FailingBiConsumer());
1546 <        f.complete(3);
1547 <        checkIncomplete(h);
1548 <        g.complete(1);
1549 <        checkCompletedWithWrappedCFException(h);
1550 <
1551 <        f = new CompletableFuture<>();
1552 <        g = new CompletableFuture<>();
1553 <        f.complete(3);
1554 <        g.complete(1);
1555 <        h = f.thenAcceptBoth(g, r = new FailingBiConsumer());
1556 <        checkCompletedWithWrappedCFException(h);
1557 <    }
1538 >    public void testThenAcceptBoth_actionFailed1() {
1539 >        for (ExecutionMode m : ExecutionMode.values())
1540 >        for (Integer v1 : new Integer[] { 1, null })
1541 >        for (Integer v2 : new Integer[] { 2, null })
1542 >    {
1543 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1544 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1545 >        final FailingBiConsumer r = new FailingBiConsumer();
1546 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1547 >
1548 >        f.complete(v1);
1549 >        checkIncomplete(h);
1550 >        g.complete(v2);
1551 >
1552 >        checkCompletedWithWrappedCFException(h);
1553 >        checkCompletedNormally(f, v1);
1554 >        checkCompletedNormally(g, v2);
1555 >    }}
1556 >
1557 >    public void testThenAcceptBoth_actionFailed2() {
1558 >        for (ExecutionMode m : ExecutionMode.values())
1559 >        for (Integer v1 : new Integer[] { 1, null })
1560 >        for (Integer v2 : new Integer[] { 2, null })
1561 >    {
1562 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1563 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1564 >        final FailingBiConsumer r = new FailingBiConsumer();
1565 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1566 >
1567 >        g.complete(v2);
1568 >        checkIncomplete(h);
1569 >        f.complete(v1);
1570 >
1571 >        checkCompletedWithWrappedCFException(h);
1572 >        checkCompletedNormally(f, v1);
1573 >        checkCompletedNormally(g, v2);
1574 >    }}
1575  
1576      /**
1577       * thenAcceptBoth result completes exceptionally if either source cancelled
1578       */
1579 <    public void testThenAcceptBoth4() {
1580 <        CompletableFuture<Integer> f, g;
1581 <        CompletableFuture<Void> h;
1582 <        SubtractAction r;
1583 <
1584 <        f = new CompletableFuture<>();
1585 <        g = new CompletableFuture<>();
1586 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
1587 <        assertTrue(f.cancel(true));
891 <        checkIncomplete(h);
892 <        g.complete(1);
893 <        checkCompletedWithWrappedCancellationException(h);
1579 >    public void testThenAcceptBoth_sourceCancelled1() {
1580 >        for (ExecutionMode m : ExecutionMode.values())
1581 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1582 >        for (Integer v1 : new Integer[] { 1, null })
1583 >    {
1584 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1585 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1586 >        final SubtractAction r = new SubtractAction();
1587 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1588  
1589 <        f = new CompletableFuture<>();
896 <        g = new CompletableFuture<>();
897 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
898 <        assertTrue(g.cancel(true));
1589 >        assertTrue(f.cancel(mayInterruptIfRunning));
1590          checkIncomplete(h);
1591 <        f.complete(3);
901 <        checkCompletedWithWrappedCancellationException(h);
1591 >        g.complete(v1);
1592  
903        f = new CompletableFuture<>();
904        g = new CompletableFuture<>();
905        f.complete(3);
906        assertTrue(g.cancel(true));
907        h = f.thenAcceptBoth(g, r = new SubtractAction());
1593          checkCompletedWithWrappedCancellationException(h);
1594 +        checkCancelled(f);
1595 +        assertEquals(0, r.invocationCount);
1596 +        checkCompletedNormally(g, v1);
1597 +    }}
1598 +
1599 +    public void testThenAcceptBoth_sourceCancelled2() {
1600 +        for (ExecutionMode m : ExecutionMode.values())
1601 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1602 +        for (Integer v1 : new Integer[] { 1, null })
1603 +    {
1604 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
1605 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
1606 +        final SubtractAction r = new SubtractAction();
1607 +        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1608 +
1609 +        assertTrue(g.cancel(mayInterruptIfRunning));
1610 +        checkIncomplete(h);
1611 +        f.complete(v1);
1612 +
1613 +        checkCompletedWithWrappedCancellationException(h);
1614 +        checkCancelled(g);
1615 +        assertEquals(0, r.invocationCount);
1616 +        checkCompletedNormally(f, v1);
1617 +    }}
1618 +
1619 +    public void testThenAcceptBoth_sourceCancelled3() {
1620 +        for (ExecutionMode m : ExecutionMode.values())
1621 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1622 +        for (Integer v1 : new Integer[] { 1, null })
1623 +    {
1624 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
1625 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
1626 +        final SubtractAction r = new SubtractAction();
1627 +
1628 +        assertTrue(g.cancel(mayInterruptIfRunning));
1629 +        f.complete(v1);
1630 +        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1631 +
1632 +        checkCompletedWithWrappedCancellationException(h);
1633 +        checkCancelled(g);
1634 +        assertEquals(0, r.invocationCount);
1635 +        checkCompletedNormally(f, v1);
1636 +    }}
1637 +
1638 +    public void testThenAcceptBoth_sourceCancelled4() {
1639 +        for (ExecutionMode m : ExecutionMode.values())
1640 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1641 +        for (Integer v1 : new Integer[] { 1, null })
1642 +    {
1643 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
1644 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
1645 +        final SubtractAction r = new SubtractAction();
1646 +
1647 +        assertTrue(f.cancel(mayInterruptIfRunning));
1648 +        g.complete(v1);
1649 +        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1650  
910        f = new CompletableFuture<>();
911        g = new CompletableFuture<>();
912        assertTrue(f.cancel(true));
913        g.complete(3);
914        h = f.thenAcceptBoth(g, r = new SubtractAction());
1651          checkCompletedWithWrappedCancellationException(h);
1652 <    }
1652 >        checkCancelled(f);
1653 >        assertEquals(0, r.invocationCount);
1654 >        checkCompletedNormally(g, v1);
1655 >    }}
1656  
1657      /**
1658       * runAfterBoth result completes normally after normal
1659       * completion of sources
1660       */
1661 <    public void testRunAfterBoth() {
1662 <        CompletableFuture<Integer> f, g;
1663 <        CompletableFuture<Void> h;
1664 <        Noop r;
1661 >    public void testRunAfterBoth_normalCompletion1() {
1662 >        for (ExecutionMode m : ExecutionMode.values())
1663 >        for (Integer v1 : new Integer[] { 1, null })
1664 >        for (Integer v2 : new Integer[] { 2, null })
1665 >    {
1666 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1667 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1668 >        final Noop r = new Noop();
1669 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1670  
1671 <        f = new CompletableFuture<>();
928 <        g = new CompletableFuture<>();
929 <        h = f.runAfterBoth(g, r = new Noop());
930 <        f.complete(3);
1671 >        f.complete(v1);
1672          checkIncomplete(h);
1673 <        g.complete(1);
1673 >        assertEquals(0, r.invocationCount);
1674 >        g.complete(v2);
1675 >
1676          checkCompletedNormally(h, null);
1677 <        assertTrue(r.ran);
1677 >        assertEquals(1, r.invocationCount);
1678 >        checkCompletedNormally(f, v1);
1679 >        checkCompletedNormally(g, v2);
1680 >    }}
1681 >
1682 >    public void testRunAfterBoth_normalCompletion2() {
1683 >        for (ExecutionMode m : ExecutionMode.values())
1684 >        for (Integer v1 : new Integer[] { 1, null })
1685 >        for (Integer v2 : new Integer[] { 2, null })
1686 >    {
1687 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1688 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1689 >        final Noop r = new Noop();
1690 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1691  
1692 <        f = new CompletableFuture<>();
937 <        g = new CompletableFuture<>();
938 <        h = f.runAfterBoth(g, r = new Noop());
939 <        g.complete(1);
1692 >        g.complete(v2);
1693          checkIncomplete(h);
1694 <        f.complete(3);
1694 >        assertEquals(0, r.invocationCount);
1695 >        f.complete(v1);
1696 >
1697          checkCompletedNormally(h, null);
1698 <        assertTrue(r.ran);
1698 >        assertEquals(1, r.invocationCount);
1699 >        checkCompletedNormally(f, v1);
1700 >        checkCompletedNormally(g, v2);
1701 >    }}
1702 >
1703 >    public void testRunAfterBoth_normalCompletion3() {
1704 >        for (ExecutionMode m : ExecutionMode.values())
1705 >        for (Integer v1 : new Integer[] { 1, null })
1706 >        for (Integer v2 : new Integer[] { 2, null })
1707 >    {
1708 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1709 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1710 >        final Noop r = new Noop();
1711 >
1712 >        g.complete(v2);
1713 >        f.complete(v1);
1714 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1715  
945        f = new CompletableFuture<>();
946        g = new CompletableFuture<>();
947        g.complete(1);
948        f.complete(3);
949        h = f.runAfterBoth(g, r = new Noop());
1716          checkCompletedNormally(h, null);
1717 <        assertTrue(r.ran);
1718 <    }
1717 >        assertEquals(1, r.invocationCount);
1718 >        checkCompletedNormally(f, v1);
1719 >        checkCompletedNormally(g, v2);
1720 >    }}
1721 >
1722 >    public void testRunAfterBoth_normalCompletion4() {
1723 >        for (ExecutionMode m : ExecutionMode.values())
1724 >        for (Integer v1 : new Integer[] { 1, null })
1725 >        for (Integer v2 : new Integer[] { 2, null })
1726 >    {
1727 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1728 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1729 >        final Noop r = new Noop();
1730 >
1731 >        f.complete(v1);
1732 >        g.complete(v2);
1733 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1734 >
1735 >        checkCompletedNormally(h, null);
1736 >        assertEquals(1, r.invocationCount);
1737 >        checkCompletedNormally(f, v1);
1738 >        checkCompletedNormally(g, v2);
1739 >    }}
1740  
1741      /**
1742       * runAfterBoth result completes exceptionally after exceptional
1743       * completion of either source
1744       */
1745 <    public void testRunAfterBoth2() {
1746 <        CompletableFuture<Integer> f, g;
1747 <        CompletableFuture<Void> h;
1748 <        Noop r;
1749 <
1750 <        f = new CompletableFuture<>();
1751 <        g = new CompletableFuture<>();
1752 <        h = f.runAfterBoth(g, r = new Noop());
1753 <        f.completeExceptionally(new CFException());
1754 <        checkIncomplete(h);
1755 <        g.complete(1);
1756 <        checkCompletedWithWrappedCFException(h);
1757 <        assertFalse(r.ran);
1758 <
1759 <        f = new CompletableFuture<>();
1760 <        g = new CompletableFuture<>();
1761 <        h = f.runAfterBoth(g, r = new Noop());
1762 <        g.completeExceptionally(new CFException());
1763 <        checkIncomplete(h);
1764 <        f.complete(3);
1765 <        checkCompletedWithWrappedCFException(h);
1766 <        assertFalse(r.ran);
1767 <
1768 <        f = new CompletableFuture<>();
1769 <        g = new CompletableFuture<>();
1770 <        g.completeExceptionally(new CFException());
1771 <        f.complete(3);
1772 <        h = f.runAfterBoth(g, r = new Noop());
1773 <        checkCompletedWithWrappedCFException(h);
1774 <        assertFalse(r.ran);
1775 <
1776 <        f = new CompletableFuture<>();
1777 <        g = new CompletableFuture<>();
1778 <        f.completeExceptionally(new CFException());
1779 <        g.complete(1);
1780 <        h = f.runAfterBoth(g, r = new Noop());
1781 <        checkCompletedWithWrappedCFException(h);
1782 <        assertFalse(r.ran);
1783 <    }
1745 >    public void testRunAfterBoth_exceptionalCompletion1() {
1746 >        for (ExecutionMode m : ExecutionMode.values())
1747 >        for (Integer v1 : new Integer[] { 1, null })
1748 >    {
1749 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1750 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1751 >        final Noop r = new Noop();
1752 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1753 >        final CFException ex = new CFException();
1754 >
1755 >        f.completeExceptionally(ex);
1756 >        checkIncomplete(h);
1757 >        g.complete(v1);
1758 >
1759 >        checkCompletedWithWrappedCFException(h, ex);
1760 >        checkCompletedWithWrappedCFException(f, ex);
1761 >        assertEquals(0, r.invocationCount);
1762 >        checkCompletedNormally(g, v1);
1763 >    }}
1764 >
1765 >    public void testRunAfterBoth_exceptionalCompletion2() {
1766 >        for (ExecutionMode m : ExecutionMode.values())
1767 >        for (Integer v1 : new Integer[] { 1, null })
1768 >    {
1769 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1770 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1771 >        final Noop r = new Noop();
1772 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1773 >        final CFException ex = new CFException();
1774 >
1775 >        g.completeExceptionally(ex);
1776 >        checkIncomplete(h);
1777 >        f.complete(v1);
1778 >
1779 >        checkCompletedWithWrappedCFException(h, ex);
1780 >        checkCompletedWithWrappedCFException(g, ex);
1781 >        assertEquals(0, r.invocationCount);
1782 >        checkCompletedNormally(f, v1);
1783 >    }}
1784 >
1785 >    public void testRunAfterBoth_exceptionalCompletion3() {
1786 >        for (ExecutionMode m : ExecutionMode.values())
1787 >        for (Integer v1 : new Integer[] { 1, null })
1788 >    {
1789 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1790 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1791 >        final Noop r = new Noop();
1792 >        final CFException ex = new CFException();
1793 >
1794 >        g.completeExceptionally(ex);
1795 >        f.complete(v1);
1796 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1797 >
1798 >        checkCompletedWithWrappedCFException(h, ex);
1799 >        checkCompletedWithWrappedCFException(g, ex);
1800 >        assertEquals(0, r.invocationCount);
1801 >        checkCompletedNormally(f, v1);
1802 >    }}
1803 >
1804 >    public void testRunAfterBoth_exceptionalCompletion4() {
1805 >        for (ExecutionMode m : ExecutionMode.values())
1806 >        for (Integer v1 : new Integer[] { 1, null })
1807 >    {
1808 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1809 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1810 >        final Noop r = new Noop();
1811 >        final CFException ex = new CFException();
1812 >
1813 >        f.completeExceptionally(ex);
1814 >        g.complete(v1);
1815 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1816 >
1817 >        checkCompletedWithWrappedCFException(h, ex);
1818 >        checkCompletedWithWrappedCFException(f, ex);
1819 >        assertEquals(0, r.invocationCount);
1820 >        checkCompletedNormally(g, v1);
1821 >    }}
1822  
1823      /**
1824       * runAfterBoth result completes exceptionally if action does
1825       */
1826 <    public void testRunAfterBoth3() {
1827 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1828 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1829 <        FailingNoop r = new FailingNoop();
1830 <        CompletableFuture<Void> g = f.runAfterBoth(f2, r);
1831 <        f.complete(one);
1832 <        checkIncomplete(g);
1833 <        f2.complete(two);
1834 <        checkCompletedWithWrappedCFException(g);
1835 <    }
1826 >    public void testRunAfterBoth_actionFailed1() {
1827 >        for (ExecutionMode m : ExecutionMode.values())
1828 >        for (Integer v1 : new Integer[] { 1, null })
1829 >        for (Integer v2 : new Integer[] { 2, null })
1830 >    {
1831 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1832 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1833 >        final FailingNoop r = new FailingNoop();
1834 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1835 >
1836 >        f.complete(v1);
1837 >        checkIncomplete(h);
1838 >        g.complete(v2);
1839 >
1840 >        checkCompletedWithWrappedCFException(h);
1841 >        checkCompletedNormally(f, v1);
1842 >        checkCompletedNormally(g, v2);
1843 >    }}
1844 >
1845 >    public void testRunAfterBoth_actionFailed2() {
1846 >        for (ExecutionMode m : ExecutionMode.values())
1847 >        for (Integer v1 : new Integer[] { 1, null })
1848 >        for (Integer v2 : new Integer[] { 2, null })
1849 >    {
1850 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1851 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1852 >        final FailingNoop r = new FailingNoop();
1853 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1854 >
1855 >        g.complete(v2);
1856 >        checkIncomplete(h);
1857 >        f.complete(v1);
1858 >
1859 >        checkCompletedWithWrappedCFException(h);
1860 >        checkCompletedNormally(f, v1);
1861 >        checkCompletedNormally(g, v2);
1862 >    }}
1863  
1864      /**
1865       * runAfterBoth result completes exceptionally if either source cancelled
1866       */
1867 <    public void testRunAfterBoth4() {
1868 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1869 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1870 <        Noop r = new Noop();
1871 <        CompletableFuture<Void> g = f.runAfterBoth(f2, r);
1872 <        assertTrue(f.cancel(true));
1873 <        f2.complete(two);
1874 <        checkCompletedWithWrappedCancellationException(g);
1875 <        f = new CompletableFuture<>();
1876 <        f2 = new CompletableFuture<>();
1877 <        r = new Noop();
1878 <        g = f.runAfterBoth(f2, r);
1879 <        f.complete(one);
1880 <        assertTrue(f2.cancel(true));
1881 <        checkCompletedWithWrappedCancellationException(g);
1882 <    }
1867 >    public void testRunAfterBoth_sourceCancelled1() {
1868 >        for (ExecutionMode m : ExecutionMode.values())
1869 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1870 >        for (Integer v1 : new Integer[] { 1, null })
1871 >    {
1872 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1873 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1874 >        final Noop r = new Noop();
1875 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1876 >
1877 >        assertTrue(f.cancel(mayInterruptIfRunning));
1878 >        checkIncomplete(h);
1879 >        g.complete(v1);
1880 >
1881 >        checkCompletedWithWrappedCancellationException(h);
1882 >        checkCancelled(f);
1883 >        assertEquals(0, r.invocationCount);
1884 >        checkCompletedNormally(g, v1);
1885 >    }}
1886 >
1887 >    public void testRunAfterBoth_sourceCancelled2() {
1888 >        for (ExecutionMode m : ExecutionMode.values())
1889 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1890 >        for (Integer v1 : new Integer[] { 1, null })
1891 >    {
1892 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1893 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1894 >        final Noop r = new Noop();
1895 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1896 >
1897 >        assertTrue(g.cancel(mayInterruptIfRunning));
1898 >        checkIncomplete(h);
1899 >        f.complete(v1);
1900 >
1901 >        checkCompletedWithWrappedCancellationException(h);
1902 >        checkCancelled(g);
1903 >        assertEquals(0, r.invocationCount);
1904 >        checkCompletedNormally(f, v1);
1905 >    }}
1906 >
1907 >    public void testRunAfterBoth_sourceCancelled3() {
1908 >        for (ExecutionMode m : ExecutionMode.values())
1909 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1910 >        for (Integer v1 : new Integer[] { 1, null })
1911 >    {
1912 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1913 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1914 >        final Noop r = new Noop();
1915 >
1916 >        assertTrue(g.cancel(mayInterruptIfRunning));
1917 >        f.complete(v1);
1918 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1919 >
1920 >        checkCompletedWithWrappedCancellationException(h);
1921 >        checkCancelled(g);
1922 >        assertEquals(0, r.invocationCount);
1923 >        checkCompletedNormally(f, v1);
1924 >    }}
1925 >
1926 >    public void testRunAfterBoth_sourceCancelled4() {
1927 >        for (ExecutionMode m : ExecutionMode.values())
1928 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1929 >        for (Integer v1 : new Integer[] { 1, null })
1930 >    {
1931 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1932 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1933 >        final Noop r = new Noop();
1934 >
1935 >        assertTrue(f.cancel(mayInterruptIfRunning));
1936 >        g.complete(v1);
1937 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1938 >
1939 >        checkCompletedWithWrappedCancellationException(h);
1940 >        checkCancelled(f);
1941 >        assertEquals(0, r.invocationCount);
1942 >        checkCompletedNormally(g, v1);
1943 >    }}
1944  
1945      /**
1946       * applyToEither result completes normally after normal completion
1947       * of either source
1948       */
1949 <    public void testApplyToEither() {
1950 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1951 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1952 <        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
1953 <        f.complete(one);
1954 <        checkCompletedNormally(g, two);
1955 <        f2.complete(one);
1956 <        checkCompletedNormally(g, two);
1957 <
1958 <        f = new CompletableFuture<>();
1959 <        f.complete(one);
1960 <        f2 = new CompletableFuture<>();
1961 <        g = f.applyToEither(f2, inc);
1962 <        checkCompletedNormally(g, two);
1963 <    }
1949 >    public void testApplyToEither_normalCompletion1() {
1950 >        for (ExecutionMode m : ExecutionMode.values())
1951 >        for (Integer v1 : new Integer[] { 1, null })
1952 >        for (Integer v2 : new Integer[] { 2, null })
1953 >    {
1954 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1955 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1956 >        final IncFunction r = new IncFunction();
1957 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1958 >
1959 >        f.complete(v1);
1960 >        checkCompletedNormally(h, inc(v1));
1961 >        g.complete(v2);
1962 >
1963 >        checkCompletedNormally(f, v1);
1964 >        checkCompletedNormally(g, v2);
1965 >        checkCompletedNormally(h, inc(v1));
1966 >    }}
1967 >
1968 >    public void testApplyToEither_normalCompletion2() {
1969 >        for (ExecutionMode m : ExecutionMode.values())
1970 >        for (Integer v1 : new Integer[] { 1, null })
1971 >        for (Integer v2 : new Integer[] { 2, null })
1972 >    {
1973 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1974 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1975 >        final IncFunction r = new IncFunction();
1976 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1977 >
1978 >        g.complete(v2);
1979 >        checkCompletedNormally(h, inc(v2));
1980 >        f.complete(v1);
1981 >
1982 >        checkCompletedNormally(f, v1);
1983 >        checkCompletedNormally(g, v2);
1984 >        checkCompletedNormally(h, inc(v2));
1985 >        }}
1986 >
1987 >    public void testApplyToEither_normalCompletion3() {
1988 >        for (ExecutionMode m : ExecutionMode.values())
1989 >        for (Integer v1 : new Integer[] { 1, null })
1990 >        for (Integer v2 : new Integer[] { 2, null })
1991 >    {
1992 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1993 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1994 >        final IncFunction r = new IncFunction();
1995 >
1996 >        f.complete(v1);
1997 >        g.complete(v2);
1998 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1999 >
2000 >        checkCompletedNormally(f, v1);
2001 >        checkCompletedNormally(g, v2);
2002 >
2003 >        // unspecified behavior
2004 >        assertTrue(Objects.equals(h.join(), inc(v1)) ||
2005 >                   Objects.equals(h.join(), inc(v2)));
2006 >        assertEquals(1, r.invocationCount);
2007 >    }}
2008  
2009      /**
2010       * applyToEither result completes exceptionally after exceptional
2011       * completion of either source
2012       */
2013 <    public void testApplyToEither2() {
2014 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2015 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2016 <        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
2017 <        f.completeExceptionally(new CFException());
2018 <        f2.complete(one);
2019 <        checkCompletedWithWrappedCFException(g);
2013 >    public void testApplyToEither_exceptionalCompletion1() {
2014 >        for (ExecutionMode m : ExecutionMode.values())
2015 >        for (Integer v1 : new Integer[] { 1, null })
2016 >    {
2017 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2018 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2019 >        final IncFunction r = new IncFunction();
2020 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2021 >        final CFException ex = new CFException();
2022 >
2023 >        f.completeExceptionally(ex);
2024 >        checkCompletedWithWrappedCFException(h, ex);
2025 >        g.complete(v1);
2026 >
2027 >        assertEquals(0, r.invocationCount);
2028 >        checkCompletedNormally(g, v1);
2029 >        checkCompletedWithWrappedCFException(f, ex);
2030 >        checkCompletedWithWrappedCFException(h, ex);
2031 >    }}
2032 >
2033 >    public void testApplyToEither_exceptionalCompletion2() {
2034 >        for (ExecutionMode m : ExecutionMode.values())
2035 >        for (Integer v1 : new Integer[] { 1, null })
2036 >    {
2037 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2038 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2039 >        final IncFunction r = new IncFunction();
2040 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2041 >        final CFException ex = new CFException();
2042 >
2043 >        g.completeExceptionally(ex);
2044 >        checkCompletedWithWrappedCFException(h, ex);
2045 >        f.complete(v1);
2046 >
2047 >        assertEquals(0, r.invocationCount);
2048 >        checkCompletedNormally(f, v1);
2049 >        checkCompletedWithWrappedCFException(g, ex);
2050 >        checkCompletedWithWrappedCFException(h, ex);
2051 >    }}
2052 >
2053 >    public void testApplyToEither_exceptionalCompletion3() {
2054 >        for (ExecutionMode m : ExecutionMode.values())
2055 >        for (Integer v1 : new Integer[] { 1, null })
2056 >    {
2057 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2058 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2059 >        final IncFunction r = new IncFunction();
2060 >        final CFException ex = new CFException();
2061 >
2062 >        g.completeExceptionally(ex);
2063 >        f.complete(v1);
2064 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2065  
2066 <        f = new CompletableFuture<>();
2067 <        f2 = new CompletableFuture<>();
2068 <        f2.completeExceptionally(new CFException());
2069 <        g = f.applyToEither(f2, inc);
2070 <        checkCompletedWithWrappedCFException(g);
2071 <    }
2066 >        // unspecified behavior
2067 >        Integer v;
2068 >        try {
2069 >            assertEquals(inc(v1), h.join());
2070 >            assertEquals(1, r.invocationCount);
2071 >        } catch (CompletionException ok) {
2072 >            checkCompletedWithWrappedCFException(h, ex);
2073 >            assertEquals(0, r.invocationCount);
2074 >        }
2075 >
2076 >        checkCompletedWithWrappedCFException(g, ex);
2077 >        checkCompletedNormally(f, v1);
2078 >    }}
2079 >
2080 >    public void testApplyToEither_exceptionalCompletion4() {
2081 >        for (ExecutionMode m : ExecutionMode.values())
2082 >        for (Integer v1 : new Integer[] { 1, null })
2083 >    {
2084 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2085 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2086 >        final IncFunction r = new IncFunction();
2087 >        final CFException ex = new CFException();
2088 >
2089 >        f.completeExceptionally(ex);
2090 >        g.complete(v1);
2091 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2092 >
2093 >        // unspecified behavior
2094 >        Integer v;
2095 >        try {
2096 >            assertEquals(inc(v1), h.join());
2097 >            assertEquals(1, r.invocationCount);
2098 >        } catch (CompletionException ok) {
2099 >            checkCompletedWithWrappedCFException(h, ex);
2100 >            assertEquals(0, r.invocationCount);
2101 >        }
2102 >
2103 >        checkCompletedWithWrappedCFException(f, ex);
2104 >        checkCompletedNormally(g, v1);
2105 >    }}
2106  
2107      /**
2108       * applyToEither result completes exceptionally if action does
2109       */
2110 <    public void testApplyToEither3() {
2111 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2112 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2113 <        FailingFunction r = new FailingFunction();
2114 <        CompletableFuture<Integer> g = f.applyToEither(f2, r);
2115 <        f2.complete(two);
2116 <        checkCompletedWithWrappedCFException(g);
2117 <    }
2110 >    public void testApplyToEither_actionFailed1() {
2111 >        for (ExecutionMode m : ExecutionMode.values())
2112 >        for (Integer v1 : new Integer[] { 1, null })
2113 >        for (Integer v2 : new Integer[] { 2, null })
2114 >    {
2115 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2116 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2117 >        final FailingFunction r = new FailingFunction();
2118 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2119 >
2120 >        f.complete(v1);
2121 >        checkCompletedWithWrappedCFException(h);
2122 >        g.complete(v2);
2123 >        checkCompletedNormally(f, v1);
2124 >        checkCompletedNormally(g, v2);
2125 >    }}
2126 >
2127 >    public void testApplyToEither_actionFailed2() {
2128 >        for (ExecutionMode m : ExecutionMode.values())
2129 >        for (Integer v1 : new Integer[] { 1, null })
2130 >        for (Integer v2 : new Integer[] { 2, null })
2131 >    {
2132 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2133 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2134 >        final FailingFunction r = new FailingFunction();
2135 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2136 >
2137 >        g.complete(v2);
2138 >        checkCompletedWithWrappedCFException(h);
2139 >        f.complete(v1);
2140 >        checkCompletedNormally(f, v1);
2141 >        checkCompletedNormally(g, v2);
2142 >    }}
2143  
2144      /**
2145       * applyToEither result completes exceptionally if either source cancelled
2146       */
2147 <    public void testApplyToEither4() {
2148 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2149 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2150 <        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
2151 <        assertTrue(f.cancel(true));
2152 <        checkCompletedWithWrappedCancellationException(g);
2153 <        f = new CompletableFuture<>();
2154 <        f2 = new CompletableFuture<>();
2155 <        assertTrue(f2.cancel(true));
2156 <        checkCompletedWithWrappedCancellationException(g);
2157 <    }
2147 >    public void testApplyToEither_sourceCancelled1() {
2148 >        for (ExecutionMode m : ExecutionMode.values())
2149 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2150 >        for (Integer v1 : new Integer[] { 1, null })
2151 >    {
2152 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2153 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2154 >        final IncFunction r = new IncFunction();
2155 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2156 >
2157 >        assertTrue(f.cancel(mayInterruptIfRunning));
2158 >        checkCompletedWithWrappedCancellationException(h);
2159 >        g.complete(v1);
2160 >
2161 >        checkCancelled(f);
2162 >        assertEquals(0, r.invocationCount);
2163 >        checkCompletedNormally(g, v1);
2164 >        checkCompletedWithWrappedCancellationException(h);
2165 >    }}
2166 >
2167 >    public void testApplyToEither_sourceCancelled2() {
2168 >        for (ExecutionMode m : ExecutionMode.values())
2169 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2170 >        for (Integer v1 : new Integer[] { 1, null })
2171 >    {
2172 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2173 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2174 >        final IncFunction r = new IncFunction();
2175 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2176 >
2177 >        assertTrue(g.cancel(mayInterruptIfRunning));
2178 >        checkCompletedWithWrappedCancellationException(h);
2179 >        f.complete(v1);
2180 >
2181 >        checkCancelled(g);
2182 >        assertEquals(0, r.invocationCount);
2183 >        checkCompletedNormally(f, v1);
2184 >        checkCompletedWithWrappedCancellationException(h);
2185 >    }}
2186 >
2187 >    public void testApplyToEither_sourceCancelled3() {
2188 >        for (ExecutionMode m : ExecutionMode.values())
2189 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2190 >        for (Integer v1 : new Integer[] { 1, null })
2191 >    {
2192 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2193 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2194 >        final IncFunction r = new IncFunction();
2195 >
2196 >        assertTrue(g.cancel(mayInterruptIfRunning));
2197 >        f.complete(v1);
2198 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2199 >
2200 >        // unspecified behavior
2201 >        Integer v;
2202 >        try {
2203 >            assertEquals(inc(v1), h.join());
2204 >            assertEquals(1, r.invocationCount);
2205 >        } catch (CompletionException ok) {
2206 >            checkCompletedWithWrappedCancellationException(h);
2207 >            assertEquals(0, r.invocationCount);
2208 >        }
2209 >
2210 >        checkCancelled(g);
2211 >        checkCompletedNormally(f, v1);
2212 >    }}
2213 >
2214 >    public void testApplyToEither_sourceCancelled4() {
2215 >        for (ExecutionMode m : ExecutionMode.values())
2216 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2217 >        for (Integer v1 : new Integer[] { 1, null })
2218 >    {
2219 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2220 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2221 >        final IncFunction r = new IncFunction();
2222 >
2223 >        assertTrue(f.cancel(mayInterruptIfRunning));
2224 >        g.complete(v1);
2225 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2226 >
2227 >        // unspecified behavior
2228 >        Integer v;
2229 >        try {
2230 >            assertEquals(inc(v1), h.join());
2231 >            assertEquals(1, r.invocationCount);
2232 >        } catch (CompletionException ok) {
2233 >            checkCompletedWithWrappedCancellationException(h);
2234 >            assertEquals(0, r.invocationCount);
2235 >        }
2236 >
2237 >        checkCancelled(f);
2238 >        checkCompletedNormally(g, v1);
2239 >    }}
2240  
2241      /**
2242       * acceptEither result completes normally after normal completion
2243       * of either source
2244       */
2245 <    public void testAcceptEither() {
2246 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2247 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2248 <        IncAction r = new IncAction();
2249 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
2250 <        f.complete(one);
2251 <        checkCompletedNormally(g, null);
2252 <        f2.complete(one);
2253 <        checkCompletedNormally(g, null);
1111 <        assertEquals(r.value, 2);
2245 >    public void testAcceptEither_normalCompletion1() {
2246 >        for (ExecutionMode m : ExecutionMode.values())
2247 >        for (Integer v1 : new Integer[] { 1, null })
2248 >        for (Integer v2 : new Integer[] { 2, null })
2249 >    {
2250 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2251 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2252 >        final IncAction r = new IncAction();
2253 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2254  
2255 <        r = new IncAction();
2256 <        f = new CompletableFuture<>();
2257 <        f.complete(one);
2258 <        f2 = new CompletableFuture<>();
2259 <        g = f.acceptEither(f2, r);
2260 <        checkCompletedNormally(g, null);
2261 <        assertEquals(r.value, 2);
2262 <    }
2255 >        f.complete(v1);
2256 >        checkCompletedNormally(h, null);
2257 >        assertEquals(inc(v1), r.value);
2258 >        g.complete(v2);
2259 >
2260 >        checkCompletedNormally(f, v1);
2261 >        checkCompletedNormally(g, v2);
2262 >        checkCompletedNormally(h, null);
2263 >    }}
2264 >
2265 >    public void testAcceptEither_normalCompletion2() {
2266 >        for (ExecutionMode m : ExecutionMode.values())
2267 >        for (Integer v1 : new Integer[] { 1, null })
2268 >        for (Integer v2 : new Integer[] { 2, null })
2269 >    {
2270 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2271 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2272 >        final IncAction r = new IncAction();
2273 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2274 >
2275 >        g.complete(v2);
2276 >        checkCompletedNormally(h, null);
2277 >        assertEquals(inc(v2), r.value);
2278 >        f.complete(v1);
2279 >
2280 >        checkCompletedNormally(f, v1);
2281 >        checkCompletedNormally(g, v2);
2282 >        checkCompletedNormally(h, null);
2283 >    }}
2284 >
2285 >    public void testAcceptEither_normalCompletion3() {
2286 >        for (ExecutionMode m : ExecutionMode.values())
2287 >        for (Integer v1 : new Integer[] { 1, null })
2288 >        for (Integer v2 : new Integer[] { 2, null })
2289 >    {
2290 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2291 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2292 >        final IncAction r = new IncAction();
2293 >
2294 >        f.complete(v1);
2295 >        g.complete(v2);
2296 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2297 >
2298 >        checkCompletedNormally(h, null);
2299 >        checkCompletedNormally(f, v1);
2300 >        checkCompletedNormally(g, v2);
2301 >
2302 >        // unspecified behavior
2303 >        assertTrue(Objects.equals(r.value, inc(v1)) ||
2304 >                   Objects.equals(r.value, inc(v2)));
2305 >    }}
2306  
2307      /**
2308       * acceptEither result completes exceptionally after exceptional
2309       * completion of either source
2310       */
2311 <    public void testAcceptEither2() {
2312 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2313 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2314 <        IncAction r = new IncAction();
2315 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
2316 <        f.completeExceptionally(new CFException());
2317 <        f2.complete(one);
2318 <        checkCompletedWithWrappedCFException(g);
2311 >    public void testAcceptEither_exceptionalCompletion1() {
2312 >        for (ExecutionMode m : ExecutionMode.values())
2313 >        for (Integer v1 : new Integer[] { 1, null })
2314 >    {
2315 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2316 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2317 >        final IncAction r = new IncAction();
2318 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2319 >        final CFException ex = new CFException();
2320 >
2321 >        f.completeExceptionally(ex);
2322 >        checkCompletedWithWrappedCFException(h, ex);
2323 >        g.complete(v1);
2324 >
2325 >        assertEquals(0, r.invocationCount);
2326 >        checkCompletedNormally(g, v1);
2327 >        checkCompletedWithWrappedCFException(f, ex);
2328 >        checkCompletedWithWrappedCFException(h, ex);
2329 >    }}
2330 >
2331 >    public void testAcceptEither_exceptionalCompletion2() {
2332 >        for (ExecutionMode m : ExecutionMode.values())
2333 >        for (Integer v1 : new Integer[] { 1, null })
2334 >    {
2335 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2336 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2337 >        final IncAction r = new IncAction();
2338 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2339 >        final CFException ex = new CFException();
2340 >
2341 >        g.completeExceptionally(ex);
2342 >        checkCompletedWithWrappedCFException(h, ex);
2343 >        f.complete(v1);
2344 >
2345 >        assertEquals(0, r.invocationCount);
2346 >        checkCompletedNormally(f, v1);
2347 >        checkCompletedWithWrappedCFException(g, ex);
2348 >        checkCompletedWithWrappedCFException(h, ex);
2349 >    }}
2350 >
2351 >    public void testAcceptEither_exceptionalCompletion3() {
2352 >        for (ExecutionMode m : ExecutionMode.values())
2353 >        for (Integer v1 : new Integer[] { 1, null })
2354 >    {
2355 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2356 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2357 >        final IncAction r = new IncAction();
2358 >        final CFException ex = new CFException();
2359 >
2360 >        g.completeExceptionally(ex);
2361 >        f.complete(v1);
2362 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2363  
2364 <        r = new IncAction();
2365 <        f = new CompletableFuture<>();
2366 <        f2 = new CompletableFuture<>();
2367 <        f2.completeExceptionally(new CFException());
2368 <        g = f.acceptEither(f2, r);
2369 <        checkCompletedWithWrappedCFException(g);
2370 <    }
2364 >        // unspecified behavior
2365 >        Integer v;
2366 >        try {
2367 >            assertNull(h.join());
2368 >            assertEquals(1, r.invocationCount);
2369 >            assertEquals(inc(v1), r.value);
2370 >        } catch (CompletionException ok) {
2371 >            checkCompletedWithWrappedCFException(h, ex);
2372 >            assertEquals(0, r.invocationCount);
2373 >        }
2374 >
2375 >        checkCompletedWithWrappedCFException(g, ex);
2376 >        checkCompletedNormally(f, v1);
2377 >    }}
2378 >
2379 >    public void testAcceptEither_exceptionalCompletion4() {
2380 >        for (ExecutionMode m : ExecutionMode.values())
2381 >        for (Integer v1 : new Integer[] { 1, null })
2382 >    {
2383 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2384 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2385 >        final IncAction r = new IncAction();
2386 >        final CFException ex = new CFException();
2387 >
2388 >        f.completeExceptionally(ex);
2389 >        g.complete(v1);
2390 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2391 >
2392 >        // unspecified behavior
2393 >        Integer v;
2394 >        try {
2395 >            assertNull(h.join());
2396 >            assertEquals(1, r.invocationCount);
2397 >            assertEquals(inc(v1), r.value);
2398 >        } catch (CompletionException ok) {
2399 >            checkCompletedWithWrappedCFException(h, ex);
2400 >            assertEquals(0, r.invocationCount);
2401 >        }
2402 >
2403 >        checkCompletedWithWrappedCFException(f, ex);
2404 >        checkCompletedNormally(g, v1);
2405 >    }}
2406  
2407      /**
2408       * acceptEither result completes exceptionally if action does
2409       */
2410 <    public void testAcceptEither3() {
2411 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2412 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2413 <        FailingConsumer r = new FailingConsumer();
2414 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
2415 <        f2.complete(two);
2416 <        checkCompletedWithWrappedCFException(g);
2417 <    }
2410 >    public void testAcceptEither_actionFailed1() {
2411 >        for (ExecutionMode m : ExecutionMode.values())
2412 >        for (Integer v1 : new Integer[] { 1, null })
2413 >        for (Integer v2 : new Integer[] { 2, null })
2414 >    {
2415 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2416 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2417 >        final FailingConsumer r = new FailingConsumer();
2418 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2419 >
2420 >        f.complete(v1);
2421 >        checkCompletedWithWrappedCFException(h);
2422 >        g.complete(v2);
2423 >        checkCompletedNormally(f, v1);
2424 >        checkCompletedNormally(g, v2);
2425 >    }}
2426 >
2427 >    public void testAcceptEither_actionFailed2() {
2428 >        for (ExecutionMode m : ExecutionMode.values())
2429 >        for (Integer v1 : new Integer[] { 1, null })
2430 >        for (Integer v2 : new Integer[] { 2, null })
2431 >    {
2432 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2433 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2434 >        final FailingConsumer r = new FailingConsumer();
2435 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2436 >
2437 >        g.complete(v2);
2438 >        checkCompletedWithWrappedCFException(h);
2439 >        f.complete(v1);
2440 >        checkCompletedNormally(f, v1);
2441 >        checkCompletedNormally(g, v2);
2442 >    }}
2443  
2444      /**
2445       * acceptEither result completes exceptionally if either source cancelled
2446       */
2447 <    public void testAcceptEither4() {
2448 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2449 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2450 <        IncAction r = new IncAction();
2451 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
2452 <        assertTrue(f.cancel(true));
2453 <        checkCompletedWithWrappedCancellationException(g);
2454 <        f = new CompletableFuture<>();
2455 <        f2 = new CompletableFuture<>();
2456 <        assertTrue(f2.cancel(true));
2457 <        checkCompletedWithWrappedCancellationException(g);
2458 <    }
2447 >    public void testAcceptEither_sourceCancelled1() {
2448 >        for (ExecutionMode m : ExecutionMode.values())
2449 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2450 >        for (Integer v1 : new Integer[] { 1, null })
2451 >    {
2452 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2453 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2454 >        final IncAction r = new IncAction();
2455 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2456 >
2457 >        assertTrue(f.cancel(mayInterruptIfRunning));
2458 >        checkCompletedWithWrappedCancellationException(h);
2459 >        g.complete(v1);
2460 >
2461 >        checkCancelled(f);
2462 >        assertEquals(0, r.invocationCount);
2463 >        checkCompletedNormally(g, v1);
2464 >        checkCompletedWithWrappedCancellationException(h);
2465 >    }}
2466 >
2467 >    public void testAcceptEither_sourceCancelled2() {
2468 >        for (ExecutionMode m : ExecutionMode.values())
2469 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2470 >        for (Integer v1 : new Integer[] { 1, null })
2471 >    {
2472 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2473 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2474 >        final IncAction r = new IncAction();
2475 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2476 >
2477 >        assertTrue(g.cancel(mayInterruptIfRunning));
2478 >        checkCompletedWithWrappedCancellationException(h);
2479 >        f.complete(v1);
2480 >
2481 >        checkCancelled(g);
2482 >        assertEquals(0, r.invocationCount);
2483 >        checkCompletedNormally(f, v1);
2484 >        checkCompletedWithWrappedCancellationException(h);
2485 >    }}
2486 >
2487 >    public void testAcceptEither_sourceCancelled3() {
2488 >        for (ExecutionMode m : ExecutionMode.values())
2489 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2490 >        for (Integer v1 : new Integer[] { 1, null })
2491 >    {
2492 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2493 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2494 >        final IncAction r = new IncAction();
2495 >
2496 >        assertTrue(g.cancel(mayInterruptIfRunning));
2497 >        f.complete(v1);
2498 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2499 >
2500 >        // unspecified behavior
2501 >        Integer v;
2502 >        try {
2503 >            assertNull(h.join());
2504 >            assertEquals(1, r.invocationCount);
2505 >            assertEquals(inc(v1), r.value);
2506 >        } catch (CompletionException ok) {
2507 >            checkCompletedWithWrappedCancellationException(h);
2508 >            assertEquals(0, r.invocationCount);
2509 >        }
2510 >
2511 >        checkCancelled(g);
2512 >        checkCompletedNormally(f, v1);
2513 >    }}
2514 >
2515 >    public void testAcceptEither_sourceCancelled4() {
2516 >        for (ExecutionMode m : ExecutionMode.values())
2517 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2518 >        for (Integer v1 : new Integer[] { 1, null })
2519 >    {
2520 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2521 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2522 >        final IncAction r = new IncAction();
2523 >
2524 >        assertTrue(f.cancel(mayInterruptIfRunning));
2525 >        g.complete(v1);
2526 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2527 >
2528 >        // unspecified behavior
2529 >        Integer v;
2530 >        try {
2531 >            assertNull(h.join());
2532 >            assertEquals(1, r.invocationCount);
2533 >            assertEquals(inc(v1), r.value);
2534 >        } catch (CompletionException ok) {
2535 >            checkCompletedWithWrappedCancellationException(h);
2536 >            assertEquals(0, r.invocationCount);
2537 >        }
2538 >
2539 >        checkCancelled(f);
2540 >        checkCompletedNormally(g, v1);
2541 >    }}
2542  
2543      /**
2544       * runAfterEither result completes normally after normal completion
2545       * of either source
2546       */
2547 <    public void testRunAfterEither() {
2548 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2549 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2550 <        Noop r = new Noop();
2551 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
2552 <        f.complete(one);
2553 <        checkCompletedNormally(g, null);
2554 <        f2.complete(one);
2555 <        checkCompletedNormally(g, null);
1184 <        assertTrue(r.ran);
2547 >    public void testRunAfterEither_normalCompletion1() {
2548 >        for (ExecutionMode m : ExecutionMode.values())
2549 >        for (Integer v1 : new Integer[] { 1, null })
2550 >        for (Integer v2 : new Integer[] { 2, null })
2551 >    {
2552 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2553 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2554 >        final Noop r = new Noop();
2555 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2556  
2557 <        r = new Noop();
2558 <        f = new CompletableFuture<>();
2559 <        f.complete(one);
2560 <        f2 = new CompletableFuture<>();
2561 <        g = f.runAfterEither(f2, r);
2562 <        checkCompletedNormally(g, null);
2563 <        assertTrue(r.ran);
2564 <    }
2557 >        f.complete(v1);
2558 >        checkCompletedNormally(h, null);
2559 >        assertEquals(1, r.invocationCount);
2560 >        g.complete(v2);
2561 >
2562 >        checkCompletedNormally(f, v1);
2563 >        checkCompletedNormally(g, v2);
2564 >        checkCompletedNormally(h, null);
2565 >        assertEquals(1, r.invocationCount);
2566 >    }}
2567 >
2568 >    public void testRunAfterEither_normalCompletion2() {
2569 >        for (ExecutionMode m : ExecutionMode.values())
2570 >        for (Integer v1 : new Integer[] { 1, null })
2571 >        for (Integer v2 : new Integer[] { 2, null })
2572 >    {
2573 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2574 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2575 >        final Noop r = new Noop();
2576 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2577 >
2578 >        g.complete(v2);
2579 >        checkCompletedNormally(h, null);
2580 >        assertEquals(1, r.invocationCount);
2581 >        f.complete(v1);
2582 >
2583 >        checkCompletedNormally(f, v1);
2584 >        checkCompletedNormally(g, v2);
2585 >        checkCompletedNormally(h, null);
2586 >        assertEquals(1, r.invocationCount);
2587 >        }}
2588 >
2589 >    public void testRunAfterEither_normalCompletion3() {
2590 >        for (ExecutionMode m : ExecutionMode.values())
2591 >        for (Integer v1 : new Integer[] { 1, null })
2592 >        for (Integer v2 : new Integer[] { 2, null })
2593 >    {
2594 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2595 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2596 >        final Noop r = new Noop();
2597 >
2598 >        f.complete(v1);
2599 >        g.complete(v2);
2600 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2601 >
2602 >        checkCompletedNormally(h, null);
2603 >        checkCompletedNormally(f, v1);
2604 >        checkCompletedNormally(g, v2);
2605 >        assertEquals(1, r.invocationCount);
2606 >    }}
2607  
2608      /**
2609       * runAfterEither result completes exceptionally after exceptional
2610       * completion of either source
2611       */
2612 <    public void testRunAfterEither2() {
2613 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2614 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2615 <        Noop r = new Noop();
2616 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
2617 <        f.completeExceptionally(new CFException());
2618 <        f2.complete(one);
2619 <        checkCompletedWithWrappedCFException(g);
2612 >    public void testRunAfterEither_exceptionalCompletion1() {
2613 >        for (ExecutionMode m : ExecutionMode.values())
2614 >        for (Integer v1 : new Integer[] { 1, null })
2615 >    {
2616 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2617 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2618 >        final Noop r = new Noop();
2619 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2620 >        final CFException ex = new CFException();
2621 >
2622 >        f.completeExceptionally(ex);
2623 >        checkCompletedWithWrappedCFException(h, ex);
2624 >        g.complete(v1);
2625 >
2626 >        assertEquals(0, r.invocationCount);
2627 >        checkCompletedNormally(g, v1);
2628 >        checkCompletedWithWrappedCFException(f, ex);
2629 >        checkCompletedWithWrappedCFException(h, ex);
2630 >    }}
2631 >
2632 >    public void testRunAfterEither_exceptionalCompletion2() {
2633 >        for (ExecutionMode m : ExecutionMode.values())
2634 >        for (Integer v1 : new Integer[] { 1, null })
2635 >    {
2636 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2637 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2638 >        final Noop r = new Noop();
2639 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2640 >        final CFException ex = new CFException();
2641 >
2642 >        g.completeExceptionally(ex);
2643 >        checkCompletedWithWrappedCFException(h, ex);
2644 >        f.complete(v1);
2645 >
2646 >        assertEquals(0, r.invocationCount);
2647 >        checkCompletedNormally(f, v1);
2648 >        checkCompletedWithWrappedCFException(g, ex);
2649 >        checkCompletedWithWrappedCFException(h, ex);
2650 >    }}
2651 >
2652 >    public void testRunAfterEither_exceptionalCompletion3() {
2653 >        for (ExecutionMode m : ExecutionMode.values())
2654 >        for (Integer v1 : new Integer[] { 1, null })
2655 >    {
2656 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2657 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2658 >        final Noop r = new Noop();
2659 >        final CFException ex = new CFException();
2660 >
2661 >        g.completeExceptionally(ex);
2662 >        f.complete(v1);
2663 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2664  
2665 <        r = new Noop();
2666 <        f = new CompletableFuture<>();
2667 <        f2 = new CompletableFuture<>();
2668 <        f2.completeExceptionally(new CFException());
2669 <        g = f.runAfterEither(f2, r);
2670 <        checkCompletedWithWrappedCFException(g);
2671 <    }
2665 >        // unspecified behavior
2666 >        Integer v;
2667 >        try {
2668 >            assertNull(h.join());
2669 >            assertEquals(1, r.invocationCount);
2670 >        } catch (CompletionException ok) {
2671 >            checkCompletedWithWrappedCFException(h, ex);
2672 >            assertEquals(0, r.invocationCount);
2673 >        }
2674 >
2675 >        checkCompletedWithWrappedCFException(g, ex);
2676 >        checkCompletedNormally(f, v1);
2677 >    }}
2678 >
2679 >    public void testRunAfterEither_exceptionalCompletion4() {
2680 >        for (ExecutionMode m : ExecutionMode.values())
2681 >        for (Integer v1 : new Integer[] { 1, null })
2682 >    {
2683 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2684 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2685 >        final Noop r = new Noop();
2686 >        final CFException ex = new CFException();
2687 >
2688 >        f.completeExceptionally(ex);
2689 >        g.complete(v1);
2690 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2691 >
2692 >        // unspecified behavior
2693 >        Integer v;
2694 >        try {
2695 >            assertNull(h.join());
2696 >            assertEquals(1, r.invocationCount);
2697 >        } catch (CompletionException ok) {
2698 >            checkCompletedWithWrappedCFException(h, ex);
2699 >            assertEquals(0, r.invocationCount);
2700 >        }
2701 >
2702 >        checkCompletedWithWrappedCFException(f, ex);
2703 >        checkCompletedNormally(g, v1);
2704 >    }}
2705  
2706      /**
2707       * runAfterEither result completes exceptionally if action does
2708       */
2709 <    public void testRunAfterEither3() {
2710 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2711 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2712 <        FailingNoop r = new FailingNoop();
2713 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
2714 <        f2.complete(two);
2715 <        checkCompletedWithWrappedCFException(g);
2716 <    }
2709 >    public void testRunAfterEither_actionFailed1() {
2710 >        for (ExecutionMode m : ExecutionMode.values())
2711 >        for (Integer v1 : new Integer[] { 1, null })
2712 >        for (Integer v2 : new Integer[] { 2, null })
2713 >    {
2714 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2715 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2716 >        final FailingNoop r = new FailingNoop();
2717 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2718 >
2719 >        f.complete(v1);
2720 >        checkCompletedWithWrappedCFException(h);
2721 >        g.complete(v2);
2722 >        checkCompletedNormally(f, v1);
2723 >        checkCompletedNormally(g, v2);
2724 >    }}
2725 >
2726 >    public void testRunAfterEither_actionFailed2() {
2727 >        for (ExecutionMode m : ExecutionMode.values())
2728 >        for (Integer v1 : new Integer[] { 1, null })
2729 >        for (Integer v2 : new Integer[] { 2, null })
2730 >    {
2731 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2732 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2733 >        final FailingNoop r = new FailingNoop();
2734 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2735 >
2736 >        g.complete(v2);
2737 >        checkCompletedWithWrappedCFException(h);
2738 >        f.complete(v1);
2739 >        checkCompletedNormally(f, v1);
2740 >        checkCompletedNormally(g, v2);
2741 >    }}
2742  
2743      /**
2744       * runAfterEither result completes exceptionally if either source cancelled
2745       */
2746 <    public void testRunAfterEither4() {
2747 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2748 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2749 <        Noop r = new Noop();
2750 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
2751 <        assertTrue(f.cancel(true));
2752 <        checkCompletedWithWrappedCancellationException(g);
2753 <        f = new CompletableFuture<>();
2754 <        f2 = new CompletableFuture<>();
2755 <        assertTrue(f2.cancel(true));
2756 <        checkCompletedWithWrappedCancellationException(g);
2757 <    }
2746 >    public void testRunAfterEither_sourceCancelled1() {
2747 >        for (ExecutionMode m : ExecutionMode.values())
2748 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2749 >        for (Integer v1 : new Integer[] { 1, null })
2750 >    {
2751 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2752 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2753 >        final Noop r = new Noop();
2754 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2755 >
2756 >        assertTrue(f.cancel(mayInterruptIfRunning));
2757 >        checkCompletedWithWrappedCancellationException(h);
2758 >        g.complete(v1);
2759 >
2760 >        checkCancelled(f);
2761 >        assertEquals(0, r.invocationCount);
2762 >        checkCompletedNormally(g, v1);
2763 >        checkCompletedWithWrappedCancellationException(h);
2764 >    }}
2765 >
2766 >    public void testRunAfterEither_sourceCancelled2() {
2767 >        for (ExecutionMode m : ExecutionMode.values())
2768 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2769 >        for (Integer v1 : new Integer[] { 1, null })
2770 >    {
2771 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2772 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2773 >        final Noop r = new Noop();
2774 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2775 >
2776 >        assertTrue(g.cancel(mayInterruptIfRunning));
2777 >        checkCompletedWithWrappedCancellationException(h);
2778 >        f.complete(v1);
2779 >
2780 >        checkCancelled(g);
2781 >        assertEquals(0, r.invocationCount);
2782 >        checkCompletedNormally(f, v1);
2783 >        checkCompletedWithWrappedCancellationException(h);
2784 >    }}
2785 >
2786 >    public void testRunAfterEither_sourceCancelled3() {
2787 >        for (ExecutionMode m : ExecutionMode.values())
2788 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2789 >        for (Integer v1 : new Integer[] { 1, null })
2790 >    {
2791 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2792 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2793 >        final Noop r = new Noop();
2794 >
2795 >        assertTrue(g.cancel(mayInterruptIfRunning));
2796 >        f.complete(v1);
2797 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2798 >
2799 >        // unspecified behavior
2800 >        Integer v;
2801 >        try {
2802 >            assertNull(h.join());
2803 >            assertEquals(1, r.invocationCount);
2804 >        } catch (CompletionException ok) {
2805 >            checkCompletedWithWrappedCancellationException(h);
2806 >            assertEquals(0, r.invocationCount);
2807 >        }
2808 >
2809 >        checkCancelled(g);
2810 >        checkCompletedNormally(f, v1);
2811 >    }}
2812 >
2813 >    public void testRunAfterEither_sourceCancelled4() {
2814 >        for (ExecutionMode m : ExecutionMode.values())
2815 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2816 >        for (Integer v1 : new Integer[] { 1, null })
2817 >    {
2818 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2819 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2820 >        final Noop r = new Noop();
2821 >
2822 >        assertTrue(f.cancel(mayInterruptIfRunning));
2823 >        g.complete(v1);
2824 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2825 >
2826 >        // unspecified behavior
2827 >        Integer v;
2828 >        try {
2829 >            assertNull(h.join());
2830 >            assertEquals(1, r.invocationCount);
2831 >        } catch (CompletionException ok) {
2832 >            checkCompletedWithWrappedCancellationException(h);
2833 >            assertEquals(0, r.invocationCount);
2834 >        }
2835 >
2836 >        checkCancelled(f);
2837 >        checkCompletedNormally(g, v1);
2838 >    }}
2839  
2840      /**
2841       * thenCompose result completes normally after normal completion of source
2842       */
2843 <    public void testThenCompose() {
2844 <        CompletableFuture<Integer> f, g;
2845 <        CompletableFutureInc r;
2846 <
2847 <        f = new CompletableFuture<>();
2848 <        g = f.thenCompose(r = new CompletableFutureInc());
2849 <        f.complete(one);
2850 <        checkCompletedNormally(g, two);
2851 <        assertTrue(r.ran);
2852 <
2853 <        f = new CompletableFuture<>();
2854 <        f.complete(one);
2855 <        g = f.thenCompose(r = new CompletableFutureInc());
2856 <        checkCompletedNormally(g, two);
2857 <        assertTrue(r.ran);
2858 <    }
2843 >    public void testThenCompose_normalCompletion1() {
2844 >        for (ExecutionMode m : ExecutionMode.values())
2845 >        for (Integer v1 : new Integer[] { 1, null })
2846 >    {
2847 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2848 >        final CompletableFutureInc r = new CompletableFutureInc();
2849 >        final CompletableFuture<Integer> g = f.thenCompose(r);
2850 >        f.complete(v1);
2851 >        checkCompletedNormally(g, inc(v1));
2852 >        checkCompletedNormally(f, v1);
2853 >        assertEquals(1, r.invocationCount);
2854 >    }}
2855 >
2856 >    public void testThenCompose_normalCompletion2() {
2857 >        for (ExecutionMode m : ExecutionMode.values())
2858 >        for (Integer v1 : new Integer[] { 1, null })
2859 >    {
2860 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2861 >        final CompletableFutureInc r = new CompletableFutureInc();
2862 >        f.complete(v1);
2863 >        final CompletableFuture<Integer> g = f.thenCompose(r);
2864 >        checkCompletedNormally(g, inc(v1));
2865 >        checkCompletedNormally(f, v1);
2866 >        assertEquals(1, r.invocationCount);
2867 >    }}
2868  
2869      /**
2870       * thenCompose result completes exceptionally after exceptional
2871       * completion of source
2872       */
2873 <    public void testThenCompose2() {
2874 <        CompletableFuture<Integer> f, g;
2875 <        CompletableFutureInc r;
2876 <
2877 <        f = new CompletableFuture<>();
2878 <        g = f.thenCompose(r = new CompletableFutureInc());
2879 <        f.completeExceptionally(new CFException());
2880 <        checkCompletedWithWrappedCFException(g);
2881 <
2882 <        f = new CompletableFuture<>();
2883 <        f.completeExceptionally(new CFException());
2884 <        g = f.thenCompose(r = new CompletableFutureInc());
2885 <        checkCompletedWithWrappedCFException(g);
2886 <    }
2873 >    public void testThenCompose_exceptionalCompletion1() {
2874 >        for (ExecutionMode m : ExecutionMode.values())
2875 >    {
2876 >        final CFException ex = new CFException();
2877 >        final CompletableFutureInc r = new CompletableFutureInc();
2878 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2879 >        final CompletableFuture<Integer> g = f.thenCompose(r);
2880 >        f.completeExceptionally(ex);
2881 >        checkCompletedWithWrappedCFException(g, ex);
2882 >        checkCompletedWithWrappedCFException(f, ex);
2883 >    }}
2884 >
2885 >    public void testThenCompose_exceptionalCompletion2() {
2886 >        for (ExecutionMode m : ExecutionMode.values())
2887 >    {
2888 >        final CFException ex = new CFException();
2889 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2890 >        f.completeExceptionally(ex);
2891 >        final CompletableFutureInc r = new CompletableFutureInc();
2892 >        final CompletableFuture<Integer> g = f.thenCompose(r);
2893 >        checkCompletedWithWrappedCFException(g, ex);
2894 >        checkCompletedWithWrappedCFException(f, ex);
2895 >    }}
2896  
2897      /**
2898       * thenCompose result completes exceptionally if action does
2899       */
2900 <    public void testThenCompose3() {
2901 <        CompletableFuture<Integer> f, g;
2902 <        FailingCompletableFutureFunction r;
2903 <
2904 <        f = new CompletableFuture<>();
2905 <        g = f.thenCompose(r = new FailingCompletableFutureFunction());
2906 <        f.complete(one);
2907 <        checkCompletedWithWrappedCFException(g);
2908 <
2909 <        f = new CompletableFuture<>();
2910 <        f.complete(one);
2911 <        g = f.thenCompose(r = new FailingCompletableFutureFunction());
2900 >    public void testThenCompose_actionFailed1() {
2901 >        for (ExecutionMode m : ExecutionMode.values())
2902 >        for (Integer v1 : new Integer[] { 1, null })
2903 >    {
2904 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2905 >        final FailingCompletableFutureFunction r
2906 >            = new FailingCompletableFutureFunction();
2907 >        final CompletableFuture<Integer> g = f.thenCompose(r);
2908 >        f.complete(v1);
2909 >        checkCompletedWithWrappedCFException(g);
2910 >        checkCompletedNormally(f, v1);
2911 >    }}
2912 >
2913 >    public void testThenCompose_actionFailed2() {
2914 >        for (ExecutionMode m : ExecutionMode.values())
2915 >        for (Integer v1 : new Integer[] { 1, null })
2916 >    {
2917 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2918 >        f.complete(v1);
2919 >        final FailingCompletableFutureFunction r
2920 >            = new FailingCompletableFutureFunction();
2921 >        final CompletableFuture<Integer> g = f.thenCompose(r);
2922          checkCompletedWithWrappedCFException(g);
2923 <    }
2923 >        checkCompletedNormally(f, v1);
2924 >    }}
2925  
2926      /**
2927       * thenCompose result completes exceptionally if source cancelled
2928       */
2929 <    public void testThenCompose4() {
2930 <        CompletableFuture<Integer> f, g;
2931 <        CompletableFutureInc r;
2932 <
2933 <        f = new CompletableFuture<>();
2934 <        g = f.thenCompose(r = new CompletableFutureInc());
2935 <        assertTrue(f.cancel(true));
2929 >    public void testThenCompose_sourceCancelled1() {
2930 >        for (ExecutionMode m : ExecutionMode.values())
2931 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2932 >    {
2933 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2934 >        final CompletableFutureInc r = new CompletableFutureInc();
2935 >        final CompletableFuture<Integer> g = f.thenCompose(r);
2936 >        assertTrue(f.cancel(mayInterruptIfRunning));
2937          checkCompletedWithWrappedCancellationException(g);
2938 +        checkCancelled(f);
2939 +    }}
2940  
2941 <        f = new CompletableFuture<>();
2942 <        assertTrue(f.cancel(true));
2943 <        g = f.thenCompose(r = new CompletableFutureInc());
2941 >    public void testThenCompose_sourceCancelled2() {
2942 >        for (ExecutionMode m : ExecutionMode.values())
2943 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2944 >    {
2945 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2946 >        assertTrue(f.cancel(mayInterruptIfRunning));
2947 >        final CompletableFutureInc r = new CompletableFutureInc();
2948 >        final CompletableFuture<Integer> g = f.thenCompose(r);
2949          checkCompletedWithWrappedCancellationException(g);
2950 <    }
2950 >        checkCancelled(f);
2951 >    }}
2952  
2953      // asyncs
2954  
# Line 1348 | Line 2982 | public class CompletableFutureTest exten
2982          try {
2983              g.join();
2984              shouldThrow();
2985 <        } catch (Exception ok) {
1352 <        }
2985 >        } catch (CompletionException success) {}
2986          checkCompletedWithWrappedCFException(g);
2987      }
2988  
# Line 1427 | Line 3060 | public class CompletableFutureTest exten
3060          CompletableFuture<Void> g = f.thenAcceptAsync(r);
3061          f.complete(one);
3062          checkCompletedNormally(g, null);
3063 <        assertEquals(r.value, 2);
3063 >        assertEquals(r.value, (Integer) 2);
3064      }
3065  
3066      /**
# Line 1464 | Line 3097 | public class CompletableFutureTest exten
3097          checkCompletedWithWrappedCancellationException(g);
3098      }
3099  
1467    /**
1468     * thenCombineAsync result completes normally after normal
1469     * completion of sources
1470     */
1471    public void testThenCombineAsync() {
1472        CompletableFuture<Integer> f, g, h;
1473
1474        f = new CompletableFuture<>();
1475        g = new CompletableFuture<>();
1476        h = f.thenCombineAsync(g, subtract);
1477        f.complete(3);
1478        checkIncomplete(h);
1479        g.complete(1);
1480        checkCompletedNormally(h, 2);
1481
1482        f = new CompletableFuture<>();
1483        g = new CompletableFuture<>();
1484        h = f.thenCombineAsync(g, subtract);
1485        g.complete(1);
1486        checkIncomplete(h);
1487        f.complete(3);
1488        checkCompletedNormally(h, 2);
1489
1490        f = new CompletableFuture<>();
1491        g = new CompletableFuture<>();
1492        g.complete(1);
1493        f.complete(3);
1494        h = f.thenCombineAsync(g, subtract);
1495        checkCompletedNormally(h, 2);
1496    }
1497
1498    /**
1499     * thenCombineAsync result completes exceptionally after exceptional
1500     * completion of either source
1501     */
1502    public void testThenCombineAsync2() {
1503        CompletableFuture<Integer> f, g, h;
1504
1505        f = new CompletableFuture<>();
1506        g = new CompletableFuture<>();
1507        h = f.thenCombineAsync(g, subtract);
1508        f.completeExceptionally(new CFException());
1509        checkIncomplete(h);
1510        g.complete(1);
1511        checkCompletedWithWrappedCFException(h);
1512
1513        f = new CompletableFuture<>();
1514        g = new CompletableFuture<>();
1515        h = f.thenCombineAsync(g, subtract);
1516        g.completeExceptionally(new CFException());
1517        checkIncomplete(h);
1518        f.complete(3);
1519        checkCompletedWithWrappedCFException(h);
1520
1521        f = new CompletableFuture<>();
1522        g = new CompletableFuture<>();
1523        g.completeExceptionally(new CFException());
1524        f.complete(3);
1525        h = f.thenCombineAsync(g, subtract);
1526        checkCompletedWithWrappedCFException(h);
1527    }
1528
1529    /**
1530     * thenCombineAsync result completes exceptionally if action does
1531     */
1532    public void testThenCombineAsync3() {
1533        CompletableFuture<Integer> f = new CompletableFuture<>();
1534        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1535        FailingBiFunction r = new FailingBiFunction();
1536        CompletableFuture<Integer> g = f.thenCombineAsync(f2, r);
1537        f.complete(one);
1538        checkIncomplete(g);
1539        assertFalse(r.ran);
1540        f2.complete(two);
1541        checkCompletedWithWrappedCFException(g);
1542        assertTrue(r.ran);
1543    }
1544
1545    /**
1546     * thenCombineAsync result completes exceptionally if either source cancelled
1547     */
1548    public void testThenCombineAsync4() {
1549        CompletableFuture<Integer> f, g, h;
1550
1551        f = new CompletableFuture<>();
1552        g = new CompletableFuture<>();
1553        h = f.thenCombineAsync(g, subtract);
1554        assertTrue(f.cancel(true));
1555        checkIncomplete(h);
1556        g.complete(1);
1557        checkCompletedWithWrappedCancellationException(h);
1558
1559        f = new CompletableFuture<>();
1560        g = new CompletableFuture<>();
1561        h = f.thenCombineAsync(g, subtract);
1562        assertTrue(g.cancel(true));
1563        checkIncomplete(h);
1564        f.complete(3);
1565        checkCompletedWithWrappedCancellationException(h);
1566
1567        f = new CompletableFuture<>();
1568        g = new CompletableFuture<>();
1569        g.complete(3);
1570        assertTrue(f.cancel(true));
1571        h = f.thenCombineAsync(g, subtract);
1572        checkCompletedWithWrappedCancellationException(h);
1573
1574        f = new CompletableFuture<>();
1575        g = new CompletableFuture<>();
1576        f.complete(3);
1577        assertTrue(g.cancel(true));
1578        h = f.thenCombineAsync(g, subtract);
1579        checkCompletedWithWrappedCancellationException(h);
1580    }
1581
1582    /**
1583     * thenAcceptBothAsync result completes normally after normal
1584     * completion of sources
1585     */
1586    public void testThenAcceptBothAsync() {
1587        CompletableFuture<Integer> f, g;
1588        CompletableFuture<Void> h;
1589        SubtractAction r;
1590
1591        f = new CompletableFuture<>();
1592        g = new CompletableFuture<>();
1593        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1594        f.complete(3);
1595        checkIncomplete(h);
1596        g.complete(1);
1597        checkCompletedNormally(h, null);
1598        assertEquals(r.value, 2);
1599
1600        f = new CompletableFuture<>();
1601        g = new CompletableFuture<>();
1602        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1603        g.complete(1);
1604        checkIncomplete(h);
1605        f.complete(3);
1606        checkCompletedNormally(h, null);
1607        assertEquals(r.value, 2);
1608
1609        f = new CompletableFuture<>();
1610        g = new CompletableFuture<>();
1611        g.complete(1);
1612        f.complete(3);
1613        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1614        checkCompletedNormally(h, null);
1615        assertEquals(r.value, 2);
1616    }
1617
1618    /**
1619     * thenAcceptBothAsync result completes exceptionally after exceptional
1620     * completion of source
1621     */
1622    public void testThenAcceptBothAsync2() {
1623        CompletableFuture<Integer> f, g;
1624        CompletableFuture<Void> h;
1625        SubtractAction r;
1626
1627        f = new CompletableFuture<>();
1628        g = new CompletableFuture<>();
1629        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1630        f.completeExceptionally(new CFException());
1631        checkIncomplete(h);
1632        g.complete(1);
1633        checkCompletedWithWrappedCFException(h);
1634
1635        f = new CompletableFuture<>();
1636        g = new CompletableFuture<>();
1637        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1638        g.completeExceptionally(new CFException());
1639        checkIncomplete(h);
1640        f.complete(3);
1641        checkCompletedWithWrappedCFException(h);
1642
1643        f = new CompletableFuture<>();
1644        g = new CompletableFuture<>();
1645        f.complete(3);
1646        g.completeExceptionally(new CFException());
1647        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1648        checkCompletedWithWrappedCFException(h);
1649
1650        f = new CompletableFuture<>();
1651        g = new CompletableFuture<>();
1652        f.completeExceptionally(new CFException());
1653        g.complete(3);
1654        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1655        checkCompletedWithWrappedCFException(h);
1656    }
1657
1658    /**
1659     * thenAcceptBothAsync result completes exceptionally if action does
1660     */
1661    public void testThenAcceptBothAsync3() {
1662        CompletableFuture<Integer> f, g;
1663        CompletableFuture<Void> h;
1664        FailingBiConsumer r;
1665
1666        f = new CompletableFuture<>();
1667        g = new CompletableFuture<>();
1668        h = f.thenAcceptBothAsync(g, r = new FailingBiConsumer());
1669        f.complete(3);
1670        checkIncomplete(h);
1671        g.complete(1);
1672        checkCompletedWithWrappedCFException(h);
1673
1674        f = new CompletableFuture<>();
1675        g = new CompletableFuture<>();
1676        f.complete(3);
1677        g.complete(1);
1678        h = f.thenAcceptBothAsync(g, r = new FailingBiConsumer());
1679        checkCompletedWithWrappedCFException(h);
1680    }
1681
1682    /**
1683     * thenAcceptBothAsync result completes exceptionally if either source cancelled
1684     */
1685    public void testThenAcceptBothAsync4() {
1686        CompletableFuture<Integer> f, g;
1687        CompletableFuture<Void> h;
1688        SubtractAction r;
1689
1690        f = new CompletableFuture<>();
1691        g = new CompletableFuture<>();
1692        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1693        assertTrue(f.cancel(true));
1694        checkIncomplete(h);
1695        g.complete(1);
1696        checkCompletedWithWrappedCancellationException(h);
1697
1698        f = new CompletableFuture<>();
1699        g = new CompletableFuture<>();
1700        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1701        assertTrue(g.cancel(true));
1702        checkIncomplete(h);
1703        f.complete(3);
1704        checkCompletedWithWrappedCancellationException(h);
1705
1706        f = new CompletableFuture<>();
1707        g = new CompletableFuture<>();
1708        f.complete(3);
1709        assertTrue(g.cancel(true));
1710        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1711        checkCompletedWithWrappedCancellationException(h);
1712
1713        f = new CompletableFuture<>();
1714        g = new CompletableFuture<>();
1715        assertTrue(f.cancel(true));
1716        g.complete(3);
1717        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1718        checkCompletedWithWrappedCancellationException(h);
1719    }
1720
1721    /**
1722     * runAfterBothAsync result completes normally after normal
1723     * completion of sources
1724     */
1725    public void testRunAfterBothAsync() {
1726        CompletableFuture<Integer> f = new CompletableFuture<>();
1727        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1728        Noop r = new Noop();
1729        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r);
1730        f.complete(one);
1731        checkIncomplete(g);
1732        f2.complete(two);
1733        checkCompletedNormally(g, null);
1734        assertTrue(r.ran);
1735    }
1736
1737    /**
1738     * runAfterBothAsync result completes exceptionally after exceptional
1739     * completion of source
1740     */
1741    public void testRunAfterBothAsync2() {
1742        CompletableFuture<Integer> f = new CompletableFuture<>();
1743        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1744        Noop r = new Noop();
1745        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r);
1746        f.completeExceptionally(new CFException());
1747        f2.complete(two);
1748        checkCompletedWithWrappedCFException(g);
1749
1750        r = new Noop();
1751        f = new CompletableFuture<>();
1752        f2 = new CompletableFuture<>();
1753        g = f.runAfterBothAsync(f2, r);
1754        f.complete(one);
1755        f2.completeExceptionally(new CFException());
1756        checkCompletedWithWrappedCFException(g);
1757    }
1758
1759    /**
1760     * runAfterBothAsync result completes exceptionally if action does
1761     */
1762    public void testRunAfterBothAsync3() {
1763        CompletableFuture<Integer> f = new CompletableFuture<>();
1764        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1765        FailingNoop r = new FailingNoop();
1766        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r);
1767        f.complete(one);
1768        checkIncomplete(g);
1769        f2.complete(two);
1770        checkCompletedWithWrappedCFException(g);
1771    }
1772
1773    /**
1774     * runAfterBothAsync result completes exceptionally if either source cancelled
1775     */
1776    public void testRunAfterBothAsync4() {
1777        CompletableFuture<Integer> f = new CompletableFuture<>();
1778        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1779        Noop r = new Noop();
1780        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r);
1781        assertTrue(f.cancel(true));
1782        f2.complete(two);
1783        checkCompletedWithWrappedCancellationException(g);
1784
1785        r = new Noop();
1786        f = new CompletableFuture<>();
1787        f2 = new CompletableFuture<>();
1788        g = f.runAfterBothAsync(f2, r);
1789        f.complete(one);
1790        assertTrue(f2.cancel(true));
1791        checkCompletedWithWrappedCancellationException(g);
1792    }
1793
1794    /**
1795     * applyToEitherAsync result completes normally after normal
1796     * completion of sources
1797     */
1798    public void testApplyToEitherAsync() {
1799        CompletableFuture<Integer> f = new CompletableFuture<>();
1800        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1801        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
1802        f.complete(one);
1803        checkCompletedNormally(g, two);
1804
1805        f = new CompletableFuture<>();
1806        f.complete(one);
1807        f2 = new CompletableFuture<>();
1808        g = f.applyToEitherAsync(f2, inc);
1809        checkCompletedNormally(g, two);
1810    }
1811
1812    /**
1813     * applyToEitherAsync result completes exceptionally after exceptional
1814     * completion of source
1815     */
1816    public void testApplyToEitherAsync2() {
1817        CompletableFuture<Integer> f = new CompletableFuture<>();
1818        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1819        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
1820        f.completeExceptionally(new CFException());
1821        checkCompletedWithWrappedCFException(g);
1822
1823        f = new CompletableFuture<>();
1824        f2 = new CompletableFuture<>();
1825        f2.completeExceptionally(new CFException());
1826        g = f.applyToEitherAsync(f2, inc);
1827        f.complete(one);
1828        checkCompletedWithWrappedCFException(g);
1829    }
1830
1831    /**
1832     * applyToEitherAsync result completes exceptionally if action does
1833     */
1834    public void testApplyToEitherAsync3() {
1835        CompletableFuture<Integer> f = new CompletableFuture<>();
1836        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1837        FailingFunction r = new FailingFunction();
1838        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, r);
1839        f.complete(one);
1840        checkCompletedWithWrappedCFException(g);
1841    }
1842
1843    /**
1844     * applyToEitherAsync result completes exceptionally if either source cancelled
1845     */
1846    public void testApplyToEitherAsync4() {
1847        CompletableFuture<Integer> f = new CompletableFuture<>();
1848        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1849        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
1850        assertTrue(f.cancel(true));
1851        checkCompletedWithWrappedCancellationException(g);
1852
1853        f = new CompletableFuture<>();
1854        f2 = new CompletableFuture<>();
1855        assertTrue(f2.cancel(true));
1856        g = f.applyToEitherAsync(f2, inc);
1857        checkCompletedWithWrappedCancellationException(g);
1858    }
1859
1860    /**
1861     * acceptEitherAsync result completes normally after normal
1862     * completion of sources
1863     */
1864    public void testAcceptEitherAsync() {
1865        CompletableFuture<Integer> f = new CompletableFuture<>();
1866        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1867        IncAction r = new IncAction();
1868        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
1869        f.complete(one);
1870        checkCompletedNormally(g, null);
1871        assertEquals(r.value, 2);
1872
1873        r = new IncAction();
1874        f = new CompletableFuture<>();
1875        f.complete(one);
1876        f2 = new CompletableFuture<>();
1877        g = f.acceptEitherAsync(f2, r);
1878        checkCompletedNormally(g, null);
1879        assertEquals(r.value, 2);
1880    }
1881
1882    /**
1883     * acceptEitherAsync result completes exceptionally after exceptional
1884     * completion of source
1885     */
1886    public void testAcceptEitherAsync2() {
1887        CompletableFuture<Integer> f = new CompletableFuture<>();
1888        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1889        IncAction r = new IncAction();
1890        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
1891        f.completeExceptionally(new CFException());
1892        checkCompletedWithWrappedCFException(g);
1893
1894        r = new IncAction();
1895        f = new CompletableFuture<>();
1896        f2 = new CompletableFuture<>();
1897        f2.completeExceptionally(new CFException());
1898        g = f.acceptEitherAsync(f2, r);
1899        f.complete(one);
1900        checkCompletedWithWrappedCFException(g);
1901    }
1902
1903    /**
1904     * acceptEitherAsync result completes exceptionally if action does
1905     */
1906    public void testAcceptEitherAsync3() {
1907        CompletableFuture<Integer> f = new CompletableFuture<>();
1908        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1909        FailingConsumer r = new FailingConsumer();
1910        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
1911        f.complete(one);
1912        checkCompletedWithWrappedCFException(g);
1913    }
1914
1915    /**
1916     * acceptEitherAsync result completes exceptionally if either
1917     * source cancelled
1918     */
1919    public void testAcceptEitherAsync4() {
1920        CompletableFuture<Integer> f = new CompletableFuture<>();
1921        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1922        IncAction r = new IncAction();
1923        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
1924        assertTrue(f.cancel(true));
1925        checkCompletedWithWrappedCancellationException(g);
1926
1927        r = new IncAction();
1928        f = new CompletableFuture<>();
1929        f2 = new CompletableFuture<>();
1930        assertTrue(f2.cancel(true));
1931        g = f.acceptEitherAsync(f2, r);
1932        checkCompletedWithWrappedCancellationException(g);
1933    }
1934
1935    /**
1936     * runAfterEitherAsync result completes normally after normal
1937     * completion of sources
1938     */
1939    public void testRunAfterEitherAsync() {
1940        CompletableFuture<Integer> f = new CompletableFuture<>();
1941        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1942        Noop r = new Noop();
1943        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
1944        f.complete(one);
1945        checkCompletedNormally(g, null);
1946        assertTrue(r.ran);
1947
1948        r = new Noop();
1949        f = new CompletableFuture<>();
1950        f.complete(one);
1951        f2 = new CompletableFuture<>();
1952        g = f.runAfterEitherAsync(f2, r);
1953        checkCompletedNormally(g, null);
1954        assertTrue(r.ran);
1955    }
1956
1957    /**
1958     * runAfterEitherAsync result completes exceptionally after exceptional
1959     * completion of source
1960     */
1961    public void testRunAfterEitherAsync2() {
1962        CompletableFuture<Integer> f = new CompletableFuture<>();
1963        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1964        Noop r = new Noop();
1965        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
1966        f.completeExceptionally(new CFException());
1967        checkCompletedWithWrappedCFException(g);
1968
1969        r = new Noop();
1970        f = new CompletableFuture<>();
1971        f2 = new CompletableFuture<>();
1972        f2.completeExceptionally(new CFException());
1973        g = f.runAfterEitherAsync(f2, r);
1974        f.complete(one);
1975        checkCompletedWithWrappedCFException(g);
1976    }
1977
1978    /**
1979     * runAfterEitherAsync result completes exceptionally if action does
1980     */
1981    public void testRunAfterEitherAsync3() {
1982        CompletableFuture<Integer> f = new CompletableFuture<>();
1983        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1984        FailingNoop r = new FailingNoop();
1985        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
1986        f.complete(one);
1987        checkCompletedWithWrappedCFException(g);
1988    }
1989
1990    /**
1991     * runAfterEitherAsync result completes exceptionally if either
1992     * source cancelled
1993     */
1994    public void testRunAfterEitherAsync4() {
1995        CompletableFuture<Integer> f = new CompletableFuture<>();
1996        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1997        Noop r = new Noop();
1998        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
1999        assertTrue(f.cancel(true));
2000        checkCompletedWithWrappedCancellationException(g);
2001
2002        r = new Noop();
2003        f = new CompletableFuture<>();
2004        f2 = new CompletableFuture<>();
2005        assertTrue(f2.cancel(true));
2006        g = f.runAfterEitherAsync(f2, r);
2007        checkCompletedWithWrappedCancellationException(g);
2008    }
2009
2010    /**
2011     * thenComposeAsync result completes normally after normal
2012     * completion of source
2013     */
2014    public void testThenComposeAsync() {
2015        CompletableFuture<Integer> f, g;
2016        CompletableFutureInc r;
2017
2018        f = new CompletableFuture<>();
2019        g = f.thenComposeAsync(r = new CompletableFutureInc());
2020        f.complete(one);
2021        checkCompletedNormally(g, two);
2022
2023        f = new CompletableFuture<>();
2024        f.complete(one);
2025        g = f.thenComposeAsync(r = new CompletableFutureInc());
2026        checkCompletedNormally(g, two);
2027    }
2028
2029    /**
2030     * thenComposeAsync result completes exceptionally after
2031     * exceptional completion of source
2032     */
2033    public void testThenComposeAsync2() {
2034        CompletableFuture<Integer> f, g;
2035        CompletableFutureInc r;
2036
2037        f = new CompletableFuture<>();
2038        g = f.thenComposeAsync(r = new CompletableFutureInc());
2039        f.completeExceptionally(new CFException());
2040        checkCompletedWithWrappedCFException(g);
2041        assertFalse(r.ran);
2042
2043        f = new CompletableFuture<>();
2044        f.completeExceptionally(new CFException());
2045        g = f.thenComposeAsync(r = new CompletableFutureInc());
2046        checkCompletedWithWrappedCFException(g);
2047        assertFalse(r.ran);
2048    }
2049
2050    /**
2051     * thenComposeAsync result completes exceptionally if action does
2052     */
2053    public void testThenComposeAsync3() {
2054        CompletableFuture<Integer> f, g;
2055        FailingCompletableFutureFunction r;
2056
2057        f = new CompletableFuture<>();
2058        g = f.thenComposeAsync(r = new FailingCompletableFutureFunction());
2059        f.complete(one);
2060        checkCompletedWithWrappedCFException(g);
2061
2062        f = new CompletableFuture<>();
2063        f.complete(one);
2064        g = f.thenComposeAsync(r = new FailingCompletableFutureFunction());
2065        checkCompletedWithWrappedCFException(g);
2066    }
2067
2068    /**
2069     * thenComposeAsync result completes exceptionally if source cancelled
2070     */
2071    public void testThenComposeAsync4() {
2072        CompletableFuture<Integer> f, g;
2073        CompletableFutureInc r;
2074
2075        f = new CompletableFuture<>();
2076        g = f.thenComposeAsync(r = new CompletableFutureInc());
2077        assertTrue(f.cancel(true));
2078        checkCompletedWithWrappedCancellationException(g);
2079
2080        f = new CompletableFuture<>();
2081        assertTrue(f.cancel(true));
2082        g = f.thenComposeAsync(r = new CompletableFutureInc());
2083        checkCompletedWithWrappedCancellationException(g);
2084    }
2085
3100      // async with explicit executors
3101  
3102      /**
# Line 2115 | Line 3129 | public class CompletableFutureTest exten
3129          try {
3130              g.join();
3131              shouldThrow();
3132 <        } catch (Exception ok) {
2119 <        }
3132 >        } catch (CompletionException success) {}
3133          checkCompletedWithWrappedCFException(g);
3134      }
3135  
# Line 2194 | Line 3207 | public class CompletableFutureTest exten
3207          CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3208          f.complete(one);
3209          checkCompletedNormally(g, null);
3210 <        assertEquals(r.value, 2);
3210 >        assertEquals(r.value, (Integer) 2);
3211      }
3212  
3213      /**
# Line 2231 | Line 3244 | public class CompletableFutureTest exten
3244          checkCompletedWithWrappedCancellationException(g);
3245      }
3246  
2234    /**
2235     * thenCombineAsync result completes normally after normal
2236     * completion of sources
2237     */
2238    public void testThenCombineAsyncE() {
2239        CompletableFuture<Integer> f, g, h;
2240        ThreadExecutor e = new ThreadExecutor();
2241        int count = 0;
2242
2243        f = new CompletableFuture<>();
2244        g = new CompletableFuture<>();
2245        h = f.thenCombineAsync(g, subtract, e);
2246        f.complete(3);
2247        checkIncomplete(h);
2248        g.complete(1);
2249        checkCompletedNormally(h, 2);
2250        assertEquals(++count, e.count.get());
2251
2252        f = new CompletableFuture<>();
2253        g = new CompletableFuture<>();
2254        h = f.thenCombineAsync(g, subtract, e);
2255        g.complete(1);
2256        checkIncomplete(h);
2257        f.complete(3);
2258        checkCompletedNormally(h, 2);
2259        assertEquals(++count, e.count.get());
2260
2261        f = new CompletableFuture<>();
2262        g = new CompletableFuture<>();
2263        g.complete(1);
2264        f.complete(3);
2265        h = f.thenCombineAsync(g, subtract, e);
2266        checkCompletedNormally(h, 2);
2267        assertEquals(++count, e.count.get());
2268    }
2269
2270    /**
2271     * thenCombineAsync result completes exceptionally after exceptional
2272     * completion of either source
2273     */
2274    public void testThenCombineAsync2E() {
2275        CompletableFuture<Integer> f, g, h;
2276        ThreadExecutor e = new ThreadExecutor();
2277        int count = 0;
2278
2279        f = new CompletableFuture<>();
2280        g = new CompletableFuture<>();
2281        h = f.thenCombineAsync(g, subtract, e);
2282        f.completeExceptionally(new CFException());
2283        checkIncomplete(h);
2284        g.complete(1);
2285        checkCompletedWithWrappedCFException(h);
2286
2287        f = new CompletableFuture<>();
2288        g = new CompletableFuture<>();
2289        h = f.thenCombineAsync(g, subtract, e);
2290        g.completeExceptionally(new CFException());
2291        checkIncomplete(h);
2292        f.complete(3);
2293        checkCompletedWithWrappedCFException(h);
2294
2295        f = new CompletableFuture<>();
2296        g = new CompletableFuture<>();
2297        g.completeExceptionally(new CFException());
2298        h = f.thenCombineAsync(g, subtract, e);
2299        checkIncomplete(h);
2300        f.complete(3);
2301        checkCompletedWithWrappedCFException(h);
2302
2303        assertEquals(0, e.count.get());
2304    }
2305
2306    /**
2307     * thenCombineAsync result completes exceptionally if action does
2308     */
2309    public void testThenCombineAsync3E() {
2310        CompletableFuture<Integer> f = new CompletableFuture<>();
2311        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2312        FailingBiFunction r = new FailingBiFunction();
2313        CompletableFuture<Integer> g = f.thenCombineAsync(f2, r, new ThreadExecutor());
2314        f.complete(one);
2315        checkIncomplete(g);
2316        assertFalse(r.ran);
2317        f2.complete(two);
2318        checkCompletedWithWrappedCFException(g);
2319        assertTrue(r.ran);
2320    }
2321
2322    /**
2323     * thenCombineAsync result completes exceptionally if either source cancelled
2324     */
2325    public void testThenCombineAsync4E() {
2326        CompletableFuture<Integer> f, g, h;
2327        ThreadExecutor e = new ThreadExecutor();
2328
2329        f = new CompletableFuture<>();
2330        g = new CompletableFuture<>();
2331        h = f.thenCombineAsync(g, subtract, e);
2332        assertTrue(f.cancel(true));
2333        checkIncomplete(h);
2334        g.complete(1);
2335        checkCompletedWithWrappedCancellationException(h);
2336
2337        f = new CompletableFuture<>();
2338        g = new CompletableFuture<>();
2339        h = f.thenCombineAsync(g, subtract, e);
2340        assertTrue(g.cancel(true));
2341        checkIncomplete(h);
2342        f.complete(3);
2343        checkCompletedWithWrappedCancellationException(h);
2344
2345        f = new CompletableFuture<>();
2346        g = new CompletableFuture<>();
2347        assertTrue(g.cancel(true));
2348        h = f.thenCombineAsync(g, subtract, e);
2349        checkIncomplete(h);
2350        f.complete(3);
2351        checkCompletedWithWrappedCancellationException(h);
2352
2353        f = new CompletableFuture<>();
2354        g = new CompletableFuture<>();
2355        assertTrue(f.cancel(true));
2356        assertTrue(g.cancel(true));
2357        h = f.thenCombineAsync(g, subtract, e);
2358        checkCompletedWithWrappedCancellationException(h);
2359
2360        assertEquals(0, e.count.get());
2361    }
2362
2363    /**
2364     * thenAcceptBothAsync result completes normally after normal
2365     * completion of sources
2366     */
2367    public void testThenAcceptBothAsyncE() {
2368        CompletableFuture<Integer> f, g;
2369        CompletableFuture<Void> h;
2370        SubtractAction r;
2371        ThreadExecutor e = new ThreadExecutor();
2372
2373        f = new CompletableFuture<>();
2374        g = new CompletableFuture<>();
2375        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2376        f.complete(3);
2377        checkIncomplete(h);
2378        g.complete(1);
2379        checkCompletedNormally(h, null);
2380        assertEquals(r.value, 2);
2381
2382        f = new CompletableFuture<>();
2383        g = new CompletableFuture<>();
2384        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2385        g.complete(1);
2386        checkIncomplete(h);
2387        f.complete(3);
2388        checkCompletedNormally(h, null);
2389        assertEquals(r.value, 2);
2390
2391        f = new CompletableFuture<>();
2392        g = new CompletableFuture<>();
2393        g.complete(1);
2394        f.complete(3);
2395        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2396        checkCompletedNormally(h, null);
2397        assertEquals(r.value, 2);
2398
2399        assertEquals(3, e.count.get());
2400    }
2401
2402    /**
2403     * thenAcceptBothAsync result completes exceptionally after exceptional
2404     * completion of source
2405     */
2406    public void testThenAcceptBothAsync2E() {
2407        CompletableFuture<Integer> f, g;
2408        CompletableFuture<Void> h;
2409        SubtractAction r;
2410        ThreadExecutor e = new ThreadExecutor();
2411
2412        f = new CompletableFuture<>();
2413        g = new CompletableFuture<>();
2414        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2415        f.completeExceptionally(new CFException());
2416        checkIncomplete(h);
2417        g.complete(1);
2418        checkCompletedWithWrappedCFException(h);
2419
2420        f = new CompletableFuture<>();
2421        g = new CompletableFuture<>();
2422        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2423        g.completeExceptionally(new CFException());
2424        checkIncomplete(h);
2425        f.complete(3);
2426        checkCompletedWithWrappedCFException(h);
2427
2428        f = new CompletableFuture<>();
2429        g = new CompletableFuture<>();
2430        f.complete(3);
2431        g.completeExceptionally(new CFException());
2432        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2433        checkCompletedWithWrappedCFException(h);
2434
2435        f = new CompletableFuture<>();
2436        g = new CompletableFuture<>();
2437        f.completeExceptionally(new CFException());
2438        g.complete(3);
2439        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2440        checkCompletedWithWrappedCFException(h);
2441
2442        assertEquals(0, e.count.get());
2443    }
2444
2445    /**
2446     * thenAcceptBothAsync result completes exceptionally if action does
2447     */
2448    public void testThenAcceptBothAsync3E() {
2449        CompletableFuture<Integer> f, g;
2450        CompletableFuture<Void> h;
2451        FailingBiConsumer r;
2452        ThreadExecutor e = new ThreadExecutor();
2453
2454        f = new CompletableFuture<>();
2455        g = new CompletableFuture<>();
2456        h = f.thenAcceptBothAsync(g, r = new FailingBiConsumer(), e);
2457        f.complete(3);
2458        checkIncomplete(h);
2459        g.complete(1);
2460        checkCompletedWithWrappedCFException(h);
2461
2462        f = new CompletableFuture<>();
2463        g = new CompletableFuture<>();
2464        f.complete(3);
2465        g.complete(1);
2466        h = f.thenAcceptBothAsync(g, r = new FailingBiConsumer(), e);
2467        checkCompletedWithWrappedCFException(h);
2468
2469        assertEquals(2, e.count.get());
2470    }
2471
2472    /**
2473     * thenAcceptBothAsync result completes exceptionally if either source cancelled
2474     */
2475    public void testThenAcceptBothAsync4E() {
2476        CompletableFuture<Integer> f, g;
2477        CompletableFuture<Void> h;
2478        SubtractAction r;
2479        ThreadExecutor e = new ThreadExecutor();
2480
2481        f = new CompletableFuture<>();
2482        g = new CompletableFuture<>();
2483        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2484        assertTrue(f.cancel(true));
2485        checkIncomplete(h);
2486        g.complete(1);
2487        checkCompletedWithWrappedCancellationException(h);
2488
2489        f = new CompletableFuture<>();
2490        g = new CompletableFuture<>();
2491        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2492        assertTrue(g.cancel(true));
2493        checkIncomplete(h);
2494        f.complete(3);
2495        checkCompletedWithWrappedCancellationException(h);
2496
2497        f = new CompletableFuture<>();
2498        g = new CompletableFuture<>();
2499        f.complete(3);
2500        assertTrue(g.cancel(true));
2501        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2502        checkCompletedWithWrappedCancellationException(h);
2503
2504        f = new CompletableFuture<>();
2505        g = new CompletableFuture<>();
2506        assertTrue(f.cancel(true));
2507        g.complete(3);
2508        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2509        checkCompletedWithWrappedCancellationException(h);
2510
2511        assertEquals(0, e.count.get());
2512    }
2513
2514    /**
2515     * runAfterBothAsync result completes normally after normal
2516     * completion of sources
2517     */
2518    public void testRunAfterBothAsyncE() {
2519        CompletableFuture<Integer> f = new CompletableFuture<>();
2520        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2521        Noop r = new Noop();
2522        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2523        f.complete(one);
2524        checkIncomplete(g);
2525        f2.complete(two);
2526        checkCompletedNormally(g, null);
2527        assertTrue(r.ran);
2528    }
2529
2530    /**
2531     * runAfterBothAsync result completes exceptionally after exceptional
2532     * completion of source
2533     */
2534    public void testRunAfterBothAsync2E() {
2535        CompletableFuture<Integer> f = new CompletableFuture<>();
2536        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2537        Noop r = new Noop();
2538        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2539        f.completeExceptionally(new CFException());
2540        f2.complete(two);
2541        checkCompletedWithWrappedCFException(g);
2542
2543        r = new Noop();
2544        f = new CompletableFuture<>();
2545        f2 = new CompletableFuture<>();
2546        g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2547        f.complete(one);
2548        f2.completeExceptionally(new CFException());
2549        checkCompletedWithWrappedCFException(g);
2550    }
2551
2552    /**
2553     * runAfterBothAsync result completes exceptionally if action does
2554     */
2555    public void testRunAfterBothAsync3E() {
2556        CompletableFuture<Integer> f = new CompletableFuture<>();
2557        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2558        FailingNoop r = new FailingNoop();
2559        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2560        f.complete(one);
2561        checkIncomplete(g);
2562        f2.complete(two);
2563        checkCompletedWithWrappedCFException(g);
2564    }
2565
2566    /**
2567     * runAfterBothAsync result completes exceptionally if either source cancelled
2568     */
2569    public void testRunAfterBothAsync4E() {
2570        CompletableFuture<Integer> f = new CompletableFuture<>();
2571        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2572        Noop r = new Noop();
2573        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2574        assertTrue(f.cancel(true));
2575        f2.complete(two);
2576        checkCompletedWithWrappedCancellationException(g);
2577
2578        r = new Noop();
2579        f = new CompletableFuture<>();
2580        f2 = new CompletableFuture<>();
2581        g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2582        f.complete(one);
2583        assertTrue(f2.cancel(true));
2584        checkCompletedWithWrappedCancellationException(g);
2585    }
2586
2587    /**
2588     * applyToEitherAsync result completes normally after normal
2589     * completion of sources
2590     */
2591    public void testApplyToEitherAsyncE() {
2592        CompletableFuture<Integer> f = new CompletableFuture<>();
2593        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2594        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2595        f.complete(one);
2596        checkCompletedNormally(g, two);
2597
2598        f = new CompletableFuture<>();
2599        f.complete(one);
2600        f2 = new CompletableFuture<>();
2601        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2602        checkCompletedNormally(g, two);
2603    }
2604
2605    /**
2606     * applyToEitherAsync result completes exceptionally after exceptional
2607     * completion of source
2608     */
2609    public void testApplyToEitherAsync2E() {
2610        CompletableFuture<Integer> f = new CompletableFuture<>();
2611        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2612        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2613        f.completeExceptionally(new CFException());
2614        checkCompletedWithWrappedCFException(g);
2615
2616        f = new CompletableFuture<>();
2617        f2 = new CompletableFuture<>();
2618        f2.completeExceptionally(new CFException());
2619        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2620        f.complete(one);
2621        checkCompletedWithWrappedCFException(g);
2622    }
2623
2624    /**
2625     * applyToEitherAsync result completes exceptionally if action does
2626     */
2627    public void testApplyToEitherAsync3E() {
2628        CompletableFuture<Integer> f = new CompletableFuture<>();
2629        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2630        FailingFunction r = new FailingFunction();
2631        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, r, new ThreadExecutor());
2632        f.complete(one);
2633        checkCompletedWithWrappedCFException(g);
2634    }
2635
2636    /**
2637     * applyToEitherAsync result completes exceptionally if either source cancelled
2638     */
2639    public void testApplyToEitherAsync4E() {
2640        CompletableFuture<Integer> f = new CompletableFuture<>();
2641        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2642        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2643        assertTrue(f.cancel(true));
2644        checkCompletedWithWrappedCancellationException(g);
2645
2646        f = new CompletableFuture<>();
2647        f2 = new CompletableFuture<>();
2648        assertTrue(f2.cancel(true));
2649        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2650        checkCompletedWithWrappedCancellationException(g);
2651    }
2652
2653    /**
2654     * acceptEitherAsync result completes normally after normal
2655     * completion of sources
2656     */
2657    public void testAcceptEitherAsyncE() {
2658        CompletableFuture<Integer> f = new CompletableFuture<>();
2659        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2660        IncAction r = new IncAction();
2661        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2662        f.complete(one);
2663        checkCompletedNormally(g, null);
2664        assertEquals(r.value, 2);
2665
2666        r = new IncAction();
2667        f = new CompletableFuture<>();
2668        f.complete(one);
2669        f2 = new CompletableFuture<>();
2670        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2671        checkCompletedNormally(g, null);
2672        assertEquals(r.value, 2);
2673    }
2674
2675    /**
2676     * acceptEitherAsync result completes exceptionally after exceptional
2677     * completion of source
2678     */
2679    public void testAcceptEitherAsync2E() {
2680        CompletableFuture<Integer> f = new CompletableFuture<>();
2681        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2682        IncAction r = new IncAction();
2683        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2684        f.completeExceptionally(new CFException());
2685        checkCompletedWithWrappedCFException(g);
2686
2687        r = new IncAction();
2688        f = new CompletableFuture<>();
2689        f2 = new CompletableFuture<>();
2690        f2.completeExceptionally(new CFException());
2691        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2692        f.complete(one);
2693        checkCompletedWithWrappedCFException(g);
2694    }
2695
2696    /**
2697     * acceptEitherAsync result completes exceptionally if action does
2698     */
2699    public void testAcceptEitherAsync3E() {
2700        CompletableFuture<Integer> f = new CompletableFuture<>();
2701        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2702        FailingConsumer r = new FailingConsumer();
2703        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2704        f.complete(one);
2705        checkCompletedWithWrappedCFException(g);
2706    }
2707
2708    /**
2709     * acceptEitherAsync result completes exceptionally if either
2710     * source cancelled
2711     */
2712    public void testAcceptEitherAsync4E() {
2713        CompletableFuture<Integer> f = new CompletableFuture<>();
2714        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2715        IncAction r = new IncAction();
2716        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2717        assertTrue(f.cancel(true));
2718        checkCompletedWithWrappedCancellationException(g);
2719
2720        r = new IncAction();
2721        f = new CompletableFuture<>();
2722        f2 = new CompletableFuture<>();
2723        assertTrue(f2.cancel(true));
2724        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2725        checkCompletedWithWrappedCancellationException(g);
2726    }
2727
2728    /**
2729     * runAfterEitherAsync result completes normally after normal
2730     * completion of sources
2731     */
2732    public void testRunAfterEitherAsyncE() {
2733        CompletableFuture<Integer> f = new CompletableFuture<>();
2734        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2735        Noop r = new Noop();
2736        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2737        f.complete(one);
2738        checkCompletedNormally(g, null);
2739        assertTrue(r.ran);
2740
2741        r = new Noop();
2742        f = new CompletableFuture<>();
2743        f.complete(one);
2744        f2 = new CompletableFuture<>();
2745        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2746        checkCompletedNormally(g, null);
2747        assertTrue(r.ran);
2748    }
2749
2750    /**
2751     * runAfterEitherAsync result completes exceptionally after exceptional
2752     * completion of source
2753     */
2754    public void testRunAfterEitherAsync2E() {
2755        CompletableFuture<Integer> f = new CompletableFuture<>();
2756        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2757        Noop r = new Noop();
2758        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2759        f.completeExceptionally(new CFException());
2760        checkCompletedWithWrappedCFException(g);
2761
2762        r = new Noop();
2763        f = new CompletableFuture<>();
2764        f2 = new CompletableFuture<>();
2765        f2.completeExceptionally(new CFException());
2766        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2767        f.complete(one);
2768        checkCompletedWithWrappedCFException(g);
2769    }
2770
2771    /**
2772     * runAfterEitherAsync result completes exceptionally if action does
2773     */
2774    public void testRunAfterEitherAsync3E() {
2775        CompletableFuture<Integer> f = new CompletableFuture<>();
2776        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2777        FailingNoop r = new FailingNoop();
2778        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2779        f.complete(one);
2780        checkCompletedWithWrappedCFException(g);
2781    }
2782
2783    /**
2784     * runAfterEitherAsync result completes exceptionally if either
2785     * source cancelled
2786     */
2787    public void testRunAfterEitherAsync4E() {
2788        CompletableFuture<Integer> f = new CompletableFuture<>();
2789        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2790        Noop r = new Noop();
2791        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2792        assertTrue(f.cancel(true));
2793        checkCompletedWithWrappedCancellationException(g);
2794
2795        r = new Noop();
2796        f = new CompletableFuture<>();
2797        f2 = new CompletableFuture<>();
2798        assertTrue(f2.cancel(true));
2799        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2800        checkCompletedWithWrappedCancellationException(g);
2801    }
2802
2803    /**
2804     * thenComposeAsync result completes normally after normal
2805     * completion of source
2806     */
2807    public void testThenComposeAsyncE() {
2808        CompletableFuture<Integer> f = new CompletableFuture<>();
2809        CompletableFutureInc r = new CompletableFutureInc();
2810        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2811        f.complete(one);
2812        checkCompletedNormally(g, two);
2813    }
2814
2815    /**
2816     * thenComposeAsync result completes exceptionally after
2817     * exceptional completion of source
2818     */
2819    public void testThenComposeAsync2E() {
2820        CompletableFuture<Integer> f = new CompletableFuture<>();
2821        CompletableFutureInc r = new CompletableFutureInc();
2822        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2823        f.completeExceptionally(new CFException());
2824        checkCompletedWithWrappedCFException(g);
2825    }
2826
2827    /**
2828     * thenComposeAsync result completes exceptionally if action does
2829     */
2830    public void testThenComposeAsync3E() {
2831        CompletableFuture<Integer> f = new CompletableFuture<>();
2832        FailingCompletableFutureFunction r = new FailingCompletableFutureFunction();
2833        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2834        f.complete(one);
2835        checkCompletedWithWrappedCFException(g);
2836    }
2837
2838    /**
2839     * thenComposeAsync result completes exceptionally if source cancelled
2840     */
2841    public void testThenComposeAsync4E() {
2842        CompletableFuture<Integer> f = new CompletableFuture<>();
2843        CompletableFutureInc r = new CompletableFutureInc();
2844        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2845        assertTrue(f.cancel(true));
2846        checkCompletedWithWrappedCancellationException(g);
2847    }
2848
3247      // other static methods
3248  
3249      /**
# Line 2933 | Line 3331 | public class CompletableFutureTest exten
3331          ThreadExecutor exec = new ThreadExecutor();
3332  
3333          Runnable[] throwingActions = {
3334 <            () -> { CompletableFuture.supplyAsync(null); },
3335 <            () -> { CompletableFuture.supplyAsync(null, exec); },
3336 <            () -> { CompletableFuture.supplyAsync(supplyOne, null); },
3337 <
3338 <            () -> { CompletableFuture.runAsync(null); },
3339 <            () -> { CompletableFuture.runAsync(null, exec); },
3340 <            () -> { CompletableFuture.runAsync(() -> {}, null); },
3341 <
3342 <            () -> { f.completeExceptionally(null); },
3343 <
3344 <            () -> { f.thenApply(null); },
3345 <            () -> { f.thenApplyAsync(null); },
3346 <            () -> { f.thenApplyAsync((x) -> x, null); },
3347 <            () -> { f.thenApplyAsync(null, exec); },
3348 <
3349 <            () -> { f.thenAccept(null); },
3350 <            () -> { f.thenAcceptAsync(null); },
3351 <            () -> { f.thenAcceptAsync((x) -> { ; }, null); },
3352 <            () -> { f.thenAcceptAsync(null, exec); },
3353 <
3354 <            () -> { f.thenRun(null); },
3355 <            () -> { f.thenRunAsync(null); },
3356 <            () -> { f.thenRunAsync(() -> { ; }, null); },
3357 <            () -> { f.thenRunAsync(null, exec); },
3358 <
3359 <            () -> { f.thenCombine(g, null); },
3360 <            () -> { f.thenCombineAsync(g, null); },
3361 <            () -> { f.thenCombineAsync(g, null, exec); },
3362 <            () -> { f.thenCombine(nullFuture, (x, y) -> x); },
3363 <            () -> { f.thenCombineAsync(nullFuture, (x, y) -> x); },
3364 <            () -> { f.thenCombineAsync(nullFuture, (x, y) -> x, exec); },
3365 <            () -> { f.thenCombineAsync(g, (x, y) -> x, null); },
3366 <
3367 <            () -> { f.thenAcceptBoth(g, null); },
3368 <            () -> { f.thenAcceptBothAsync(g, null); },
3369 <            () -> { f.thenAcceptBothAsync(g, null, exec); },
3370 <            () -> { f.thenAcceptBoth(nullFuture, (x, y) -> {}); },
3371 <            () -> { f.thenAcceptBothAsync(nullFuture, (x, y) -> {}); },
3372 <            () -> { f.thenAcceptBothAsync(nullFuture, (x, y) -> {}, exec); },
3373 <            () -> { f.thenAcceptBothAsync(g, (x, y) -> {}, null); },
3374 <
3375 <            () -> { f.runAfterBoth(g, null); },
3376 <            () -> { f.runAfterBothAsync(g, null); },
3377 <            () -> { f.runAfterBothAsync(g, null, exec); },
3378 <            () -> { f.runAfterBoth(nullFuture, () -> {}); },
3379 <            () -> { f.runAfterBothAsync(nullFuture, () -> {}); },
3380 <            () -> { f.runAfterBothAsync(nullFuture, () -> {}, exec); },
3381 <            () -> { f.runAfterBothAsync(g, () -> {}, null); },
3382 <
3383 <            () -> { f.applyToEither(g, null); },
3384 <            () -> { f.applyToEitherAsync(g, null); },
3385 <            () -> { f.applyToEitherAsync(g, null, exec); },
3386 <            () -> { f.applyToEither(nullFuture, (x) -> x); },
3387 <            () -> { f.applyToEitherAsync(nullFuture, (x) -> x); },
3388 <            () -> { f.applyToEitherAsync(nullFuture, (x) -> x, exec); },
3389 <            () -> { f.applyToEitherAsync(g, (x) -> x, null); },
3390 <
3391 <            () -> { f.acceptEither(g, null); },
3392 <            () -> { f.acceptEitherAsync(g, null); },
3393 <            () -> { f.acceptEitherAsync(g, null, exec); },
3394 <            () -> { f.acceptEither(nullFuture, (x) -> {}); },
3395 <            () -> { f.acceptEitherAsync(nullFuture, (x) -> {}); },
3396 <            () -> { f.acceptEitherAsync(nullFuture, (x) -> {}, exec); },
3397 <            () -> { f.acceptEitherAsync(g, (x) -> {}, null); },
3398 <
3399 <            () -> { f.runAfterEither(g, null); },
3400 <            () -> { f.runAfterEitherAsync(g, null); },
3401 <            () -> { f.runAfterEitherAsync(g, null, exec); },
3402 <            () -> { f.runAfterEither(nullFuture, () -> {}); },
3403 <            () -> { f.runAfterEitherAsync(nullFuture, () -> {}); },
3404 <            () -> { f.runAfterEitherAsync(nullFuture, () -> {}, exec); },
3405 <            () -> { f.runAfterEitherAsync(g, () -> {}, null); },
3406 <
3407 <            () -> { f.thenCompose(null); },
3408 <            () -> { f.thenComposeAsync(null); },
3409 <            () -> { f.thenComposeAsync(new CompletableFutureInc(), null); },
3410 <            () -> { f.thenComposeAsync(null, exec); },
3411 <
3412 <            () -> { f.exceptionally(null); },
3413 <
3414 <            () -> { f.handle(null); },
3415 <
3416 <            () -> { CompletableFuture.allOf((CompletableFuture<?>)null); },
3417 <            () -> { CompletableFuture.allOf((CompletableFuture<?>[])null); },
3418 <            () -> { CompletableFuture.allOf(f, null); },
3419 <            () -> { CompletableFuture.allOf(null, f); },
3420 <
3421 <            () -> { CompletableFuture.anyOf((CompletableFuture<?>)null); },
3422 <            () -> { CompletableFuture.anyOf((CompletableFuture<?>[])null); },
3423 <            () -> { CompletableFuture.anyOf(f, null); },
3424 <            () -> { CompletableFuture.anyOf(null, f); },
3334 >            () -> CompletableFuture.supplyAsync(null),
3335 >            () -> CompletableFuture.supplyAsync(null, exec),
3336 >            () -> CompletableFuture.supplyAsync(supplyOne, null),
3337 >
3338 >            () -> CompletableFuture.runAsync(null),
3339 >            () -> CompletableFuture.runAsync(null, exec),
3340 >            () -> CompletableFuture.runAsync(() -> {}, null),
3341 >
3342 >            () -> f.completeExceptionally(null),
3343 >
3344 >            () -> f.thenApply(null),
3345 >            () -> f.thenApplyAsync(null),
3346 >            () -> f.thenApplyAsync((x) -> x, null),
3347 >            () -> f.thenApplyAsync(null, exec),
3348 >
3349 >            () -> f.thenAccept(null),
3350 >            () -> f.thenAcceptAsync(null),
3351 >            () -> f.thenAcceptAsync((x) -> {} , null),
3352 >            () -> f.thenAcceptAsync(null, exec),
3353 >
3354 >            () -> f.thenRun(null),
3355 >            () -> f.thenRunAsync(null),
3356 >            () -> f.thenRunAsync(() -> {} , null),
3357 >            () -> f.thenRunAsync(null, exec),
3358 >
3359 >            () -> f.thenCombine(g, null),
3360 >            () -> f.thenCombineAsync(g, null),
3361 >            () -> f.thenCombineAsync(g, null, exec),
3362 >            () -> f.thenCombine(nullFuture, (x, y) -> x),
3363 >            () -> f.thenCombineAsync(nullFuture, (x, y) -> x),
3364 >            () -> f.thenCombineAsync(nullFuture, (x, y) -> x, exec),
3365 >            () -> f.thenCombineAsync(g, (x, y) -> x, null),
3366 >
3367 >            () -> f.thenAcceptBoth(g, null),
3368 >            () -> f.thenAcceptBothAsync(g, null),
3369 >            () -> f.thenAcceptBothAsync(g, null, exec),
3370 >            () -> f.thenAcceptBoth(nullFuture, (x, y) -> {}),
3371 >            () -> f.thenAcceptBothAsync(nullFuture, (x, y) -> {}),
3372 >            () -> f.thenAcceptBothAsync(nullFuture, (x, y) -> {}, exec),
3373 >            () -> f.thenAcceptBothAsync(g, (x, y) -> {}, null),
3374 >
3375 >            () -> f.runAfterBoth(g, null),
3376 >            () -> f.runAfterBothAsync(g, null),
3377 >            () -> f.runAfterBothAsync(g, null, exec),
3378 >            () -> f.runAfterBoth(nullFuture, () -> {}),
3379 >            () -> f.runAfterBothAsync(nullFuture, () -> {}),
3380 >            () -> f.runAfterBothAsync(nullFuture, () -> {}, exec),
3381 >            () -> f.runAfterBothAsync(g, () -> {}, null),
3382 >
3383 >            () -> f.applyToEither(g, null),
3384 >            () -> f.applyToEitherAsync(g, null),
3385 >            () -> f.applyToEitherAsync(g, null, exec),
3386 >            () -> f.applyToEither(nullFuture, (x) -> x),
3387 >            () -> f.applyToEitherAsync(nullFuture, (x) -> x),
3388 >            () -> f.applyToEitherAsync(nullFuture, (x) -> x, exec),
3389 >            () -> f.applyToEitherAsync(g, (x) -> x, null),
3390 >
3391 >            () -> f.acceptEither(g, null),
3392 >            () -> f.acceptEitherAsync(g, null),
3393 >            () -> f.acceptEitherAsync(g, null, exec),
3394 >            () -> f.acceptEither(nullFuture, (x) -> {}),
3395 >            () -> f.acceptEitherAsync(nullFuture, (x) -> {}),
3396 >            () -> f.acceptEitherAsync(nullFuture, (x) -> {}, exec),
3397 >            () -> f.acceptEitherAsync(g, (x) -> {}, null),
3398 >
3399 >            () -> f.runAfterEither(g, null),
3400 >            () -> f.runAfterEitherAsync(g, null),
3401 >            () -> f.runAfterEitherAsync(g, null, exec),
3402 >            () -> f.runAfterEither(nullFuture, () -> {}),
3403 >            () -> f.runAfterEitherAsync(nullFuture, () -> {}),
3404 >            () -> f.runAfterEitherAsync(nullFuture, () -> {}, exec),
3405 >            () -> f.runAfterEitherAsync(g, () -> {}, null),
3406 >
3407 >            () -> f.thenCompose(null),
3408 >            () -> f.thenComposeAsync(null),
3409 >            () -> f.thenComposeAsync(new CompletableFutureInc(), null),
3410 >            () -> f.thenComposeAsync(null, exec),
3411 >
3412 >            () -> f.exceptionally(null),
3413 >
3414 >            () -> f.handle(null),
3415 >
3416 >            () -> CompletableFuture.allOf((CompletableFuture<?>)null),
3417 >            () -> CompletableFuture.allOf((CompletableFuture<?>[])null),
3418 >            () -> CompletableFuture.allOf(f, null),
3419 >            () -> CompletableFuture.allOf(null, f),
3420 >
3421 >            () -> CompletableFuture.anyOf((CompletableFuture<?>)null),
3422 >            () -> CompletableFuture.anyOf((CompletableFuture<?>[])null),
3423 >            () -> CompletableFuture.anyOf(f, null),
3424 >            () -> CompletableFuture.anyOf(null, f),
3425 >
3426 >            () -> f.obtrudeException(null),
3427          };
3428  
3429          assertThrows(NullPointerException.class, throwingActions);
# Line 3042 | Line 3442 | public class CompletableFutureTest exten
3442       * whenComplete action executes on normal completion, propagating
3443       * source result.
3444       */
3445 <    public void testWhenComplete1() {
3446 <        final AtomicInteger a = new AtomicInteger();
3447 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3448 <        CompletableFuture<Integer> g =
3449 <            f.whenComplete((Integer x, Throwable t) -> a.getAndIncrement());
3450 <        f.complete(three);
3451 <        checkCompletedNormally(f, three);
3452 <        checkCompletedNormally(g, three);
3453 <        assertEquals(a.get(), 1);
3454 <    }
3445 >    public void testWhenComplete_normalCompletion1() {
3446 >        for (ExecutionMode m : ExecutionMode.values())
3447 >        for (boolean createIncomplete : new boolean[] { true, false })
3448 >        for (Integer v1 : new Integer[] { 1, null })
3449 >    {
3450 >        final AtomicInteger a = new AtomicInteger(0);
3451 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
3452 >        if (!createIncomplete) f.complete(v1);
3453 >        final CompletableFuture<Integer> g = m.whenComplete
3454 >            (f,
3455 >             (Integer x, Throwable t) -> {
3456 >                threadAssertSame(x, v1);
3457 >                threadAssertNull(t);
3458 >                a.getAndIncrement();
3459 >            });
3460 >        if (createIncomplete) f.complete(v1);
3461 >
3462 >        checkCompletedNormally(g, v1);
3463 >        checkCompletedNormally(f, v1);
3464 >        assertEquals(1, a.get());
3465 >    }}
3466  
3467      /**
3468       * whenComplete action executes on exceptional completion, propagating
3469       * source result.
3470       */
3471 <    public void testWhenComplete2() {
3472 <        final AtomicInteger a = new AtomicInteger();
3473 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3474 <        CompletableFuture<Integer> g =
3475 <            f.whenComplete((Integer x, Throwable t) -> a.getAndIncrement());
3476 <        f.completeExceptionally(new CFException());
3477 <        assertTrue(f.isCompletedExceptionally());
3478 <        assertTrue(g.isCompletedExceptionally());
3479 <        assertEquals(a.get(), 1);
3480 <    }
3471 >    public void testWhenComplete_exceptionalCompletion() {
3472 >        for (ExecutionMode m : ExecutionMode.values())
3473 >        for (boolean createIncomplete : new boolean[] { true, false })
3474 >        for (Integer v1 : new Integer[] { 1, null })
3475 >    {
3476 >        final AtomicInteger a = new AtomicInteger(0);
3477 >        final CFException ex = new CFException();
3478 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
3479 >        if (!createIncomplete) f.completeExceptionally(ex);
3480 >        final CompletableFuture<Integer> g = m.whenComplete
3481 >            (f,
3482 >             (Integer x, Throwable t) -> {
3483 >                threadAssertNull(x);
3484 >                threadAssertSame(t, ex);
3485 >                a.getAndIncrement();
3486 >            });
3487 >        if (createIncomplete) f.completeExceptionally(ex);
3488 >        checkCompletedWithWrappedCFException(f, ex);
3489 >        checkCompletedWithWrappedCFException(g, ex);
3490 >        assertEquals(1, a.get());
3491 >    }}
3492 >
3493 >    /**
3494 >     * whenComplete action executes on cancelled source, propagating
3495 >     * CancellationException.
3496 >     */
3497 >    public void testWhenComplete_sourceCancelled() {
3498 >        for (ExecutionMode m : ExecutionMode.values())
3499 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3500 >        for (boolean createIncomplete : new boolean[] { true, false })
3501 >    {
3502 >        final AtomicInteger a = new AtomicInteger(0);
3503 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
3504 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
3505 >        final CompletableFuture<Integer> g = m.whenComplete
3506 >            (f,
3507 >             (Integer x, Throwable t) -> {
3508 >                threadAssertNull(x);
3509 >                threadAssertTrue(t instanceof CancellationException);
3510 >                a.getAndIncrement();
3511 >            });
3512 >        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
3513 >
3514 >        //try { g.join(); } catch (Throwable t) { throw new Error(t); }
3515 >        checkCompletedWithWrappedCancellationException(g);
3516 >        checkCancelled(f);
3517 >        assertEquals(1, a.get());
3518 >    }}
3519  
3520      /**
3521       * If a whenComplete action throws an exception when triggered by
3522       * a normal completion, it completes exceptionally
3523       */
3524 <    public void testWhenComplete3() {
3525 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3526 <        CompletableFuture<Integer> g =
3527 <            f.whenComplete((Integer x, Throwable t) ->
3528 <                           { throw new CFException(); } );
3529 <        f.complete(three);
3530 <        checkCompletedNormally(f, three);
3531 <        assertTrue(g.isCompletedExceptionally());
3532 <        checkCompletedWithWrappedCFException(g);
3533 <    }
3534 <
3535 <    /**
3536 <     * whenCompleteAsync action executes on normal completion, propagating
3537 <     * source result.
3538 <     */
3539 <    public void testWhenCompleteAsync1() {
3540 <        final AtomicInteger a = new AtomicInteger();
3541 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3542 <        CompletableFuture<Integer> g =
3543 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement());
3544 <        f.complete(three);
3545 <        checkCompletedNormally(f, three);
3097 <        checkCompletedNormally(g, three);
3098 <        assertEquals(a.get(), 1);
3099 <    }
3100 <
3101 <    /**
3102 <     * whenCompleteAsync action executes on exceptional completion, propagating
3103 <     * source result.
3104 <     */
3105 <    public void testWhenCompleteAsync2() {
3106 <        final AtomicInteger a = new AtomicInteger();
3107 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3108 <        CompletableFuture<Integer> g =
3109 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement());
3110 <        f.completeExceptionally(new CFException());
3111 <        checkCompletedWithWrappedCFException(f);
3112 <        checkCompletedWithWrappedCFException(g);
3113 <    }
3114 <
3115 <    /**
3116 <     * If a whenCompleteAsync action throws an exception when
3117 <     * triggered by a normal completion, it completes exceptionally
3118 <     */
3119 <    public void testWhenCompleteAsync3() {
3120 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3121 <        CompletableFuture<Integer> g =
3122 <            f.whenCompleteAsync((Integer x, Throwable t) ->
3123 <                           { throw new CFException(); } );
3124 <        f.complete(three);
3125 <        checkCompletedNormally(f, three);
3126 <        checkCompletedWithWrappedCFException(g);
3127 <    }
3128 <
3129 <    /**
3130 <     * whenCompleteAsync action executes on normal completion, propagating
3131 <     * source result.
3132 <     */
3133 <    public void testWhenCompleteAsync1e() {
3134 <        final AtomicInteger a = new AtomicInteger();
3135 <        ThreadExecutor exec = new ThreadExecutor();
3136 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3137 <        CompletableFuture<Integer> g =
3138 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement(),
3139 <                                exec);
3140 <        f.complete(three);
3141 <        checkCompletedNormally(f, three);
3142 <        checkCompletedNormally(g, three);
3143 <        assertEquals(a.get(), 1);
3144 <    }
3145 <
3146 <    /**
3147 <     * whenCompleteAsync action executes on exceptional completion, propagating
3148 <     * source result.
3149 <     */
3150 <    public void testWhenCompleteAsync2e() {
3151 <        final AtomicInteger a = new AtomicInteger();
3152 <        ThreadExecutor exec = new ThreadExecutor();
3153 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3154 <        CompletableFuture<Integer> g =
3155 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement(),
3156 <                                exec);
3157 <        f.completeExceptionally(new CFException());
3158 <        checkCompletedWithWrappedCFException(f);
3159 <        checkCompletedWithWrappedCFException(g);
3160 <    }
3161 <
3162 <    /**
3163 <     * If a whenCompleteAsync action throws an exception when triggered
3164 <     * by a normal completion, it completes exceptionally
3165 <     */
3166 <    public void testWhenCompleteAsync3e() {
3167 <        ThreadExecutor exec = new ThreadExecutor();
3168 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3169 <        CompletableFuture<Integer> g =
3170 <            f.whenCompleteAsync((Integer x, Throwable t) ->
3171 <                                { throw new CFException(); },
3172 <                                exec);
3173 <        f.complete(three);
3174 <        checkCompletedNormally(f, three);
3175 <        checkCompletedWithWrappedCFException(g);
3176 <    }
3177 <
3178 <    /**
3179 <     * handleAsync action completes normally with function value on
3180 <     * either normal or exceptional completion of source
3181 <     */
3182 <    public void testHandleAsync() {
3183 <        CompletableFuture<Integer> f, g;
3184 <        IntegerHandler r;
3185 <
3186 <        f = new CompletableFuture<>();
3187 <        g = f.handleAsync(r = new IntegerHandler());
3188 <        assertFalse(r.ran);
3189 <        f.completeExceptionally(new CFException());
3190 <        checkCompletedWithWrappedCFException(f);
3191 <        checkCompletedNormally(g, three);
3192 <        assertTrue(r.ran);
3193 <
3194 <        f = new CompletableFuture<>();
3195 <        g = f.handleAsync(r = new IntegerHandler());
3196 <        assertFalse(r.ran);
3197 <        f.completeExceptionally(new CFException());
3198 <        checkCompletedWithWrappedCFException(f);
3199 <        checkCompletedNormally(g, three);
3200 <        assertTrue(r.ran);
3201 <
3202 <        f = new CompletableFuture<>();
3203 <        g = f.handleAsync(r = new IntegerHandler());
3204 <        assertFalse(r.ran);
3205 <        f.complete(one);
3206 <        checkCompletedNormally(f, one);
3207 <        checkCompletedNormally(g, two);
3208 <        assertTrue(r.ran);
3209 <
3210 <        f = new CompletableFuture<>();
3211 <        g = f.handleAsync(r = new IntegerHandler());
3212 <        assertFalse(r.ran);
3213 <        f.complete(one);
3214 <        checkCompletedNormally(f, one);
3215 <        checkCompletedNormally(g, two);
3216 <        assertTrue(r.ran);
3217 <    }
3524 >    public void testWhenComplete_actionFailed() {
3525 >        for (boolean createIncomplete : new boolean[] { true, false })
3526 >        for (ExecutionMode m : ExecutionMode.values())
3527 >        for (Integer v1 : new Integer[] { 1, null })
3528 >    {
3529 >        final AtomicInteger a = new AtomicInteger(0);
3530 >        final CFException ex = new CFException();
3531 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
3532 >        if (!createIncomplete) f.complete(v1);
3533 >        final CompletableFuture<Integer> g = m.whenComplete
3534 >            (f,
3535 >             (Integer x, Throwable t) -> {
3536 >                threadAssertSame(x, v1);
3537 >                threadAssertNull(t);
3538 >                a.getAndIncrement();
3539 >                throw ex;
3540 >            });
3541 >        if (createIncomplete) f.complete(v1);
3542 >        checkCompletedNormally(f, v1);
3543 >        checkCompletedWithWrappedCFException(g, ex);
3544 >        assertEquals(1, a.get());
3545 >    }}
3546  
3547      /**
3548 <     * handleAsync action with Executor completes normally with
3549 <     * function value on either normal or exceptional completion of
3550 <     * source
3548 >     * If a whenComplete action throws an exception when triggered by
3549 >     * a source completion that also throws an exception, the source
3550 >     * exception takes precedence.
3551       */
3552 <    public void testHandleAsync2() {
3553 <        CompletableFuture<Integer> f, g;
3554 <        ThreadExecutor exec = new ThreadExecutor();
3555 <        IntegerHandler r;
3556 <
3557 <        f = new CompletableFuture<>();
3558 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3559 <        assertFalse(r.ran);
3560 <        f.completeExceptionally(new CFException());
3561 <        checkCompletedWithWrappedCFException(f);
3562 <        checkCompletedNormally(g, three);
3563 <        assertTrue(r.ran);
3564 <
3565 <        f = new CompletableFuture<>();
3566 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3567 <        assertFalse(r.ran);
3568 <        f.completeExceptionally(new CFException());
3569 <        checkCompletedWithWrappedCFException(f);
3570 <        checkCompletedNormally(g, three);
3571 <        assertTrue(r.ran);
3572 <
3573 <        f = new CompletableFuture<>();
3574 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3575 <        assertFalse(r.ran);
3576 <        f.complete(one);
3249 <        checkCompletedNormally(f, one);
3250 <        checkCompletedNormally(g, two);
3251 <        assertTrue(r.ran);
3252 <
3253 <        f = new CompletableFuture<>();
3254 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3255 <        assertFalse(r.ran);
3256 <        f.complete(one);
3257 <        checkCompletedNormally(f, one);
3258 <        checkCompletedNormally(g, two);
3259 <        assertTrue(r.ran);
3260 <    }
3552 >    public void testWhenComplete_actionFailedSourceFailed() {
3553 >        for (boolean createIncomplete : new boolean[] { true, false })
3554 >        for (ExecutionMode m : ExecutionMode.values())
3555 >        for (Integer v1 : new Integer[] { 1, null })
3556 >    {
3557 >        final AtomicInteger a = new AtomicInteger(0);
3558 >        final CFException ex1 = new CFException();
3559 >        final CFException ex2 = new CFException();
3560 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
3561 >
3562 >        if (!createIncomplete) f.completeExceptionally(ex1);
3563 >        final CompletableFuture<Integer> g = m.whenComplete
3564 >            (f,
3565 >             (Integer x, Throwable t) -> {
3566 >                threadAssertSame(t, ex1);
3567 >                threadAssertNull(x);
3568 >                a.getAndIncrement();
3569 >                throw ex2;
3570 >            });
3571 >        if (createIncomplete) f.completeExceptionally(ex1);
3572 >
3573 >        checkCompletedWithWrappedCFException(f, ex1);
3574 >        checkCompletedWithWrappedCFException(g, ex1);
3575 >        assertEquals(1, a.get());
3576 >    }}
3577  
3578   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines