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.30 by jsr166, Mon Jul 22 18:25:42 2013 UTC vs.
Revision 1.45 by jsr166, Mon Jun 2 06:07: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 286 | Line 318 | public class CompletableFutureTest exten
318  
319      // Choose non-commutative actions for better coverage
320  
321 +    // A non-commutative function that handles and produces null values as well.
322 +    static Integer subtract(Integer x, Integer y) {
323 +        return (x == null && y == null) ? null :
324 +            ((x == null) ? 42 : x.intValue())
325 +            - ((y == null) ? 99 : y.intValue());
326 +    }
327 +
328 +    // A function that handles and produces null values as well.
329 +    static Integer inc(Integer x) {
330 +        return (x == null) ? null : x + 1;
331 +    }
332 +
333      static final Supplier<Integer> supplyOne =
334          () -> Integer.valueOf(1);
335      static final Function<Integer, Integer> inc =
336          (Integer x) -> Integer.valueOf(x.intValue() + 1);
337      static final BiFunction<Integer, Integer, Integer> subtract =
338 <        (Integer x, Integer y) -> Integer.valueOf(x.intValue() - y.intValue());
338 >        (Integer x, Integer y) -> subtract(x, y);
339      static final class IncAction implements Consumer<Integer> {
340 <        int value;
341 <        public void accept(Integer x) { value = x.intValue() + 1; }
340 >        int invocationCount = 0;
341 >        Integer value;
342 >        public void accept(Integer x) {
343 >            invocationCount++;
344 >            value = inc(x);
345 >        }
346 >    }
347 >    static final class IncFunction implements Function<Integer,Integer> {
348 >        int invocationCount = 0;
349 >        Integer value;
350 >        public Integer apply(Integer x) {
351 >            invocationCount++;
352 >            return value = inc(x);
353 >        }
354      }
355      static final class SubtractAction implements BiConsumer<Integer, Integer> {
356 <        int value;
356 >        int invocationCount = 0;
357 >        Integer value;
358 >        // Check this action was invoked exactly once when result is computed.
359          public void accept(Integer x, Integer y) {
360 <            value = x.intValue() - y.intValue();
360 >            invocationCount++;
361 >            value = subtract(x, y);
362 >        }
363 >    }
364 >    static final class SubtractFunction implements BiFunction<Integer, Integer, Integer> {
365 >        int invocationCount = 0;
366 >        Integer value;
367 >        // Check this action was invoked exactly once when result is computed.
368 >        public Integer apply(Integer x, Integer y) {
369 >            invocationCount++;
370 >            return value = subtract(x, y);
371          }
372      }
373      static final class Noop implements Runnable {
374 <        boolean ran;
375 <        public void run() { ran = true; }
374 >        int invocationCount = 0;
375 >        public void run() {
376 >            invocationCount++;
377 >        }
378      }
379  
380      static final class FailingSupplier implements Supplier<Integer> {
381 <        boolean ran;
382 <        public Integer get() { ran = true; throw new CFException(); }
381 >        int invocationCount = 0;
382 >        public Integer get() {
383 >            invocationCount++;
384 >            throw new CFException();
385 >        }
386      }
387      static final class FailingConsumer implements Consumer<Integer> {
388 <        boolean ran;
389 <        public void accept(Integer x) { ran = true; throw new CFException(); }
388 >        int invocationCount = 0;
389 >        public void accept(Integer x) {
390 >            invocationCount++;
391 >            throw new CFException();
392 >        }
393      }
394      static final class FailingBiConsumer implements BiConsumer<Integer, Integer> {
395 <        boolean ran;
396 <        public void accept(Integer x, Integer y) { ran = true; throw new CFException(); }
395 >        int invocationCount = 0;
396 >        public void accept(Integer x, Integer y) {
397 >            invocationCount++;
398 >            throw new CFException();
399 >        }
400      }
401      static final class FailingFunction implements Function<Integer, Integer> {
402 <        boolean ran;
403 <        public Integer apply(Integer x) { ran = true; throw new CFException(); }
402 >        int invocationCount = 0;
403 >        public Integer apply(Integer x) {
404 >            invocationCount++;
405 >            throw new CFException();
406 >        }
407      }
408      static final class FailingBiFunction implements BiFunction<Integer, Integer, Integer> {
409 <        boolean ran;
410 <        public Integer apply(Integer x, Integer y) { ran = true; throw new CFException(); }
409 >        int invocationCount = 0;
410 >        public Integer apply(Integer x, Integer y) {
411 >            invocationCount++;
412 >            throw new CFException();
413 >        }
414      }
415      static final class FailingNoop implements Runnable {
416 <        boolean ran;
417 <        public void run() { ran = true; throw new CFException(); }
416 >        int invocationCount = 0;
417 >        public void run() {
418 >            invocationCount++;
419 >            throw new CFException();
420 >        }
421      }
422  
423      static final class CompletableFutureInc
424          implements Function<Integer, CompletableFuture<Integer>> {
425 <        boolean ran;
425 >        int invocationCount = 0;
426          public CompletableFuture<Integer> apply(Integer x) {
427 <            ran = true;
427 >            invocationCount++;
428              CompletableFuture<Integer> f = new CompletableFuture<>();
429 <            f.complete(Integer.valueOf(x.intValue() + 1));
429 >            f.complete(inc(x));
430              return f;
431          }
432      }
433  
434      static final class FailingCompletableFutureFunction
435          implements Function<Integer, CompletableFuture<Integer>> {
436 <        boolean ran;
436 >        int invocationCount = 0;
437          public CompletableFuture<Integer> apply(Integer x) {
438 <            ran = true; throw new CFException();
438 >            invocationCount++;
439 >            throw new CFException();
440          }
441      }
442  
# Line 366 | Line 455 | public class CompletableFutureTest exten
455      }
456  
457      static final class IntegerHandler implements BiFunction<Integer, Throwable, Integer> {
458 <        boolean ran;
458 >        int invocationCount = 0;
459          public Integer apply(Integer x, Throwable t) {
460 <            ran = true;
460 >            invocationCount++;
461              return (t == null) ? two : three;
462          }
463      }
464  
465      /**
466 +     * Permits the testing of parallel code for the 3 different
467 +     * execution modes without repeating all the testing code.
468 +     */
469 +    enum ExecutionMode {
470 +        DEFAULT {
471 +            public <T,U> CompletableFuture<Void> runAfterBoth
472 +                (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
473 +                return f.runAfterBoth(g, a);
474 +            }
475 +            public <T,U> CompletableFuture<Void> thenAcceptBoth
476 +                (CompletableFuture<T> f,
477 +                 CompletionStage<? extends U> g,
478 +                 BiConsumer<? super T,? super U> a) {
479 +                return f.thenAcceptBoth(g, a);
480 +            }
481 +            public <T,U,V> CompletableFuture<V> thenCombine
482 +                (CompletableFuture<T> f,
483 +                 CompletionStage<? extends U> g,
484 +                 BiFunction<? super T,? super U,? extends V> a) {
485 +                return f.thenCombine(g, a);
486 +            }
487 +            public <T,U> CompletableFuture<U> applyToEither
488 +                (CompletableFuture<T> f,
489 +                 CompletionStage<? extends T> g,
490 +                 Function<? super T,U> a) {
491 +                return f.applyToEither(g, a);
492 +            }
493 +            public <T> CompletableFuture<Void> acceptEither
494 +                (CompletableFuture<T> f,
495 +                 CompletionStage<? extends T> g,
496 +                 Consumer<? super T> a) {
497 +                return f.acceptEither(g, a);
498 +            }
499 +            public <T> CompletableFuture<Void> runAfterEither
500 +                (CompletableFuture<T> f,
501 +                 CompletionStage<?> g,
502 +                 java.lang.Runnable a) {
503 +                return f.runAfterEither(g, a);
504 +            }
505 +            public <T,U> CompletableFuture<U> thenCompose
506 +                (CompletableFuture<T> f,
507 +                 Function<? super T,? extends CompletionStage<U>> a) {
508 +                return f.thenCompose(a);
509 +            }
510 +            public <T> CompletableFuture<T> whenComplete
511 +                (CompletableFuture<T> f,
512 +                 BiConsumer<? super T,? super Throwable> a) {
513 +                return f.whenComplete(a);
514 +            }
515 +        },
516 +
517 +        DEFAULT_ASYNC {
518 +            public <T,U> CompletableFuture<Void> runAfterBoth
519 +                (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
520 +                return f.runAfterBothAsync(g, a);
521 +            }
522 +            public <T,U> CompletableFuture<Void> thenAcceptBoth
523 +                (CompletableFuture<T> f,
524 +                 CompletionStage<? extends U> g,
525 +                 BiConsumer<? super T,? super U> a) {
526 +                return f.thenAcceptBothAsync(g, a);
527 +            }
528 +            public <T,U,V> CompletableFuture<V> thenCombine
529 +                (CompletableFuture<T> f,
530 +                 CompletionStage<? extends U> g,
531 +                 BiFunction<? super T,? super U,? extends V> a) {
532 +                return f.thenCombineAsync(g, a);
533 +            }
534 +            public <T,U> CompletableFuture<U> applyToEither
535 +                (CompletableFuture<T> f,
536 +                 CompletionStage<? extends T> g,
537 +                 Function<? super T,U> a) {
538 +                return f.applyToEitherAsync(g, a);
539 +            }
540 +            public <T> CompletableFuture<Void> acceptEither
541 +                (CompletableFuture<T> f,
542 +                 CompletionStage<? extends T> g,
543 +                 Consumer<? super T> a) {
544 +                return f.acceptEitherAsync(g, a);
545 +            }
546 +            public <T> CompletableFuture<Void> runAfterEither
547 +                (CompletableFuture<T> f,
548 +                 CompletionStage<?> g,
549 +                 java.lang.Runnable a) {
550 +                return f.runAfterEitherAsync(g, a);
551 +            }
552 +            public <T,U> CompletableFuture<U> thenCompose
553 +                (CompletableFuture<T> f,
554 +                 Function<? super T,? extends CompletionStage<U>> a) {
555 +                return f.thenComposeAsync(a);
556 +            }
557 +            public <T> CompletableFuture<T> whenComplete
558 +                (CompletableFuture<T> f,
559 +                 BiConsumer<? super T,? super Throwable> a) {
560 +                return f.whenCompleteAsync(a);
561 +            }
562 +        },
563 +
564 +        EXECUTOR {
565 +            public <T,U> CompletableFuture<Void> runAfterBoth
566 +                (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
567 +                return f.runAfterBothAsync(g, a, new ThreadExecutor());
568 +            }
569 +            public <T,U> CompletableFuture<Void> thenAcceptBoth
570 +                (CompletableFuture<T> f,
571 +                 CompletionStage<? extends U> g,
572 +                 BiConsumer<? super T,? super U> a) {
573 +                return f.thenAcceptBothAsync(g, a, new ThreadExecutor());
574 +            }
575 +            public <T,U,V> CompletableFuture<V> thenCombine
576 +                (CompletableFuture<T> f,
577 +                 CompletionStage<? extends U> g,
578 +                 BiFunction<? super T,? super U,? extends V> a) {
579 +                return f.thenCombineAsync(g, a, new ThreadExecutor());
580 +            }
581 +            public <T,U> CompletableFuture<U> applyToEither
582 +                (CompletableFuture<T> f,
583 +                 CompletionStage<? extends T> g,
584 +                 Function<? super T,U> a) {
585 +                return f.applyToEitherAsync(g, a, new ThreadExecutor());
586 +            }
587 +            public <T> CompletableFuture<Void> acceptEither
588 +                (CompletableFuture<T> f,
589 +                 CompletionStage<? extends T> g,
590 +                 Consumer<? super T> a) {
591 +                return f.acceptEitherAsync(g, a, new ThreadExecutor());
592 +            }
593 +            public <T> CompletableFuture<Void> runAfterEither
594 +                (CompletableFuture<T> f,
595 +                 CompletionStage<?> g,
596 +                 java.lang.Runnable a) {
597 +                return f.runAfterEitherAsync(g, a, new ThreadExecutor());
598 +            }
599 +            public <T,U> CompletableFuture<U> thenCompose
600 +                (CompletableFuture<T> f,
601 +                 Function<? super T,? extends CompletionStage<U>> a) {
602 +                return f.thenComposeAsync(a, new ThreadExecutor());
603 +            }
604 +            public <T> CompletableFuture<T> whenComplete
605 +                (CompletableFuture<T> f,
606 +                 BiConsumer<? super T,? super Throwable> a) {
607 +                return f.whenCompleteAsync(a, new ThreadExecutor());
608 +            }
609 +        };
610 +
611 +        public abstract <T,U> CompletableFuture<Void> runAfterBoth
612 +            (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a);
613 +        public abstract <T,U> CompletableFuture<Void> thenAcceptBoth
614 +            (CompletableFuture<T> f,
615 +             CompletionStage<? extends U> g,
616 +             BiConsumer<? super T,? super U> a);
617 +        public abstract <T,U,V> CompletableFuture<V> thenCombine
618 +            (CompletableFuture<T> f,
619 +             CompletionStage<? extends U> g,
620 +             BiFunction<? super T,? super U,? extends V> a);
621 +        public abstract <T,U> CompletableFuture<U> applyToEither
622 +            (CompletableFuture<T> f,
623 +             CompletionStage<? extends T> g,
624 +             Function<? super T,U> a);
625 +        public abstract <T> CompletableFuture<Void> acceptEither
626 +            (CompletableFuture<T> f,
627 +             CompletionStage<? extends T> g,
628 +             Consumer<? super T> a);
629 +        public abstract <T> CompletableFuture<Void> runAfterEither
630 +            (CompletableFuture<T> f,
631 +             CompletionStage<?> g,
632 +             java.lang.Runnable a);
633 +        public abstract <T,U> CompletableFuture<U> thenCompose
634 +            (CompletableFuture<T> f,
635 +             Function<? super T,? extends CompletionStage<U>> a);
636 +        public abstract <T> CompletableFuture<T> whenComplete
637 +            (CompletableFuture<T> f,
638 +             BiConsumer<? super T,? super Throwable> a);
639 +
640 +
641 +    }
642 +
643 +    /**
644       * exceptionally action completes with function value on source
645       * exception; otherwise with source value
646       */
# Line 402 | Line 669 | public class CompletableFutureTest exten
669          f = new CompletableFuture<>();
670          f.completeExceptionally(new CFException());
671          g = f.handle(r = new IntegerHandler());
672 <        assertTrue(r.ran);
672 >        assertEquals(1, r.invocationCount);
673 >        assertEquals(1, r.invocationCount);
674          checkCompletedNormally(g, three);
675  
676          f = new CompletableFuture<>();
677          g = f.handle(r = new IntegerHandler());
678 <        assertFalse(r.ran);
678 >        assertEquals(0, r.invocationCount);
679          f.completeExceptionally(new CFException());
680          checkCompletedNormally(g, three);
681 <        assertTrue(r.ran);
681 >        assertEquals(1, r.invocationCount);
682  
683          f = new CompletableFuture<>();
684          f.complete(one);
685          g = f.handle(r = new IntegerHandler());
686 <        assertTrue(r.ran);
686 >        assertEquals(1, r.invocationCount);
687          checkCompletedNormally(g, two);
688  
689          f = new CompletableFuture<>();
690          g = f.handle(r = new IntegerHandler());
691 <        assertFalse(r.ran);
691 >        assertEquals(0, r.invocationCount);
692          f.complete(one);
693 <        assertTrue(r.ran);
693 >        assertEquals(1, r.invocationCount);
694          checkCompletedNormally(g, two);
695      }
696  
# Line 433 | Line 701 | public class CompletableFutureTest exten
701          Noop r = new Noop();
702          CompletableFuture<Void> f = CompletableFuture.runAsync(r);
703          assertNull(f.join());
704 <        assertTrue(r.ran);
704 >        assertEquals(1, r.invocationCount);
705          checkCompletedNormally(f, null);
706      }
707  
# Line 445 | Line 713 | public class CompletableFutureTest exten
713          ThreadExecutor exec = new ThreadExecutor();
714          CompletableFuture<Void> f = CompletableFuture.runAsync(r, exec);
715          assertNull(f.join());
716 <        assertTrue(r.ran);
716 >        assertEquals(1, r.invocationCount);
717          checkCompletedNormally(f, null);
718          assertEquals(1, exec.count.get());
719      }
# Line 457 | Line 725 | public class CompletableFutureTest exten
725          FailingNoop r = new FailingNoop();
726          CompletableFuture<Void> f = CompletableFuture.runAsync(r);
727          checkCompletedWithWrappedCFException(f);
728 <        assertTrue(r.ran);
728 >        assertEquals(1, r.invocationCount);
729      }
730  
731      /**
# Line 487 | Line 755 | public class CompletableFutureTest exten
755          FailingSupplier r = new FailingSupplier();
756          CompletableFuture<Integer> f = CompletableFuture.supplyAsync(r);
757          checkCompletedWithWrappedCFException(f);
758 <        assertTrue(r.ran);
758 >        assertEquals(1, r.invocationCount);
759      }
760  
761      // seq completion methods
# Line 504 | Line 772 | public class CompletableFutureTest exten
772          g = f.thenRun(r = new Noop());
773          f.complete(null);
774          checkCompletedNormally(g, null);
775 <        assertTrue(r.ran);
775 >        assertEquals(1, r.invocationCount);
776  
777          f = new CompletableFuture<>();
778          f.complete(null);
779          g = f.thenRun(r = new Noop());
780          checkCompletedNormally(g, null);
781 <        assertTrue(r.ran);
781 >        assertEquals(1, r.invocationCount);
782      }
783  
784      /**
# Line 526 | Line 794 | public class CompletableFutureTest exten
794          g = f.thenRun(r = new Noop());
795          f.completeExceptionally(new CFException());
796          checkCompletedWithWrappedCFException(g);
797 <        assertFalse(r.ran);
797 >        assertEquals(0, r.invocationCount);
798  
799          f = new CompletableFuture<>();
800          f.completeExceptionally(new CFException());
801          g = f.thenRun(r = new Noop());
802          checkCompletedWithWrappedCFException(g);
803 <        assertFalse(r.ran);
803 >        assertEquals(0, r.invocationCount);
804      }
805  
806      /**
# Line 623 | Line 891 | public class CompletableFutureTest exten
891          CompletableFuture<Void> g = f.thenAccept(r);
892          f.complete(one);
893          checkCompletedNormally(g, null);
894 <        assertEquals(r.value, 2);
894 >        assertEquals(r.value, (Integer) 2);
895      }
896  
897      /**
# Line 647 | Line 915 | public class CompletableFutureTest exten
915          CompletableFuture<Void> g = f.thenAccept(r);
916          f.complete(one);
917          checkCompletedWithWrappedCFException(g);
918 <        assertTrue(r.ran);
918 >        assertEquals(1, r.invocationCount);
919      }
920  
921      /**
# Line 665 | Line 933 | public class CompletableFutureTest exten
933       * thenCombine result completes normally after normal completion
934       * of sources
935       */
936 <    public void testThenCombine() {
937 <        CompletableFuture<Integer> f, g, h;
938 <
939 <        f = new CompletableFuture<>();
940 <        g = new CompletableFuture<>();
941 <        h = f.thenCombine(g, subtract);
942 <        f.complete(3);
943 <        checkIncomplete(h);
944 <        g.complete(1);
945 <        checkCompletedNormally(h, 2);
946 <
947 <        f = new CompletableFuture<>();
948 <        g = new CompletableFuture<>();
949 <        h = f.thenCombine(g, subtract);
950 <        g.complete(1);
951 <        checkIncomplete(h);
952 <        f.complete(3);
953 <        checkCompletedNormally(h, 2);
954 <
955 <        f = new CompletableFuture<>();
956 <        g = new CompletableFuture<>();
957 <        g.complete(1);
958 <        f.complete(3);
959 <        h = f.thenCombine(g, subtract);
960 <        checkCompletedNormally(h, 2);
936 >    public void testThenCombine_normalCompletion1() {
937 >        for (boolean createIncomplete : new boolean[] { true, false })
938 >        for (boolean fFirst : new boolean[] { true, false })
939 >        for (ExecutionMode m : ExecutionMode.values())
940 >        for (Integer v1 : new Integer[] { 1, null })
941 >        for (Integer v2 : new Integer[] { 2, null }) {
942 >
943 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
944 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
945 >        final SubtractFunction r = new SubtractFunction();
946 >        CompletableFuture<Integer> h = null;
947 >        if (createIncomplete) h = m.thenCombine(f, g, r);
948 >
949 >        if (fFirst)
950 >            f.complete(v1);
951 >        else
952 >            g.complete(v2);
953 >        if (createIncomplete) checkIncomplete(h);
954 >        assertEquals(0, r.invocationCount);
955 >        if (!fFirst)
956 >            f.complete(v1);
957 >        else
958 >            g.complete(v2);
959 >        if (!createIncomplete) h = m.thenCombine(f, g, r);
960 >
961 >        checkCompletedNormally(h, subtract(v1, v2));
962 >        checkCompletedNormally(f, v1);
963 >        checkCompletedNormally(g, v2);
964 >        assertEquals(1, r.invocationCount);
965 >        }
966      }
967  
968      /**
969       * thenCombine result completes exceptionally after exceptional
970       * completion of either source
971       */
972 <    public void testThenCombine2() {
973 <        CompletableFuture<Integer> f, g, h;
974 <
975 <        f = new CompletableFuture<>();
976 <        g = new CompletableFuture<>();
977 <        h = f.thenCombine(g, subtract);
978 <        f.completeExceptionally(new CFException());
979 <        checkIncomplete(h);
980 <        g.complete(1);
981 <        checkCompletedWithWrappedCFException(h);
972 >    public void testThenCombine_exceptionalCompletion1() {
973 >        for (ExecutionMode m : ExecutionMode.values())
974 >        for (Integer v1 : new Integer[] { 1, null }) {
975 >
976 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
977 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
978 >        final SubtractFunction r = new SubtractFunction();
979 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
980 >        final CFException ex = new CFException();
981 >
982 >        f.completeExceptionally(ex);
983 >        checkIncomplete(h);
984 >        g.complete(v1);
985 >
986 >        checkCompletedWithWrappedCFException(h, ex);
987 >        checkCompletedWithWrappedCFException(f, ex);
988 >        assertEquals(0, r.invocationCount);
989 >        checkCompletedNormally(g, v1);
990 >        }
991 >    }
992  
993 <        f = new CompletableFuture<>();
994 <        g = new CompletableFuture<>();
995 <        h = f.thenCombine(g, subtract);
996 <        g.completeExceptionally(new CFException());
997 <        checkIncomplete(h);
998 <        f.complete(3);
999 <        checkCompletedWithWrappedCFException(h);
993 >    public void testThenCombine_exceptionalCompletion2() {
994 >        for (ExecutionMode m : ExecutionMode.values())
995 >        for (Integer v1 : new Integer[] { 1, null }) {
996 >
997 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
998 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
999 >        final SubtractFunction r = new SubtractFunction();
1000 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1001 >        final CFException ex = new CFException();
1002 >
1003 >        g.completeExceptionally(ex);
1004 >        checkIncomplete(h);
1005 >        f.complete(v1);
1006 >
1007 >        checkCompletedWithWrappedCFException(h, ex);
1008 >        checkCompletedWithWrappedCFException(g, ex);
1009 >        assertEquals(0, r.invocationCount);
1010 >        checkCompletedNormally(f, v1);
1011 >        }
1012 >    }
1013  
1014 <        f = new CompletableFuture<>();
1015 <        g = new CompletableFuture<>();
1016 <        f.complete(3);
1017 <        g.completeExceptionally(new CFException());
1018 <        h = f.thenCombine(g, subtract);
1019 <        checkCompletedWithWrappedCFException(h);
1014 >    public void testThenCombine_exceptionalCompletion3() {
1015 >        for (ExecutionMode m : ExecutionMode.values())
1016 >        for (Integer v1 : new Integer[] { 1, null }) {
1017 >
1018 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1019 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1020 >        final SubtractFunction r = new SubtractFunction();
1021 >        final CFException ex = new CFException();
1022 >
1023 >        g.completeExceptionally(ex);
1024 >        f.complete(v1);
1025 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1026 >
1027 >        checkCompletedWithWrappedCFException(h, ex);
1028 >        checkCompletedWithWrappedCFException(g, ex);
1029 >        assertEquals(0, r.invocationCount);
1030 >        checkCompletedNormally(f, v1);
1031 >        }
1032 >    }
1033  
1034 <        f = new CompletableFuture<>();
1035 <        g = new CompletableFuture<>();
1036 <        f.completeExceptionally(new CFException());
1037 <        g.complete(3);
1038 <        h = f.thenCombine(g, subtract);
1039 <        checkCompletedWithWrappedCFException(h);
1034 >    public void testThenCombine_exceptionalCompletion4() {
1035 >        for (ExecutionMode m : ExecutionMode.values())
1036 >        for (Integer v1 : new Integer[] { 1, null }) {
1037 >
1038 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1039 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1040 >        final SubtractFunction r = new SubtractFunction();
1041 >        final CFException ex = new CFException();
1042 >
1043 >        f.completeExceptionally(ex);
1044 >        g.complete(v1);
1045 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1046 >
1047 >        checkCompletedWithWrappedCFException(h, ex);
1048 >        checkCompletedWithWrappedCFException(f, ex);
1049 >        assertEquals(0, r.invocationCount);
1050 >        checkCompletedNormally(g, v1);
1051 >        }
1052      }
1053  
1054      /**
1055       * thenCombine result completes exceptionally if action does
1056       */
1057 <    public void testThenCombine3() {
1058 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1059 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1060 <        FailingBiFunction r = new FailingBiFunction();
1061 <        CompletableFuture<Integer> g = f.thenCombine(f2, r);
1062 <        f.complete(one);
1063 <        checkIncomplete(g);
1064 <        assertFalse(r.ran);
1065 <        f2.complete(two);
1066 <        checkCompletedWithWrappedCFException(g);
1067 <        assertTrue(r.ran);
1057 >    public void testThenCombine_actionFailed1() {
1058 >        for (ExecutionMode m : ExecutionMode.values())
1059 >        for (Integer v1 : new Integer[] { 1, null })
1060 >        for (Integer v2 : new Integer[] { 2, null }) {
1061 >
1062 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1063 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1064 >        final FailingBiFunction r = new FailingBiFunction();
1065 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1066 >
1067 >        f.complete(v1);
1068 >        checkIncomplete(h);
1069 >        g.complete(v2);
1070 >
1071 >        checkCompletedWithWrappedCFException(h);
1072 >        checkCompletedNormally(f, v1);
1073 >        checkCompletedNormally(g, v2);
1074 >        }
1075 >    }
1076 >
1077 >    public void testThenCombine_actionFailed2() {
1078 >        for (ExecutionMode m : ExecutionMode.values())
1079 >        for (Integer v1 : new Integer[] { 1, null })
1080 >        for (Integer v2 : new Integer[] { 2, null }) {
1081 >
1082 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1083 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1084 >        final FailingBiFunction r = new FailingBiFunction();
1085 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1086 >
1087 >        g.complete(v2);
1088 >        checkIncomplete(h);
1089 >        f.complete(v1);
1090 >
1091 >        checkCompletedWithWrappedCFException(h);
1092 >        checkCompletedNormally(f, v1);
1093 >        checkCompletedNormally(g, v2);
1094 >        }
1095      }
1096  
1097      /**
1098       * thenCombine result completes exceptionally if either source cancelled
1099       */
1100 <    public void testThenCombine4() {
1101 <        CompletableFuture<Integer> f, g, h;
1100 >    public void testThenCombine_sourceCancelled1() {
1101 >        for (ExecutionMode m : ExecutionMode.values())
1102 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1103 >        for (Integer v1 : new Integer[] { 1, null }) {
1104 >
1105 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1106 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1107 >        final SubtractFunction r = new SubtractFunction();
1108 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1109  
1110 <        f = new CompletableFuture<>();
756 <        g = new CompletableFuture<>();
757 <        h = f.thenCombine(g, subtract);
758 <        assertTrue(f.cancel(true));
1110 >        assertTrue(f.cancel(mayInterruptIfRunning));
1111          checkIncomplete(h);
1112 <        g.complete(1);
1112 >        g.complete(v1);
1113 >
1114          checkCompletedWithWrappedCancellationException(h);
1115 +        checkCancelled(f);
1116 +        assertEquals(0, r.invocationCount);
1117 +        checkCompletedNormally(g, v1);
1118 +        }
1119 +    }
1120  
1121 <        f = new CompletableFuture<>();
1122 <        g = new CompletableFuture<>();
1123 <        h = f.thenCombine(g, subtract);
1124 <        assertTrue(g.cancel(true));
1121 >    public void testThenCombine_sourceCancelled2() {
1122 >        for (ExecutionMode m : ExecutionMode.values())
1123 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1124 >        for (Integer v1 : new Integer[] { 1, null }) {
1125 >
1126 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1127 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1128 >        final SubtractFunction r = new SubtractFunction();
1129 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1130 >
1131 >        assertTrue(g.cancel(mayInterruptIfRunning));
1132          checkIncomplete(h);
1133 <        f.complete(3);
1133 >        f.complete(v1);
1134 >
1135          checkCompletedWithWrappedCancellationException(h);
1136 +        checkCancelled(g);
1137 +        assertEquals(0, r.invocationCount);
1138 +        checkCompletedNormally(f, v1);
1139 +        }
1140 +    }
1141 +
1142 +    public void testThenCombine_sourceCancelled3() {
1143 +        for (ExecutionMode m : ExecutionMode.values())
1144 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1145 +        for (Integer v1 : new Integer[] { 1, null }) {
1146 +
1147 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
1148 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
1149 +        final SubtractFunction r = new SubtractFunction();
1150 +
1151 +        assertTrue(g.cancel(mayInterruptIfRunning));
1152 +        f.complete(v1);
1153 +        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1154 +
1155 +        checkCompletedWithWrappedCancellationException(h);
1156 +        checkCancelled(g);
1157 +        assertEquals(0, r.invocationCount);
1158 +        checkCompletedNormally(f, v1);
1159 +        }
1160 +    }
1161 +
1162 +    public void testThenCombine_sourceCancelled4() {
1163 +        for (ExecutionMode m : ExecutionMode.values())
1164 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1165 +        for (Integer v1 : new Integer[] { 1, null }) {
1166 +
1167 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
1168 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
1169 +        final SubtractFunction r = new SubtractFunction();
1170 +
1171 +        assertTrue(f.cancel(mayInterruptIfRunning));
1172 +        g.complete(v1);
1173 +        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1174  
771        f = new CompletableFuture<>();
772        g = new CompletableFuture<>();
773        assertTrue(f.cancel(true));
774        assertTrue(g.cancel(true));
775        h = f.thenCombine(g, subtract);
1175          checkCompletedWithWrappedCancellationException(h);
1176 +        checkCancelled(f);
1177 +        assertEquals(0, r.invocationCount);
1178 +        checkCompletedNormally(g, v1);
1179 +        }
1180      }
1181  
1182      /**
1183       * thenAcceptBoth result completes normally after normal
1184       * completion of sources
1185       */
1186 <    public void testThenAcceptBoth() {
1187 <        CompletableFuture<Integer> f, g;
1188 <        CompletableFuture<Void> h;
1189 <        SubtractAction r;
1186 >    public void testThenAcceptBoth_normalCompletion1() {
1187 >        for (ExecutionMode m : ExecutionMode.values())
1188 >        for (Integer v1 : new Integer[] { 1, null })
1189 >        for (Integer v2 : new Integer[] { 2, null }) {
1190 >
1191 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1192 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1193 >        final SubtractAction r = new SubtractAction();
1194 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1195  
1196 <        f = new CompletableFuture<>();
789 <        g = new CompletableFuture<>();
790 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
791 <        f.complete(3);
1196 >        f.complete(v1);
1197          checkIncomplete(h);
1198 <        g.complete(1);
1198 >        assertEquals(0, r.invocationCount);
1199 >        g.complete(v2);
1200 >
1201          checkCompletedNormally(h, null);
1202 <        assertEquals(r.value, 2);
1202 >        assertEquals(r.value, subtract(v1, v2));
1203 >        checkCompletedNormally(f, v1);
1204 >        checkCompletedNormally(g, v2);
1205 >        }
1206 >    }
1207  
1208 <        f = new CompletableFuture<>();
1209 <        g = new CompletableFuture<>();
1210 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
1211 <        g.complete(1);
1208 >    public void testThenAcceptBoth_normalCompletion2() {
1209 >        for (ExecutionMode m : ExecutionMode.values())
1210 >        for (Integer v1 : new Integer[] { 1, null })
1211 >        for (Integer v2 : new Integer[] { 2, null }) {
1212 >
1213 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1214 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1215 >        final SubtractAction r = new SubtractAction();
1216 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1217 >
1218 >        g.complete(v2);
1219          checkIncomplete(h);
1220 <        f.complete(3);
1220 >        assertEquals(0, r.invocationCount);
1221 >        f.complete(v1);
1222 >
1223          checkCompletedNormally(h, null);
1224 <        assertEquals(r.value, 2);
1224 >        assertEquals(r.value, subtract(v1, v2));
1225 >        checkCompletedNormally(f, v1);
1226 >        checkCompletedNormally(g, v2);
1227 >        }
1228 >    }
1229 >
1230 >    public void testThenAcceptBoth_normalCompletion3() {
1231 >        for (ExecutionMode m : ExecutionMode.values())
1232 >        for (Integer v1 : new Integer[] { 1, null })
1233 >        for (Integer v2 : new Integer[] { 2, null }) {
1234 >
1235 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1236 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1237 >        final SubtractAction r = new SubtractAction();
1238 >
1239 >        g.complete(v2);
1240 >        f.complete(v1);
1241 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1242  
806        f = new CompletableFuture<>();
807        g = new CompletableFuture<>();
808        g.complete(1);
809        f.complete(3);
810        h = f.thenAcceptBoth(g, r = new SubtractAction());
1243          checkCompletedNormally(h, null);
1244 <        assertEquals(r.value, 2);
1244 >        assertEquals(r.value, subtract(v1, v2));
1245 >        checkCompletedNormally(f, v1);
1246 >        checkCompletedNormally(g, v2);
1247 >        }
1248 >    }
1249 >
1250 >    public void testThenAcceptBoth_normalCompletion4() {
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 SubtractAction r = new SubtractAction();
1258 >
1259 >        f.complete(v1);
1260 >        g.complete(v2);
1261 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1262 >
1263 >        checkCompletedNormally(h, null);
1264 >        assertEquals(r.value, subtract(v1, v2));
1265 >        checkCompletedNormally(f, v1);
1266 >        checkCompletedNormally(g, v2);
1267 >        }
1268      }
1269  
1270      /**
1271       * thenAcceptBoth result completes exceptionally after exceptional
1272       * completion of either source
1273       */
1274 <    public void testThenAcceptBoth2() {
1275 <        CompletableFuture<Integer> f, g;
1276 <        CompletableFuture<Void> h;
1277 <        SubtractAction r;
1278 <
1279 <        f = new CompletableFuture<>();
1280 <        g = new CompletableFuture<>();
1281 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
1282 <        f.completeExceptionally(new CFException());
1283 <        checkIncomplete(h);
1284 <        g.complete(1);
1285 <        checkCompletedWithWrappedCFException(h);
1274 >    public void testThenAcceptBoth_exceptionalCompletion1() {
1275 >        for (ExecutionMode m : ExecutionMode.values())
1276 >        for (Integer v1 : new Integer[] { 1, null }) {
1277 >
1278 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1279 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1280 >        final SubtractAction r = new SubtractAction();
1281 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1282 >        final CFException ex = new CFException();
1283 >
1284 >        f.completeExceptionally(ex);
1285 >        checkIncomplete(h);
1286 >        g.complete(v1);
1287 >
1288 >        checkCompletedWithWrappedCFException(h, ex);
1289 >        checkCompletedWithWrappedCFException(f, ex);
1290 >        assertEquals(0, r.invocationCount);
1291 >        checkCompletedNormally(g, v1);
1292 >        }
1293 >    }
1294  
1295 <        f = new CompletableFuture<>();
1296 <        g = new CompletableFuture<>();
1297 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
1298 <        g.completeExceptionally(new CFException());
1299 <        checkIncomplete(h);
1300 <        f.complete(3);
1301 <        checkCompletedWithWrappedCFException(h);
1295 >    public void testThenAcceptBoth_exceptionalCompletion2() {
1296 >        for (ExecutionMode m : ExecutionMode.values())
1297 >        for (Integer v1 : new Integer[] { 1, null }) {
1298 >
1299 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1300 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1301 >        final SubtractAction r = new SubtractAction();
1302 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1303 >        final CFException ex = new CFException();
1304 >
1305 >        g.completeExceptionally(ex);
1306 >        checkIncomplete(h);
1307 >        f.complete(v1);
1308 >
1309 >        checkCompletedWithWrappedCFException(h, ex);
1310 >        checkCompletedWithWrappedCFException(g, ex);
1311 >        assertEquals(0, r.invocationCount);
1312 >        checkCompletedNormally(f, v1);
1313 >        }
1314 >    }
1315  
1316 <        f = new CompletableFuture<>();
1317 <        g = new CompletableFuture<>();
1318 <        f.complete(3);
1319 <        g.completeExceptionally(new CFException());
1320 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
1321 <        checkCompletedWithWrappedCFException(h);
1316 >    public void testThenAcceptBoth_exceptionalCompletion3() {
1317 >        for (ExecutionMode m : ExecutionMode.values())
1318 >        for (Integer v1 : new Integer[] { 1, null }) {
1319 >
1320 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1321 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1322 >        final SubtractAction r = new SubtractAction();
1323 >        final CFException ex = new CFException();
1324 >
1325 >        g.completeExceptionally(ex);
1326 >        f.complete(v1);
1327 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1328 >
1329 >        checkCompletedWithWrappedCFException(h, ex);
1330 >        checkCompletedWithWrappedCFException(g, ex);
1331 >        assertEquals(0, r.invocationCount);
1332 >        checkCompletedNormally(f, v1);
1333 >        }
1334 >    }
1335  
1336 <        f = new CompletableFuture<>();
1337 <        g = new CompletableFuture<>();
1338 <        f.completeExceptionally(new CFException());
1339 <        g.complete(3);
1340 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
1341 <        checkCompletedWithWrappedCFException(h);
1336 >    public void testThenAcceptBoth_exceptionalCompletion4() {
1337 >        for (ExecutionMode m : ExecutionMode.values())
1338 >        for (Integer v1 : new Integer[] { 1, null }) {
1339 >
1340 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1341 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1342 >        final SubtractAction r = new SubtractAction();
1343 >        final CFException ex = new CFException();
1344 >
1345 >        f.completeExceptionally(ex);
1346 >        g.complete(v1);
1347 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1348 >
1349 >        checkCompletedWithWrappedCFException(h, ex);
1350 >        checkCompletedWithWrappedCFException(f, ex);
1351 >        assertEquals(0, r.invocationCount);
1352 >        checkCompletedNormally(g, v1);
1353 >        }
1354      }
1355  
1356      /**
1357       * thenAcceptBoth result completes exceptionally if action does
1358       */
1359 <    public void testThenAcceptBoth3() {
1360 <        CompletableFuture<Integer> f, g;
1361 <        CompletableFuture<Void> h;
1362 <        FailingBiConsumer r;
1359 >    public void testThenAcceptBoth_actionFailed1() {
1360 >        for (ExecutionMode m : ExecutionMode.values())
1361 >        for (Integer v1 : new Integer[] { 1, null })
1362 >        for (Integer v2 : new Integer[] { 2, null }) {
1363  
1364 <        f = new CompletableFuture<>();
1365 <        g = new CompletableFuture<>();
1366 <        h = f.thenAcceptBoth(g, r = new FailingBiConsumer());
1367 <        f.complete(3);
1364 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1365 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1366 >        final FailingBiConsumer r = new FailingBiConsumer();
1367 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1368 >
1369 >        f.complete(v1);
1370          checkIncomplete(h);
1371 <        g.complete(1);
1371 >        g.complete(v2);
1372 >
1373          checkCompletedWithWrappedCFException(h);
1374 +        checkCompletedNormally(f, v1);
1375 +        checkCompletedNormally(g, v2);
1376 +        }
1377 +    }
1378 +
1379 +    public void testThenAcceptBoth_actionFailed2() {
1380 +        for (ExecutionMode m : ExecutionMode.values())
1381 +        for (Integer v1 : new Integer[] { 1, null })
1382 +        for (Integer v2 : new Integer[] { 2, null }) {
1383 +
1384 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
1385 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
1386 +        final FailingBiConsumer r = new FailingBiConsumer();
1387 +        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1388 +
1389 +        g.complete(v2);
1390 +        checkIncomplete(h);
1391 +        f.complete(v1);
1392  
871        f = new CompletableFuture<>();
872        g = new CompletableFuture<>();
873        f.complete(3);
874        g.complete(1);
875        h = f.thenAcceptBoth(g, r = new FailingBiConsumer());
1393          checkCompletedWithWrappedCFException(h);
1394 +        checkCompletedNormally(f, v1);
1395 +        checkCompletedNormally(g, v2);
1396 +        }
1397      }
1398  
1399      /**
1400       * thenAcceptBoth result completes exceptionally if either source cancelled
1401       */
1402 <    public void testThenAcceptBoth4() {
1403 <        CompletableFuture<Integer> f, g;
1404 <        CompletableFuture<Void> h;
1405 <        SubtractAction r;
1402 >    public void testThenAcceptBoth_sourceCancelled1() {
1403 >        for (ExecutionMode m : ExecutionMode.values())
1404 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1405 >        for (Integer v1 : new Integer[] { 1, null }) {
1406 >
1407 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1408 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1409 >        final SubtractAction r = new SubtractAction();
1410 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1411  
1412 <        f = new CompletableFuture<>();
888 <        g = new CompletableFuture<>();
889 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
890 <        assertTrue(f.cancel(true));
1412 >        assertTrue(f.cancel(mayInterruptIfRunning));
1413          checkIncomplete(h);
1414 <        g.complete(1);
1414 >        g.complete(v1);
1415 >
1416          checkCompletedWithWrappedCancellationException(h);
1417 +        checkCancelled(f);
1418 +        assertEquals(0, r.invocationCount);
1419 +        checkCompletedNormally(g, v1);
1420 +        }
1421 +    }
1422  
1423 <        f = new CompletableFuture<>();
1424 <        g = new CompletableFuture<>();
1425 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
1426 <        assertTrue(g.cancel(true));
1423 >    public void testThenAcceptBoth_sourceCancelled2() {
1424 >        for (ExecutionMode m : ExecutionMode.values())
1425 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1426 >        for (Integer v1 : new Integer[] { 1, null }) {
1427 >
1428 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1429 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1430 >        final SubtractAction r = new SubtractAction();
1431 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1432 >
1433 >        assertTrue(g.cancel(mayInterruptIfRunning));
1434          checkIncomplete(h);
1435 <        f.complete(3);
901 <        checkCompletedWithWrappedCancellationException(h);
1435 >        f.complete(v1);
1436  
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());
1437          checkCompletedWithWrappedCancellationException(h);
1438 +        checkCancelled(g);
1439 +        assertEquals(0, r.invocationCount);
1440 +        checkCompletedNormally(f, v1);
1441 +        }
1442 +    }
1443 +
1444 +    public void testThenAcceptBoth_sourceCancelled3() {
1445 +        for (ExecutionMode m : ExecutionMode.values())
1446 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1447 +        for (Integer v1 : new Integer[] { 1, null }) {
1448 +
1449 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
1450 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
1451 +        final SubtractAction r = new SubtractAction();
1452 +
1453 +        assertTrue(g.cancel(mayInterruptIfRunning));
1454 +        f.complete(v1);
1455 +        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1456 +
1457 +        checkCompletedWithWrappedCancellationException(h);
1458 +        checkCancelled(g);
1459 +        assertEquals(0, r.invocationCount);
1460 +        checkCompletedNormally(f, v1);
1461 +        }
1462 +    }
1463 +
1464 +    public void testThenAcceptBoth_sourceCancelled4() {
1465 +        for (ExecutionMode m : ExecutionMode.values())
1466 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1467 +        for (Integer v1 : new Integer[] { 1, null }) {
1468 +
1469 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
1470 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
1471 +        final SubtractAction r = new SubtractAction();
1472 +
1473 +        assertTrue(f.cancel(mayInterruptIfRunning));
1474 +        g.complete(v1);
1475 +        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1476  
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());
1477          checkCompletedWithWrappedCancellationException(h);
1478 +        checkCancelled(f);
1479 +        assertEquals(0, r.invocationCount);
1480 +        checkCompletedNormally(g, v1);
1481 +        }
1482      }
1483  
1484      /**
1485       * runAfterBoth result completes normally after normal
1486       * completion of sources
1487       */
1488 <    public void testRunAfterBoth() {
1489 <        CompletableFuture<Integer> f, g;
1490 <        CompletableFuture<Void> h;
1491 <        Noop r;
1488 >    public void testRunAfterBoth_normalCompletion1() {
1489 >        for (ExecutionMode m : ExecutionMode.values())
1490 >        for (Integer v1 : new Integer[] { 1, null })
1491 >        for (Integer v2 : new Integer[] { 2, null }) {
1492 >
1493 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1494 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1495 >        final Noop r = new Noop();
1496 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1497  
1498 <        f = new CompletableFuture<>();
928 <        g = new CompletableFuture<>();
929 <        h = f.runAfterBoth(g, r = new Noop());
930 <        f.complete(3);
1498 >        f.complete(v1);
1499          checkIncomplete(h);
1500 <        g.complete(1);
1500 >        assertEquals(0, r.invocationCount);
1501 >        g.complete(v2);
1502 >
1503          checkCompletedNormally(h, null);
1504 <        assertTrue(r.ran);
1504 >        assertEquals(1, r.invocationCount);
1505 >        checkCompletedNormally(f, v1);
1506 >        checkCompletedNormally(g, v2);
1507 >        }
1508 >    }
1509  
1510 <        f = new CompletableFuture<>();
1511 <        g = new CompletableFuture<>();
1512 <        h = f.runAfterBoth(g, r = new Noop());
1513 <        g.complete(1);
1510 >    public void testRunAfterBoth_normalCompletion2() {
1511 >        for (ExecutionMode m : ExecutionMode.values())
1512 >        for (Integer v1 : new Integer[] { 1, null })
1513 >        for (Integer v2 : new Integer[] { 2, null }) {
1514 >
1515 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1516 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1517 >        final Noop r = new Noop();
1518 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1519 >
1520 >        g.complete(v2);
1521          checkIncomplete(h);
1522 <        f.complete(3);
1522 >        assertEquals(0, r.invocationCount);
1523 >        f.complete(v1);
1524 >
1525          checkCompletedNormally(h, null);
1526 <        assertTrue(r.ran);
1526 >        assertEquals(1, r.invocationCount);
1527 >        checkCompletedNormally(f, v1);
1528 >        checkCompletedNormally(g, v2);
1529 >        }
1530 >    }
1531 >
1532 >    public void testRunAfterBoth_normalCompletion3() {
1533 >        for (ExecutionMode m : ExecutionMode.values())
1534 >        for (Integer v1 : new Integer[] { 1, null })
1535 >        for (Integer v2 : new Integer[] { 2, null }) {
1536 >
1537 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1538 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1539 >        final Noop r = new Noop();
1540 >
1541 >        g.complete(v2);
1542 >        f.complete(v1);
1543 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1544 >
1545 >        checkCompletedNormally(h, null);
1546 >        assertEquals(1, r.invocationCount);
1547 >        checkCompletedNormally(f, v1);
1548 >        checkCompletedNormally(g, v2);
1549 >        }
1550 >    }
1551 >
1552 >    public void testRunAfterBoth_normalCompletion4() {
1553 >        for (ExecutionMode m : ExecutionMode.values())
1554 >        for (Integer v1 : new Integer[] { 1, null })
1555 >        for (Integer v2 : new Integer[] { 2, null }) {
1556 >
1557 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1558 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1559 >        final Noop r = new Noop();
1560 >
1561 >        f.complete(v1);
1562 >        g.complete(v2);
1563 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1564  
945        f = new CompletableFuture<>();
946        g = new CompletableFuture<>();
947        g.complete(1);
948        f.complete(3);
949        h = f.runAfterBoth(g, r = new Noop());
1565          checkCompletedNormally(h, null);
1566 <        assertTrue(r.ran);
1566 >        assertEquals(1, r.invocationCount);
1567 >        checkCompletedNormally(f, v1);
1568 >        checkCompletedNormally(g, v2);
1569 >        }
1570      }
1571  
1572      /**
1573       * runAfterBoth result completes exceptionally after exceptional
1574       * completion of either source
1575       */
1576 <    public void testRunAfterBoth2() {
1577 <        CompletableFuture<Integer> f, g;
1578 <        CompletableFuture<Void> h;
1579 <        Noop r;
1580 <
1581 <        f = new CompletableFuture<>();
1582 <        g = new CompletableFuture<>();
1583 <        h = f.runAfterBoth(g, r = new Noop());
1584 <        f.completeExceptionally(new CFException());
1585 <        checkIncomplete(h);
1586 <        g.complete(1);
1587 <        checkCompletedWithWrappedCFException(h);
1588 <        assertFalse(r.ran);
1576 >    public void testRunAfterBoth_exceptionalCompletion1() {
1577 >        for (ExecutionMode m : ExecutionMode.values())
1578 >        for (Integer v1 : new Integer[] { 1, null }) {
1579 >
1580 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1581 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1582 >        final Noop r = new Noop();
1583 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1584 >        final CFException ex = new CFException();
1585 >
1586 >        f.completeExceptionally(ex);
1587 >        checkIncomplete(h);
1588 >        g.complete(v1);
1589 >
1590 >        checkCompletedWithWrappedCFException(h, ex);
1591 >        checkCompletedWithWrappedCFException(f, ex);
1592 >        assertEquals(0, r.invocationCount);
1593 >        checkCompletedNormally(g, v1);
1594 >        }
1595 >    }
1596  
1597 <        f = new CompletableFuture<>();
1598 <        g = new CompletableFuture<>();
1599 <        h = f.runAfterBoth(g, r = new Noop());
1600 <        g.completeExceptionally(new CFException());
1601 <        checkIncomplete(h);
1602 <        f.complete(3);
1603 <        checkCompletedWithWrappedCFException(h);
1604 <        assertFalse(r.ran);
1597 >    public void testRunAfterBoth_exceptionalCompletion2() {
1598 >        for (ExecutionMode m : ExecutionMode.values())
1599 >        for (Integer v1 : new Integer[] { 1, null }) {
1600 >
1601 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1602 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1603 >        final Noop r = new Noop();
1604 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1605 >        final CFException ex = new CFException();
1606 >
1607 >        g.completeExceptionally(ex);
1608 >        checkIncomplete(h);
1609 >        f.complete(v1);
1610 >
1611 >        checkCompletedWithWrappedCFException(h, ex);
1612 >        checkCompletedWithWrappedCFException(g, ex);
1613 >        assertEquals(0, r.invocationCount);
1614 >        checkCompletedNormally(f, v1);
1615 >        }
1616 >    }
1617  
1618 <        f = new CompletableFuture<>();
1619 <        g = new CompletableFuture<>();
1620 <        g.completeExceptionally(new CFException());
1621 <        f.complete(3);
1622 <        h = f.runAfterBoth(g, r = new Noop());
1623 <        checkCompletedWithWrappedCFException(h);
1624 <        assertFalse(r.ran);
1618 >    public void testRunAfterBoth_exceptionalCompletion3() {
1619 >        for (ExecutionMode m : ExecutionMode.values())
1620 >        for (Integer v1 : new Integer[] { 1, null }) {
1621 >
1622 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1623 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1624 >        final Noop r = new Noop();
1625 >        final CFException ex = new CFException();
1626 >
1627 >        g.completeExceptionally(ex);
1628 >        f.complete(v1);
1629 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1630 >
1631 >        checkCompletedWithWrappedCFException(h, ex);
1632 >        checkCompletedWithWrappedCFException(g, ex);
1633 >        assertEquals(0, r.invocationCount);
1634 >        checkCompletedNormally(f, v1);
1635 >        }
1636 >    }
1637  
1638 <        f = new CompletableFuture<>();
1639 <        g = new CompletableFuture<>();
1640 <        f.completeExceptionally(new CFException());
1641 <        g.complete(1);
1642 <        h = f.runAfterBoth(g, r = new Noop());
1643 <        checkCompletedWithWrappedCFException(h);
1644 <        assertFalse(r.ran);
1638 >    public void testRunAfterBoth_exceptionalCompletion4() {
1639 >        for (ExecutionMode m : ExecutionMode.values())
1640 >        for (Integer v1 : new Integer[] { 1, null }) {
1641 >
1642 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1643 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1644 >        final Noop r = new Noop();
1645 >        final CFException ex = new CFException();
1646 >
1647 >        f.completeExceptionally(ex);
1648 >        g.complete(v1);
1649 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1650 >
1651 >        checkCompletedWithWrappedCFException(h, ex);
1652 >        checkCompletedWithWrappedCFException(f, ex);
1653 >        assertEquals(0, r.invocationCount);
1654 >        checkCompletedNormally(g, v1);
1655 >        }
1656      }
1657  
1658      /**
1659       * runAfterBoth result completes exceptionally if action does
1660       */
1661 <    public void testRunAfterBoth3() {
1662 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1663 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1664 <        FailingNoop r = new FailingNoop();
1665 <        CompletableFuture<Void> g = f.runAfterBoth(f2, r);
1666 <        f.complete(one);
1667 <        checkIncomplete(g);
1668 <        f2.complete(two);
1669 <        checkCompletedWithWrappedCFException(g);
1661 >    public void testRunAfterBoth_actionFailed1() {
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 FailingNoop r = new FailingNoop();
1669 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1670 >
1671 >        f.complete(v1);
1672 >        checkIncomplete(h);
1673 >        g.complete(v2);
1674 >
1675 >        checkCompletedWithWrappedCFException(h);
1676 >        checkCompletedNormally(f, v1);
1677 >        checkCompletedNormally(g, v2);
1678 >        }
1679 >    }
1680 >
1681 >    public void testRunAfterBoth_actionFailed2() {
1682 >        for (ExecutionMode m : ExecutionMode.values())
1683 >        for (Integer v1 : new Integer[] { 1, null })
1684 >        for (Integer v2 : new Integer[] { 2, null }) {
1685 >
1686 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1687 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1688 >        final FailingNoop r = new FailingNoop();
1689 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1690 >
1691 >        g.complete(v2);
1692 >        checkIncomplete(h);
1693 >        f.complete(v1);
1694 >
1695 >        checkCompletedWithWrappedCFException(h);
1696 >        checkCompletedNormally(f, v1);
1697 >        checkCompletedNormally(g, v2);
1698 >        }
1699      }
1700  
1701      /**
1702       * runAfterBoth result completes exceptionally if either source cancelled
1703       */
1704 <    public void testRunAfterBoth4() {
1705 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1706 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1707 <        Noop r = new Noop();
1708 <        CompletableFuture<Void> g = f.runAfterBoth(f2, r);
1709 <        assertTrue(f.cancel(true));
1710 <        f2.complete(two);
1711 <        checkCompletedWithWrappedCancellationException(g);
1712 <        f = new CompletableFuture<>();
1713 <        f2 = new CompletableFuture<>();
1714 <        r = new Noop();
1715 <        g = f.runAfterBoth(f2, r);
1716 <        f.complete(one);
1717 <        assertTrue(f2.cancel(true));
1718 <        checkCompletedWithWrappedCancellationException(g);
1704 >    public void testRunAfterBoth_sourceCancelled1() {
1705 >        for (ExecutionMode m : ExecutionMode.values())
1706 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1707 >        for (Integer v1 : new Integer[] { 1, null }) {
1708 >
1709 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1710 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1711 >        final Noop r = new Noop();
1712 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1713 >
1714 >        assertTrue(f.cancel(mayInterruptIfRunning));
1715 >        checkIncomplete(h);
1716 >        g.complete(v1);
1717 >
1718 >        checkCompletedWithWrappedCancellationException(h);
1719 >        checkCancelled(f);
1720 >        assertEquals(0, r.invocationCount);
1721 >        checkCompletedNormally(g, v1);
1722 >        }
1723 >    }
1724 >
1725 >    public void testRunAfterBoth_sourceCancelled2() {
1726 >        for (ExecutionMode m : ExecutionMode.values())
1727 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1728 >        for (Integer v1 : new Integer[] { 1, null }) {
1729 >
1730 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1731 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1732 >        final Noop r = new Noop();
1733 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1734 >
1735 >        assertTrue(g.cancel(mayInterruptIfRunning));
1736 >        checkIncomplete(h);
1737 >        f.complete(v1);
1738 >
1739 >        checkCompletedWithWrappedCancellationException(h);
1740 >        checkCancelled(g);
1741 >        assertEquals(0, r.invocationCount);
1742 >        checkCompletedNormally(f, v1);
1743 >        }
1744 >    }
1745 >
1746 >    public void testRunAfterBoth_sourceCancelled3() {
1747 >        for (ExecutionMode m : ExecutionMode.values())
1748 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1749 >        for (Integer v1 : new Integer[] { 1, null }) {
1750 >
1751 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1752 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1753 >        final Noop r = new Noop();
1754 >
1755 >        assertTrue(g.cancel(mayInterruptIfRunning));
1756 >        f.complete(v1);
1757 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1758 >
1759 >        checkCompletedWithWrappedCancellationException(h);
1760 >        checkCancelled(g);
1761 >        assertEquals(0, r.invocationCount);
1762 >        checkCompletedNormally(f, v1);
1763 >        }
1764 >    }
1765 >
1766 >    public void testRunAfterBoth_sourceCancelled4() {
1767 >        for (ExecutionMode m : ExecutionMode.values())
1768 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1769 >        for (Integer v1 : new Integer[] { 1, null }) {
1770 >
1771 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1772 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1773 >        final Noop r = new Noop();
1774 >
1775 >        assertTrue(f.cancel(mayInterruptIfRunning));
1776 >        g.complete(v1);
1777 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1778 >
1779 >        checkCompletedWithWrappedCancellationException(h);
1780 >        checkCancelled(f);
1781 >        assertEquals(0, r.invocationCount);
1782 >        checkCompletedNormally(g, v1);
1783 >        }
1784      }
1785  
1786      /**
1787       * applyToEither result completes normally after normal completion
1788       * of either source
1789       */
1790 <    public void testApplyToEither() {
1791 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1792 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1793 <        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
1794 <        f.complete(one);
1795 <        checkCompletedNormally(g, two);
1796 <        f2.complete(one);
1797 <        checkCompletedNormally(g, two);
1790 >    public void testApplyToEither_normalCompletion1() {
1791 >        for (ExecutionMode m : ExecutionMode.values())
1792 >        for (Integer v1 : new Integer[] { 1, null })
1793 >        for (Integer v2 : new Integer[] { 2, null }) {
1794 >
1795 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1796 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1797 >        final IncFunction r = new IncFunction();
1798 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1799 >
1800 >        f.complete(v1);
1801 >        checkCompletedNormally(h, inc(v1));
1802 >        g.complete(v2);
1803 >
1804 >        checkCompletedNormally(f, v1);
1805 >        checkCompletedNormally(g, v2);
1806 >        checkCompletedNormally(h, inc(v1));
1807 >        }
1808 >    }
1809  
1810 <        f = new CompletableFuture<>();
1811 <        f.complete(one);
1812 <        f2 = new CompletableFuture<>();
1813 <        g = f.applyToEither(f2, inc);
1814 <        checkCompletedNormally(g, two);
1810 >    public void testApplyToEither_normalCompletion2() {
1811 >        for (ExecutionMode m : ExecutionMode.values())
1812 >        for (Integer v1 : new Integer[] { 1, null })
1813 >        for (Integer v2 : new Integer[] { 2, null }) {
1814 >
1815 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1816 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1817 >        final IncFunction r = new IncFunction();
1818 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1819 >
1820 >        g.complete(v2);
1821 >        checkCompletedNormally(h, inc(v2));
1822 >        f.complete(v1);
1823 >
1824 >        checkCompletedNormally(f, v1);
1825 >        checkCompletedNormally(g, v2);
1826 >        checkCompletedNormally(h, inc(v2));
1827 >        }
1828 >    }
1829 >    public void testApplyToEither_normalCompletion3() {
1830 >        for (ExecutionMode m : ExecutionMode.values())
1831 >        for (Integer v1 : new Integer[] { 1, null })
1832 >        for (Integer v2 : new Integer[] { 2, null }) {
1833 >
1834 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1835 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1836 >        final IncFunction r = new IncFunction();
1837 >
1838 >        f.complete(v1);
1839 >        g.complete(v2);
1840 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1841 >
1842 >        checkCompletedNormally(f, v1);
1843 >        checkCompletedNormally(g, v2);
1844 >
1845 >        // unspecified behavior
1846 >        assertTrue(Objects.equals(h.join(), inc(v1)) ||
1847 >                   Objects.equals(h.join(), inc(v2)));
1848 >        assertEquals(1, r.invocationCount);
1849 >        }
1850      }
1851  
1852      /**
1853       * applyToEither result completes exceptionally after exceptional
1854       * completion of either source
1855       */
1856 <    public void testApplyToEither2() {
1857 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1858 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1859 <        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
1860 <        f.completeExceptionally(new CFException());
1861 <        f2.complete(one);
1862 <        checkCompletedWithWrappedCFException(g);
1856 >    public void testApplyToEither_exceptionalCompletion1() {
1857 >        for (ExecutionMode m : ExecutionMode.values())
1858 >        for (Integer v1 : new Integer[] { 1, null }) {
1859 >
1860 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1861 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1862 >        final IncFunction r = new IncFunction();
1863 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1864 >        final CFException ex = new CFException();
1865 >
1866 >        f.completeExceptionally(ex);
1867 >        checkCompletedWithWrappedCFException(h, ex);
1868 >        g.complete(v1);
1869 >
1870 >        assertEquals(0, r.invocationCount);
1871 >        checkCompletedNormally(g, v1);
1872 >        checkCompletedWithWrappedCFException(f, ex);
1873 >        checkCompletedWithWrappedCFException(h, ex);
1874 >        }
1875 >    }
1876  
1877 <        f = new CompletableFuture<>();
1878 <        f2 = new CompletableFuture<>();
1879 <        f2.completeExceptionally(new CFException());
1880 <        g = f.applyToEither(f2, inc);
1881 <        checkCompletedWithWrappedCFException(g);
1877 >    public void testApplyToEither_exceptionalCompletion2() {
1878 >        for (ExecutionMode m : ExecutionMode.values())
1879 >        for (Integer v1 : new Integer[] { 1, null }) {
1880 >
1881 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1882 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1883 >        final IncFunction r = new IncFunction();
1884 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1885 >        final CFException ex = new CFException();
1886 >
1887 >        g.completeExceptionally(ex);
1888 >        checkCompletedWithWrappedCFException(h, ex);
1889 >        f.complete(v1);
1890 >
1891 >        assertEquals(0, r.invocationCount);
1892 >        checkCompletedNormally(f, v1);
1893 >        checkCompletedWithWrappedCFException(g, ex);
1894 >        checkCompletedWithWrappedCFException(h, ex);
1895 >        }
1896 >    }
1897 >
1898 >    public void testApplyToEither_exceptionalCompletion3() {
1899 >        for (ExecutionMode m : ExecutionMode.values())
1900 >        for (Integer v1 : new Integer[] { 1, null }) {
1901 >
1902 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1903 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1904 >        final IncFunction r = new IncFunction();
1905 >        final CFException ex = new CFException();
1906 >
1907 >        g.completeExceptionally(ex);
1908 >        f.complete(v1);
1909 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1910 >
1911 >        // unspecified behavior
1912 >        Integer v;
1913 >        try {
1914 >            assertEquals(h.join(), inc(v1));
1915 >            assertEquals(1, r.invocationCount);
1916 >        } catch (CompletionException ok) {
1917 >            checkCompletedWithWrappedCFException(h, ex);
1918 >            assertEquals(0, r.invocationCount);
1919 >        }
1920 >
1921 >        checkCompletedWithWrappedCFException(g, ex);
1922 >        checkCompletedNormally(f, v1);
1923 >        }
1924 >    }
1925 >
1926 >    public void testApplyToEither_exceptionalCompletion4() {
1927 >        for (ExecutionMode m : ExecutionMode.values())
1928 >        for (Integer v1 : new Integer[] { 1, null }) {
1929 >
1930 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1931 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1932 >        final IncFunction r = new IncFunction();
1933 >        final CFException ex = new CFException();
1934 >
1935 >        f.completeExceptionally(ex);
1936 >        g.complete(v1);
1937 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1938 >
1939 >        // unspecified behavior
1940 >        Integer v;
1941 >        try {
1942 >            assertEquals(h.join(), inc(v1));
1943 >            assertEquals(1, r.invocationCount);
1944 >        } catch (CompletionException ok) {
1945 >            checkCompletedWithWrappedCFException(h, ex);
1946 >            assertEquals(0, r.invocationCount);
1947 >        }
1948 >
1949 >        checkCompletedWithWrappedCFException(f, ex);
1950 >        checkCompletedNormally(g, v1);
1951 >        }
1952      }
1953  
1954      /**
1955       * applyToEither result completes exceptionally if action does
1956       */
1957 <    public void testApplyToEither3() {
1958 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1959 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1960 <        FailingFunction r = new FailingFunction();
1961 <        CompletableFuture<Integer> g = f.applyToEither(f2, r);
1962 <        f2.complete(two);
1963 <        checkCompletedWithWrappedCFException(g);
1957 >    public void testApplyToEither_actionFailed1() {
1958 >        for (ExecutionMode m : ExecutionMode.values())
1959 >        for (Integer v1 : new Integer[] { 1, null })
1960 >        for (Integer v2 : new Integer[] { 2, null }) {
1961 >
1962 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1963 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1964 >        final FailingFunction r = new FailingFunction();
1965 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1966 >
1967 >        f.complete(v1);
1968 >        checkCompletedWithWrappedCFException(h);
1969 >        g.complete(v2);
1970 >        checkCompletedNormally(f, v1);
1971 >        checkCompletedNormally(g, v2);
1972 >        }
1973 >    }
1974 >
1975 >    public void testApplyToEither_actionFailed2() {
1976 >        for (ExecutionMode m : ExecutionMode.values())
1977 >        for (Integer v1 : new Integer[] { 1, null })
1978 >        for (Integer v2 : new Integer[] { 2, null }) {
1979 >
1980 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1981 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1982 >        final FailingFunction r = new FailingFunction();
1983 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1984 >
1985 >        g.complete(v2);
1986 >        checkCompletedWithWrappedCFException(h);
1987 >        f.complete(v1);
1988 >        checkCompletedNormally(f, v1);
1989 >        checkCompletedNormally(g, v2);
1990 >        }
1991      }
1992  
1993      /**
1994       * applyToEither result completes exceptionally if either source cancelled
1995       */
1996 <    public void testApplyToEither4() {
1997 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1998 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1999 <        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
2000 <        assertTrue(f.cancel(true));
2001 <        checkCompletedWithWrappedCancellationException(g);
2002 <        f = new CompletableFuture<>();
2003 <        f2 = new CompletableFuture<>();
2004 <        assertTrue(f2.cancel(true));
2005 <        checkCompletedWithWrappedCancellationException(g);
1996 >    public void testApplyToEither_sourceCancelled1() {
1997 >        for (ExecutionMode m : ExecutionMode.values())
1998 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1999 >        for (Integer v1 : new Integer[] { 1, null }) {
2000 >
2001 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2002 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2003 >        final IncFunction r = new IncFunction();
2004 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2005 >
2006 >        assertTrue(f.cancel(mayInterruptIfRunning));
2007 >        checkCompletedWithWrappedCancellationException(h);
2008 >        g.complete(v1);
2009 >
2010 >        checkCancelled(f);
2011 >        assertEquals(0, r.invocationCount);
2012 >        checkCompletedNormally(g, v1);
2013 >        checkCompletedWithWrappedCancellationException(h);
2014 >        }
2015 >    }
2016 >
2017 >    public void testApplyToEither_sourceCancelled2() {
2018 >        for (ExecutionMode m : ExecutionMode.values())
2019 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2020 >        for (Integer v1 : new Integer[] { 1, null }) {
2021 >
2022 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2023 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2024 >        final IncFunction r = new IncFunction();
2025 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2026 >
2027 >        assertTrue(g.cancel(mayInterruptIfRunning));
2028 >        checkCompletedWithWrappedCancellationException(h);
2029 >        f.complete(v1);
2030 >
2031 >        checkCancelled(g);
2032 >        assertEquals(0, r.invocationCount);
2033 >        checkCompletedNormally(f, v1);
2034 >        checkCompletedWithWrappedCancellationException(h);
2035 >        }
2036 >    }
2037 >
2038 >    public void testApplyToEither_sourceCancelled3() {
2039 >        for (ExecutionMode m : ExecutionMode.values())
2040 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2041 >        for (Integer v1 : new Integer[] { 1, null }) {
2042 >
2043 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2044 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2045 >        final IncFunction r = new IncFunction();
2046 >
2047 >        assertTrue(g.cancel(mayInterruptIfRunning));
2048 >        f.complete(v1);
2049 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2050 >
2051 >        // unspecified behavior
2052 >        Integer v;
2053 >        try {
2054 >            assertEquals(h.join(), inc(v1));
2055 >            assertEquals(1, r.invocationCount);
2056 >        } catch (CompletionException ok) {
2057 >            checkCompletedWithWrappedCancellationException(h);
2058 >            assertEquals(0, r.invocationCount);
2059 >        }
2060 >
2061 >        checkCancelled(g);
2062 >        checkCompletedNormally(f, v1);
2063 >        }
2064 >    }
2065 >
2066 >    public void testApplyToEither_sourceCancelled4() {
2067 >        for (ExecutionMode m : ExecutionMode.values())
2068 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2069 >        for (Integer v1 : new Integer[] { 1, null }) {
2070 >
2071 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2072 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2073 >        final IncFunction r = new IncFunction();
2074 >
2075 >        assertTrue(f.cancel(mayInterruptIfRunning));
2076 >        g.complete(v1);
2077 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2078 >
2079 >        // unspecified behavior
2080 >        Integer v;
2081 >        try {
2082 >            assertEquals(h.join(), inc(v1));
2083 >            assertEquals(1, r.invocationCount);
2084 >        } catch (CompletionException ok) {
2085 >            checkCompletedWithWrappedCancellationException(h);
2086 >            assertEquals(0, r.invocationCount);
2087 >        }
2088 >
2089 >        checkCancelled(f);
2090 >        checkCompletedNormally(g, v1);
2091 >        }
2092      }
2093  
2094      /**
2095       * acceptEither result completes normally after normal completion
2096       * of either source
2097       */
2098 <    public void testAcceptEither() {
2099 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2100 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2101 <        IncAction r = new IncAction();
2102 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
2103 <        f.complete(one);
2104 <        checkCompletedNormally(g, null);
2105 <        f2.complete(one);
2106 <        checkCompletedNormally(g, null);
1111 <        assertEquals(r.value, 2);
2098 >    public void testAcceptEither_normalCompletion1() {
2099 >        for (ExecutionMode m : ExecutionMode.values())
2100 >        for (Integer v1 : new Integer[] { 1, null })
2101 >        for (Integer v2 : new Integer[] { 2, null }) {
2102 >
2103 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2104 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2105 >        final IncAction r = new IncAction();
2106 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2107  
2108 <        r = new IncAction();
2109 <        f = new CompletableFuture<>();
2110 <        f.complete(one);
2111 <        f2 = new CompletableFuture<>();
2112 <        g = f.acceptEither(f2, r);
2113 <        checkCompletedNormally(g, null);
2114 <        assertEquals(r.value, 2);
2108 >        f.complete(v1);
2109 >        checkCompletedNormally(h, null);
2110 >        assertEquals(r.value, inc(v1));
2111 >        g.complete(v2);
2112 >
2113 >        checkCompletedNormally(f, v1);
2114 >        checkCompletedNormally(g, v2);
2115 >        checkCompletedNormally(h, null);
2116 >        }
2117 >    }
2118 >
2119 >    public void testAcceptEither_normalCompletion2() {
2120 >        for (ExecutionMode m : ExecutionMode.values())
2121 >        for (Integer v1 : new Integer[] { 1, null })
2122 >        for (Integer v2 : new Integer[] { 2, null }) {
2123 >
2124 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2125 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2126 >        final IncAction r = new IncAction();
2127 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2128 >
2129 >        g.complete(v2);
2130 >        checkCompletedNormally(h, null);
2131 >        assertEquals(r.value, inc(v2));
2132 >        f.complete(v1);
2133 >
2134 >        checkCompletedNormally(f, v1);
2135 >        checkCompletedNormally(g, v2);
2136 >        checkCompletedNormally(h, null);
2137 >        }
2138 >    }
2139 >    public void testAcceptEither_normalCompletion3() {
2140 >        for (ExecutionMode m : ExecutionMode.values())
2141 >        for (Integer v1 : new Integer[] { 1, null })
2142 >        for (Integer v2 : new Integer[] { 2, null }) {
2143 >
2144 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2145 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2146 >        final IncAction r = new IncAction();
2147 >
2148 >        f.complete(v1);
2149 >        g.complete(v2);
2150 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2151 >
2152 >        checkCompletedNormally(h, null);
2153 >        checkCompletedNormally(f, v1);
2154 >        checkCompletedNormally(g, v2);
2155 >
2156 >        // unspecified behavior
2157 >        assertTrue(Objects.equals(r.value, inc(v1)) ||
2158 >                   Objects.equals(r.value, inc(v2)));
2159 >        }
2160      }
2161  
2162      /**
2163       * acceptEither result completes exceptionally after exceptional
2164       * completion of either source
2165       */
2166 <    public void testAcceptEither2() {
2167 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2168 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2169 <        IncAction r = new IncAction();
2170 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
2171 <        f.completeExceptionally(new CFException());
2172 <        f2.complete(one);
2173 <        checkCompletedWithWrappedCFException(g);
2166 >    public void testAcceptEither_exceptionalCompletion1() {
2167 >        for (ExecutionMode m : ExecutionMode.values())
2168 >        for (Integer v1 : new Integer[] { 1, null }) {
2169 >
2170 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2171 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2172 >        final IncAction r = new IncAction();
2173 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2174 >        final CFException ex = new CFException();
2175 >
2176 >        f.completeExceptionally(ex);
2177 >        checkCompletedWithWrappedCFException(h, ex);
2178 >        g.complete(v1);
2179 >
2180 >        assertEquals(0, r.invocationCount);
2181 >        checkCompletedNormally(g, v1);
2182 >        checkCompletedWithWrappedCFException(f, ex);
2183 >        checkCompletedWithWrappedCFException(h, ex);
2184 >        }
2185 >    }
2186  
2187 <        r = new IncAction();
2188 <        f = new CompletableFuture<>();
2189 <        f2 = new CompletableFuture<>();
2190 <        f2.completeExceptionally(new CFException());
2191 <        g = f.acceptEither(f2, r);
2192 <        checkCompletedWithWrappedCFException(g);
2187 >    public void testAcceptEither_exceptionalCompletion2() {
2188 >        for (ExecutionMode m : ExecutionMode.values())
2189 >        for (Integer v1 : new Integer[] { 1, null }) {
2190 >
2191 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2192 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2193 >        final IncAction r = new IncAction();
2194 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2195 >        final CFException ex = new CFException();
2196 >
2197 >        g.completeExceptionally(ex);
2198 >        checkCompletedWithWrappedCFException(h, ex);
2199 >        f.complete(v1);
2200 >
2201 >        assertEquals(0, r.invocationCount);
2202 >        checkCompletedNormally(f, v1);
2203 >        checkCompletedWithWrappedCFException(g, ex);
2204 >        checkCompletedWithWrappedCFException(h, ex);
2205 >        }
2206 >    }
2207 >
2208 >    public void testAcceptEither_exceptionalCompletion3() {
2209 >        for (ExecutionMode m : ExecutionMode.values())
2210 >        for (Integer v1 : new Integer[] { 1, null }) {
2211 >
2212 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2213 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2214 >        final IncAction r = new IncAction();
2215 >        final CFException ex = new CFException();
2216 >
2217 >        g.completeExceptionally(ex);
2218 >        f.complete(v1);
2219 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2220 >
2221 >        // unspecified behavior
2222 >        Integer v;
2223 >        try {
2224 >            assertEquals(h.join(), null);
2225 >            assertEquals(1, r.invocationCount);
2226 >            assertEquals(inc(v1), r.value);
2227 >        } catch (CompletionException ok) {
2228 >            checkCompletedWithWrappedCFException(h, ex);
2229 >            assertEquals(0, r.invocationCount);
2230 >        }
2231 >
2232 >        checkCompletedWithWrappedCFException(g, ex);
2233 >        checkCompletedNormally(f, v1);
2234 >        }
2235 >    }
2236 >
2237 >    public void testAcceptEither_exceptionalCompletion4() {
2238 >        for (ExecutionMode m : ExecutionMode.values())
2239 >        for (Integer v1 : new Integer[] { 1, null }) {
2240 >
2241 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2242 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2243 >        final IncAction r = new IncAction();
2244 >        final CFException ex = new CFException();
2245 >
2246 >        f.completeExceptionally(ex);
2247 >        g.complete(v1);
2248 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2249 >
2250 >        // unspecified behavior
2251 >        Integer v;
2252 >        try {
2253 >            assertEquals(h.join(), null);
2254 >            assertEquals(1, r.invocationCount);
2255 >            assertEquals(inc(v1), r.value);
2256 >        } catch (CompletionException ok) {
2257 >            checkCompletedWithWrappedCFException(h, ex);
2258 >            assertEquals(0, r.invocationCount);
2259 >        }
2260 >
2261 >        checkCompletedWithWrappedCFException(f, ex);
2262 >        checkCompletedNormally(g, v1);
2263 >        }
2264      }
2265  
2266      /**
2267       * acceptEither result completes exceptionally if action does
2268       */
2269 <    public void testAcceptEither3() {
2270 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2271 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2272 <        FailingConsumer r = new FailingConsumer();
2273 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
2274 <        f2.complete(two);
2275 <        checkCompletedWithWrappedCFException(g);
2269 >    public void testAcceptEither_actionFailed1() {
2270 >        for (ExecutionMode m : ExecutionMode.values())
2271 >        for (Integer v1 : new Integer[] { 1, null })
2272 >        for (Integer v2 : new Integer[] { 2, null }) {
2273 >
2274 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2275 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2276 >        final FailingConsumer r = new FailingConsumer();
2277 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2278 >
2279 >        f.complete(v1);
2280 >        checkCompletedWithWrappedCFException(h);
2281 >        g.complete(v2);
2282 >        checkCompletedNormally(f, v1);
2283 >        checkCompletedNormally(g, v2);
2284 >        }
2285 >    }
2286 >
2287 >    public void testAcceptEither_actionFailed2() {
2288 >        for (ExecutionMode m : ExecutionMode.values())
2289 >        for (Integer v1 : new Integer[] { 1, null })
2290 >        for (Integer v2 : new Integer[] { 2, null }) {
2291 >
2292 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2293 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2294 >        final FailingConsumer r = new FailingConsumer();
2295 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2296 >
2297 >        g.complete(v2);
2298 >        checkCompletedWithWrappedCFException(h);
2299 >        f.complete(v1);
2300 >        checkCompletedNormally(f, v1);
2301 >        checkCompletedNormally(g, v2);
2302 >        }
2303      }
2304  
2305      /**
2306       * acceptEither result completes exceptionally if either source cancelled
2307       */
2308 <    public void testAcceptEither4() {
2309 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2310 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2311 <        IncAction r = new IncAction();
2312 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
2313 <        assertTrue(f.cancel(true));
2314 <        checkCompletedWithWrappedCancellationException(g);
2315 <        f = new CompletableFuture<>();
2316 <        f2 = new CompletableFuture<>();
2317 <        assertTrue(f2.cancel(true));
2318 <        checkCompletedWithWrappedCancellationException(g);
2308 >    public void testAcceptEither_sourceCancelled1() {
2309 >        for (ExecutionMode m : ExecutionMode.values())
2310 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2311 >        for (Integer v1 : new Integer[] { 1, null }) {
2312 >
2313 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2314 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2315 >        final IncAction r = new IncAction();
2316 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2317 >
2318 >        assertTrue(f.cancel(mayInterruptIfRunning));
2319 >        checkCompletedWithWrappedCancellationException(h);
2320 >        g.complete(v1);
2321 >
2322 >        checkCancelled(f);
2323 >        assertEquals(0, r.invocationCount);
2324 >        checkCompletedNormally(g, v1);
2325 >        checkCompletedWithWrappedCancellationException(h);
2326 >        }
2327 >    }
2328 >
2329 >    public void testAcceptEither_sourceCancelled2() {
2330 >        for (ExecutionMode m : ExecutionMode.values())
2331 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2332 >        for (Integer v1 : new Integer[] { 1, null }) {
2333 >
2334 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2335 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2336 >        final IncAction r = new IncAction();
2337 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2338 >
2339 >        assertTrue(g.cancel(mayInterruptIfRunning));
2340 >        checkCompletedWithWrappedCancellationException(h);
2341 >        f.complete(v1);
2342 >
2343 >        checkCancelled(g);
2344 >        assertEquals(0, r.invocationCount);
2345 >        checkCompletedNormally(f, v1);
2346 >        checkCompletedWithWrappedCancellationException(h);
2347 >        }
2348 >    }
2349 >
2350 >    public void testAcceptEither_sourceCancelled3() {
2351 >        for (ExecutionMode m : ExecutionMode.values())
2352 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
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 >
2359 >        assertTrue(g.cancel(mayInterruptIfRunning));
2360 >        f.complete(v1);
2361 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2362 >
2363 >        // unspecified behavior
2364 >        Integer v;
2365 >        try {
2366 >            assertEquals(h.join(), null);
2367 >            assertEquals(1, r.invocationCount);
2368 >            assertEquals(inc(v1), r.value);
2369 >        } catch (CompletionException ok) {
2370 >            checkCompletedWithWrappedCancellationException(h);
2371 >            assertEquals(0, r.invocationCount);
2372 >        }
2373 >
2374 >        checkCancelled(g);
2375 >        checkCompletedNormally(f, v1);
2376 >        }
2377 >    }
2378 >
2379 >    public void testAcceptEither_sourceCancelled4() {
2380 >        for (ExecutionMode m : ExecutionMode.values())
2381 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2382 >        for (Integer v1 : new Integer[] { 1, null }) {
2383 >
2384 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2385 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2386 >        final IncAction r = new IncAction();
2387 >
2388 >        assertTrue(f.cancel(mayInterruptIfRunning));
2389 >        g.complete(v1);
2390 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2391 >
2392 >        // unspecified behavior
2393 >        Integer v;
2394 >        try {
2395 >            assertEquals(h.join(), null);
2396 >            assertEquals(1, r.invocationCount);
2397 >            assertEquals(inc(v1), r.value);
2398 >        } catch (CompletionException ok) {
2399 >            checkCompletedWithWrappedCancellationException(h);
2400 >            assertEquals(0, r.invocationCount);
2401 >        }
2402 >
2403 >        checkCancelled(f);
2404 >        checkCompletedNormally(g, v1);
2405 >        }
2406      }
2407  
2408      /**
2409       * runAfterEither result completes normally after normal completion
2410       * of either source
2411       */
2412 <    public void testRunAfterEither() {
2413 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2414 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2415 <        Noop r = new Noop();
2416 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
2417 <        f.complete(one);
2418 <        checkCompletedNormally(g, null);
2419 <        f2.complete(one);
2420 <        checkCompletedNormally(g, null);
1184 <        assertTrue(r.ran);
2412 >    public void testRunAfterEither_normalCompletion1() {
2413 >        for (ExecutionMode m : ExecutionMode.values())
2414 >        for (Integer v1 : new Integer[] { 1, null })
2415 >        for (Integer v2 : new Integer[] { 2, null }) {
2416 >
2417 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2418 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2419 >        final Noop r = new Noop();
2420 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2421  
2422 <        r = new Noop();
2423 <        f = new CompletableFuture<>();
2424 <        f.complete(one);
2425 <        f2 = new CompletableFuture<>();
2426 <        g = f.runAfterEither(f2, r);
2427 <        checkCompletedNormally(g, null);
2428 <        assertTrue(r.ran);
2422 >        f.complete(v1);
2423 >        checkCompletedNormally(h, null);
2424 >        assertEquals(1, r.invocationCount);
2425 >        g.complete(v2);
2426 >
2427 >        checkCompletedNormally(f, v1);
2428 >        checkCompletedNormally(g, v2);
2429 >        checkCompletedNormally(h, null);
2430 >        assertEquals(1, r.invocationCount);
2431 >        }
2432 >    }
2433 >
2434 >    public void testRunAfterEither_normalCompletion2() {
2435 >        for (ExecutionMode m : ExecutionMode.values())
2436 >        for (Integer v1 : new Integer[] { 1, null })
2437 >        for (Integer v2 : new Integer[] { 2, null }) {
2438 >
2439 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2440 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2441 >        final Noop r = new Noop();
2442 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2443 >
2444 >        g.complete(v2);
2445 >        checkCompletedNormally(h, null);
2446 >        assertEquals(1, r.invocationCount);
2447 >        f.complete(v1);
2448 >
2449 >        checkCompletedNormally(f, v1);
2450 >        checkCompletedNormally(g, v2);
2451 >        checkCompletedNormally(h, null);
2452 >        assertEquals(1, r.invocationCount);
2453 >        }
2454 >    }
2455 >    public void testRunAfterEither_normalCompletion3() {
2456 >        for (ExecutionMode m : ExecutionMode.values())
2457 >        for (Integer v1 : new Integer[] { 1, null })
2458 >        for (Integer v2 : new Integer[] { 2, null }) {
2459 >
2460 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2461 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2462 >        final Noop r = new Noop();
2463 >
2464 >        f.complete(v1);
2465 >        g.complete(v2);
2466 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2467 >
2468 >        checkCompletedNormally(h, null);
2469 >        checkCompletedNormally(f, v1);
2470 >        checkCompletedNormally(g, v2);
2471 >        assertEquals(1, r.invocationCount);
2472 >        }
2473      }
2474  
2475      /**
2476       * runAfterEither result completes exceptionally after exceptional
2477       * completion of either source
2478       */
2479 <    public void testRunAfterEither2() {
2480 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2481 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2482 <        Noop r = new Noop();
2483 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
2484 <        f.completeExceptionally(new CFException());
2485 <        f2.complete(one);
2486 <        checkCompletedWithWrappedCFException(g);
2479 >    public void testRunAfterEither_exceptionalCompletion1() {
2480 >        for (ExecutionMode m : ExecutionMode.values())
2481 >        for (Integer v1 : new Integer[] { 1, null }) {
2482 >
2483 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2484 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2485 >        final Noop r = new Noop();
2486 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2487 >        final CFException ex = new CFException();
2488 >
2489 >        f.completeExceptionally(ex);
2490 >        checkCompletedWithWrappedCFException(h, ex);
2491 >        g.complete(v1);
2492 >
2493 >        assertEquals(0, r.invocationCount);
2494 >        checkCompletedNormally(g, v1);
2495 >        checkCompletedWithWrappedCFException(f, ex);
2496 >        checkCompletedWithWrappedCFException(h, ex);
2497 >        }
2498 >    }
2499  
2500 <        r = new Noop();
2501 <        f = new CompletableFuture<>();
2502 <        f2 = new CompletableFuture<>();
2503 <        f2.completeExceptionally(new CFException());
2504 <        g = f.runAfterEither(f2, r);
2505 <        checkCompletedWithWrappedCFException(g);
2500 >    public void testRunAfterEither_exceptionalCompletion2() {
2501 >        for (ExecutionMode m : ExecutionMode.values())
2502 >        for (Integer v1 : new Integer[] { 1, null }) {
2503 >
2504 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2505 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2506 >        final Noop r = new Noop();
2507 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2508 >        final CFException ex = new CFException();
2509 >
2510 >        g.completeExceptionally(ex);
2511 >        checkCompletedWithWrappedCFException(h, ex);
2512 >        f.complete(v1);
2513 >
2514 >        assertEquals(0, r.invocationCount);
2515 >        checkCompletedNormally(f, v1);
2516 >        checkCompletedWithWrappedCFException(g, ex);
2517 >        checkCompletedWithWrappedCFException(h, ex);
2518 >        }
2519 >    }
2520 >
2521 >    public void testRunAfterEither_exceptionalCompletion3() {
2522 >        for (ExecutionMode m : ExecutionMode.values())
2523 >        for (Integer v1 : new Integer[] { 1, null }) {
2524 >
2525 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2526 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2527 >        final Noop r = new Noop();
2528 >        final CFException ex = new CFException();
2529 >
2530 >        g.completeExceptionally(ex);
2531 >        f.complete(v1);
2532 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2533 >
2534 >        // unspecified behavior
2535 >        Integer v;
2536 >        try {
2537 >            assertEquals(h.join(), null);
2538 >            assertEquals(1, r.invocationCount);
2539 >        } catch (CompletionException ok) {
2540 >            checkCompletedWithWrappedCFException(h, ex);
2541 >            assertEquals(0, r.invocationCount);
2542 >        }
2543 >
2544 >        checkCompletedWithWrappedCFException(g, ex);
2545 >        checkCompletedNormally(f, v1);
2546 >        }
2547 >    }
2548 >
2549 >    public void testRunAfterEither_exceptionalCompletion4() {
2550 >        for (ExecutionMode m : ExecutionMode.values())
2551 >        for (Integer v1 : new Integer[] { 1, null }) {
2552 >
2553 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2554 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2555 >        final Noop r = new Noop();
2556 >        final CFException ex = new CFException();
2557 >
2558 >        f.completeExceptionally(ex);
2559 >        g.complete(v1);
2560 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2561 >
2562 >        // unspecified behavior
2563 >        Integer v;
2564 >        try {
2565 >            assertEquals(h.join(), null);
2566 >            assertEquals(1, r.invocationCount);
2567 >        } catch (CompletionException ok) {
2568 >            checkCompletedWithWrappedCFException(h, ex);
2569 >            assertEquals(0, r.invocationCount);
2570 >        }
2571 >
2572 >        checkCompletedWithWrappedCFException(f, ex);
2573 >        checkCompletedNormally(g, v1);
2574 >        }
2575      }
2576  
2577      /**
2578       * runAfterEither result completes exceptionally if action does
2579       */
2580 <    public void testRunAfterEither3() {
2581 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2582 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2583 <        FailingNoop r = new FailingNoop();
2584 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
2585 <        f2.complete(two);
2586 <        checkCompletedWithWrappedCFException(g);
2580 >    public void testRunAfterEither_actionFailed1() {
2581 >        for (ExecutionMode m : ExecutionMode.values())
2582 >        for (Integer v1 : new Integer[] { 1, null })
2583 >        for (Integer v2 : new Integer[] { 2, null }) {
2584 >
2585 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2586 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2587 >        final FailingNoop r = new FailingNoop();
2588 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2589 >
2590 >        f.complete(v1);
2591 >        checkCompletedWithWrappedCFException(h);
2592 >        g.complete(v2);
2593 >        checkCompletedNormally(f, v1);
2594 >        checkCompletedNormally(g, v2);
2595 >        }
2596 >    }
2597 >
2598 >    public void testRunAfterEither_actionFailed2() {
2599 >        for (ExecutionMode m : ExecutionMode.values())
2600 >        for (Integer v1 : new Integer[] { 1, null })
2601 >        for (Integer v2 : new Integer[] { 2, null }) {
2602 >
2603 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2604 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2605 >        final FailingNoop r = new FailingNoop();
2606 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2607 >
2608 >        g.complete(v2);
2609 >        checkCompletedWithWrappedCFException(h);
2610 >        f.complete(v1);
2611 >        checkCompletedNormally(f, v1);
2612 >        checkCompletedNormally(g, v2);
2613 >        }
2614      }
2615  
2616      /**
2617       * runAfterEither result completes exceptionally if either source cancelled
2618       */
2619 <    public void testRunAfterEither4() {
2620 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2621 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2622 <        Noop r = new Noop();
2623 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
2624 <        assertTrue(f.cancel(true));
2625 <        checkCompletedWithWrappedCancellationException(g);
2626 <        f = new CompletableFuture<>();
2627 <        f2 = new CompletableFuture<>();
2628 <        assertTrue(f2.cancel(true));
2629 <        checkCompletedWithWrappedCancellationException(g);
2619 >    public void testRunAfterEither_sourceCancelled1() {
2620 >        for (ExecutionMode m : ExecutionMode.values())
2621 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2622 >        for (Integer v1 : new Integer[] { 1, null }) {
2623 >
2624 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2625 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2626 >        final Noop r = new Noop();
2627 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2628 >
2629 >        assertTrue(f.cancel(mayInterruptIfRunning));
2630 >        checkCompletedWithWrappedCancellationException(h);
2631 >        g.complete(v1);
2632 >
2633 >        checkCancelled(f);
2634 >        assertEquals(0, r.invocationCount);
2635 >        checkCompletedNormally(g, v1);
2636 >        checkCompletedWithWrappedCancellationException(h);
2637 >        }
2638 >    }
2639 >
2640 >    public void testRunAfterEither_sourceCancelled2() {
2641 >        for (ExecutionMode m : ExecutionMode.values())
2642 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2643 >        for (Integer v1 : new Integer[] { 1, null }) {
2644 >
2645 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2646 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2647 >        final Noop r = new Noop();
2648 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2649 >
2650 >        assertTrue(g.cancel(mayInterruptIfRunning));
2651 >        checkCompletedWithWrappedCancellationException(h);
2652 >        f.complete(v1);
2653 >
2654 >        checkCancelled(g);
2655 >        assertEquals(0, r.invocationCount);
2656 >        checkCompletedNormally(f, v1);
2657 >        checkCompletedWithWrappedCancellationException(h);
2658 >        }
2659 >    }
2660 >
2661 >    public void testRunAfterEither_sourceCancelled3() {
2662 >        for (ExecutionMode m : ExecutionMode.values())
2663 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2664 >        for (Integer v1 : new Integer[] { 1, null }) {
2665 >
2666 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2667 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2668 >        final Noop r = new Noop();
2669 >
2670 >        assertTrue(g.cancel(mayInterruptIfRunning));
2671 >        f.complete(v1);
2672 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2673 >
2674 >        // unspecified behavior
2675 >        Integer v;
2676 >        try {
2677 >            assertEquals(h.join(), null);
2678 >            assertEquals(1, r.invocationCount);
2679 >        } catch (CompletionException ok) {
2680 >            checkCompletedWithWrappedCancellationException(h);
2681 >            assertEquals(0, r.invocationCount);
2682 >        }
2683 >
2684 >        checkCancelled(g);
2685 >        checkCompletedNormally(f, v1);
2686 >        }
2687 >    }
2688 >
2689 >    public void testRunAfterEither_sourceCancelled4() {
2690 >        for (ExecutionMode m : ExecutionMode.values())
2691 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2692 >        for (Integer v1 : new Integer[] { 1, null }) {
2693 >
2694 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2695 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2696 >        final Noop r = new Noop();
2697 >
2698 >        assertTrue(f.cancel(mayInterruptIfRunning));
2699 >        g.complete(v1);
2700 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2701 >
2702 >        // unspecified behavior
2703 >        Integer v;
2704 >        try {
2705 >            assertEquals(h.join(), null);
2706 >            assertEquals(1, r.invocationCount);
2707 >        } catch (CompletionException ok) {
2708 >            checkCompletedWithWrappedCancellationException(h);
2709 >            assertEquals(0, r.invocationCount);
2710 >        }
2711 >
2712 >        checkCancelled(f);
2713 >        checkCompletedNormally(g, v1);
2714 >        }
2715      }
2716  
2717      /**
2718       * thenCompose result completes normally after normal completion of source
2719       */
2720 <    public void testThenCompose() {
2721 <        CompletableFuture<Integer> f, g;
2722 <        CompletableFutureInc r;
2723 <
2724 <        f = new CompletableFuture<>();
2725 <        g = f.thenCompose(r = new CompletableFutureInc());
2726 <        f.complete(one);
2727 <        checkCompletedNormally(g, two);
2728 <        assertTrue(r.ran);
2720 >    public void testThenCompose_normalCompletion1() {
2721 >        for (ExecutionMode m : ExecutionMode.values())
2722 >        for (Integer v1 : new Integer[] { 1, null }) {
2723 >
2724 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2725 >        final CompletableFutureInc r = new CompletableFutureInc();
2726 >        final CompletableFuture<Integer> g = f.thenCompose(r);
2727 >        f.complete(v1);
2728 >        checkCompletedNormally(g, inc(v1));
2729 >        checkCompletedNormally(f, v1);
2730 >        assertEquals(1, r.invocationCount);
2731 >        }
2732 >    }
2733  
2734 <        f = new CompletableFuture<>();
2735 <        f.complete(one);
2736 <        g = f.thenCompose(r = new CompletableFutureInc());
2737 <        checkCompletedNormally(g, two);
2738 <        assertTrue(r.ran);
2734 >    public void testThenCompose_normalCompletion2() {
2735 >        for (ExecutionMode m : ExecutionMode.values())
2736 >        for (Integer v1 : new Integer[] { 1, null }) {
2737 >
2738 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2739 >        final CompletableFutureInc r = new CompletableFutureInc();
2740 >        f.complete(v1);
2741 >        final CompletableFuture<Integer> g = f.thenCompose(r);
2742 >        checkCompletedNormally(g, inc(v1));
2743 >        checkCompletedNormally(f, v1);
2744 >        assertEquals(1, r.invocationCount);
2745 >        }
2746      }
2747  
2748      /**
2749       * thenCompose result completes exceptionally after exceptional
2750       * completion of source
2751       */
2752 <    public void testThenCompose2() {
2753 <        CompletableFuture<Integer> f, g;
1270 <        CompletableFutureInc r;
2752 >    public void testThenCompose_exceptionalCompletion1() {
2753 >        for (ExecutionMode m : ExecutionMode.values()) {
2754  
2755 <        f = new CompletableFuture<>();
2756 <        g = f.thenCompose(r = new CompletableFutureInc());
2757 <        f.completeExceptionally(new CFException());
2758 <        checkCompletedWithWrappedCFException(g);
2755 >        final CFException ex = new CFException();
2756 >        final CompletableFutureInc r = new CompletableFutureInc();
2757 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2758 >        final CompletableFuture<Integer> g = f.thenCompose(r);
2759 >        f.completeExceptionally(ex);
2760 >        checkCompletedWithWrappedCFException(g, ex);
2761 >        checkCompletedWithWrappedCFException(f, ex);
2762 >        }
2763 >    }
2764  
2765 <        f = new CompletableFuture<>();
2766 <        f.completeExceptionally(new CFException());
2767 <        g = f.thenCompose(r = new CompletableFutureInc());
2768 <        checkCompletedWithWrappedCFException(g);
2765 >    public void testThenCompose_exceptionalCompletion2() {
2766 >        for (ExecutionMode m : ExecutionMode.values()) {
2767 >
2768 >        final CFException ex = new CFException();
2769 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2770 >        f.completeExceptionally(ex);
2771 >        final CompletableFutureInc r = new CompletableFutureInc();
2772 >        final CompletableFuture<Integer> g = f.thenCompose(r);
2773 >        checkCompletedWithWrappedCFException(g, ex);
2774 >        checkCompletedWithWrappedCFException(f, ex);
2775 >        }
2776      }
2777  
2778      /**
2779       * thenCompose result completes exceptionally if action does
2780       */
2781 <    public void testThenCompose3() {
2782 <        CompletableFuture<Integer> f, g;
2783 <        FailingCompletableFutureFunction r;
2784 <
2785 <        f = new CompletableFuture<>();
2786 <        g = f.thenCompose(r = new FailingCompletableFutureFunction());
2787 <        f.complete(one);
2781 >    public void testThenCompose_actionFailed1() {
2782 >        for (ExecutionMode m : ExecutionMode.values())
2783 >        for (Integer v1 : new Integer[] { 1, null }) {
2784 >
2785 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2786 >        final FailingCompletableFutureFunction r
2787 >            = new FailingCompletableFutureFunction();
2788 >        final CompletableFuture<Integer> g = f.thenCompose(r);
2789 >        f.complete(v1);
2790          checkCompletedWithWrappedCFException(g);
2791 +        checkCompletedNormally(f, v1);
2792 +        }
2793 +    }
2794  
2795 <        f = new CompletableFuture<>();
2796 <        f.complete(one);
2797 <        g = f.thenCompose(r = new FailingCompletableFutureFunction());
2795 >    public void testThenCompose_actionFailed2() {
2796 >        for (ExecutionMode m : ExecutionMode.values())
2797 >        for (Integer v1 : new Integer[] { 1, null }) {
2798 >
2799 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2800 >        f.complete(v1);
2801 >        final FailingCompletableFutureFunction r
2802 >            = new FailingCompletableFutureFunction();
2803 >        final CompletableFuture<Integer> g = f.thenCompose(r);
2804          checkCompletedWithWrappedCFException(g);
2805 +        checkCompletedNormally(f, v1);
2806 +        }
2807      }
2808  
2809      /**
2810       * thenCompose result completes exceptionally if source cancelled
2811       */
2812 <    public void testThenCompose4() {
2813 <        CompletableFuture<Integer> f, g;
2814 <        CompletableFutureInc r;
2815 <
2816 <        f = new CompletableFuture<>();
2817 <        g = f.thenCompose(r = new CompletableFutureInc());
2818 <        assertTrue(f.cancel(true));
2812 >    public void testThenCompose_sourceCancelled1() {
2813 >        for (ExecutionMode m : ExecutionMode.values())
2814 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false }) {
2815 >
2816 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2817 >        final CompletableFutureInc r = new CompletableFutureInc();
2818 >        final CompletableFuture<Integer> g = f.thenCompose(r);
2819 >        assertTrue(f.cancel(mayInterruptIfRunning));
2820          checkCompletedWithWrappedCancellationException(g);
2821 +        checkCancelled(f);
2822 +        }
2823 +    }
2824  
2825 <        f = new CompletableFuture<>();
2826 <        assertTrue(f.cancel(true));
2827 <        g = f.thenCompose(r = new CompletableFutureInc());
2825 >    public void testThenCompose_sourceCancelled2() {
2826 >        for (ExecutionMode m : ExecutionMode.values())
2827 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false }) {
2828 >
2829 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2830 >        assertTrue(f.cancel(mayInterruptIfRunning));
2831 >        final CompletableFutureInc r = new CompletableFutureInc();
2832 >        final CompletableFuture<Integer> g = f.thenCompose(r);
2833          checkCompletedWithWrappedCancellationException(g);
2834 +        checkCancelled(f);
2835 +        }
2836      }
2837  
2838      // asyncs
# Line 1426 | Line 2945 | public class CompletableFutureTest exten
2945          CompletableFuture<Void> g = f.thenAcceptAsync(r);
2946          f.complete(one);
2947          checkCompletedNormally(g, null);
2948 <        assertEquals(r.value, 2);
2948 >        assertEquals(r.value, (Integer) 2);
2949      }
2950  
2951      /**
# Line 1463 | Line 2982 | public class CompletableFutureTest exten
2982          checkCompletedWithWrappedCancellationException(g);
2983      }
2984  
1466    /**
1467     * thenCombineAsync result completes normally after normal
1468     * completion of sources
1469     */
1470    public void testThenCombineAsync() {
1471        CompletableFuture<Integer> f, g, h;
1472
1473        f = new CompletableFuture<>();
1474        g = new CompletableFuture<>();
1475        h = f.thenCombineAsync(g, subtract);
1476        f.complete(3);
1477        checkIncomplete(h);
1478        g.complete(1);
1479        checkCompletedNormally(h, 2);
1480
1481        f = new CompletableFuture<>();
1482        g = new CompletableFuture<>();
1483        h = f.thenCombineAsync(g, subtract);
1484        g.complete(1);
1485        checkIncomplete(h);
1486        f.complete(3);
1487        checkCompletedNormally(h, 2);
1488
1489        f = new CompletableFuture<>();
1490        g = new CompletableFuture<>();
1491        g.complete(1);
1492        f.complete(3);
1493        h = f.thenCombineAsync(g, subtract);
1494        checkCompletedNormally(h, 2);
1495    }
1496
1497    /**
1498     * thenCombineAsync result completes exceptionally after exceptional
1499     * completion of either source
1500     */
1501    public void testThenCombineAsync2() {
1502        CompletableFuture<Integer> f, g, h;
1503
1504        f = new CompletableFuture<>();
1505        g = new CompletableFuture<>();
1506        h = f.thenCombineAsync(g, subtract);
1507        f.completeExceptionally(new CFException());
1508        checkIncomplete(h);
1509        g.complete(1);
1510        checkCompletedWithWrappedCFException(h);
1511
1512        f = new CompletableFuture<>();
1513        g = new CompletableFuture<>();
1514        h = f.thenCombineAsync(g, subtract);
1515        g.completeExceptionally(new CFException());
1516        checkIncomplete(h);
1517        f.complete(3);
1518        checkCompletedWithWrappedCFException(h);
1519
1520        f = new CompletableFuture<>();
1521        g = new CompletableFuture<>();
1522        g.completeExceptionally(new CFException());
1523        f.complete(3);
1524        h = f.thenCombineAsync(g, subtract);
1525        checkCompletedWithWrappedCFException(h);
1526    }
1527
1528    /**
1529     * thenCombineAsync result completes exceptionally if action does
1530     */
1531    public void testThenCombineAsync3() {
1532        CompletableFuture<Integer> f = new CompletableFuture<>();
1533        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1534        FailingBiFunction r = new FailingBiFunction();
1535        CompletableFuture<Integer> g = f.thenCombineAsync(f2, r);
1536        f.complete(one);
1537        checkIncomplete(g);
1538        assertFalse(r.ran);
1539        f2.complete(two);
1540        checkCompletedWithWrappedCFException(g);
1541        assertTrue(r.ran);
1542    }
1543
1544    /**
1545     * thenCombineAsync result completes exceptionally if either source cancelled
1546     */
1547    public void testThenCombineAsync4() {
1548        CompletableFuture<Integer> f, g, h;
1549
1550        f = new CompletableFuture<>();
1551        g = new CompletableFuture<>();
1552        h = f.thenCombineAsync(g, subtract);
1553        assertTrue(f.cancel(true));
1554        checkIncomplete(h);
1555        g.complete(1);
1556        checkCompletedWithWrappedCancellationException(h);
1557
1558        f = new CompletableFuture<>();
1559        g = new CompletableFuture<>();
1560        h = f.thenCombineAsync(g, subtract);
1561        assertTrue(g.cancel(true));
1562        checkIncomplete(h);
1563        f.complete(3);
1564        checkCompletedWithWrappedCancellationException(h);
1565
1566        f = new CompletableFuture<>();
1567        g = new CompletableFuture<>();
1568        g.complete(3);
1569        assertTrue(f.cancel(true));
1570        h = f.thenCombineAsync(g, subtract);
1571        checkCompletedWithWrappedCancellationException(h);
1572
1573        f = new CompletableFuture<>();
1574        g = new CompletableFuture<>();
1575        f.complete(3);
1576        assertTrue(g.cancel(true));
1577        h = f.thenCombineAsync(g, subtract);
1578        checkCompletedWithWrappedCancellationException(h);
1579    }
1580
1581    /**
1582     * thenAcceptBothAsync result completes normally after normal
1583     * completion of sources
1584     */
1585    public void testThenAcceptBothAsync() {
1586        CompletableFuture<Integer> f, g;
1587        CompletableFuture<Void> h;
1588        SubtractAction r;
1589
1590        f = new CompletableFuture<>();
1591        g = new CompletableFuture<>();
1592        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1593        f.complete(3);
1594        checkIncomplete(h);
1595        g.complete(1);
1596        checkCompletedNormally(h, null);
1597        assertEquals(r.value, 2);
1598
1599        f = new CompletableFuture<>();
1600        g = new CompletableFuture<>();
1601        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1602        g.complete(1);
1603        checkIncomplete(h);
1604        f.complete(3);
1605        checkCompletedNormally(h, null);
1606        assertEquals(r.value, 2);
1607
1608        f = new CompletableFuture<>();
1609        g = new CompletableFuture<>();
1610        g.complete(1);
1611        f.complete(3);
1612        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1613        checkCompletedNormally(h, null);
1614        assertEquals(r.value, 2);
1615    }
1616
1617    /**
1618     * thenAcceptBothAsync result completes exceptionally after exceptional
1619     * completion of source
1620     */
1621    public void testThenAcceptBothAsync2() {
1622        CompletableFuture<Integer> f, g;
1623        CompletableFuture<Void> h;
1624        SubtractAction r;
1625
1626        f = new CompletableFuture<>();
1627        g = new CompletableFuture<>();
1628        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1629        f.completeExceptionally(new CFException());
1630        checkIncomplete(h);
1631        g.complete(1);
1632        checkCompletedWithWrappedCFException(h);
1633
1634        f = new CompletableFuture<>();
1635        g = new CompletableFuture<>();
1636        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1637        g.completeExceptionally(new CFException());
1638        checkIncomplete(h);
1639        f.complete(3);
1640        checkCompletedWithWrappedCFException(h);
1641
1642        f = new CompletableFuture<>();
1643        g = new CompletableFuture<>();
1644        f.complete(3);
1645        g.completeExceptionally(new CFException());
1646        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1647        checkCompletedWithWrappedCFException(h);
1648
1649        f = new CompletableFuture<>();
1650        g = new CompletableFuture<>();
1651        f.completeExceptionally(new CFException());
1652        g.complete(3);
1653        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1654        checkCompletedWithWrappedCFException(h);
1655    }
1656
1657    /**
1658     * thenAcceptBothAsync result completes exceptionally if action does
1659     */
1660    public void testThenAcceptBothAsync3() {
1661        CompletableFuture<Integer> f, g;
1662        CompletableFuture<Void> h;
1663        FailingBiConsumer r;
1664
1665        f = new CompletableFuture<>();
1666        g = new CompletableFuture<>();
1667        h = f.thenAcceptBothAsync(g, r = new FailingBiConsumer());
1668        f.complete(3);
1669        checkIncomplete(h);
1670        g.complete(1);
1671        checkCompletedWithWrappedCFException(h);
1672
1673        f = new CompletableFuture<>();
1674        g = new CompletableFuture<>();
1675        f.complete(3);
1676        g.complete(1);
1677        h = f.thenAcceptBothAsync(g, r = new FailingBiConsumer());
1678        checkCompletedWithWrappedCFException(h);
1679    }
1680
1681    /**
1682     * thenAcceptBothAsync result completes exceptionally if either source cancelled
1683     */
1684    public void testThenAcceptBothAsync4() {
1685        CompletableFuture<Integer> f, g;
1686        CompletableFuture<Void> h;
1687        SubtractAction r;
1688
1689        f = new CompletableFuture<>();
1690        g = new CompletableFuture<>();
1691        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1692        assertTrue(f.cancel(true));
1693        checkIncomplete(h);
1694        g.complete(1);
1695        checkCompletedWithWrappedCancellationException(h);
1696
1697        f = new CompletableFuture<>();
1698        g = new CompletableFuture<>();
1699        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1700        assertTrue(g.cancel(true));
1701        checkIncomplete(h);
1702        f.complete(3);
1703        checkCompletedWithWrappedCancellationException(h);
1704
1705        f = new CompletableFuture<>();
1706        g = new CompletableFuture<>();
1707        f.complete(3);
1708        assertTrue(g.cancel(true));
1709        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1710        checkCompletedWithWrappedCancellationException(h);
1711
1712        f = new CompletableFuture<>();
1713        g = new CompletableFuture<>();
1714        assertTrue(f.cancel(true));
1715        g.complete(3);
1716        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1717        checkCompletedWithWrappedCancellationException(h);
1718    }
1719
1720    /**
1721     * runAfterBothAsync result completes normally after normal
1722     * completion of sources
1723     */
1724    public void testRunAfterBothAsync() {
1725        CompletableFuture<Integer> f = new CompletableFuture<>();
1726        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1727        Noop r = new Noop();
1728        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r);
1729        f.complete(one);
1730        checkIncomplete(g);
1731        f2.complete(two);
1732        checkCompletedNormally(g, null);
1733        assertTrue(r.ran);
1734    }
1735
1736    /**
1737     * runAfterBothAsync result completes exceptionally after exceptional
1738     * completion of source
1739     */
1740    public void testRunAfterBothAsync2() {
1741        CompletableFuture<Integer> f = new CompletableFuture<>();
1742        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1743        Noop r = new Noop();
1744        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r);
1745        f.completeExceptionally(new CFException());
1746        f2.complete(two);
1747        checkCompletedWithWrappedCFException(g);
1748
1749        r = new Noop();
1750        f = new CompletableFuture<>();
1751        f2 = new CompletableFuture<>();
1752        g = f.runAfterBothAsync(f2, r);
1753        f.complete(one);
1754        f2.completeExceptionally(new CFException());
1755        checkCompletedWithWrappedCFException(g);
1756    }
1757
1758    /**
1759     * runAfterBothAsync result completes exceptionally if action does
1760     */
1761    public void testRunAfterBothAsync3() {
1762        CompletableFuture<Integer> f = new CompletableFuture<>();
1763        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1764        FailingNoop r = new FailingNoop();
1765        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r);
1766        f.complete(one);
1767        checkIncomplete(g);
1768        f2.complete(two);
1769        checkCompletedWithWrappedCFException(g);
1770    }
1771
1772    /**
1773     * runAfterBothAsync result completes exceptionally if either source cancelled
1774     */
1775    public void testRunAfterBothAsync4() {
1776        CompletableFuture<Integer> f = new CompletableFuture<>();
1777        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1778        Noop r = new Noop();
1779        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r);
1780        assertTrue(f.cancel(true));
1781        f2.complete(two);
1782        checkCompletedWithWrappedCancellationException(g);
1783
1784        r = new Noop();
1785        f = new CompletableFuture<>();
1786        f2 = new CompletableFuture<>();
1787        g = f.runAfterBothAsync(f2, r);
1788        f.complete(one);
1789        assertTrue(f2.cancel(true));
1790        checkCompletedWithWrappedCancellationException(g);
1791    }
1792
1793    /**
1794     * applyToEitherAsync result completes normally after normal
1795     * completion of sources
1796     */
1797    public void testApplyToEitherAsync() {
1798        CompletableFuture<Integer> f = new CompletableFuture<>();
1799        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1800        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
1801        f.complete(one);
1802        checkCompletedNormally(g, two);
1803
1804        f = new CompletableFuture<>();
1805        f.complete(one);
1806        f2 = new CompletableFuture<>();
1807        g = f.applyToEitherAsync(f2, inc);
1808        checkCompletedNormally(g, two);
1809    }
1810
1811    /**
1812     * applyToEitherAsync result completes exceptionally after exceptional
1813     * completion of source
1814     */
1815    public void testApplyToEitherAsync2() {
1816        CompletableFuture<Integer> f = new CompletableFuture<>();
1817        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1818        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
1819        f.completeExceptionally(new CFException());
1820        checkCompletedWithWrappedCFException(g);
1821
1822        f = new CompletableFuture<>();
1823        f2 = new CompletableFuture<>();
1824        f2.completeExceptionally(new CFException());
1825        g = f.applyToEitherAsync(f2, inc);
1826        f.complete(one);
1827        checkCompletedWithWrappedCFException(g);
1828    }
1829
1830    /**
1831     * applyToEitherAsync result completes exceptionally if action does
1832     */
1833    public void testApplyToEitherAsync3() {
1834        CompletableFuture<Integer> f = new CompletableFuture<>();
1835        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1836        FailingFunction r = new FailingFunction();
1837        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, r);
1838        f.complete(one);
1839        checkCompletedWithWrappedCFException(g);
1840    }
1841
1842    /**
1843     * applyToEitherAsync result completes exceptionally if either source cancelled
1844     */
1845    public void testApplyToEitherAsync4() {
1846        CompletableFuture<Integer> f = new CompletableFuture<>();
1847        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1848        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
1849        assertTrue(f.cancel(true));
1850        checkCompletedWithWrappedCancellationException(g);
1851
1852        f = new CompletableFuture<>();
1853        f2 = new CompletableFuture<>();
1854        assertTrue(f2.cancel(true));
1855        g = f.applyToEitherAsync(f2, inc);
1856        checkCompletedWithWrappedCancellationException(g);
1857    }
1858
1859    /**
1860     * acceptEitherAsync result completes normally after normal
1861     * completion of sources
1862     */
1863    public void testAcceptEitherAsync() {
1864        CompletableFuture<Integer> f = new CompletableFuture<>();
1865        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1866        IncAction r = new IncAction();
1867        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
1868        f.complete(one);
1869        checkCompletedNormally(g, null);
1870        assertEquals(r.value, 2);
1871
1872        r = new IncAction();
1873        f = new CompletableFuture<>();
1874        f.complete(one);
1875        f2 = new CompletableFuture<>();
1876        g = f.acceptEitherAsync(f2, r);
1877        checkCompletedNormally(g, null);
1878        assertEquals(r.value, 2);
1879    }
1880
1881    /**
1882     * acceptEitherAsync result completes exceptionally after exceptional
1883     * completion of source
1884     */
1885    public void testAcceptEitherAsync2() {
1886        CompletableFuture<Integer> f = new CompletableFuture<>();
1887        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1888        IncAction r = new IncAction();
1889        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
1890        f.completeExceptionally(new CFException());
1891        checkCompletedWithWrappedCFException(g);
1892
1893        r = new IncAction();
1894        f = new CompletableFuture<>();
1895        f2 = new CompletableFuture<>();
1896        f2.completeExceptionally(new CFException());
1897        g = f.acceptEitherAsync(f2, r);
1898        f.complete(one);
1899        checkCompletedWithWrappedCFException(g);
1900    }
1901
1902    /**
1903     * acceptEitherAsync result completes exceptionally if action does
1904     */
1905    public void testAcceptEitherAsync3() {
1906        CompletableFuture<Integer> f = new CompletableFuture<>();
1907        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1908        FailingConsumer r = new FailingConsumer();
1909        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
1910        f.complete(one);
1911        checkCompletedWithWrappedCFException(g);
1912    }
1913
1914    /**
1915     * acceptEitherAsync result completes exceptionally if either
1916     * source cancelled
1917     */
1918    public void testAcceptEitherAsync4() {
1919        CompletableFuture<Integer> f = new CompletableFuture<>();
1920        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1921        IncAction r = new IncAction();
1922        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
1923        assertTrue(f.cancel(true));
1924        checkCompletedWithWrappedCancellationException(g);
1925
1926        r = new IncAction();
1927        f = new CompletableFuture<>();
1928        f2 = new CompletableFuture<>();
1929        assertTrue(f2.cancel(true));
1930        g = f.acceptEitherAsync(f2, r);
1931        checkCompletedWithWrappedCancellationException(g);
1932    }
1933
1934    /**
1935     * runAfterEitherAsync result completes normally after normal
1936     * completion of sources
1937     */
1938    public void testRunAfterEitherAsync() {
1939        CompletableFuture<Integer> f = new CompletableFuture<>();
1940        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1941        Noop r = new Noop();
1942        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
1943        f.complete(one);
1944        checkCompletedNormally(g, null);
1945        assertTrue(r.ran);
1946
1947        r = new Noop();
1948        f = new CompletableFuture<>();
1949        f.complete(one);
1950        f2 = new CompletableFuture<>();
1951        g = f.runAfterEitherAsync(f2, r);
1952        checkCompletedNormally(g, null);
1953        assertTrue(r.ran);
1954    }
1955
1956    /**
1957     * runAfterEitherAsync result completes exceptionally after exceptional
1958     * completion of source
1959     */
1960    public void testRunAfterEitherAsync2() {
1961        CompletableFuture<Integer> f = new CompletableFuture<>();
1962        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1963        Noop r = new Noop();
1964        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
1965        f.completeExceptionally(new CFException());
1966        checkCompletedWithWrappedCFException(g);
1967
1968        r = new Noop();
1969        f = new CompletableFuture<>();
1970        f2 = new CompletableFuture<>();
1971        f2.completeExceptionally(new CFException());
1972        g = f.runAfterEitherAsync(f2, r);
1973        f.complete(one);
1974        checkCompletedWithWrappedCFException(g);
1975    }
1976
1977    /**
1978     * runAfterEitherAsync result completes exceptionally if action does
1979     */
1980    public void testRunAfterEitherAsync3() {
1981        CompletableFuture<Integer> f = new CompletableFuture<>();
1982        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1983        FailingNoop r = new FailingNoop();
1984        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
1985        f.complete(one);
1986        checkCompletedWithWrappedCFException(g);
1987    }
1988
1989    /**
1990     * runAfterEitherAsync result completes exceptionally if either
1991     * source cancelled
1992     */
1993    public void testRunAfterEitherAsync4() {
1994        CompletableFuture<Integer> f = new CompletableFuture<>();
1995        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1996        Noop r = new Noop();
1997        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
1998        assertTrue(f.cancel(true));
1999        checkCompletedWithWrappedCancellationException(g);
2000
2001        r = new Noop();
2002        f = new CompletableFuture<>();
2003        f2 = new CompletableFuture<>();
2004        assertTrue(f2.cancel(true));
2005        g = f.runAfterEitherAsync(f2, r);
2006        checkCompletedWithWrappedCancellationException(g);
2007    }
2008
2009    /**
2010     * thenComposeAsync result completes normally after normal
2011     * completion of source
2012     */
2013    public void testThenComposeAsync() {
2014        CompletableFuture<Integer> f, g;
2015        CompletableFutureInc r;
2016
2017        f = new CompletableFuture<>();
2018        g = f.thenComposeAsync(r = new CompletableFutureInc());
2019        f.complete(one);
2020        checkCompletedNormally(g, two);
2021
2022        f = new CompletableFuture<>();
2023        f.complete(one);
2024        g = f.thenComposeAsync(r = new CompletableFutureInc());
2025        checkCompletedNormally(g, two);
2026    }
2027
2028    /**
2029     * thenComposeAsync result completes exceptionally after
2030     * exceptional completion of source
2031     */
2032    public void testThenComposeAsync2() {
2033        CompletableFuture<Integer> f, g;
2034        CompletableFutureInc r;
2035
2036        f = new CompletableFuture<>();
2037        g = f.thenComposeAsync(r = new CompletableFutureInc());
2038        f.completeExceptionally(new CFException());
2039        checkCompletedWithWrappedCFException(g);
2040        assertFalse(r.ran);
2041
2042        f = new CompletableFuture<>();
2043        f.completeExceptionally(new CFException());
2044        g = f.thenComposeAsync(r = new CompletableFutureInc());
2045        checkCompletedWithWrappedCFException(g);
2046        assertFalse(r.ran);
2047    }
2048
2049    /**
2050     * thenComposeAsync result completes exceptionally if action does
2051     */
2052    public void testThenComposeAsync3() {
2053        CompletableFuture<Integer> f, g;
2054        FailingCompletableFutureFunction r;
2055
2056        f = new CompletableFuture<>();
2057        g = f.thenComposeAsync(r = new FailingCompletableFutureFunction());
2058        f.complete(one);
2059        checkCompletedWithWrappedCFException(g);
2060
2061        f = new CompletableFuture<>();
2062        f.complete(one);
2063        g = f.thenComposeAsync(r = new FailingCompletableFutureFunction());
2064        checkCompletedWithWrappedCFException(g);
2065    }
2066
2067    /**
2068     * thenComposeAsync result completes exceptionally if source cancelled
2069     */
2070    public void testThenComposeAsync4() {
2071        CompletableFuture<Integer> f, g;
2072        CompletableFutureInc r;
2073
2074        f = new CompletableFuture<>();
2075        g = f.thenComposeAsync(r = new CompletableFutureInc());
2076        assertTrue(f.cancel(true));
2077        checkCompletedWithWrappedCancellationException(g);
2078
2079        f = new CompletableFuture<>();
2080        assertTrue(f.cancel(true));
2081        g = f.thenComposeAsync(r = new CompletableFutureInc());
2082        checkCompletedWithWrappedCancellationException(g);
2083    }
2084
2985      // async with explicit executors
2986  
2987      /**
# Line 2192 | Line 3092 | public class CompletableFutureTest exten
3092          CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3093          f.complete(one);
3094          checkCompletedNormally(g, null);
3095 <        assertEquals(r.value, 2);
3095 >        assertEquals(r.value, (Integer) 2);
3096      }
3097  
3098      /**
# Line 2229 | Line 3129 | public class CompletableFutureTest exten
3129          checkCompletedWithWrappedCancellationException(g);
3130      }
3131  
2232    /**
2233     * thenCombineAsync result completes normally after normal
2234     * completion of sources
2235     */
2236    public void testThenCombineAsyncE() {
2237        CompletableFuture<Integer> f, g, h;
2238        ThreadExecutor e = new ThreadExecutor();
2239        int count = 0;
2240
2241        f = new CompletableFuture<>();
2242        g = new CompletableFuture<>();
2243        h = f.thenCombineAsync(g, subtract, e);
2244        f.complete(3);
2245        checkIncomplete(h);
2246        g.complete(1);
2247        checkCompletedNormally(h, 2);
2248        assertEquals(++count, e.count.get());
2249
2250        f = new CompletableFuture<>();
2251        g = new CompletableFuture<>();
2252        h = f.thenCombineAsync(g, subtract, e);
2253        g.complete(1);
2254        checkIncomplete(h);
2255        f.complete(3);
2256        checkCompletedNormally(h, 2);
2257        assertEquals(++count, e.count.get());
2258
2259        f = new CompletableFuture<>();
2260        g = new CompletableFuture<>();
2261        g.complete(1);
2262        f.complete(3);
2263        h = f.thenCombineAsync(g, subtract, e);
2264        checkCompletedNormally(h, 2);
2265        assertEquals(++count, e.count.get());
2266    }
2267
2268    /**
2269     * thenCombineAsync result completes exceptionally after exceptional
2270     * completion of either source
2271     */
2272    public void testThenCombineAsync2E() {
2273        CompletableFuture<Integer> f, g, h;
2274        ThreadExecutor e = new ThreadExecutor();
2275        int count = 0;
2276
2277        f = new CompletableFuture<>();
2278        g = new CompletableFuture<>();
2279        h = f.thenCombineAsync(g, subtract, e);
2280        f.completeExceptionally(new CFException());
2281        checkIncomplete(h);
2282        g.complete(1);
2283        checkCompletedWithWrappedCFException(h);
2284
2285        f = new CompletableFuture<>();
2286        g = new CompletableFuture<>();
2287        h = f.thenCombineAsync(g, subtract, e);
2288        g.completeExceptionally(new CFException());
2289        checkIncomplete(h);
2290        f.complete(3);
2291        checkCompletedWithWrappedCFException(h);
2292
2293        f = new CompletableFuture<>();
2294        g = new CompletableFuture<>();
2295        g.completeExceptionally(new CFException());
2296        h = f.thenCombineAsync(g, subtract, e);
2297        checkIncomplete(h);
2298        f.complete(3);
2299        checkCompletedWithWrappedCFException(h);
2300
2301        assertEquals(0, e.count.get());
2302    }
2303
2304    /**
2305     * thenCombineAsync result completes exceptionally if action does
2306     */
2307    public void testThenCombineAsync3E() {
2308        CompletableFuture<Integer> f = new CompletableFuture<>();
2309        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2310        FailingBiFunction r = new FailingBiFunction();
2311        CompletableFuture<Integer> g = f.thenCombineAsync(f2, r, new ThreadExecutor());
2312        f.complete(one);
2313        checkIncomplete(g);
2314        assertFalse(r.ran);
2315        f2.complete(two);
2316        checkCompletedWithWrappedCFException(g);
2317        assertTrue(r.ran);
2318    }
2319
2320    /**
2321     * thenCombineAsync result completes exceptionally if either source cancelled
2322     */
2323    public void testThenCombineAsync4E() {
2324        CompletableFuture<Integer> f, g, h;
2325        ThreadExecutor e = new ThreadExecutor();
2326
2327        f = new CompletableFuture<>();
2328        g = new CompletableFuture<>();
2329        h = f.thenCombineAsync(g, subtract, e);
2330        assertTrue(f.cancel(true));
2331        checkIncomplete(h);
2332        g.complete(1);
2333        checkCompletedWithWrappedCancellationException(h);
2334
2335        f = new CompletableFuture<>();
2336        g = new CompletableFuture<>();
2337        h = f.thenCombineAsync(g, subtract, e);
2338        assertTrue(g.cancel(true));
2339        checkIncomplete(h);
2340        f.complete(3);
2341        checkCompletedWithWrappedCancellationException(h);
2342
2343        f = new CompletableFuture<>();
2344        g = new CompletableFuture<>();
2345        assertTrue(g.cancel(true));
2346        h = f.thenCombineAsync(g, subtract, e);
2347        checkIncomplete(h);
2348        f.complete(3);
2349        checkCompletedWithWrappedCancellationException(h);
2350
2351        f = new CompletableFuture<>();
2352        g = new CompletableFuture<>();
2353        assertTrue(f.cancel(true));
2354        assertTrue(g.cancel(true));
2355        h = f.thenCombineAsync(g, subtract, e);
2356        checkCompletedWithWrappedCancellationException(h);
2357
2358        assertEquals(0, e.count.get());
2359    }
2360
2361    /**
2362     * thenAcceptBothAsync result completes normally after normal
2363     * completion of sources
2364     */
2365    public void testThenAcceptBothAsyncE() {
2366        CompletableFuture<Integer> f, g;
2367        CompletableFuture<Void> h;
2368        SubtractAction r;
2369        ThreadExecutor e = new ThreadExecutor();
2370
2371        f = new CompletableFuture<>();
2372        g = new CompletableFuture<>();
2373        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2374        f.complete(3);
2375        checkIncomplete(h);
2376        g.complete(1);
2377        checkCompletedNormally(h, null);
2378        assertEquals(r.value, 2);
2379
2380        f = new CompletableFuture<>();
2381        g = new CompletableFuture<>();
2382        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2383        g.complete(1);
2384        checkIncomplete(h);
2385        f.complete(3);
2386        checkCompletedNormally(h, null);
2387        assertEquals(r.value, 2);
2388
2389        f = new CompletableFuture<>();
2390        g = new CompletableFuture<>();
2391        g.complete(1);
2392        f.complete(3);
2393        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2394        checkCompletedNormally(h, null);
2395        assertEquals(r.value, 2);
2396
2397        assertEquals(3, e.count.get());
2398    }
2399
2400    /**
2401     * thenAcceptBothAsync result completes exceptionally after exceptional
2402     * completion of source
2403     */
2404    public void testThenAcceptBothAsync2E() {
2405        CompletableFuture<Integer> f, g;
2406        CompletableFuture<Void> h;
2407        SubtractAction r;
2408        ThreadExecutor e = new ThreadExecutor();
2409
2410        f = new CompletableFuture<>();
2411        g = new CompletableFuture<>();
2412        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2413        f.completeExceptionally(new CFException());
2414        checkIncomplete(h);
2415        g.complete(1);
2416        checkCompletedWithWrappedCFException(h);
2417
2418        f = new CompletableFuture<>();
2419        g = new CompletableFuture<>();
2420        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2421        g.completeExceptionally(new CFException());
2422        checkIncomplete(h);
2423        f.complete(3);
2424        checkCompletedWithWrappedCFException(h);
2425
2426        f = new CompletableFuture<>();
2427        g = new CompletableFuture<>();
2428        f.complete(3);
2429        g.completeExceptionally(new CFException());
2430        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2431        checkCompletedWithWrappedCFException(h);
2432
2433        f = new CompletableFuture<>();
2434        g = new CompletableFuture<>();
2435        f.completeExceptionally(new CFException());
2436        g.complete(3);
2437        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2438        checkCompletedWithWrappedCFException(h);
2439
2440        assertEquals(0, e.count.get());
2441    }
2442
2443    /**
2444     * thenAcceptBothAsync result completes exceptionally if action does
2445     */
2446    public void testThenAcceptBothAsync3E() {
2447        CompletableFuture<Integer> f, g;
2448        CompletableFuture<Void> h;
2449        FailingBiConsumer r;
2450        ThreadExecutor e = new ThreadExecutor();
2451
2452        f = new CompletableFuture<>();
2453        g = new CompletableFuture<>();
2454        h = f.thenAcceptBothAsync(g, r = new FailingBiConsumer(), e);
2455        f.complete(3);
2456        checkIncomplete(h);
2457        g.complete(1);
2458        checkCompletedWithWrappedCFException(h);
2459
2460        f = new CompletableFuture<>();
2461        g = new CompletableFuture<>();
2462        f.complete(3);
2463        g.complete(1);
2464        h = f.thenAcceptBothAsync(g, r = new FailingBiConsumer(), e);
2465        checkCompletedWithWrappedCFException(h);
2466
2467        assertEquals(2, e.count.get());
2468    }
2469
2470    /**
2471     * thenAcceptBothAsync result completes exceptionally if either source cancelled
2472     */
2473    public void testThenAcceptBothAsync4E() {
2474        CompletableFuture<Integer> f, g;
2475        CompletableFuture<Void> h;
2476        SubtractAction r;
2477        ThreadExecutor e = new ThreadExecutor();
2478
2479        f = new CompletableFuture<>();
2480        g = new CompletableFuture<>();
2481        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2482        assertTrue(f.cancel(true));
2483        checkIncomplete(h);
2484        g.complete(1);
2485        checkCompletedWithWrappedCancellationException(h);
2486
2487        f = new CompletableFuture<>();
2488        g = new CompletableFuture<>();
2489        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2490        assertTrue(g.cancel(true));
2491        checkIncomplete(h);
2492        f.complete(3);
2493        checkCompletedWithWrappedCancellationException(h);
2494
2495        f = new CompletableFuture<>();
2496        g = new CompletableFuture<>();
2497        f.complete(3);
2498        assertTrue(g.cancel(true));
2499        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2500        checkCompletedWithWrappedCancellationException(h);
2501
2502        f = new CompletableFuture<>();
2503        g = new CompletableFuture<>();
2504        assertTrue(f.cancel(true));
2505        g.complete(3);
2506        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2507        checkCompletedWithWrappedCancellationException(h);
2508
2509        assertEquals(0, e.count.get());
2510    }
2511
2512    /**
2513     * runAfterBothAsync result completes normally after normal
2514     * completion of sources
2515     */
2516    public void testRunAfterBothAsyncE() {
2517        CompletableFuture<Integer> f = new CompletableFuture<>();
2518        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2519        Noop r = new Noop();
2520        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2521        f.complete(one);
2522        checkIncomplete(g);
2523        f2.complete(two);
2524        checkCompletedNormally(g, null);
2525        assertTrue(r.ran);
2526    }
2527
2528    /**
2529     * runAfterBothAsync result completes exceptionally after exceptional
2530     * completion of source
2531     */
2532    public void testRunAfterBothAsync2E() {
2533        CompletableFuture<Integer> f = new CompletableFuture<>();
2534        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2535        Noop r = new Noop();
2536        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2537        f.completeExceptionally(new CFException());
2538        f2.complete(two);
2539        checkCompletedWithWrappedCFException(g);
2540
2541        r = new Noop();
2542        f = new CompletableFuture<>();
2543        f2 = new CompletableFuture<>();
2544        g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2545        f.complete(one);
2546        f2.completeExceptionally(new CFException());
2547        checkCompletedWithWrappedCFException(g);
2548    }
2549
2550    /**
2551     * runAfterBothAsync result completes exceptionally if action does
2552     */
2553    public void testRunAfterBothAsync3E() {
2554        CompletableFuture<Integer> f = new CompletableFuture<>();
2555        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2556        FailingNoop r = new FailingNoop();
2557        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2558        f.complete(one);
2559        checkIncomplete(g);
2560        f2.complete(two);
2561        checkCompletedWithWrappedCFException(g);
2562    }
2563
2564    /**
2565     * runAfterBothAsync result completes exceptionally if either source cancelled
2566     */
2567    public void testRunAfterBothAsync4E() {
2568        CompletableFuture<Integer> f = new CompletableFuture<>();
2569        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2570        Noop r = new Noop();
2571        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2572        assertTrue(f.cancel(true));
2573        f2.complete(two);
2574        checkCompletedWithWrappedCancellationException(g);
2575
2576        r = new Noop();
2577        f = new CompletableFuture<>();
2578        f2 = new CompletableFuture<>();
2579        g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2580        f.complete(one);
2581        assertTrue(f2.cancel(true));
2582        checkCompletedWithWrappedCancellationException(g);
2583    }
2584
2585    /**
2586     * applyToEitherAsync result completes normally after normal
2587     * completion of sources
2588     */
2589    public void testApplyToEitherAsyncE() {
2590        CompletableFuture<Integer> f = new CompletableFuture<>();
2591        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2592        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2593        f.complete(one);
2594        checkCompletedNormally(g, two);
2595
2596        f = new CompletableFuture<>();
2597        f.complete(one);
2598        f2 = new CompletableFuture<>();
2599        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2600        checkCompletedNormally(g, two);
2601    }
2602
2603    /**
2604     * applyToEitherAsync result completes exceptionally after exceptional
2605     * completion of source
2606     */
2607    public void testApplyToEitherAsync2E() {
2608        CompletableFuture<Integer> f = new CompletableFuture<>();
2609        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2610        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2611        f.completeExceptionally(new CFException());
2612        checkCompletedWithWrappedCFException(g);
2613
2614        f = new CompletableFuture<>();
2615        f2 = new CompletableFuture<>();
2616        f2.completeExceptionally(new CFException());
2617        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2618        f.complete(one);
2619        checkCompletedWithWrappedCFException(g);
2620    }
2621
2622    /**
2623     * applyToEitherAsync result completes exceptionally if action does
2624     */
2625    public void testApplyToEitherAsync3E() {
2626        CompletableFuture<Integer> f = new CompletableFuture<>();
2627        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2628        FailingFunction r = new FailingFunction();
2629        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, r, new ThreadExecutor());
2630        f.complete(one);
2631        checkCompletedWithWrappedCFException(g);
2632    }
2633
2634    /**
2635     * applyToEitherAsync result completes exceptionally if either source cancelled
2636     */
2637    public void testApplyToEitherAsync4E() {
2638        CompletableFuture<Integer> f = new CompletableFuture<>();
2639        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2640        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2641        assertTrue(f.cancel(true));
2642        checkCompletedWithWrappedCancellationException(g);
2643
2644        f = new CompletableFuture<>();
2645        f2 = new CompletableFuture<>();
2646        assertTrue(f2.cancel(true));
2647        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2648        checkCompletedWithWrappedCancellationException(g);
2649    }
2650
2651    /**
2652     * acceptEitherAsync result completes normally after normal
2653     * completion of sources
2654     */
2655    public void testAcceptEitherAsyncE() {
2656        CompletableFuture<Integer> f = new CompletableFuture<>();
2657        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2658        IncAction r = new IncAction();
2659        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2660        f.complete(one);
2661        checkCompletedNormally(g, null);
2662        assertEquals(r.value, 2);
2663
2664        r = new IncAction();
2665        f = new CompletableFuture<>();
2666        f.complete(one);
2667        f2 = new CompletableFuture<>();
2668        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2669        checkCompletedNormally(g, null);
2670        assertEquals(r.value, 2);
2671    }
2672
2673    /**
2674     * acceptEitherAsync result completes exceptionally after exceptional
2675     * completion of source
2676     */
2677    public void testAcceptEitherAsync2E() {
2678        CompletableFuture<Integer> f = new CompletableFuture<>();
2679        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2680        IncAction r = new IncAction();
2681        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2682        f.completeExceptionally(new CFException());
2683        checkCompletedWithWrappedCFException(g);
2684
2685        r = new IncAction();
2686        f = new CompletableFuture<>();
2687        f2 = new CompletableFuture<>();
2688        f2.completeExceptionally(new CFException());
2689        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2690        f.complete(one);
2691        checkCompletedWithWrappedCFException(g);
2692    }
2693
2694    /**
2695     * acceptEitherAsync result completes exceptionally if action does
2696     */
2697    public void testAcceptEitherAsync3E() {
2698        CompletableFuture<Integer> f = new CompletableFuture<>();
2699        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2700        FailingConsumer r = new FailingConsumer();
2701        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2702        f.complete(one);
2703        checkCompletedWithWrappedCFException(g);
2704    }
2705
2706    /**
2707     * acceptEitherAsync result completes exceptionally if either
2708     * source cancelled
2709     */
2710    public void testAcceptEitherAsync4E() {
2711        CompletableFuture<Integer> f = new CompletableFuture<>();
2712        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2713        IncAction r = new IncAction();
2714        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2715        assertTrue(f.cancel(true));
2716        checkCompletedWithWrappedCancellationException(g);
2717
2718        r = new IncAction();
2719        f = new CompletableFuture<>();
2720        f2 = new CompletableFuture<>();
2721        assertTrue(f2.cancel(true));
2722        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2723        checkCompletedWithWrappedCancellationException(g);
2724    }
2725
2726    /**
2727     * runAfterEitherAsync result completes normally after normal
2728     * completion of sources
2729     */
2730    public void testRunAfterEitherAsyncE() {
2731        CompletableFuture<Integer> f = new CompletableFuture<>();
2732        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2733        Noop r = new Noop();
2734        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2735        f.complete(one);
2736        checkCompletedNormally(g, null);
2737        assertTrue(r.ran);
2738
2739        r = new Noop();
2740        f = new CompletableFuture<>();
2741        f.complete(one);
2742        f2 = new CompletableFuture<>();
2743        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2744        checkCompletedNormally(g, null);
2745        assertTrue(r.ran);
2746    }
2747
2748    /**
2749     * runAfterEitherAsync result completes exceptionally after exceptional
2750     * completion of source
2751     */
2752    public void testRunAfterEitherAsync2E() {
2753        CompletableFuture<Integer> f = new CompletableFuture<>();
2754        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2755        Noop r = new Noop();
2756        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2757        f.completeExceptionally(new CFException());
2758        checkCompletedWithWrappedCFException(g);
2759
2760        r = new Noop();
2761        f = new CompletableFuture<>();
2762        f2 = new CompletableFuture<>();
2763        f2.completeExceptionally(new CFException());
2764        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2765        f.complete(one);
2766        checkCompletedWithWrappedCFException(g);
2767    }
2768
2769    /**
2770     * runAfterEitherAsync result completes exceptionally if action does
2771     */
2772    public void testRunAfterEitherAsync3E() {
2773        CompletableFuture<Integer> f = new CompletableFuture<>();
2774        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2775        FailingNoop r = new FailingNoop();
2776        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2777        f.complete(one);
2778        checkCompletedWithWrappedCFException(g);
2779    }
2780
2781    /**
2782     * runAfterEitherAsync result completes exceptionally if either
2783     * source cancelled
2784     */
2785    public void testRunAfterEitherAsync4E() {
2786        CompletableFuture<Integer> f = new CompletableFuture<>();
2787        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2788        Noop r = new Noop();
2789        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2790        assertTrue(f.cancel(true));
2791        checkCompletedWithWrappedCancellationException(g);
2792
2793        r = new Noop();
2794        f = new CompletableFuture<>();
2795        f2 = new CompletableFuture<>();
2796        assertTrue(f2.cancel(true));
2797        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2798        checkCompletedWithWrappedCancellationException(g);
2799    }
2800
2801    /**
2802     * thenComposeAsync result completes normally after normal
2803     * completion of source
2804     */
2805    public void testThenComposeAsyncE() {
2806        CompletableFuture<Integer> f = new CompletableFuture<>();
2807        CompletableFutureInc r = new CompletableFutureInc();
2808        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2809        f.complete(one);
2810        checkCompletedNormally(g, two);
2811    }
2812
2813    /**
2814     * thenComposeAsync result completes exceptionally after
2815     * exceptional completion of source
2816     */
2817    public void testThenComposeAsync2E() {
2818        CompletableFuture<Integer> f = new CompletableFuture<>();
2819        CompletableFutureInc r = new CompletableFutureInc();
2820        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2821        f.completeExceptionally(new CFException());
2822        checkCompletedWithWrappedCFException(g);
2823    }
2824
2825    /**
2826     * thenComposeAsync result completes exceptionally if action does
2827     */
2828    public void testThenComposeAsync3E() {
2829        CompletableFuture<Integer> f = new CompletableFuture<>();
2830        FailingCompletableFutureFunction r = new FailingCompletableFutureFunction();
2831        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2832        f.complete(one);
2833        checkCompletedWithWrappedCFException(g);
2834    }
2835
2836    /**
2837     * thenComposeAsync result completes exceptionally if source cancelled
2838     */
2839    public void testThenComposeAsync4E() {
2840        CompletableFuture<Integer> f = new CompletableFuture<>();
2841        CompletableFutureInc r = new CompletableFutureInc();
2842        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2843        assertTrue(f.cancel(true));
2844        checkCompletedWithWrappedCancellationException(g);
2845    }
2846
3132      // other static methods
3133  
3134      /**
# Line 2931 | Line 3216 | public class CompletableFutureTest exten
3216          ThreadExecutor exec = new ThreadExecutor();
3217  
3218          Runnable[] throwingActions = {
3219 <            () -> { CompletableFuture.supplyAsync(null); },
3220 <            () -> { CompletableFuture.supplyAsync(null, exec); },
3221 <            () -> { CompletableFuture.supplyAsync(supplyOne, null); },
3222 <
3223 <            () -> { CompletableFuture.runAsync(null); },
3224 <            () -> { CompletableFuture.runAsync(null, exec); },
3225 <            () -> { CompletableFuture.runAsync(() -> {}, null); },
3226 <
3227 <            () -> { f.completeExceptionally(null); },
3228 <
3229 <            () -> { f.thenApply(null); },
3230 <            () -> { f.thenApplyAsync(null); },
3231 <            () -> { f.thenApplyAsync((x) -> x, null); },
3232 <            () -> { f.thenApplyAsync(null, exec); },
3233 <
3234 <            () -> { f.thenAccept(null); },
3235 <            () -> { f.thenAcceptAsync(null); },
3236 <            () -> { f.thenAcceptAsync((x) -> { ; }, null); },
3237 <            () -> { f.thenAcceptAsync(null, exec); },
3238 <
3239 <            () -> { f.thenRun(null); },
3240 <            () -> { f.thenRunAsync(null); },
3241 <            () -> { f.thenRunAsync(() -> { ; }, null); },
3242 <            () -> { f.thenRunAsync(null, exec); },
3243 <
3244 <            () -> { f.thenCombine(g, null); },
3245 <            () -> { f.thenCombineAsync(g, null); },
3246 <            () -> { f.thenCombineAsync(g, null, exec); },
3247 <            () -> { f.thenCombine(nullFuture, (x, y) -> x); },
3248 <            () -> { f.thenCombineAsync(nullFuture, (x, y) -> x); },
3249 <            () -> { f.thenCombineAsync(nullFuture, (x, y) -> x, exec); },
3250 <            () -> { f.thenCombineAsync(g, (x, y) -> x, null); },
3251 <
3252 <            () -> { f.thenAcceptBoth(g, null); },
3253 <            () -> { f.thenAcceptBothAsync(g, null); },
3254 <            () -> { f.thenAcceptBothAsync(g, null, exec); },
3255 <            () -> { f.thenAcceptBoth(nullFuture, (x, y) -> {}); },
3256 <            () -> { f.thenAcceptBothAsync(nullFuture, (x, y) -> {}); },
3257 <            () -> { f.thenAcceptBothAsync(nullFuture, (x, y) -> {}, exec); },
3258 <            () -> { f.thenAcceptBothAsync(g, (x, y) -> {}, null); },
3259 <
3260 <            () -> { f.runAfterBoth(g, null); },
3261 <            () -> { f.runAfterBothAsync(g, null); },
3262 <            () -> { f.runAfterBothAsync(g, null, exec); },
3263 <            () -> { f.runAfterBoth(nullFuture, () -> {}); },
3264 <            () -> { f.runAfterBothAsync(nullFuture, () -> {}); },
3265 <            () -> { f.runAfterBothAsync(nullFuture, () -> {}, exec); },
3266 <            () -> { f.runAfterBothAsync(g, () -> {}, null); },
3267 <
3268 <            () -> { f.applyToEither(g, null); },
3269 <            () -> { f.applyToEitherAsync(g, null); },
3270 <            () -> { f.applyToEitherAsync(g, null, exec); },
3271 <            () -> { f.applyToEither(nullFuture, (x) -> x); },
3272 <            () -> { f.applyToEitherAsync(nullFuture, (x) -> x); },
3273 <            () -> { f.applyToEitherAsync(nullFuture, (x) -> x, exec); },
3274 <            () -> { f.applyToEitherAsync(g, (x) -> x, null); },
3275 <
3276 <            () -> { f.acceptEither(g, null); },
3277 <            () -> { f.acceptEitherAsync(g, null); },
3278 <            () -> { f.acceptEitherAsync(g, null, exec); },
3279 <            () -> { f.acceptEither(nullFuture, (x) -> {}); },
3280 <            () -> { f.acceptEitherAsync(nullFuture, (x) -> {}); },
3281 <            () -> { f.acceptEitherAsync(nullFuture, (x) -> {}, exec); },
3282 <            () -> { f.acceptEitherAsync(g, (x) -> {}, null); },
3283 <
3284 <            () -> { f.runAfterEither(g, null); },
3285 <            () -> { f.runAfterEitherAsync(g, null); },
3286 <            () -> { f.runAfterEitherAsync(g, null, exec); },
3287 <            () -> { f.runAfterEither(nullFuture, () -> {}); },
3288 <            () -> { f.runAfterEitherAsync(nullFuture, () -> {}); },
3289 <            () -> { f.runAfterEitherAsync(nullFuture, () -> {}, exec); },
3290 <            () -> { f.runAfterEitherAsync(g, () -> {}, null); },
3291 <
3292 <            () -> { f.thenCompose(null); },
3293 <            () -> { f.thenComposeAsync(null); },
3294 <            () -> { f.thenComposeAsync(new CompletableFutureInc(), null); },
3295 <            () -> { f.thenComposeAsync(null, exec); },
3296 <
3297 <            () -> { f.exceptionally(null); },
3298 <
3299 <            () -> { f.handle(null); },
3300 <
3301 <            () -> { CompletableFuture.allOf((CompletableFuture<?>)null); },
3302 <            () -> { CompletableFuture.allOf((CompletableFuture<?>[])null); },
3303 <            () -> { CompletableFuture.allOf(f, null); },
3304 <            () -> { CompletableFuture.allOf(null, f); },
3305 <
3306 <            () -> { CompletableFuture.anyOf((CompletableFuture<?>)null); },
3307 <            () -> { CompletableFuture.anyOf((CompletableFuture<?>[])null); },
3308 <            () -> { CompletableFuture.anyOf(f, null); },
3309 <            () -> { CompletableFuture.anyOf(null, f); },
3219 >            () -> CompletableFuture.supplyAsync(null),
3220 >            () -> CompletableFuture.supplyAsync(null, exec),
3221 >            () -> CompletableFuture.supplyAsync(supplyOne, null),
3222 >
3223 >            () -> CompletableFuture.runAsync(null),
3224 >            () -> CompletableFuture.runAsync(null, exec),
3225 >            () -> CompletableFuture.runAsync(() -> {}, null),
3226 >
3227 >            () -> f.completeExceptionally(null),
3228 >
3229 >            () -> f.thenApply(null),
3230 >            () -> f.thenApplyAsync(null),
3231 >            () -> f.thenApplyAsync((x) -> x, null),
3232 >            () -> f.thenApplyAsync(null, exec),
3233 >
3234 >            () -> f.thenAccept(null),
3235 >            () -> f.thenAcceptAsync(null),
3236 >            () -> f.thenAcceptAsync((x) -> {} , null),
3237 >            () -> f.thenAcceptAsync(null, exec),
3238 >
3239 >            () -> f.thenRun(null),
3240 >            () -> f.thenRunAsync(null),
3241 >            () -> f.thenRunAsync(() -> {} , null),
3242 >            () -> f.thenRunAsync(null, exec),
3243 >
3244 >            () -> f.thenCombine(g, null),
3245 >            () -> f.thenCombineAsync(g, null),
3246 >            () -> f.thenCombineAsync(g, null, exec),
3247 >            () -> f.thenCombine(nullFuture, (x, y) -> x),
3248 >            () -> f.thenCombineAsync(nullFuture, (x, y) -> x),
3249 >            () -> f.thenCombineAsync(nullFuture, (x, y) -> x, exec),
3250 >            () -> f.thenCombineAsync(g, (x, y) -> x, null),
3251 >
3252 >            () -> f.thenAcceptBoth(g, null),
3253 >            () -> f.thenAcceptBothAsync(g, null),
3254 >            () -> f.thenAcceptBothAsync(g, null, exec),
3255 >            () -> f.thenAcceptBoth(nullFuture, (x, y) -> {}),
3256 >            () -> f.thenAcceptBothAsync(nullFuture, (x, y) -> {}),
3257 >            () -> f.thenAcceptBothAsync(nullFuture, (x, y) -> {}, exec),
3258 >            () -> f.thenAcceptBothAsync(g, (x, y) -> {}, null),
3259 >
3260 >            () -> f.runAfterBoth(g, null),
3261 >            () -> f.runAfterBothAsync(g, null),
3262 >            () -> f.runAfterBothAsync(g, null, exec),
3263 >            () -> f.runAfterBoth(nullFuture, () -> {}),
3264 >            () -> f.runAfterBothAsync(nullFuture, () -> {}),
3265 >            () -> f.runAfterBothAsync(nullFuture, () -> {}, exec),
3266 >            () -> f.runAfterBothAsync(g, () -> {}, null),
3267 >
3268 >            () -> f.applyToEither(g, null),
3269 >            () -> f.applyToEitherAsync(g, null),
3270 >            () -> f.applyToEitherAsync(g, null, exec),
3271 >            () -> f.applyToEither(nullFuture, (x) -> x),
3272 >            () -> f.applyToEitherAsync(nullFuture, (x) -> x),
3273 >            () -> f.applyToEitherAsync(nullFuture, (x) -> x, exec),
3274 >            () -> f.applyToEitherAsync(g, (x) -> x, null),
3275 >
3276 >            () -> f.acceptEither(g, null),
3277 >            () -> f.acceptEitherAsync(g, null),
3278 >            () -> f.acceptEitherAsync(g, null, exec),
3279 >            () -> f.acceptEither(nullFuture, (x) -> {}),
3280 >            () -> f.acceptEitherAsync(nullFuture, (x) -> {}),
3281 >            () -> f.acceptEitherAsync(nullFuture, (x) -> {}, exec),
3282 >            () -> f.acceptEitherAsync(g, (x) -> {}, null),
3283 >
3284 >            () -> f.runAfterEither(g, null),
3285 >            () -> f.runAfterEitherAsync(g, null),
3286 >            () -> f.runAfterEitherAsync(g, null, exec),
3287 >            () -> f.runAfterEither(nullFuture, () -> {}),
3288 >            () -> f.runAfterEitherAsync(nullFuture, () -> {}),
3289 >            () -> f.runAfterEitherAsync(nullFuture, () -> {}, exec),
3290 >            () -> f.runAfterEitherAsync(g, () -> {}, null),
3291 >
3292 >            () -> f.thenCompose(null),
3293 >            () -> f.thenComposeAsync(null),
3294 >            () -> f.thenComposeAsync(new CompletableFutureInc(), null),
3295 >            () -> f.thenComposeAsync(null, exec),
3296 >
3297 >            () -> f.exceptionally(null),
3298 >
3299 >            () -> f.handle(null),
3300 >
3301 >            () -> CompletableFuture.allOf((CompletableFuture<?>)null),
3302 >            () -> CompletableFuture.allOf((CompletableFuture<?>[])null),
3303 >            () -> CompletableFuture.allOf(f, null),
3304 >            () -> CompletableFuture.allOf(null, f),
3305 >
3306 >            () -> CompletableFuture.anyOf((CompletableFuture<?>)null),
3307 >            () -> CompletableFuture.anyOf((CompletableFuture<?>[])null),
3308 >            () -> CompletableFuture.anyOf(f, null),
3309 >            () -> CompletableFuture.anyOf(null, f),
3310 >
3311 >            () -> f.obtrudeException(null),
3312          };
3313  
3314          assertThrows(NullPointerException.class, throwingActions);
# Line 3040 | Line 3327 | public class CompletableFutureTest exten
3327       * whenComplete action executes on normal completion, propagating
3328       * source result.
3329       */
3330 <    public void testWhenComplete1() {
3330 >    public void testWhenComplete_normalCompletion1() {
3331 >        for (boolean createIncomplete : new boolean[] { true, false })
3332 >        for (ExecutionMode m : ExecutionMode.values())
3333 >        for (Integer v1 : new Integer[] { 1, null }) {
3334 >
3335          final AtomicInteger a = new AtomicInteger();
3336 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3337 <        CompletableFuture<Integer> g =
3338 <            f.whenComplete((Integer x, Throwable t) -> a.getAndIncrement());
3339 <        f.complete(three);
3340 <        checkCompletedNormally(f, three);
3341 <        checkCompletedNormally(g, three);
3336 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
3337 >        if (!createIncomplete) f.complete(v1);
3338 >        final CompletableFuture<Integer> g =
3339 >            m.whenComplete(f,
3340 >                           (Integer x, Throwable t) -> {
3341 >                               threadAssertSame(x, v1);
3342 >                               threadAssertNull(t);
3343 >                               a.getAndIncrement();
3344 >                           });
3345 >        if (createIncomplete) f.complete(v1);
3346 >        checkCompletedNormally(f, v1);
3347 >        checkCompletedNormally(g, v1);
3348          assertEquals(a.get(), 1);
3349 +        }
3350      }
3351  
3352      /**
3353       * whenComplete action executes on exceptional completion, propagating
3354       * source result.
3355       */
3356 <    public void testWhenComplete2() {
3356 >    public void testWhenComplete_exceptionalCompletion() {
3357 >        for (boolean createIncomplete : new boolean[] { true, false })
3358 >        for (ExecutionMode m : ExecutionMode.values())
3359 >        for (Integer v1 : new Integer[] { 1, null }) {
3360 >
3361          final AtomicInteger a = new AtomicInteger();
3362 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3363 <        CompletableFuture<Integer> g =
3364 <            f.whenComplete((Integer x, Throwable t) -> a.getAndIncrement());
3365 <        f.completeExceptionally(new CFException());
3366 <        assertTrue(f.isCompletedExceptionally());
3367 <        assertTrue(g.isCompletedExceptionally());
3362 >        final CFException ex = new CFException();
3363 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
3364 >        if (!createIncomplete) f.completeExceptionally(ex);
3365 >        final CompletableFuture<Integer> g = m.whenComplete
3366 >            (f,
3367 >             (Integer x, Throwable t) -> {
3368 >                threadAssertNull(x);
3369 >                threadAssertSame(t, ex);
3370 >                a.getAndIncrement();
3371 >            });
3372 >        if (createIncomplete) f.completeExceptionally(ex);
3373 >        checkCompletedWithWrappedCFException(f, ex);
3374 >        checkCompletedWithWrappedCFException(g, ex);
3375          assertEquals(a.get(), 1);
3376 +        }
3377      }
3378  
3379      /**
3380       * If a whenComplete action throws an exception when triggered by
3381       * a normal completion, it completes exceptionally
3382       */
3383 <    public void testWhenComplete3() {
3384 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3385 <        CompletableFuture<Integer> g =
3386 <            f.whenComplete((Integer x, Throwable t) ->
3387 <                           { throw new CFException(); } );
3388 <        f.complete(three);
3389 <        checkCompletedNormally(f, three);
3390 <        assertTrue(g.isCompletedExceptionally());
3391 <        checkCompletedWithWrappedCFException(g);
3392 <    }
3393 <
3394 <    /**
3395 <     * whenCompleteAsync action executes on normal completion, propagating
3396 <     * source result.
3397 <     */
3398 <    public void testWhenCompleteAsync1() {
3399 <        final AtomicInteger a = new AtomicInteger();
3400 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3401 <        CompletableFuture<Integer> g =
3092 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement());
3093 <        f.complete(three);
3094 <        checkCompletedNormally(f, three);
3095 <        checkCompletedNormally(g, three);
3096 <        assertEquals(a.get(), 1);
3097 <    }
3098 <
3099 <    /**
3100 <     * whenCompleteAsync action executes on exceptional completion, propagating
3101 <     * source result.
3102 <     */
3103 <    public void testWhenCompleteAsync2() {
3104 <        final AtomicInteger a = new AtomicInteger();
3105 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3106 <        CompletableFuture<Integer> g =
3107 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement());
3108 <        f.completeExceptionally(new CFException());
3109 <        checkCompletedWithWrappedCFException(f);
3110 <        checkCompletedWithWrappedCFException(g);
3111 <    }
3112 <
3113 <    /**
3114 <     * If a whenCompleteAsync action throws an exception when
3115 <     * triggered by a normal completion, it completes exceptionally
3116 <     */
3117 <    public void testWhenCompleteAsync3() {
3118 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3119 <        CompletableFuture<Integer> g =
3120 <            f.whenCompleteAsync((Integer x, Throwable t) ->
3121 <                           { throw new CFException(); } );
3122 <        f.complete(three);
3123 <        checkCompletedNormally(f, three);
3124 <        checkCompletedWithWrappedCFException(g);
3125 <    }
3126 <
3127 <    /**
3128 <     * whenCompleteAsync action executes on normal completion, propagating
3129 <     * source result.
3130 <     */
3131 <    public void testWhenCompleteAsync1e() {
3132 <        final AtomicInteger a = new AtomicInteger();
3133 <        ThreadExecutor exec = new ThreadExecutor();
3134 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3135 <        CompletableFuture<Integer> g =
3136 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement(),
3137 <                                exec);
3138 <        f.complete(three);
3139 <        checkCompletedNormally(f, three);
3140 <        checkCompletedNormally(g, three);
3141 <        assertEquals(a.get(), 1);
3383 >    public void testWhenComplete_actionFailed() {
3384 >        for (boolean createIncomplete : new boolean[] { true, false })
3385 >        for (ExecutionMode m : ExecutionMode.values())
3386 >        for (Integer v1 : new Integer[] { 1, null }) {
3387 >
3388 >        final CFException ex = new CFException();
3389 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
3390 >        if (!createIncomplete) f.complete(v1);
3391 >        final CompletableFuture<Integer> g = m.whenComplete
3392 >            (f,
3393 >             (Integer x, Throwable t) -> {
3394 >                threadAssertSame(x, v1);
3395 >                threadAssertNull(t);
3396 >                throw ex;
3397 >            });
3398 >        if (createIncomplete) f.complete(v1);
3399 >        checkCompletedNormally(f, v1);
3400 >        checkCompletedWithWrappedCFException(g, ex);
3401 >        }
3402      }
3403  
3404      /**
3405 <     * whenCompleteAsync action executes on exceptional completion, propagating
3406 <     * source result.
3405 >     * If a whenComplete action throws an exception when triggered by
3406 >     * a source completion that also throws an exception, the source
3407 >     * exception takes precedence.
3408       */
3409 <    public void testWhenCompleteAsync2e() {
3410 <        final AtomicInteger a = new AtomicInteger();
3411 <        ThreadExecutor exec = new ThreadExecutor();
3412 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3413 <        CompletableFuture<Integer> g =
3414 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement(),
3415 <                                exec);
3416 <        f.completeExceptionally(new CFException());
3417 <        checkCompletedWithWrappedCFException(f);
3418 <        checkCompletedWithWrappedCFException(g);
3419 <    }
3409 >    public void testWhenComplete_actionFailedSourceFailed() {
3410 >        for (boolean createIncomplete : new boolean[] { true, false })
3411 >        for (ExecutionMode m : ExecutionMode.values())
3412 >        for (Integer v1 : new Integer[] { 1, null }) {
3413 >
3414 >        final CFException ex1 = new CFException();
3415 >        final CFException ex2 = new CFException();
3416 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
3417 >
3418 >        if (!createIncomplete) f.completeExceptionally(ex1);
3419 >        final CompletableFuture<Integer> g = m.whenComplete
3420 >            (f,
3421 >             (Integer x, Throwable t) -> {
3422 >                threadAssertSame(t, ex1);
3423 >                threadAssertNull(x);
3424 >                throw ex2;
3425 >            });
3426 >        if (createIncomplete) f.completeExceptionally(ex1);
3427  
3428 <    /**
3429 <     * If a whenCompleteAsync action throws an exception when triggered
3430 <     * by a normal completion, it completes exceptionally
3163 <     */
3164 <    public void testWhenCompleteAsync3e() {
3165 <        ThreadExecutor exec = new ThreadExecutor();
3166 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3167 <        CompletableFuture<Integer> g =
3168 <            f.whenCompleteAsync((Integer x, Throwable t) ->
3169 <                                { throw new CFException(); },
3170 <                                exec);
3171 <        f.complete(three);
3172 <        checkCompletedNormally(f, three);
3173 <        checkCompletedWithWrappedCFException(g);
3428 >        checkCompletedWithWrappedCFException(f, ex1);
3429 >        checkCompletedWithWrappedCFException(g, ex1);
3430 >        }
3431      }
3432  
3433      /**
# Line 3183 | Line 3440 | public class CompletableFutureTest exten
3440  
3441          f = new CompletableFuture<>();
3442          g = f.handleAsync(r = new IntegerHandler());
3443 <        assertFalse(r.ran);
3443 >        assertEquals(0, r.invocationCount);
3444          f.completeExceptionally(new CFException());
3445          checkCompletedWithWrappedCFException(f);
3446          checkCompletedNormally(g, three);
3447 <        assertTrue(r.ran);
3447 >        assertEquals(1, r.invocationCount);
3448  
3449          f = new CompletableFuture<>();
3450          g = f.handleAsync(r = new IntegerHandler());
3451 <        assertFalse(r.ran);
3451 >        assertEquals(0, r.invocationCount);
3452          f.completeExceptionally(new CFException());
3453          checkCompletedWithWrappedCFException(f);
3454          checkCompletedNormally(g, three);
3455 <        assertTrue(r.ran);
3455 >        assertEquals(1, r.invocationCount);
3456  
3457          f = new CompletableFuture<>();
3458          g = f.handleAsync(r = new IntegerHandler());
3459 <        assertFalse(r.ran);
3459 >        assertEquals(0, r.invocationCount);
3460          f.complete(one);
3461          checkCompletedNormally(f, one);
3462          checkCompletedNormally(g, two);
3463 <        assertTrue(r.ran);
3463 >        assertEquals(1, r.invocationCount);
3464  
3465          f = new CompletableFuture<>();
3466          g = f.handleAsync(r = new IntegerHandler());
3467 <        assertFalse(r.ran);
3467 >        assertEquals(0, r.invocationCount);
3468          f.complete(one);
3469          checkCompletedNormally(f, one);
3470          checkCompletedNormally(g, two);
3471 <        assertTrue(r.ran);
3471 >        assertEquals(1, r.invocationCount);
3472      }
3473  
3474      /**
# Line 3226 | Line 3483 | public class CompletableFutureTest exten
3483  
3484          f = new CompletableFuture<>();
3485          g = f.handleAsync(r = new IntegerHandler(), exec);
3486 <        assertFalse(r.ran);
3486 >        assertEquals(0, r.invocationCount);
3487          f.completeExceptionally(new CFException());
3488          checkCompletedWithWrappedCFException(f);
3489          checkCompletedNormally(g, three);
3490 <        assertTrue(r.ran);
3490 >        assertEquals(1, r.invocationCount);
3491  
3492          f = new CompletableFuture<>();
3493          g = f.handleAsync(r = new IntegerHandler(), exec);
3494 <        assertFalse(r.ran);
3494 >        assertEquals(0, r.invocationCount);
3495          f.completeExceptionally(new CFException());
3496          checkCompletedWithWrappedCFException(f);
3497          checkCompletedNormally(g, three);
3498 <        assertTrue(r.ran);
3498 >        assertEquals(1, r.invocationCount);
3499  
3500          f = new CompletableFuture<>();
3501          g = f.handleAsync(r = new IntegerHandler(), exec);
3502 <        assertFalse(r.ran);
3502 >        assertEquals(0, r.invocationCount);
3503          f.complete(one);
3504          checkCompletedNormally(f, one);
3505          checkCompletedNormally(g, two);
3506 <        assertTrue(r.ran);
3506 >        assertEquals(1, r.invocationCount);
3507  
3508          f = new CompletableFuture<>();
3509          g = f.handleAsync(r = new IntegerHandler(), exec);
3510 <        assertFalse(r.ran);
3510 >        assertEquals(0, r.invocationCount);
3511          f.complete(one);
3512          checkCompletedNormally(f, one);
3513          checkCompletedNormally(g, two);
3514 <        assertTrue(r.ran);
3514 >        assertEquals(1, r.invocationCount);
3515      }
3516  
3517   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines