ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/test/tck/CompletableFutureTest.java
(Generate patch)

Comparing jsr166/src/test/tck/CompletableFutureTest.java (file contents):
Revision 1.34 by jsr166, Sun Jun 1 21:17:05 2014 UTC vs.
Revision 1.39 by jsr166, Mon Jun 2 00:46:52 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 317 | 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 boolean ran() { return invocationCount == 1; }
343 >        public void accept(Integer x) {
344 >            invocationCount++;
345 >            value = inc(x);
346 >        }
347 >    }
348 >    static final class IncFunction implements Function<Integer,Integer> {
349 >        int invocationCount = 0;
350 >        Integer value;
351 >        public boolean ran() { return invocationCount == 1; }
352 >        public Integer apply(Integer x) {
353 >            invocationCount++;
354 >            return value = inc(x);
355 >        }
356      }
357      static final class SubtractAction implements BiConsumer<Integer, Integer> {
358 <        int value;
358 >        int invocationCount = 0;
359 >        Integer value;
360 >        // Check this action was invoked exactly once when result is computed.
361 >        public boolean ran() { return invocationCount == 1; }
362          public void accept(Integer x, Integer y) {
363 <            value = x.intValue() - y.intValue();
363 >            invocationCount++;
364 >            value = subtract(x, y);
365 >        }
366 >    }
367 >    static final class SubtractFunction implements BiFunction<Integer, Integer, Integer> {
368 >        int invocationCount = 0;
369 >        Integer value;
370 >        // Check this action was invoked exactly once when result is computed.
371 >        public boolean ran() { return invocationCount == 1; }
372 >        public Integer apply(Integer x, Integer y) {
373 >            invocationCount++;
374 >            return value = subtract(x, y);
375          }
376      }
377      static final class Noop implements Runnable {
# Line 405 | Line 446 | public class CompletableFutureTest exten
446      }
447  
448      /**
449 +     * Permits the testing of parallel code for the 3 different
450 +     * execution modes without repeating all the testing code.
451 +     */
452 +    enum ExecutionMode {
453 +        DEFAULT {
454 +            public <T,U> CompletableFuture<Void> runAfterBoth
455 +                (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
456 +                return f.runAfterBoth(g, a);
457 +            }
458 +            public <T,U> CompletableFuture<Void> thenAcceptBoth
459 +                (CompletableFuture<T> f,
460 +                 CompletionStage<? extends U> g,
461 +                 BiConsumer<? super T,? super U> a) {
462 +                return f.thenAcceptBoth(g, a);
463 +            }
464 +            public <T,U,V> CompletableFuture<V> thenCombine
465 +                (CompletableFuture<T> f,
466 +                 CompletionStage<? extends U> g,
467 +                 BiFunction<? super T,? super U,? extends V> a) {
468 +                return f.thenCombine(g, a);
469 +            }
470 +            public <T,U> CompletableFuture<U> applyToEither
471 +                (CompletableFuture<T> f,
472 +                 CompletionStage<? extends T> g,
473 +                 Function<? super T,U> a) {
474 +                return f.applyToEither(g, a);
475 +            }
476 +            public <T> CompletableFuture<Void> acceptEither
477 +                (CompletableFuture<T> f,
478 +                 CompletionStage<? extends T> g,
479 +                 Consumer<? super T> a) {
480 +                return f.acceptEither(g, a);
481 +            }
482 +            public <T> CompletableFuture<Void> runAfterEither
483 +                (CompletableFuture<T> f,
484 +                 CompletionStage<?> g,
485 +                 java.lang.Runnable a) {
486 +                return f.runAfterEither(g, a);
487 +            }
488 +            public <T,U> CompletableFuture<U> thenCompose
489 +                (CompletableFuture<T> f,
490 +                 Function<? super T,? extends CompletionStage<U>> a) {
491 +                return f.thenCompose(a);
492 +            }
493 +            public <T> CompletableFuture<T> whenComplete
494 +                (CompletableFuture<T> f,
495 +                 BiConsumer<? super T,? super Throwable> a) {
496 +                return f.whenComplete(a);
497 +            }
498 +        },
499 +
500 + //             /** Experimental way to do more testing */
501 + //         REVERSE_DEFAULT {
502 + //             public <T,U> CompletableFuture<Void> runAfterBoth
503 + //                 (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
504 + //                 return g.runAfterBoth(f, a);
505 + //             }
506 + //             public <T,U> CompletableFuture<Void> thenAcceptBoth
507 + //                 (CompletableFuture<T> f,
508 + //                  CompletionStage<? extends U> g,
509 + //                  BiConsumer<? super T,? super U> a) {
510 + //                 return DEFAULT.thenAcceptBoth(f, g, a);
511 + //             }
512 + //         },
513 +
514 +        DEFAULT_ASYNC {
515 +            public <T,U> CompletableFuture<Void> runAfterBoth
516 +                (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
517 +                return f.runAfterBothAsync(g, a);
518 +            }
519 +            public <T,U> CompletableFuture<Void> thenAcceptBoth
520 +                (CompletableFuture<T> f,
521 +                 CompletionStage<? extends U> g,
522 +                 BiConsumer<? super T,? super U> a) {
523 +                return f.thenAcceptBothAsync(g, a);
524 +            }
525 +            public <T,U,V> CompletableFuture<V> thenCombine
526 +                (CompletableFuture<T> f,
527 +                 CompletionStage<? extends U> g,
528 +                 BiFunction<? super T,? super U,? extends V> a) {
529 +                return f.thenCombineAsync(g, a);
530 +            }
531 +            public <T,U> CompletableFuture<U> applyToEither
532 +                (CompletableFuture<T> f,
533 +                 CompletionStage<? extends T> g,
534 +                 Function<? super T,U> a) {
535 +                return f.applyToEitherAsync(g, a);
536 +            }
537 +            public <T> CompletableFuture<Void> acceptEither
538 +                (CompletableFuture<T> f,
539 +                 CompletionStage<? extends T> g,
540 +                 Consumer<? super T> a) {
541 +                return f.acceptEitherAsync(g, a);
542 +            }
543 +            public <T> CompletableFuture<Void> runAfterEither
544 +                (CompletableFuture<T> f,
545 +                 CompletionStage<?> g,
546 +                 java.lang.Runnable a) {
547 +                return f.runAfterEitherAsync(g, a);
548 +            }
549 +            public <T,U> CompletableFuture<U> thenCompose
550 +                (CompletableFuture<T> f,
551 +                 Function<? super T,? extends CompletionStage<U>> a) {
552 +                return f.thenComposeAsync(a);
553 +            }
554 +            public <T> CompletableFuture<T> whenComplete
555 +                (CompletableFuture<T> f,
556 +                 BiConsumer<? super T,? super Throwable> a) {
557 +                return f.whenCompleteAsync(a);
558 +            }
559 +        },
560 +
561 + //         REVERSE_DEFAULT_ASYNC {
562 + //             public <T,U> CompletableFuture<Void> runAfterBoth
563 + //                 (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
564 + //                 return f.runAfterBothAsync(g, a);
565 + //             }
566 + //             public <T,U> CompletableFuture<Void> thenAcceptBoth
567 + //                 (CompletableFuture<T> f,
568 + //                  CompletionStage<? extends U> g,
569 + //                  BiConsumer<? super T,? super U> a) {
570 + //                 return DEFAULT_ASYNC.thenAcceptBoth(f, g, a);
571 + //             }
572 + //         },
573 +
574 +        EXECUTOR {
575 +            public <T,U> CompletableFuture<Void> runAfterBoth
576 +                (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
577 +                return f.runAfterBothAsync(g, a, new ThreadExecutor());
578 +            }
579 +            public <T,U> CompletableFuture<Void> thenAcceptBoth
580 +                (CompletableFuture<T> f,
581 +                 CompletionStage<? extends U> g,
582 +                 BiConsumer<? super T,? super U> a) {
583 +                return f.thenAcceptBothAsync(g, a, new ThreadExecutor());
584 +            }
585 +            public <T,U,V> CompletableFuture<V> thenCombine
586 +                (CompletableFuture<T> f,
587 +                 CompletionStage<? extends U> g,
588 +                 BiFunction<? super T,? super U,? extends V> a) {
589 +                return f.thenCombineAsync(g, a, new ThreadExecutor());
590 +            }
591 +            public <T,U> CompletableFuture<U> applyToEither
592 +                (CompletableFuture<T> f,
593 +                 CompletionStage<? extends T> g,
594 +                 Function<? super T,U> a) {
595 +                return f.applyToEitherAsync(g, a, new ThreadExecutor());
596 +            }
597 +            public <T> CompletableFuture<Void> acceptEither
598 +                (CompletableFuture<T> f,
599 +                 CompletionStage<? extends T> g,
600 +                 Consumer<? super T> a) {
601 +                return f.acceptEitherAsync(g, a, new ThreadExecutor());
602 +            }
603 +            public <T> CompletableFuture<Void> runAfterEither
604 +                (CompletableFuture<T> f,
605 +                 CompletionStage<?> g,
606 +                 java.lang.Runnable a) {
607 +                return f.runAfterEitherAsync(g, a, new ThreadExecutor());
608 +            }
609 +            public <T,U> CompletableFuture<U> thenCompose
610 +                (CompletableFuture<T> f,
611 +                 Function<? super T,? extends CompletionStage<U>> a) {
612 +                return f.thenComposeAsync(a, new ThreadExecutor());
613 +            }
614 +            public <T> CompletableFuture<T> whenComplete
615 +                (CompletableFuture<T> f,
616 +                 BiConsumer<? super T,? super Throwable> a) {
617 +                return f.whenCompleteAsync(a, new ThreadExecutor());
618 +            }
619 +        };
620 +
621 +        public abstract <T,U> CompletableFuture<Void> runAfterBoth
622 +            (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a);
623 +        public abstract <T,U> CompletableFuture<Void> thenAcceptBoth
624 +            (CompletableFuture<T> f,
625 +             CompletionStage<? extends U> g,
626 +             BiConsumer<? super T,? super U> a);
627 +        public abstract <T,U,V> CompletableFuture<V> thenCombine
628 +            (CompletableFuture<T> f,
629 +             CompletionStage<? extends U> g,
630 +             BiFunction<? super T,? super U,? extends V> a);
631 +        public abstract <T,U> CompletableFuture<U> applyToEither
632 +            (CompletableFuture<T> f,
633 +             CompletionStage<? extends T> g,
634 +             Function<? super T,U> a);
635 +        public abstract <T> CompletableFuture<Void> acceptEither
636 +            (CompletableFuture<T> f,
637 +             CompletionStage<? extends T> g,
638 +             Consumer<? super T> a);
639 +        public abstract <T> CompletableFuture<Void> runAfterEither
640 +            (CompletableFuture<T> f,
641 +             CompletionStage<?> g,
642 +             java.lang.Runnable a);
643 +        public abstract <T,U> CompletableFuture<U> thenCompose
644 +            (CompletableFuture<T> f,
645 +             Function<? super T,? extends CompletionStage<U>> a);
646 +        public abstract <T> CompletableFuture<T> whenComplete
647 +            (CompletableFuture<T> f,
648 +             BiConsumer<? super T,? super Throwable> a);
649 +
650 +
651 +    }
652 +
653 +    /**
654       * exceptionally action completes with function value on source
655       * exception; otherwise with source value
656       */
# Line 654 | Line 900 | public class CompletableFutureTest exten
900          CompletableFuture<Void> g = f.thenAccept(r);
901          f.complete(one);
902          checkCompletedNormally(g, null);
903 <        assertEquals(r.value, 2);
903 >        assertEquals(r.value, (Integer) 2);
904      }
905  
906      /**
# Line 696 | Line 942 | public class CompletableFutureTest exten
942       * thenCombine result completes normally after normal completion
943       * of sources
944       */
945 <    public void testThenCombine() {
946 <        CompletableFuture<Integer> f, g, h;
945 >    public void testThenCombine_normalCompletion1() {
946 >        for (ExecutionMode m : ExecutionMode.values())
947 >        for (Integer v1 : new Integer[] { 1, null })
948 >        for (Integer v2 : new Integer[] { 2, null }) {
949  
950 <        f = new CompletableFuture<>();
951 <        g = new CompletableFuture<>();
952 <        h = f.thenCombine(g, subtract);
953 <        f.complete(3);
950 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
951 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
952 >        final SubtractFunction r = new SubtractFunction();
953 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
954 >
955 >        f.complete(v1);
956          checkIncomplete(h);
957 <        g.complete(1);
958 <        checkCompletedNormally(h, 2);
957 >        assertFalse(r.ran());
958 >        g.complete(v2);
959  
960 <        f = new CompletableFuture<>();
961 <        g = new CompletableFuture<>();
962 <        h = f.thenCombine(g, subtract);
963 <        g.complete(1);
960 >        checkCompletedNormally(h, subtract(v1, v2));
961 >        checkCompletedNormally(f, v1);
962 >        checkCompletedNormally(g, v2);
963 >        }
964 >    }
965 >
966 >    public void testThenCombine_normalCompletion2() {
967 >        for (ExecutionMode m : ExecutionMode.values())
968 >        for (Integer v1 : new Integer[] { 1, null })
969 >        for (Integer v2 : new Integer[] { 2, null }) {
970 >
971 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
972 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
973 >        final SubtractFunction r = new SubtractFunction();
974 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
975 >
976 >        g.complete(v2);
977          checkIncomplete(h);
978 <        f.complete(3);
979 <        checkCompletedNormally(h, 2);
978 >        assertFalse(r.ran());
979 >        f.complete(v1);
980  
981 <        f = new CompletableFuture<>();
982 <        g = new CompletableFuture<>();
983 <        g.complete(1);
984 <        f.complete(3);
985 <        h = f.thenCombine(g, subtract);
986 <        checkCompletedNormally(h, 2);
981 >        checkCompletedNormally(h, subtract(v1, v2));
982 >        checkCompletedNormally(f, v1);
983 >        checkCompletedNormally(g, v2);
984 >        }
985 >    }
986 >
987 >    public void testThenCombine_normalCompletion3() {
988 >        for (ExecutionMode m : ExecutionMode.values())
989 >        for (Integer v1 : new Integer[] { 1, null })
990 >        for (Integer v2 : new Integer[] { 2, null }) {
991 >
992 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
993 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
994 >        final SubtractFunction r = new SubtractFunction();
995 >
996 >        g.complete(v2);
997 >        f.complete(v1);
998 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
999 >
1000 >        checkCompletedNormally(h, subtract(v1, v2));
1001 >        checkCompletedNormally(f, v1);
1002 >        checkCompletedNormally(g, v2);
1003 >        }
1004 >    }
1005 >
1006 >    public void testThenCombine_normalCompletion4() {
1007 >        for (ExecutionMode m : ExecutionMode.values())
1008 >        for (Integer v1 : new Integer[] { 1, null })
1009 >        for (Integer v2 : new Integer[] { 2, null }) {
1010 >
1011 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1012 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1013 >        final SubtractFunction r = new SubtractFunction();
1014 >
1015 >        f.complete(v1);
1016 >        g.complete(v2);
1017 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1018 >
1019 >        checkCompletedNormally(h, subtract(v1, v2));
1020 >        checkCompletedNormally(f, v1);
1021 >        checkCompletedNormally(g, v2);
1022 >        }
1023      }
1024  
1025      /**
1026       * thenCombine result completes exceptionally after exceptional
1027       * completion of either source
1028       */
1029 <    public void testThenCombine2() {
1030 <        CompletableFuture<Integer> f, g, h;
1029 >    public void testThenCombine_exceptionalCompletion1() {
1030 >        for (ExecutionMode m : ExecutionMode.values())
1031 >        for (Integer v1 : new Integer[] { 1, null }) {
1032  
1033 <        f = new CompletableFuture<>();
1034 <        g = new CompletableFuture<>();
1035 <        h = f.thenCombine(g, subtract);
1036 <        f.completeExceptionally(new CFException());
1033 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1034 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1035 >        final SubtractFunction r = new SubtractFunction();
1036 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1037 >        final CFException ex = new CFException();
1038 >
1039 >        f.completeExceptionally(ex);
1040          checkIncomplete(h);
1041 <        g.complete(1);
739 <        checkCompletedWithWrappedCFException(h);
1041 >        g.complete(v1);
1042  
1043 <        f = new CompletableFuture<>();
1044 <        g = new CompletableFuture<>();
1045 <        h = f.thenCombine(g, subtract);
1046 <        g.completeExceptionally(new CFException());
1043 >        checkCompletedWithWrappedCFException(h, ex);
1044 >        checkCompletedWithWrappedCFException(f, ex);
1045 >        assertFalse(r.ran());
1046 >        checkCompletedNormally(g, v1);
1047 >        }
1048 >    }
1049 >
1050 >    public void testThenCombine_exceptionalCompletion2() {
1051 >        for (ExecutionMode m : ExecutionMode.values())
1052 >        for (Integer v1 : new Integer[] { 1, null }) {
1053 >
1054 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1055 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1056 >        final SubtractFunction r = new SubtractFunction();
1057 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1058 >        final CFException ex = new CFException();
1059 >
1060 >        g.completeExceptionally(ex);
1061          checkIncomplete(h);
1062 <        f.complete(3);
747 <        checkCompletedWithWrappedCFException(h);
1062 >        f.complete(v1);
1063  
1064 <        f = new CompletableFuture<>();
1065 <        g = new CompletableFuture<>();
1066 <        f.complete(3);
1067 <        g.completeExceptionally(new CFException());
1068 <        h = f.thenCombine(g, subtract);
1069 <        checkCompletedWithWrappedCFException(h);
1064 >        checkCompletedWithWrappedCFException(h, ex);
1065 >        checkCompletedWithWrappedCFException(g, ex);
1066 >        assertFalse(r.ran());
1067 >        checkCompletedNormally(f, v1);
1068 >        }
1069 >    }
1070  
1071 <        f = new CompletableFuture<>();
1072 <        g = new CompletableFuture<>();
1073 <        f.completeExceptionally(new CFException());
1074 <        g.complete(3);
1075 <        h = f.thenCombine(g, subtract);
1076 <        checkCompletedWithWrappedCFException(h);
1071 >    public void testThenCombine_exceptionalCompletion3() {
1072 >        for (ExecutionMode m : ExecutionMode.values())
1073 >        for (Integer v1 : new Integer[] { 1, null }) {
1074 >
1075 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1076 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1077 >        final SubtractFunction r = new SubtractFunction();
1078 >        final CFException ex = new CFException();
1079 >
1080 >        g.completeExceptionally(ex);
1081 >        f.complete(v1);
1082 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1083 >
1084 >        checkCompletedWithWrappedCFException(h, ex);
1085 >        checkCompletedWithWrappedCFException(g, ex);
1086 >        assertFalse(r.ran());
1087 >        checkCompletedNormally(f, v1);
1088 >        }
1089 >    }
1090 >
1091 >    public void testThenCombine_exceptionalCompletion4() {
1092 >        for (ExecutionMode m : ExecutionMode.values())
1093 >        for (Integer v1 : new Integer[] { 1, null }) {
1094 >
1095 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1096 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1097 >        final SubtractFunction r = new SubtractFunction();
1098 >        final CFException ex = new CFException();
1099 >
1100 >        f.completeExceptionally(ex);
1101 >        g.complete(v1);
1102 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1103 >
1104 >        checkCompletedWithWrappedCFException(h, ex);
1105 >        checkCompletedWithWrappedCFException(f, ex);
1106 >        assertFalse(r.ran());
1107 >        checkCompletedNormally(g, v1);
1108 >        }
1109      }
1110  
1111      /**
1112       * thenCombine result completes exceptionally if action does
1113       */
1114 <    public void testThenCombine3() {
1115 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1116 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1117 <        FailingBiFunction r = new FailingBiFunction();
1118 <        CompletableFuture<Integer> g = f.thenCombine(f2, r);
1119 <        f.complete(one);
1120 <        checkIncomplete(g);
1121 <        assertFalse(r.ran);
1122 <        f2.complete(two);
1123 <        checkCompletedWithWrappedCFException(g);
1124 <        assertTrue(r.ran);
1114 >    public void testThenCombine_actionFailed1() {
1115 >        for (ExecutionMode m : ExecutionMode.values())
1116 >        for (Integer v1 : new Integer[] { 1, null })
1117 >        for (Integer v2 : new Integer[] { 2, null }) {
1118 >
1119 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1120 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1121 >        final FailingBiFunction r = new FailingBiFunction();
1122 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1123 >
1124 >        f.complete(v1);
1125 >        checkIncomplete(h);
1126 >        g.complete(v2);
1127 >
1128 >        checkCompletedWithWrappedCFException(h);
1129 >        checkCompletedNormally(f, v1);
1130 >        checkCompletedNormally(g, v2);
1131 >        }
1132 >    }
1133 >
1134 >    public void testThenCombine_actionFailed2() {
1135 >        for (ExecutionMode m : ExecutionMode.values())
1136 >        for (Integer v1 : new Integer[] { 1, null })
1137 >        for (Integer v2 : new Integer[] { 2, null }) {
1138 >
1139 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1140 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1141 >        final FailingBiFunction r = new FailingBiFunction();
1142 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1143 >
1144 >        g.complete(v2);
1145 >        checkIncomplete(h);
1146 >        f.complete(v1);
1147 >
1148 >        checkCompletedWithWrappedCFException(h);
1149 >        checkCompletedNormally(f, v1);
1150 >        checkCompletedNormally(g, v2);
1151 >        }
1152      }
1153  
1154      /**
1155       * thenCombine result completes exceptionally if either source cancelled
1156       */
1157 <    public void testThenCombine4() {
1158 <        CompletableFuture<Integer> f, g, h;
1157 >    public void testThenCombine_sourceCancelled1() {
1158 >        for (ExecutionMode m : ExecutionMode.values())
1159 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1160 >        for (Integer v1 : new Integer[] { 1, null }) {
1161  
1162 <        f = new CompletableFuture<>();
1163 <        g = new CompletableFuture<>();
1164 <        h = f.thenCombine(g, subtract);
1165 <        assertTrue(f.cancel(true));
1162 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1163 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1164 >        final SubtractFunction r = new SubtractFunction();
1165 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1166 >
1167 >        assertTrue(f.cancel(mayInterruptIfRunning));
1168          checkIncomplete(h);
1169 <        g.complete(1);
1169 >        g.complete(v1);
1170 >
1171          checkCompletedWithWrappedCancellationException(h);
1172 +        checkCancelled(f);
1173 +        assertFalse(r.ran());
1174 +        checkCompletedNormally(g, v1);
1175 +        }
1176 +    }
1177  
1178 <        f = new CompletableFuture<>();
1179 <        g = new CompletableFuture<>();
1180 <        h = f.thenCombine(g, subtract);
1181 <        assertTrue(g.cancel(true));
1178 >    public void testThenCombine_sourceCancelled2() {
1179 >        for (ExecutionMode m : ExecutionMode.values())
1180 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1181 >        for (Integer v1 : new Integer[] { 1, null }) {
1182 >
1183 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1184 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1185 >        final SubtractFunction r = new SubtractFunction();
1186 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1187 >
1188 >        assertTrue(g.cancel(mayInterruptIfRunning));
1189          checkIncomplete(h);
1190 <        f.complete(3);
1190 >        f.complete(v1);
1191 >
1192          checkCompletedWithWrappedCancellationException(h);
1193 +        checkCancelled(g);
1194 +        assertFalse(r.ran());
1195 +        checkCompletedNormally(f, v1);
1196 +        }
1197 +    }
1198 +
1199 +    public void testThenCombine_sourceCancelled3() {
1200 +        for (ExecutionMode m : ExecutionMode.values())
1201 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1202 +        for (Integer v1 : new Integer[] { 1, null }) {
1203 +
1204 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
1205 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
1206 +        final SubtractFunction r = new SubtractFunction();
1207 +
1208 +        assertTrue(g.cancel(mayInterruptIfRunning));
1209 +        f.complete(v1);
1210 +        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1211  
802        f = new CompletableFuture<>();
803        g = new CompletableFuture<>();
804        assertTrue(f.cancel(true));
805        assertTrue(g.cancel(true));
806        h = f.thenCombine(g, subtract);
1212          checkCompletedWithWrappedCancellationException(h);
1213 +        checkCancelled(g);
1214 +        assertFalse(r.ran());
1215 +        checkCompletedNormally(f, v1);
1216 +        }
1217 +    }
1218 +
1219 +    public void testThenCombine_sourceCancelled4() {
1220 +        for (ExecutionMode m : ExecutionMode.values())
1221 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1222 +        for (Integer v1 : new Integer[] { 1, null }) {
1223 +
1224 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
1225 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
1226 +        final SubtractFunction r = new SubtractFunction();
1227 +
1228 +        assertTrue(f.cancel(mayInterruptIfRunning));
1229 +        g.complete(v1);
1230 +        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1231 +
1232 +        checkCompletedWithWrappedCancellationException(h);
1233 +        checkCancelled(f);
1234 +        assertFalse(r.ran());
1235 +        checkCompletedNormally(g, v1);
1236 +        }
1237      }
1238  
1239      /**
1240       * thenAcceptBoth result completes normally after normal
1241       * completion of sources
1242       */
1243 <    public void testThenAcceptBoth() {
1244 <        CompletableFuture<Integer> f, g;
1245 <        CompletableFuture<Void> h;
1246 <        SubtractAction r;
1243 >    public void testThenAcceptBoth_normalCompletion1() {
1244 >        for (ExecutionMode m : ExecutionMode.values())
1245 >        for (Integer v1 : new Integer[] { 1, null })
1246 >        for (Integer v2 : new Integer[] { 2, null }) {
1247  
1248 <        f = new CompletableFuture<>();
1249 <        g = new CompletableFuture<>();
1250 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
1251 <        f.complete(3);
1248 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1249 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1250 >        final SubtractAction r = new SubtractAction();
1251 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1252 >
1253 >        f.complete(v1);
1254          checkIncomplete(h);
1255 <        g.complete(1);
1255 >        assertFalse(r.ran());
1256 >        g.complete(v2);
1257 >
1258          checkCompletedNormally(h, null);
1259 <        assertEquals(r.value, 2);
1259 >        assertEquals(r.value, subtract(v1, v2));
1260 >        checkCompletedNormally(f, v1);
1261 >        checkCompletedNormally(g, v2);
1262 >        }
1263 >    }
1264  
1265 <        f = new CompletableFuture<>();
1266 <        g = new CompletableFuture<>();
1267 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
1268 <        g.complete(1);
1265 >    public void testThenAcceptBoth_normalCompletion2() {
1266 >        for (ExecutionMode m : ExecutionMode.values())
1267 >        for (Integer v1 : new Integer[] { 1, null })
1268 >        for (Integer v2 : new Integer[] { 2, null }) {
1269 >
1270 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1271 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1272 >        final SubtractAction r = new SubtractAction();
1273 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1274 >
1275 >        g.complete(v2);
1276          checkIncomplete(h);
1277 <        f.complete(3);
1277 >        assertFalse(r.ran());
1278 >        f.complete(v1);
1279 >
1280          checkCompletedNormally(h, null);
1281 <        assertEquals(r.value, 2);
1281 >        assertEquals(r.value, subtract(v1, v2));
1282 >        checkCompletedNormally(f, v1);
1283 >        checkCompletedNormally(g, v2);
1284 >        }
1285 >    }
1286 >
1287 >    public void testThenAcceptBoth_normalCompletion3() {
1288 >        for (ExecutionMode m : ExecutionMode.values())
1289 >        for (Integer v1 : new Integer[] { 1, null })
1290 >        for (Integer v2 : new Integer[] { 2, null }) {
1291 >
1292 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1293 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1294 >        final SubtractAction r = new SubtractAction();
1295 >
1296 >        g.complete(v2);
1297 >        f.complete(v1);
1298 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1299  
837        f = new CompletableFuture<>();
838        g = new CompletableFuture<>();
839        g.complete(1);
840        f.complete(3);
841        h = f.thenAcceptBoth(g, r = new SubtractAction());
1300          checkCompletedNormally(h, null);
1301 <        assertEquals(r.value, 2);
1301 >        assertEquals(r.value, subtract(v1, v2));
1302 >        checkCompletedNormally(f, v1);
1303 >        checkCompletedNormally(g, v2);
1304 >        }
1305 >    }
1306 >
1307 >    public void testThenAcceptBoth_normalCompletion4() {
1308 >        for (ExecutionMode m : ExecutionMode.values())
1309 >        for (Integer v1 : new Integer[] { 1, null })
1310 >        for (Integer v2 : new Integer[] { 2, null }) {
1311 >
1312 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1313 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1314 >        final SubtractAction r = new SubtractAction();
1315 >
1316 >        f.complete(v1);
1317 >        g.complete(v2);
1318 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1319 >
1320 >        checkCompletedNormally(h, null);
1321 >        assertEquals(r.value, subtract(v1, v2));
1322 >        checkCompletedNormally(f, v1);
1323 >        checkCompletedNormally(g, v2);
1324 >        }
1325      }
1326  
1327      /**
1328       * thenAcceptBoth result completes exceptionally after exceptional
1329       * completion of either source
1330       */
1331 <    public void testThenAcceptBoth2() {
1332 <        CompletableFuture<Integer> f, g;
1333 <        CompletableFuture<Void> h;
853 <        SubtractAction r;
1331 >    public void testThenAcceptBoth_exceptionalCompletion1() {
1332 >        for (ExecutionMode m : ExecutionMode.values())
1333 >        for (Integer v1 : new Integer[] { 1, null }) {
1334  
1335 <        f = new CompletableFuture<>();
1336 <        g = new CompletableFuture<>();
1337 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
1338 <        f.completeExceptionally(new CFException());
1335 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1336 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1337 >        final SubtractAction r = new SubtractAction();
1338 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1339 >        final CFException ex = new CFException();
1340 >
1341 >        f.completeExceptionally(ex);
1342          checkIncomplete(h);
1343 <        g.complete(1);
861 <        checkCompletedWithWrappedCFException(h);
1343 >        g.complete(v1);
1344  
1345 <        f = new CompletableFuture<>();
1346 <        g = new CompletableFuture<>();
1347 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
1348 <        g.completeExceptionally(new CFException());
1345 >        checkCompletedWithWrappedCFException(h, ex);
1346 >        checkCompletedWithWrappedCFException(f, ex);
1347 >        assertFalse(r.ran());
1348 >        checkCompletedNormally(g, v1);
1349 >        }
1350 >    }
1351 >
1352 >    public void testThenAcceptBoth_exceptionalCompletion2() {
1353 >        for (ExecutionMode m : ExecutionMode.values())
1354 >        for (Integer v1 : new Integer[] { 1, null }) {
1355 >
1356 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1357 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1358 >        final SubtractAction r = new SubtractAction();
1359 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1360 >        final CFException ex = new CFException();
1361 >
1362 >        g.completeExceptionally(ex);
1363          checkIncomplete(h);
1364 <        f.complete(3);
869 <        checkCompletedWithWrappedCFException(h);
1364 >        f.complete(v1);
1365  
1366 <        f = new CompletableFuture<>();
1367 <        g = new CompletableFuture<>();
1368 <        f.complete(3);
1369 <        g.completeExceptionally(new CFException());
1370 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
1371 <        checkCompletedWithWrappedCFException(h);
1366 >        checkCompletedWithWrappedCFException(h, ex);
1367 >        checkCompletedWithWrappedCFException(g, ex);
1368 >        assertFalse(r.ran());
1369 >        checkCompletedNormally(f, v1);
1370 >        }
1371 >    }
1372  
1373 <        f = new CompletableFuture<>();
1374 <        g = new CompletableFuture<>();
1375 <        f.completeExceptionally(new CFException());
1376 <        g.complete(3);
1377 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
1378 <        checkCompletedWithWrappedCFException(h);
1373 >    public void testThenAcceptBoth_exceptionalCompletion3() {
1374 >        for (ExecutionMode m : ExecutionMode.values())
1375 >        for (Integer v1 : new Integer[] { 1, null }) {
1376 >
1377 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1378 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1379 >        final SubtractAction r = new SubtractAction();
1380 >        final CFException ex = new CFException();
1381 >
1382 >        g.completeExceptionally(ex);
1383 >        f.complete(v1);
1384 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1385 >
1386 >        checkCompletedWithWrappedCFException(h, ex);
1387 >        checkCompletedWithWrappedCFException(g, ex);
1388 >        assertFalse(r.ran());
1389 >        checkCompletedNormally(f, v1);
1390 >        }
1391 >    }
1392 >
1393 >    public void testThenAcceptBoth_exceptionalCompletion4() {
1394 >        for (ExecutionMode m : ExecutionMode.values())
1395 >        for (Integer v1 : new Integer[] { 1, null }) {
1396 >
1397 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1398 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1399 >        final SubtractAction r = new SubtractAction();
1400 >        final CFException ex = new CFException();
1401 >
1402 >        f.completeExceptionally(ex);
1403 >        g.complete(v1);
1404 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1405 >
1406 >        checkCompletedWithWrappedCFException(h, ex);
1407 >        checkCompletedWithWrappedCFException(f, ex);
1408 >        assertFalse(r.ran());
1409 >        checkCompletedNormally(g, v1);
1410 >        }
1411      }
1412  
1413      /**
1414       * thenAcceptBoth result completes exceptionally if action does
1415       */
1416 <    public void testThenAcceptBoth3() {
1417 <        CompletableFuture<Integer> f, g;
1418 <        CompletableFuture<Void> h;
1419 <        FailingBiConsumer r;
1416 >    public void testThenAcceptBoth_actionFailed1() {
1417 >        for (ExecutionMode m : ExecutionMode.values())
1418 >        for (Integer v1 : new Integer[] { 1, null })
1419 >        for (Integer v2 : new Integer[] { 2, null }) {
1420  
1421 <        f = new CompletableFuture<>();
1422 <        g = new CompletableFuture<>();
1423 <        h = f.thenAcceptBoth(g, r = new FailingBiConsumer());
1424 <        f.complete(3);
1421 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1422 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1423 >        final FailingBiConsumer r = new FailingBiConsumer();
1424 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1425 >
1426 >        f.complete(v1);
1427          checkIncomplete(h);
1428 <        g.complete(1);
1428 >        g.complete(v2);
1429 >
1430          checkCompletedWithWrappedCFException(h);
1431 +        checkCompletedNormally(f, v1);
1432 +        checkCompletedNormally(g, v2);
1433 +        }
1434 +    }
1435 +
1436 +    public void testThenAcceptBoth_actionFailed2() {
1437 +        for (ExecutionMode m : ExecutionMode.values())
1438 +        for (Integer v1 : new Integer[] { 1, null })
1439 +        for (Integer v2 : new Integer[] { 2, null }) {
1440 +
1441 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
1442 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
1443 +        final FailingBiConsumer r = new FailingBiConsumer();
1444 +        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1445 +
1446 +        g.complete(v2);
1447 +        checkIncomplete(h);
1448 +        f.complete(v1);
1449  
902        f = new CompletableFuture<>();
903        g = new CompletableFuture<>();
904        f.complete(3);
905        g.complete(1);
906        h = f.thenAcceptBoth(g, r = new FailingBiConsumer());
1450          checkCompletedWithWrappedCFException(h);
1451 +        checkCompletedNormally(f, v1);
1452 +        checkCompletedNormally(g, v2);
1453 +        }
1454      }
1455  
1456      /**
1457       * thenAcceptBoth result completes exceptionally if either source cancelled
1458       */
1459 <    public void testThenAcceptBoth4() {
1460 <        CompletableFuture<Integer> f, g;
1461 <        CompletableFuture<Void> h;
1462 <        SubtractAction r;
1459 >    public void testThenAcceptBoth_sourceCancelled1() {
1460 >        for (ExecutionMode m : ExecutionMode.values())
1461 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1462 >        for (Integer v1 : new Integer[] { 1, null }) {
1463  
1464 <        f = new CompletableFuture<>();
1465 <        g = new CompletableFuture<>();
1466 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
1467 <        assertTrue(f.cancel(true));
1464 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1465 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1466 >        final SubtractAction r = new SubtractAction();
1467 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1468 >
1469 >        assertTrue(f.cancel(mayInterruptIfRunning));
1470          checkIncomplete(h);
1471 <        g.complete(1);
1471 >        g.complete(v1);
1472 >
1473          checkCompletedWithWrappedCancellationException(h);
1474 +        checkCancelled(f);
1475 +        assertFalse(r.ran());
1476 +        checkCompletedNormally(g, v1);
1477 +        }
1478 +    }
1479  
1480 <        f = new CompletableFuture<>();
1481 <        g = new CompletableFuture<>();
1482 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
1483 <        assertTrue(g.cancel(true));
1480 >    public void testThenAcceptBoth_sourceCancelled2() {
1481 >        for (ExecutionMode m : ExecutionMode.values())
1482 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1483 >        for (Integer v1 : new Integer[] { 1, null }) {
1484 >
1485 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1486 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1487 >        final SubtractAction r = new SubtractAction();
1488 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1489 >
1490 >        assertTrue(g.cancel(mayInterruptIfRunning));
1491          checkIncomplete(h);
1492 <        f.complete(3);
932 <        checkCompletedWithWrappedCancellationException(h);
1492 >        f.complete(v1);
1493  
934        f = new CompletableFuture<>();
935        g = new CompletableFuture<>();
936        f.complete(3);
937        assertTrue(g.cancel(true));
938        h = f.thenAcceptBoth(g, r = new SubtractAction());
1494          checkCompletedWithWrappedCancellationException(h);
1495 +        checkCancelled(g);
1496 +        assertFalse(r.ran());
1497 +        checkCompletedNormally(f, v1);
1498 +        }
1499 +    }
1500 +
1501 +    public void testThenAcceptBoth_sourceCancelled3() {
1502 +        for (ExecutionMode m : ExecutionMode.values())
1503 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1504 +        for (Integer v1 : new Integer[] { 1, null }) {
1505 +
1506 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
1507 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
1508 +        final SubtractAction r = new SubtractAction();
1509 +
1510 +        assertTrue(g.cancel(mayInterruptIfRunning));
1511 +        f.complete(v1);
1512 +        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1513  
941        f = new CompletableFuture<>();
942        g = new CompletableFuture<>();
943        assertTrue(f.cancel(true));
944        g.complete(3);
945        h = f.thenAcceptBoth(g, r = new SubtractAction());
1514          checkCompletedWithWrappedCancellationException(h);
1515 +        checkCancelled(g);
1516 +        assertFalse(r.ran());
1517 +        checkCompletedNormally(f, v1);
1518 +        }
1519      }
1520  
1521 <    /**
1522 <     * Permits the testing of parallel code for the 3 different
1523 <     * execution modes without repeating all the testing code.
1524 <     */
953 <    enum ExecutionMode {
954 <        DEFAULT {
955 <            public <T,U> CompletableFuture<Void> runAfterBoth
956 <                (CompletableFuture<T> f, CompletableFuture<U> g, Runnable r) {
957 <                return f.runAfterBoth(g, r);
958 <            }
959 <        },
1521 >    public void testThenAcceptBoth_sourceCancelled4() {
1522 >        for (ExecutionMode m : ExecutionMode.values())
1523 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1524 >        for (Integer v1 : new Integer[] { 1, null }) {
1525  
1526 <        DEFAULT_ASYNC {
1527 <            public <T,U> CompletableFuture<Void> runAfterBoth
1528 <                (CompletableFuture<T> f, CompletableFuture<U> g, Runnable r) {
964 <                return f.runAfterBothAsync(g, r);
965 <            }
966 <        },
1526 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1527 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1528 >        final SubtractAction r = new SubtractAction();
1529  
1530 <        EXECUTOR {
1531 <            public <T,U> CompletableFuture<Void> runAfterBoth
1532 <                (CompletableFuture<T> f, CompletableFuture<U> g, Runnable r) {
971 <                return f.runAfterBothAsync(g, r, new ThreadExecutor());
972 <            }
973 <        };
1530 >        assertTrue(f.cancel(mayInterruptIfRunning));
1531 >        g.complete(v1);
1532 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1533  
1534 <        public abstract <T,U> CompletableFuture<Void> runAfterBoth
1535 <            (CompletableFuture<T> f, CompletableFuture<U> g, Runnable r);
1534 >        checkCompletedWithWrappedCancellationException(h);
1535 >        checkCancelled(f);
1536 >        assertFalse(r.ran());
1537 >        checkCompletedNormally(g, v1);
1538 >        }
1539      }
1540  
1541      /**
# Line 1282 | Line 1844 | public class CompletableFutureTest exten
1844       * applyToEither result completes normally after normal completion
1845       * of either source
1846       */
1847 <    public void testApplyToEither() {
1848 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1849 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1850 <        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
1289 <        f.complete(one);
1290 <        checkCompletedNormally(g, two);
1291 <        f2.complete(one);
1292 <        checkCompletedNormally(g, two);
1847 >    public void testApplyToEither_normalCompletion1() {
1848 >        for (ExecutionMode m : ExecutionMode.values())
1849 >        for (Integer v1 : new Integer[] { 1, null })
1850 >        for (Integer v2 : new Integer[] { 2, null }) {
1851  
1852 <        f = new CompletableFuture<>();
1853 <        f.complete(one);
1854 <        f2 = new CompletableFuture<>();
1855 <        g = f.applyToEither(f2, inc);
1856 <        checkCompletedNormally(g, two);
1852 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1853 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1854 >        final IncFunction r = new IncFunction();
1855 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1856 >
1857 >        f.complete(v1);
1858 >        checkCompletedNormally(h, inc(v1));
1859 >        g.complete(v2);
1860 >
1861 >        checkCompletedNormally(f, v1);
1862 >        checkCompletedNormally(g, v2);
1863 >        checkCompletedNormally(h, inc(v1));
1864 >        }
1865 >    }
1866 >
1867 >    public void testApplyToEither_normalCompletion2() {
1868 >        for (ExecutionMode m : ExecutionMode.values())
1869 >        for (Integer v1 : new Integer[] { 1, null })
1870 >        for (Integer v2 : new Integer[] { 2, null }) {
1871 >
1872 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1873 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1874 >        final IncFunction r = new IncFunction();
1875 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1876 >
1877 >        g.complete(v2);
1878 >        checkCompletedNormally(h, inc(v2));
1879 >        f.complete(v1);
1880 >
1881 >        checkCompletedNormally(f, v1);
1882 >        checkCompletedNormally(g, v2);
1883 >        checkCompletedNormally(h, inc(v2));
1884 >        }
1885 >    }
1886 >    public void testApplyToEither_normalCompletion3() {
1887 >        for (ExecutionMode m : ExecutionMode.values())
1888 >        for (Integer v1 : new Integer[] { 1, null })
1889 >        for (Integer v2 : new Integer[] { 2, null }) {
1890 >
1891 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1892 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1893 >        final IncFunction r = new IncFunction();
1894 >
1895 >        f.complete(v1);
1896 >        g.complete(v2);
1897 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1898 >
1899 >        checkCompletedNormally(f, v1);
1900 >        checkCompletedNormally(g, v2);
1901 >
1902 >        // unspecified behavior
1903 >        assertTrue(Objects.equals(h.join(), inc(v1)) ||
1904 >                   Objects.equals(h.join(), inc(v2)));
1905 >        }
1906      }
1907  
1908      /**
1909       * applyToEither result completes exceptionally after exceptional
1910       * completion of either source
1911       */
1912 <    public void testApplyToEither2() {
1913 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1914 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1308 <        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
1309 <        f.completeExceptionally(new CFException());
1310 <        f2.complete(one);
1311 <        checkCompletedWithWrappedCFException(g);
1912 >    public void testApplyToEither_exceptionalCompletion1() {
1913 >        for (ExecutionMode m : ExecutionMode.values())
1914 >        for (Integer v1 : new Integer[] { 1, null }) {
1915  
1916 <        f = new CompletableFuture<>();
1917 <        f2 = new CompletableFuture<>();
1918 <        f2.completeExceptionally(new CFException());
1919 <        g = f.applyToEither(f2, inc);
1920 <        checkCompletedWithWrappedCFException(g);
1916 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1917 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1918 >        final IncFunction r = new IncFunction();
1919 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1920 >        final CFException ex = new CFException();
1921 >
1922 >        f.completeExceptionally(ex);
1923 >        checkCompletedWithWrappedCFException(h, ex);
1924 >        g.complete(v1);
1925 >
1926 >        assertFalse(r.ran());
1927 >        checkCompletedNormally(g, v1);
1928 >        checkCompletedWithWrappedCFException(f, ex);
1929 >        checkCompletedWithWrappedCFException(h, ex);
1930 >        }
1931 >    }
1932 >
1933 >    public void testApplyToEither_exceptionalCompletion2() {
1934 >        for (ExecutionMode m : ExecutionMode.values())
1935 >        for (Integer v1 : new Integer[] { 1, null }) {
1936 >
1937 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1938 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1939 >        final IncFunction r = new IncFunction();
1940 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1941 >        final CFException ex = new CFException();
1942 >
1943 >        g.completeExceptionally(ex);
1944 >        checkCompletedWithWrappedCFException(h, ex);
1945 >        f.complete(v1);
1946 >
1947 >        assertFalse(r.ran());
1948 >        checkCompletedNormally(f, v1);
1949 >        checkCompletedWithWrappedCFException(g, ex);
1950 >        checkCompletedWithWrappedCFException(h, ex);
1951 >        }
1952 >    }
1953 >
1954 >    public void testApplyToEither_exceptionalCompletion3() {
1955 >        for (ExecutionMode m : ExecutionMode.values())
1956 >        for (Integer v1 : new Integer[] { 1, null }) {
1957 >
1958 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1959 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1960 >        final IncFunction r = new IncFunction();
1961 >        final CFException ex = new CFException();
1962 >
1963 >        g.completeExceptionally(ex);
1964 >        f.complete(v1);
1965 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1966 >
1967 >        // unspecified behavior
1968 >        Integer v;
1969 >        try {
1970 >            assertEquals(h.join(), inc(v1));
1971 >            assertTrue(r.ran());
1972 >        } catch (CompletionException ok) {
1973 >            checkCompletedWithWrappedCFException(h, ex);
1974 >            assertFalse(r.ran());
1975 >        }
1976 >
1977 >        checkCompletedWithWrappedCFException(g, ex);
1978 >        checkCompletedNormally(f, v1);
1979 >        }
1980 >    }
1981 >
1982 >    public void testApplyToEither_exceptionalCompletion4() {
1983 >        for (ExecutionMode m : ExecutionMode.values())
1984 >        for (Integer v1 : new Integer[] { 1, null }) {
1985 >
1986 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1987 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1988 >        final IncFunction r = new IncFunction();
1989 >        final CFException ex = new CFException();
1990 >
1991 >        f.completeExceptionally(ex);
1992 >        g.complete(v1);
1993 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1994 >
1995 >        // unspecified behavior
1996 >        Integer v;
1997 >        try {
1998 >            assertEquals(h.join(), inc(v1));
1999 >            assertTrue(r.ran());
2000 >        } catch (CompletionException ok) {
2001 >            checkCompletedWithWrappedCFException(h, ex);
2002 >            assertFalse(r.ran());
2003 >        }
2004 >
2005 >        checkCompletedWithWrappedCFException(f, ex);
2006 >        assertFalse(r.ran());
2007 >        checkCompletedNormally(g, v1);
2008 >        }
2009      }
2010  
2011      /**
2012       * applyToEither result completes exceptionally if action does
2013       */
2014 <    public void testApplyToEither3() {
2015 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2016 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2017 <        FailingFunction r = new FailingFunction();
2018 <        CompletableFuture<Integer> g = f.applyToEither(f2, r);
2019 <        f2.complete(two);
2020 <        checkCompletedWithWrappedCFException(g);
2014 >    public void testApplyToEither_actionFailed1() {
2015 >        for (ExecutionMode m : ExecutionMode.values())
2016 >        for (Integer v1 : new Integer[] { 1, null })
2017 >        for (Integer v2 : new Integer[] { 2, null }) {
2018 >
2019 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2020 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2021 >        final FailingFunction r = new FailingFunction();
2022 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2023 >
2024 >        f.complete(v1);
2025 >        checkCompletedWithWrappedCFException(h);
2026 >        g.complete(v2);
2027 >        checkCompletedNormally(f, v1);
2028 >        checkCompletedNormally(g, v2);
2029 >        }
2030 >    }
2031 >
2032 >    public void testApplyToEither_actionFailed2() {
2033 >        for (ExecutionMode m : ExecutionMode.values())
2034 >        for (Integer v1 : new Integer[] { 1, null })
2035 >        for (Integer v2 : new Integer[] { 2, null }) {
2036 >
2037 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2038 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2039 >        final FailingFunction r = new FailingFunction();
2040 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2041 >
2042 >        g.complete(v2);
2043 >        checkCompletedWithWrappedCFException(h);
2044 >        f.complete(v1);
2045 >        checkCompletedNormally(f, v1);
2046 >        checkCompletedNormally(g, v2);
2047 >        }
2048      }
2049  
2050      /**
2051       * applyToEither result completes exceptionally if either source cancelled
2052       */
2053 <    public void testApplyToEither4() {
2054 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2055 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2056 <        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
2057 <        assertTrue(f.cancel(true));
2058 <        checkCompletedWithWrappedCancellationException(g);
2059 <        f = new CompletableFuture<>();
2060 <        f2 = new CompletableFuture<>();
2061 <        assertTrue(f2.cancel(true));
2062 <        checkCompletedWithWrappedCancellationException(g);
2053 >    public void testApplyToEither_sourceCancelled1() {
2054 >        for (ExecutionMode m : ExecutionMode.values())
2055 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2056 >        for (Integer v1 : new Integer[] { 1, null }) {
2057 >
2058 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2059 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2060 >        final IncFunction r = new IncFunction();
2061 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2062 >
2063 >        assertTrue(f.cancel(mayInterruptIfRunning));
2064 >        checkCompletedWithWrappedCancellationException(h);
2065 >        g.complete(v1);
2066 >
2067 >        checkCancelled(f);
2068 >        assertFalse(r.ran());
2069 >        checkCompletedNormally(g, v1);
2070 >        checkCompletedWithWrappedCancellationException(h);
2071 >        }
2072 >    }
2073 >
2074 >    public void testApplyToEither_sourceCancelled2() {
2075 >        for (ExecutionMode m : ExecutionMode.values())
2076 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2077 >        for (Integer v1 : new Integer[] { 1, null }) {
2078 >
2079 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2080 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2081 >        final IncFunction r = new IncFunction();
2082 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2083 >
2084 >        assertTrue(g.cancel(mayInterruptIfRunning));
2085 >        checkCompletedWithWrappedCancellationException(h);
2086 >        f.complete(v1);
2087 >
2088 >        checkCancelled(g);
2089 >        assertFalse(r.ran());
2090 >        checkCompletedNormally(f, v1);
2091 >        checkCompletedWithWrappedCancellationException(h);
2092 >        }
2093 >    }
2094 >
2095 >    public void testApplyToEither_sourceCancelled3() {
2096 >        for (ExecutionMode m : ExecutionMode.values())
2097 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2098 >        for (Integer v1 : new Integer[] { 1, null }) {
2099 >
2100 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2101 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2102 >        final IncFunction r = new IncFunction();
2103 >
2104 >        assertTrue(g.cancel(mayInterruptIfRunning));
2105 >        f.complete(v1);
2106 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2107 >
2108 >        // unspecified behavior
2109 >        Integer v;
2110 >        try {
2111 >            assertEquals(h.join(), inc(v1));
2112 >            assertTrue(r.ran());
2113 >        } catch (CompletionException ok) {
2114 >            checkCompletedWithWrappedCancellationException(h);
2115 >            assertFalse(r.ran());
2116 >        }
2117 >
2118 >        checkCancelled(g);
2119 >        checkCompletedNormally(f, v1);
2120 >        }
2121 >    }
2122 >
2123 >    public void testApplyToEither_sourceCancelled4() {
2124 >        for (ExecutionMode m : ExecutionMode.values())
2125 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2126 >        for (Integer v1 : new Integer[] { 1, null }) {
2127 >
2128 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2129 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2130 >        final IncFunction r = new IncFunction();
2131 >
2132 >        assertTrue(f.cancel(mayInterruptIfRunning));
2133 >        g.complete(v1);
2134 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2135 >
2136 >        // unspecified behavior
2137 >        Integer v;
2138 >        try {
2139 >            assertEquals(h.join(), inc(v1));
2140 >            assertTrue(r.ran());
2141 >        } catch (CompletionException ok) {
2142 >            checkCompletedWithWrappedCancellationException(h);
2143 >            assertFalse(r.ran());
2144 >        }
2145 >
2146 >        checkCancelled(f);
2147 >        checkCompletedNormally(g, v1);
2148 >        }
2149      }
2150  
2151      /**
# Line 1357 | Line 2161 | public class CompletableFutureTest exten
2161          checkCompletedNormally(g, null);
2162          f2.complete(one);
2163          checkCompletedNormally(g, null);
2164 <        assertEquals(r.value, 2);
2164 >        assertEquals(r.value, (Integer) 2);
2165  
2166          r = new IncAction();
2167          f = new CompletableFuture<>();
# Line 1365 | Line 2169 | public class CompletableFutureTest exten
2169          f2 = new CompletableFuture<>();
2170          g = f.acceptEither(f2, r);
2171          checkCompletedNormally(g, null);
2172 <        assertEquals(r.value, 2);
2172 >        assertEquals(r.value, (Integer) 2);
2173      }
2174  
2175      /**
# Line 1675 | Line 2479 | public class CompletableFutureTest exten
2479          CompletableFuture<Void> g = f.thenAcceptAsync(r);
2480          f.complete(one);
2481          checkCompletedNormally(g, null);
2482 <        assertEquals(r.value, 2);
2482 >        assertEquals(r.value, (Integer) 2);
2483      }
2484  
2485      /**
# Line 1713 | Line 2517 | public class CompletableFutureTest exten
2517      }
2518  
2519      /**
1716     * thenCombineAsync result completes normally after normal
1717     * completion of sources
1718     */
1719    public void testThenCombineAsync() {
1720        CompletableFuture<Integer> f, g, h;
1721
1722        f = new CompletableFuture<>();
1723        g = new CompletableFuture<>();
1724        h = f.thenCombineAsync(g, subtract);
1725        f.complete(3);
1726        checkIncomplete(h);
1727        g.complete(1);
1728        checkCompletedNormally(h, 2);
1729
1730        f = new CompletableFuture<>();
1731        g = new CompletableFuture<>();
1732        h = f.thenCombineAsync(g, subtract);
1733        g.complete(1);
1734        checkIncomplete(h);
1735        f.complete(3);
1736        checkCompletedNormally(h, 2);
1737
1738        f = new CompletableFuture<>();
1739        g = new CompletableFuture<>();
1740        g.complete(1);
1741        f.complete(3);
1742        h = f.thenCombineAsync(g, subtract);
1743        checkCompletedNormally(h, 2);
1744    }
1745
1746    /**
1747     * thenCombineAsync result completes exceptionally after exceptional
1748     * completion of either source
1749     */
1750    public void testThenCombineAsync2() {
1751        CompletableFuture<Integer> f, g, h;
1752
1753        f = new CompletableFuture<>();
1754        g = new CompletableFuture<>();
1755        h = f.thenCombineAsync(g, subtract);
1756        f.completeExceptionally(new CFException());
1757        checkIncomplete(h);
1758        g.complete(1);
1759        checkCompletedWithWrappedCFException(h);
1760
1761        f = new CompletableFuture<>();
1762        g = new CompletableFuture<>();
1763        h = f.thenCombineAsync(g, subtract);
1764        g.completeExceptionally(new CFException());
1765        checkIncomplete(h);
1766        f.complete(3);
1767        checkCompletedWithWrappedCFException(h);
1768
1769        f = new CompletableFuture<>();
1770        g = new CompletableFuture<>();
1771        g.completeExceptionally(new CFException());
1772        f.complete(3);
1773        h = f.thenCombineAsync(g, subtract);
1774        checkCompletedWithWrappedCFException(h);
1775    }
1776
1777    /**
1778     * thenCombineAsync result completes exceptionally if action does
1779     */
1780    public void testThenCombineAsync3() {
1781        CompletableFuture<Integer> f = new CompletableFuture<>();
1782        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1783        FailingBiFunction r = new FailingBiFunction();
1784        CompletableFuture<Integer> g = f.thenCombineAsync(f2, r);
1785        f.complete(one);
1786        checkIncomplete(g);
1787        assertFalse(r.ran);
1788        f2.complete(two);
1789        checkCompletedWithWrappedCFException(g);
1790        assertTrue(r.ran);
1791    }
1792
1793    /**
1794     * thenCombineAsync result completes exceptionally if either source cancelled
1795     */
1796    public void testThenCombineAsync4() {
1797        CompletableFuture<Integer> f, g, h;
1798
1799        f = new CompletableFuture<>();
1800        g = new CompletableFuture<>();
1801        h = f.thenCombineAsync(g, subtract);
1802        assertTrue(f.cancel(true));
1803        checkIncomplete(h);
1804        g.complete(1);
1805        checkCompletedWithWrappedCancellationException(h);
1806
1807        f = new CompletableFuture<>();
1808        g = new CompletableFuture<>();
1809        h = f.thenCombineAsync(g, subtract);
1810        assertTrue(g.cancel(true));
1811        checkIncomplete(h);
1812        f.complete(3);
1813        checkCompletedWithWrappedCancellationException(h);
1814
1815        f = new CompletableFuture<>();
1816        g = new CompletableFuture<>();
1817        g.complete(3);
1818        assertTrue(f.cancel(true));
1819        h = f.thenCombineAsync(g, subtract);
1820        checkCompletedWithWrappedCancellationException(h);
1821
1822        f = new CompletableFuture<>();
1823        g = new CompletableFuture<>();
1824        f.complete(3);
1825        assertTrue(g.cancel(true));
1826        h = f.thenCombineAsync(g, subtract);
1827        checkCompletedWithWrappedCancellationException(h);
1828    }
1829
1830    /**
1831     * thenAcceptBothAsync result completes normally after normal
1832     * completion of sources
1833     */
1834    public void testThenAcceptBothAsync() {
1835        CompletableFuture<Integer> f, g;
1836        CompletableFuture<Void> h;
1837        SubtractAction r;
1838
1839        f = new CompletableFuture<>();
1840        g = new CompletableFuture<>();
1841        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1842        f.complete(3);
1843        checkIncomplete(h);
1844        g.complete(1);
1845        checkCompletedNormally(h, null);
1846        assertEquals(r.value, 2);
1847
1848        f = new CompletableFuture<>();
1849        g = new CompletableFuture<>();
1850        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1851        g.complete(1);
1852        checkIncomplete(h);
1853        f.complete(3);
1854        checkCompletedNormally(h, null);
1855        assertEquals(r.value, 2);
1856
1857        f = new CompletableFuture<>();
1858        g = new CompletableFuture<>();
1859        g.complete(1);
1860        f.complete(3);
1861        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1862        checkCompletedNormally(h, null);
1863        assertEquals(r.value, 2);
1864    }
1865
1866    /**
1867     * thenAcceptBothAsync result completes exceptionally after exceptional
1868     * completion of source
1869     */
1870    public void testThenAcceptBothAsync2() {
1871        CompletableFuture<Integer> f, g;
1872        CompletableFuture<Void> h;
1873        SubtractAction r;
1874
1875        f = new CompletableFuture<>();
1876        g = new CompletableFuture<>();
1877        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1878        f.completeExceptionally(new CFException());
1879        checkIncomplete(h);
1880        g.complete(1);
1881        checkCompletedWithWrappedCFException(h);
1882
1883        f = new CompletableFuture<>();
1884        g = new CompletableFuture<>();
1885        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1886        g.completeExceptionally(new CFException());
1887        checkIncomplete(h);
1888        f.complete(3);
1889        checkCompletedWithWrappedCFException(h);
1890
1891        f = new CompletableFuture<>();
1892        g = new CompletableFuture<>();
1893        f.complete(3);
1894        g.completeExceptionally(new CFException());
1895        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1896        checkCompletedWithWrappedCFException(h);
1897
1898        f = new CompletableFuture<>();
1899        g = new CompletableFuture<>();
1900        f.completeExceptionally(new CFException());
1901        g.complete(3);
1902        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1903        checkCompletedWithWrappedCFException(h);
1904    }
1905
1906    /**
1907     * thenAcceptBothAsync result completes exceptionally if action does
1908     */
1909    public void testThenAcceptBothAsync3() {
1910        CompletableFuture<Integer> f, g;
1911        CompletableFuture<Void> h;
1912        FailingBiConsumer r;
1913
1914        f = new CompletableFuture<>();
1915        g = new CompletableFuture<>();
1916        h = f.thenAcceptBothAsync(g, r = new FailingBiConsumer());
1917        f.complete(3);
1918        checkIncomplete(h);
1919        g.complete(1);
1920        checkCompletedWithWrappedCFException(h);
1921
1922        f = new CompletableFuture<>();
1923        g = new CompletableFuture<>();
1924        f.complete(3);
1925        g.complete(1);
1926        h = f.thenAcceptBothAsync(g, r = new FailingBiConsumer());
1927        checkCompletedWithWrappedCFException(h);
1928    }
1929
1930    /**
1931     * thenAcceptBothAsync result completes exceptionally if either source cancelled
1932     */
1933    public void testThenAcceptBothAsync4() {
1934        CompletableFuture<Integer> f, g;
1935        CompletableFuture<Void> h;
1936        SubtractAction r;
1937
1938        f = new CompletableFuture<>();
1939        g = new CompletableFuture<>();
1940        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1941        assertTrue(f.cancel(true));
1942        checkIncomplete(h);
1943        g.complete(1);
1944        checkCompletedWithWrappedCancellationException(h);
1945
1946        f = new CompletableFuture<>();
1947        g = new CompletableFuture<>();
1948        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1949        assertTrue(g.cancel(true));
1950        checkIncomplete(h);
1951        f.complete(3);
1952        checkCompletedWithWrappedCancellationException(h);
1953
1954        f = new CompletableFuture<>();
1955        g = new CompletableFuture<>();
1956        f.complete(3);
1957        assertTrue(g.cancel(true));
1958        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1959        checkCompletedWithWrappedCancellationException(h);
1960
1961        f = new CompletableFuture<>();
1962        g = new CompletableFuture<>();
1963        assertTrue(f.cancel(true));
1964        g.complete(3);
1965        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1966        checkCompletedWithWrappedCancellationException(h);
1967    }
1968
1969    /**
1970     * applyToEitherAsync result completes normally after normal
1971     * completion of sources
1972     */
1973    public void testApplyToEitherAsync() {
1974        CompletableFuture<Integer> f = new CompletableFuture<>();
1975        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1976        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
1977        f.complete(one);
1978        checkCompletedNormally(g, two);
1979
1980        f = new CompletableFuture<>();
1981        f.complete(one);
1982        f2 = new CompletableFuture<>();
1983        g = f.applyToEitherAsync(f2, inc);
1984        checkCompletedNormally(g, two);
1985    }
1986
1987    /**
1988     * applyToEitherAsync result completes exceptionally after exceptional
1989     * completion of source
1990     */
1991    public void testApplyToEitherAsync2() {
1992        CompletableFuture<Integer> f = new CompletableFuture<>();
1993        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1994        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
1995        f.completeExceptionally(new CFException());
1996        checkCompletedWithWrappedCFException(g);
1997
1998        f = new CompletableFuture<>();
1999        f2 = new CompletableFuture<>();
2000        f2.completeExceptionally(new CFException());
2001        g = f.applyToEitherAsync(f2, inc);
2002        f.complete(one);
2003        checkCompletedWithWrappedCFException(g);
2004    }
2005
2006    /**
2007     * applyToEitherAsync result completes exceptionally if action does
2008     */
2009    public void testApplyToEitherAsync3() {
2010        CompletableFuture<Integer> f = new CompletableFuture<>();
2011        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2012        FailingFunction r = new FailingFunction();
2013        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, r);
2014        f.complete(one);
2015        checkCompletedWithWrappedCFException(g);
2016    }
2017
2018    /**
2019     * applyToEitherAsync result completes exceptionally if either source cancelled
2020     */
2021    public void testApplyToEitherAsync4() {
2022        CompletableFuture<Integer> f = new CompletableFuture<>();
2023        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2024        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
2025        assertTrue(f.cancel(true));
2026        checkCompletedWithWrappedCancellationException(g);
2027
2028        f = new CompletableFuture<>();
2029        f2 = new CompletableFuture<>();
2030        assertTrue(f2.cancel(true));
2031        g = f.applyToEitherAsync(f2, inc);
2032        checkCompletedWithWrappedCancellationException(g);
2033    }
2034
2035    /**
2520       * acceptEitherAsync result completes normally after normal
2521       * completion of sources
2522       */
# Line 2043 | Line 2527 | public class CompletableFutureTest exten
2527          CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
2528          f.complete(one);
2529          checkCompletedNormally(g, null);
2530 <        assertEquals(r.value, 2);
2530 >        assertEquals(r.value, (Integer) 2);
2531  
2532          r = new IncAction();
2533          f = new CompletableFuture<>();
# Line 2051 | Line 2535 | public class CompletableFutureTest exten
2535          f2 = new CompletableFuture<>();
2536          g = f.acceptEitherAsync(f2, r);
2537          checkCompletedNormally(g, null);
2538 <        assertEquals(r.value, 2);
2538 >        assertEquals(r.value, (Integer) 2);
2539      }
2540  
2541      /**
# Line 2368 | Line 2852 | public class CompletableFutureTest exten
2852          CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2853          f.complete(one);
2854          checkCompletedNormally(g, null);
2855 <        assertEquals(r.value, 2);
2855 >        assertEquals(r.value, (Integer) 2);
2856      }
2857  
2858      /**
# Line 2406 | Line 2890 | public class CompletableFutureTest exten
2890      }
2891  
2892      /**
2409     * thenCombineAsync result completes normally after normal
2410     * completion of sources
2411     */
2412    public void testThenCombineAsyncE() {
2413        CompletableFuture<Integer> f, g, h;
2414        ThreadExecutor e = new ThreadExecutor();
2415        int count = 0;
2416
2417        f = new CompletableFuture<>();
2418        g = new CompletableFuture<>();
2419        h = f.thenCombineAsync(g, subtract, e);
2420        f.complete(3);
2421        checkIncomplete(h);
2422        g.complete(1);
2423        checkCompletedNormally(h, 2);
2424        assertEquals(++count, e.count.get());
2425
2426        f = new CompletableFuture<>();
2427        g = new CompletableFuture<>();
2428        h = f.thenCombineAsync(g, subtract, e);
2429        g.complete(1);
2430        checkIncomplete(h);
2431        f.complete(3);
2432        checkCompletedNormally(h, 2);
2433        assertEquals(++count, e.count.get());
2434
2435        f = new CompletableFuture<>();
2436        g = new CompletableFuture<>();
2437        g.complete(1);
2438        f.complete(3);
2439        h = f.thenCombineAsync(g, subtract, e);
2440        checkCompletedNormally(h, 2);
2441        assertEquals(++count, e.count.get());
2442    }
2443
2444    /**
2445     * thenCombineAsync result completes exceptionally after exceptional
2446     * completion of either source
2447     */
2448    public void testThenCombineAsync2E() {
2449        CompletableFuture<Integer> f, g, h;
2450        ThreadExecutor e = new ThreadExecutor();
2451        int count = 0;
2452
2453        f = new CompletableFuture<>();
2454        g = new CompletableFuture<>();
2455        h = f.thenCombineAsync(g, subtract, e);
2456        f.completeExceptionally(new CFException());
2457        checkIncomplete(h);
2458        g.complete(1);
2459        checkCompletedWithWrappedCFException(h);
2460
2461        f = new CompletableFuture<>();
2462        g = new CompletableFuture<>();
2463        h = f.thenCombineAsync(g, subtract, e);
2464        g.completeExceptionally(new CFException());
2465        checkIncomplete(h);
2466        f.complete(3);
2467        checkCompletedWithWrappedCFException(h);
2468
2469        f = new CompletableFuture<>();
2470        g = new CompletableFuture<>();
2471        g.completeExceptionally(new CFException());
2472        h = f.thenCombineAsync(g, subtract, e);
2473        checkIncomplete(h);
2474        f.complete(3);
2475        checkCompletedWithWrappedCFException(h);
2476
2477        assertEquals(0, e.count.get());
2478    }
2479
2480    /**
2481     * thenCombineAsync result completes exceptionally if action does
2482     */
2483    public void testThenCombineAsync3E() {
2484        CompletableFuture<Integer> f = new CompletableFuture<>();
2485        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2486        FailingBiFunction r = new FailingBiFunction();
2487        CompletableFuture<Integer> g = f.thenCombineAsync(f2, r, new ThreadExecutor());
2488        f.complete(one);
2489        checkIncomplete(g);
2490        assertFalse(r.ran);
2491        f2.complete(two);
2492        checkCompletedWithWrappedCFException(g);
2493        assertTrue(r.ran);
2494    }
2495
2496    /**
2497     * thenCombineAsync result completes exceptionally if either source cancelled
2498     */
2499    public void testThenCombineAsync4E() {
2500        CompletableFuture<Integer> f, g, h;
2501        ThreadExecutor e = new ThreadExecutor();
2502
2503        f = new CompletableFuture<>();
2504        g = new CompletableFuture<>();
2505        h = f.thenCombineAsync(g, subtract, e);
2506        assertTrue(f.cancel(true));
2507        checkIncomplete(h);
2508        g.complete(1);
2509        checkCompletedWithWrappedCancellationException(h);
2510
2511        f = new CompletableFuture<>();
2512        g = new CompletableFuture<>();
2513        h = f.thenCombineAsync(g, subtract, e);
2514        assertTrue(g.cancel(true));
2515        checkIncomplete(h);
2516        f.complete(3);
2517        checkCompletedWithWrappedCancellationException(h);
2518
2519        f = new CompletableFuture<>();
2520        g = new CompletableFuture<>();
2521        assertTrue(g.cancel(true));
2522        h = f.thenCombineAsync(g, subtract, e);
2523        checkIncomplete(h);
2524        f.complete(3);
2525        checkCompletedWithWrappedCancellationException(h);
2526
2527        f = new CompletableFuture<>();
2528        g = new CompletableFuture<>();
2529        assertTrue(f.cancel(true));
2530        assertTrue(g.cancel(true));
2531        h = f.thenCombineAsync(g, subtract, e);
2532        checkCompletedWithWrappedCancellationException(h);
2533
2534        assertEquals(0, e.count.get());
2535    }
2536
2537    /**
2538     * thenAcceptBothAsync result completes normally after normal
2539     * completion of sources
2540     */
2541    public void testThenAcceptBothAsyncE() {
2542        CompletableFuture<Integer> f, g;
2543        CompletableFuture<Void> h;
2544        SubtractAction r;
2545        ThreadExecutor e = new ThreadExecutor();
2546
2547        f = new CompletableFuture<>();
2548        g = new CompletableFuture<>();
2549        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2550        f.complete(3);
2551        checkIncomplete(h);
2552        g.complete(1);
2553        checkCompletedNormally(h, null);
2554        assertEquals(r.value, 2);
2555
2556        f = new CompletableFuture<>();
2557        g = new CompletableFuture<>();
2558        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2559        g.complete(1);
2560        checkIncomplete(h);
2561        f.complete(3);
2562        checkCompletedNormally(h, null);
2563        assertEquals(r.value, 2);
2564
2565        f = new CompletableFuture<>();
2566        g = new CompletableFuture<>();
2567        g.complete(1);
2568        f.complete(3);
2569        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2570        checkCompletedNormally(h, null);
2571        assertEquals(r.value, 2);
2572
2573        assertEquals(3, e.count.get());
2574    }
2575
2576    /**
2577     * thenAcceptBothAsync result completes exceptionally after exceptional
2578     * completion of source
2579     */
2580    public void testThenAcceptBothAsync2E() {
2581        CompletableFuture<Integer> f, g;
2582        CompletableFuture<Void> h;
2583        SubtractAction r;
2584        ThreadExecutor e = new ThreadExecutor();
2585
2586        f = new CompletableFuture<>();
2587        g = new CompletableFuture<>();
2588        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2589        f.completeExceptionally(new CFException());
2590        checkIncomplete(h);
2591        g.complete(1);
2592        checkCompletedWithWrappedCFException(h);
2593
2594        f = new CompletableFuture<>();
2595        g = new CompletableFuture<>();
2596        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2597        g.completeExceptionally(new CFException());
2598        checkIncomplete(h);
2599        f.complete(3);
2600        checkCompletedWithWrappedCFException(h);
2601
2602        f = new CompletableFuture<>();
2603        g = new CompletableFuture<>();
2604        f.complete(3);
2605        g.completeExceptionally(new CFException());
2606        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2607        checkCompletedWithWrappedCFException(h);
2608
2609        f = new CompletableFuture<>();
2610        g = new CompletableFuture<>();
2611        f.completeExceptionally(new CFException());
2612        g.complete(3);
2613        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2614        checkCompletedWithWrappedCFException(h);
2615
2616        assertEquals(0, e.count.get());
2617    }
2618
2619    /**
2620     * thenAcceptBothAsync result completes exceptionally if action does
2621     */
2622    public void testThenAcceptBothAsync3E() {
2623        CompletableFuture<Integer> f, g;
2624        CompletableFuture<Void> h;
2625        FailingBiConsumer r;
2626        ThreadExecutor e = new ThreadExecutor();
2627
2628        f = new CompletableFuture<>();
2629        g = new CompletableFuture<>();
2630        h = f.thenAcceptBothAsync(g, r = new FailingBiConsumer(), e);
2631        f.complete(3);
2632        checkIncomplete(h);
2633        g.complete(1);
2634        checkCompletedWithWrappedCFException(h);
2635
2636        f = new CompletableFuture<>();
2637        g = new CompletableFuture<>();
2638        f.complete(3);
2639        g.complete(1);
2640        h = f.thenAcceptBothAsync(g, r = new FailingBiConsumer(), e);
2641        checkCompletedWithWrappedCFException(h);
2642
2643        assertEquals(2, e.count.get());
2644    }
2645
2646    /**
2647     * thenAcceptBothAsync result completes exceptionally if either source cancelled
2648     */
2649    public void testThenAcceptBothAsync4E() {
2650        CompletableFuture<Integer> f, g;
2651        CompletableFuture<Void> h;
2652        SubtractAction r;
2653        ThreadExecutor e = new ThreadExecutor();
2654
2655        f = new CompletableFuture<>();
2656        g = new CompletableFuture<>();
2657        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2658        assertTrue(f.cancel(true));
2659        checkIncomplete(h);
2660        g.complete(1);
2661        checkCompletedWithWrappedCancellationException(h);
2662
2663        f = new CompletableFuture<>();
2664        g = new CompletableFuture<>();
2665        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2666        assertTrue(g.cancel(true));
2667        checkIncomplete(h);
2668        f.complete(3);
2669        checkCompletedWithWrappedCancellationException(h);
2670
2671        f = new CompletableFuture<>();
2672        g = new CompletableFuture<>();
2673        f.complete(3);
2674        assertTrue(g.cancel(true));
2675        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2676        checkCompletedWithWrappedCancellationException(h);
2677
2678        f = new CompletableFuture<>();
2679        g = new CompletableFuture<>();
2680        assertTrue(f.cancel(true));
2681        g.complete(3);
2682        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2683        checkCompletedWithWrappedCancellationException(h);
2684
2685        assertEquals(0, e.count.get());
2686    }
2687
2688    /**
2689     * applyToEitherAsync result completes normally after normal
2690     * completion of sources
2691     */
2692    public void testApplyToEitherAsyncE() {
2693        CompletableFuture<Integer> f = new CompletableFuture<>();
2694        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2695        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2696        f.complete(one);
2697        checkCompletedNormally(g, two);
2698
2699        f = new CompletableFuture<>();
2700        f.complete(one);
2701        f2 = new CompletableFuture<>();
2702        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2703        checkCompletedNormally(g, two);
2704    }
2705
2706    /**
2707     * applyToEitherAsync result completes exceptionally after exceptional
2708     * completion of source
2709     */
2710    public void testApplyToEitherAsync2E() {
2711        CompletableFuture<Integer> f = new CompletableFuture<>();
2712        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2713        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2714        f.completeExceptionally(new CFException());
2715        checkCompletedWithWrappedCFException(g);
2716
2717        f = new CompletableFuture<>();
2718        f2 = new CompletableFuture<>();
2719        f2.completeExceptionally(new CFException());
2720        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2721        f.complete(one);
2722        checkCompletedWithWrappedCFException(g);
2723    }
2724
2725    /**
2726     * applyToEitherAsync result completes exceptionally if action does
2727     */
2728    public void testApplyToEitherAsync3E() {
2729        CompletableFuture<Integer> f = new CompletableFuture<>();
2730        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2731        FailingFunction r = new FailingFunction();
2732        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, r, new ThreadExecutor());
2733        f.complete(one);
2734        checkCompletedWithWrappedCFException(g);
2735    }
2736
2737    /**
2738     * applyToEitherAsync result completes exceptionally if either source cancelled
2739     */
2740    public void testApplyToEitherAsync4E() {
2741        CompletableFuture<Integer> f = new CompletableFuture<>();
2742        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2743        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2744        assertTrue(f.cancel(true));
2745        checkCompletedWithWrappedCancellationException(g);
2746
2747        f = new CompletableFuture<>();
2748        f2 = new CompletableFuture<>();
2749        assertTrue(f2.cancel(true));
2750        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2751        checkCompletedWithWrappedCancellationException(g);
2752    }
2753
2754    /**
2893       * acceptEitherAsync result completes normally after normal
2894       * completion of sources
2895       */
# Line 2762 | Line 2900 | public class CompletableFutureTest exten
2900          CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2901          f.complete(one);
2902          checkCompletedNormally(g, null);
2903 <        assertEquals(r.value, 2);
2903 >        assertEquals(r.value, (Integer) 2);
2904  
2905          r = new IncAction();
2906          f = new CompletableFuture<>();
# Line 2770 | Line 2908 | public class CompletableFutureTest exten
2908          f2 = new CompletableFuture<>();
2909          g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2910          checkCompletedNormally(g, null);
2911 <        assertEquals(r.value, 2);
2911 >        assertEquals(r.value, (Integer) 2);
2912      }
2913  
2914      /**

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines