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.33 by jsr166, Sun Jun 1 20:40:13 2014 UTC vs.
Revision 1.38 by jsr166, Sun Jun 1 23:51:44 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 +
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  
802        f = new CompletableFuture<>();
803        g = new CompletableFuture<>();
804        assertTrue(f.cancel(true));
805        assertTrue(g.cancel(true));
806        h = f.thenCombine(g, subtract);
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 >
1300 >        checkCompletedNormally(h, null);
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  
837        f = new CompletableFuture<>();
838        g = new CompletableFuture<>();
839        g.complete(1);
840        f.complete(3);
841        h = f.thenAcceptBoth(g, r = new SubtractAction());
1320          checkCompletedNormally(h, null);
1321 <        assertEquals(r.value, 2);
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);
1492 >        f.complete(v1);
1493 >
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  
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());
1514          checkCompletedWithWrappedCancellationException(h);
1515 +        checkCancelled(g);
1516 +        assertFalse(r.ran());
1517 +        checkCompletedNormally(f, v1);
1518 +        }
1519 +    }
1520 +
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 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
1527 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
1528 +        final SubtractAction r = new SubtractAction();
1529 +
1530 +        assertTrue(f.cancel(mayInterruptIfRunning));
1531 +        g.complete(v1);
1532 +        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1533  
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());
1534          checkCompletedWithWrappedCancellationException(h);
1535 +        checkCancelled(f);
1536 +        assertFalse(r.ran());
1537 +        checkCompletedNormally(g, v1);
1538 +        }
1539      }
1540  
1541      /**
# Line 951 | Line 1543 | public class CompletableFutureTest exten
1543       * completion of sources
1544       */
1545      public void testRunAfterBoth_normalCompletion1() {
1546 +        for (ExecutionMode m : ExecutionMode.values())
1547          for (Integer v1 : new Integer[] { 1, null })
1548          for (Integer v2 : new Integer[] { 2, null }) {
1549  
1550          final CompletableFuture<Integer> f = new CompletableFuture<>();
1551          final CompletableFuture<Integer> g = new CompletableFuture<>();
1552          final Noop r = new Noop();
1553 <        final CompletableFuture<Void> h = f.runAfterBoth(g, r);
1553 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1554  
1555          f.complete(v1);
1556          checkIncomplete(h);
# Line 972 | Line 1565 | public class CompletableFutureTest exten
1565      }
1566  
1567      public void testRunAfterBoth_normalCompletion2() {
1568 +        for (ExecutionMode m : ExecutionMode.values())
1569          for (Integer v1 : new Integer[] { 1, null })
1570          for (Integer v2 : new Integer[] { 2, null }) {
1571  
1572          final CompletableFuture<Integer> f = new CompletableFuture<>();
1573          final CompletableFuture<Integer> g = new CompletableFuture<>();
1574          final Noop r = new Noop();
1575 <        final CompletableFuture<Void> h = f.runAfterBoth(g, r);
1575 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1576  
1577          g.complete(v2);
1578          checkIncomplete(h);
# Line 993 | Line 1587 | public class CompletableFutureTest exten
1587      }
1588  
1589      public void testRunAfterBoth_normalCompletion3() {
1590 +        for (ExecutionMode m : ExecutionMode.values())
1591          for (Integer v1 : new Integer[] { 1, null })
1592          for (Integer v2 : new Integer[] { 2, null }) {
1593  
# Line 1002 | Line 1597 | public class CompletableFutureTest exten
1597  
1598          g.complete(v2);
1599          f.complete(v1);
1600 <        final CompletableFuture<Void> h = f.runAfterBoth(g, r);
1600 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1601  
1602          checkCompletedNormally(h, null);
1603          assertTrue(r.ran);
# Line 1012 | Line 1607 | public class CompletableFutureTest exten
1607      }
1608  
1609      public void testRunAfterBoth_normalCompletion4() {
1610 +        for (ExecutionMode m : ExecutionMode.values())
1611          for (Integer v1 : new Integer[] { 1, null })
1612          for (Integer v2 : new Integer[] { 2, null }) {
1613  
# Line 1021 | Line 1617 | public class CompletableFutureTest exten
1617  
1618          f.complete(v1);
1619          g.complete(v2);
1620 <        final CompletableFuture<Void> h = f.runAfterBoth(g, r);
1620 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1621  
1622          checkCompletedNormally(h, null);
1623          assertTrue(r.ran);
# Line 1035 | Line 1631 | public class CompletableFutureTest exten
1631       * completion of either source
1632       */
1633      public void testRunAfterBoth_exceptionalCompletion1() {
1634 +        for (ExecutionMode m : ExecutionMode.values())
1635          for (Integer v1 : new Integer[] { 1, null }) {
1636  
1637          final CompletableFuture<Integer> f = new CompletableFuture<>();
1638          final CompletableFuture<Integer> g = new CompletableFuture<>();
1639          final Noop r = new Noop();
1640 <        final CompletableFuture<Void> h = f.runAfterBoth(g, r);
1640 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1641          final CFException ex = new CFException();
1642  
1643          f.completeExceptionally(ex);
# Line 1055 | Line 1652 | public class CompletableFutureTest exten
1652      }
1653  
1654      public void testRunAfterBoth_exceptionalCompletion2() {
1655 +        for (ExecutionMode m : ExecutionMode.values())
1656          for (Integer v1 : new Integer[] { 1, null }) {
1657  
1658          final CompletableFuture<Integer> f = new CompletableFuture<>();
1659          final CompletableFuture<Integer> g = new CompletableFuture<>();
1660          final Noop r = new Noop();
1661 <        final CompletableFuture<Void> h = f.runAfterBoth(g, r);
1661 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1662          final CFException ex = new CFException();
1663  
1664          g.completeExceptionally(ex);
# Line 1075 | Line 1673 | public class CompletableFutureTest exten
1673      }
1674  
1675      public void testRunAfterBoth_exceptionalCompletion3() {
1676 +        for (ExecutionMode m : ExecutionMode.values())
1677          for (Integer v1 : new Integer[] { 1, null }) {
1678  
1679          final CompletableFuture<Integer> f = new CompletableFuture<>();
# Line 1084 | Line 1683 | public class CompletableFutureTest exten
1683  
1684          g.completeExceptionally(ex);
1685          f.complete(v1);
1686 <        final CompletableFuture<Void> h = f.runAfterBoth(g, r);
1686 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1687  
1688          checkCompletedWithWrappedCFException(h, ex);
1689          checkCompletedWithWrappedCFException(g, ex);
# Line 1094 | Line 1693 | public class CompletableFutureTest exten
1693      }
1694  
1695      public void testRunAfterBoth_exceptionalCompletion4() {
1696 +        for (ExecutionMode m : ExecutionMode.values())
1697          for (Integer v1 : new Integer[] { 1, null }) {
1698  
1699          final CompletableFuture<Integer> f = new CompletableFuture<>();
# Line 1103 | Line 1703 | public class CompletableFutureTest exten
1703  
1704          f.completeExceptionally(ex);
1705          g.complete(v1);
1706 <        final CompletableFuture<Void> h = f.runAfterBoth(g, r);
1706 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1707  
1708          checkCompletedWithWrappedCFException(h, ex);
1709          checkCompletedWithWrappedCFException(f, ex);
# Line 1116 | Line 1716 | public class CompletableFutureTest exten
1716       * runAfterBoth result completes exceptionally if action does
1717       */
1718      public void testRunAfterBoth_actionFailed1() {
1719 +        for (ExecutionMode m : ExecutionMode.values())
1720          for (Integer v1 : new Integer[] { 1, null })
1721          for (Integer v2 : new Integer[] { 2, null }) {
1722  
1723          final CompletableFuture<Integer> f = new CompletableFuture<>();
1724          final CompletableFuture<Integer> g = new CompletableFuture<>();
1725          final FailingNoop r = new FailingNoop();
1726 <        final CompletableFuture<Void> h = f.runAfterBoth(g, r);
1726 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1727  
1728          f.complete(v1);
1729          checkIncomplete(h);
# Line 1135 | Line 1736 | public class CompletableFutureTest exten
1736      }
1737  
1738      public void testRunAfterBoth_actionFailed2() {
1739 +        for (ExecutionMode m : ExecutionMode.values())
1740          for (Integer v1 : new Integer[] { 1, null })
1741          for (Integer v2 : new Integer[] { 2, null }) {
1742  
1743          final CompletableFuture<Integer> f = new CompletableFuture<>();
1744          final CompletableFuture<Integer> g = new CompletableFuture<>();
1745          final FailingNoop r = new FailingNoop();
1746 <        final CompletableFuture<Void> h = f.runAfterBoth(g, r);
1746 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1747  
1748          g.complete(v2);
1749          checkIncomplete(h);
# Line 1157 | Line 1759 | public class CompletableFutureTest exten
1759       * runAfterBoth result completes exceptionally if either source cancelled
1760       */
1761      public void testRunAfterBoth_sourceCancelled1() {
1762 +        for (ExecutionMode m : ExecutionMode.values())
1763          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1764          for (Integer v1 : new Integer[] { 1, null }) {
1765  
1766          final CompletableFuture<Integer> f = new CompletableFuture<>();
1767          final CompletableFuture<Integer> g = new CompletableFuture<>();
1768          final Noop r = new Noop();
1769 <        final CompletableFuture<Void> h = f.runAfterBoth(g, r);
1769 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1770  
1771          assertTrue(f.cancel(mayInterruptIfRunning));
1772          checkIncomplete(h);
# Line 1177 | Line 1780 | public class CompletableFutureTest exten
1780      }
1781  
1782      public void testRunAfterBoth_sourceCancelled2() {
1783 +        for (ExecutionMode m : ExecutionMode.values())
1784          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1785          for (Integer v1 : new Integer[] { 1, null }) {
1786  
1787          final CompletableFuture<Integer> f = new CompletableFuture<>();
1788          final CompletableFuture<Integer> g = new CompletableFuture<>();
1789          final Noop r = new Noop();
1790 <        final CompletableFuture<Void> h = f.runAfterBoth(g, r);
1790 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1791  
1792          assertTrue(g.cancel(mayInterruptIfRunning));
1793          checkIncomplete(h);
# Line 1197 | Line 1801 | public class CompletableFutureTest exten
1801      }
1802  
1803      public void testRunAfterBoth_sourceCancelled3() {
1804 +        for (ExecutionMode m : ExecutionMode.values())
1805          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1806          for (Integer v1 : new Integer[] { 1, null }) {
1807  
# Line 1206 | Line 1811 | public class CompletableFutureTest exten
1811  
1812          assertTrue(g.cancel(mayInterruptIfRunning));
1813          f.complete(v1);
1814 <        final CompletableFuture<Void> h = f.runAfterBoth(g, r);
1814 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1815  
1816          checkCompletedWithWrappedCancellationException(h);
1817          checkCancelled(g);
# Line 1216 | Line 1821 | public class CompletableFutureTest exten
1821      }
1822  
1823      public void testRunAfterBoth_sourceCancelled4() {
1824 +        for (ExecutionMode m : ExecutionMode.values())
1825          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1826          for (Integer v1 : new Integer[] { 1, null }) {
1827  
# Line 1225 | Line 1831 | public class CompletableFutureTest exten
1831  
1832          assertTrue(f.cancel(mayInterruptIfRunning));
1833          g.complete(v1);
1834 <        final CompletableFuture<Void> h = f.runAfterBoth(g, r);
1834 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1835  
1836          checkCompletedWithWrappedCancellationException(h);
1837          checkCancelled(f);
# Line 1313 | Line 1919 | public class CompletableFutureTest exten
1919          checkCompletedNormally(g, null);
1920          f2.complete(one);
1921          checkCompletedNormally(g, null);
1922 <        assertEquals(r.value, 2);
1922 >        assertEquals(r.value, (Integer) 2);
1923  
1924          r = new IncAction();
1925          f = new CompletableFuture<>();
# Line 1321 | Line 1927 | public class CompletableFutureTest exten
1927          f2 = new CompletableFuture<>();
1928          g = f.acceptEither(f2, r);
1929          checkCompletedNormally(g, null);
1930 <        assertEquals(r.value, 2);
1930 >        assertEquals(r.value, (Integer) 2);
1931      }
1932  
1933      /**
# Line 1631 | Line 2237 | public class CompletableFutureTest exten
2237          CompletableFuture<Void> g = f.thenAcceptAsync(r);
2238          f.complete(one);
2239          checkCompletedNormally(g, null);
2240 <        assertEquals(r.value, 2);
2240 >        assertEquals(r.value, (Integer) 2);
2241      }
2242  
2243      /**
# Line 1669 | Line 2275 | public class CompletableFutureTest exten
2275      }
2276  
2277      /**
1672     * thenCombineAsync result completes normally after normal
1673     * completion of sources
1674     */
1675    public void testThenCombineAsync() {
1676        CompletableFuture<Integer> f, g, h;
1677
1678        f = new CompletableFuture<>();
1679        g = new CompletableFuture<>();
1680        h = f.thenCombineAsync(g, subtract);
1681        f.complete(3);
1682        checkIncomplete(h);
1683        g.complete(1);
1684        checkCompletedNormally(h, 2);
1685
1686        f = new CompletableFuture<>();
1687        g = new CompletableFuture<>();
1688        h = f.thenCombineAsync(g, subtract);
1689        g.complete(1);
1690        checkIncomplete(h);
1691        f.complete(3);
1692        checkCompletedNormally(h, 2);
1693
1694        f = new CompletableFuture<>();
1695        g = new CompletableFuture<>();
1696        g.complete(1);
1697        f.complete(3);
1698        h = f.thenCombineAsync(g, subtract);
1699        checkCompletedNormally(h, 2);
1700    }
1701
1702    /**
1703     * thenCombineAsync result completes exceptionally after exceptional
1704     * completion of either source
1705     */
1706    public void testThenCombineAsync2() {
1707        CompletableFuture<Integer> f, g, h;
1708
1709        f = new CompletableFuture<>();
1710        g = new CompletableFuture<>();
1711        h = f.thenCombineAsync(g, subtract);
1712        f.completeExceptionally(new CFException());
1713        checkIncomplete(h);
1714        g.complete(1);
1715        checkCompletedWithWrappedCFException(h);
1716
1717        f = new CompletableFuture<>();
1718        g = new CompletableFuture<>();
1719        h = f.thenCombineAsync(g, subtract);
1720        g.completeExceptionally(new CFException());
1721        checkIncomplete(h);
1722        f.complete(3);
1723        checkCompletedWithWrappedCFException(h);
1724
1725        f = new CompletableFuture<>();
1726        g = new CompletableFuture<>();
1727        g.completeExceptionally(new CFException());
1728        f.complete(3);
1729        h = f.thenCombineAsync(g, subtract);
1730        checkCompletedWithWrappedCFException(h);
1731    }
1732
1733    /**
1734     * thenCombineAsync result completes exceptionally if action does
1735     */
1736    public void testThenCombineAsync3() {
1737        CompletableFuture<Integer> f = new CompletableFuture<>();
1738        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1739        FailingBiFunction r = new FailingBiFunction();
1740        CompletableFuture<Integer> g = f.thenCombineAsync(f2, r);
1741        f.complete(one);
1742        checkIncomplete(g);
1743        assertFalse(r.ran);
1744        f2.complete(two);
1745        checkCompletedWithWrappedCFException(g);
1746        assertTrue(r.ran);
1747    }
1748
1749    /**
1750     * thenCombineAsync result completes exceptionally if either source cancelled
1751     */
1752    public void testThenCombineAsync4() {
1753        CompletableFuture<Integer> f, g, h;
1754
1755        f = new CompletableFuture<>();
1756        g = new CompletableFuture<>();
1757        h = f.thenCombineAsync(g, subtract);
1758        assertTrue(f.cancel(true));
1759        checkIncomplete(h);
1760        g.complete(1);
1761        checkCompletedWithWrappedCancellationException(h);
1762
1763        f = new CompletableFuture<>();
1764        g = new CompletableFuture<>();
1765        h = f.thenCombineAsync(g, subtract);
1766        assertTrue(g.cancel(true));
1767        checkIncomplete(h);
1768        f.complete(3);
1769        checkCompletedWithWrappedCancellationException(h);
1770
1771        f = new CompletableFuture<>();
1772        g = new CompletableFuture<>();
1773        g.complete(3);
1774        assertTrue(f.cancel(true));
1775        h = f.thenCombineAsync(g, subtract);
1776        checkCompletedWithWrappedCancellationException(h);
1777
1778        f = new CompletableFuture<>();
1779        g = new CompletableFuture<>();
1780        f.complete(3);
1781        assertTrue(g.cancel(true));
1782        h = f.thenCombineAsync(g, subtract);
1783        checkCompletedWithWrappedCancellationException(h);
1784    }
1785
1786    /**
1787     * thenAcceptBothAsync result completes normally after normal
1788     * completion of sources
1789     */
1790    public void testThenAcceptBothAsync() {
1791        CompletableFuture<Integer> f, g;
1792        CompletableFuture<Void> h;
1793        SubtractAction r;
1794
1795        f = new CompletableFuture<>();
1796        g = new CompletableFuture<>();
1797        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1798        f.complete(3);
1799        checkIncomplete(h);
1800        g.complete(1);
1801        checkCompletedNormally(h, null);
1802        assertEquals(r.value, 2);
1803
1804        f = new CompletableFuture<>();
1805        g = new CompletableFuture<>();
1806        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1807        g.complete(1);
1808        checkIncomplete(h);
1809        f.complete(3);
1810        checkCompletedNormally(h, null);
1811        assertEquals(r.value, 2);
1812
1813        f = new CompletableFuture<>();
1814        g = new CompletableFuture<>();
1815        g.complete(1);
1816        f.complete(3);
1817        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1818        checkCompletedNormally(h, null);
1819        assertEquals(r.value, 2);
1820    }
1821
1822    /**
1823     * thenAcceptBothAsync result completes exceptionally after exceptional
1824     * completion of source
1825     */
1826    public void testThenAcceptBothAsync2() {
1827        CompletableFuture<Integer> f, g;
1828        CompletableFuture<Void> h;
1829        SubtractAction r;
1830
1831        f = new CompletableFuture<>();
1832        g = new CompletableFuture<>();
1833        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1834        f.completeExceptionally(new CFException());
1835        checkIncomplete(h);
1836        g.complete(1);
1837        checkCompletedWithWrappedCFException(h);
1838
1839        f = new CompletableFuture<>();
1840        g = new CompletableFuture<>();
1841        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1842        g.completeExceptionally(new CFException());
1843        checkIncomplete(h);
1844        f.complete(3);
1845        checkCompletedWithWrappedCFException(h);
1846
1847        f = new CompletableFuture<>();
1848        g = new CompletableFuture<>();
1849        f.complete(3);
1850        g.completeExceptionally(new CFException());
1851        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1852        checkCompletedWithWrappedCFException(h);
1853
1854        f = new CompletableFuture<>();
1855        g = new CompletableFuture<>();
1856        f.completeExceptionally(new CFException());
1857        g.complete(3);
1858        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1859        checkCompletedWithWrappedCFException(h);
1860    }
1861
1862    /**
1863     * thenAcceptBothAsync result completes exceptionally if action does
1864     */
1865    public void testThenAcceptBothAsync3() {
1866        CompletableFuture<Integer> f, g;
1867        CompletableFuture<Void> h;
1868        FailingBiConsumer r;
1869
1870        f = new CompletableFuture<>();
1871        g = new CompletableFuture<>();
1872        h = f.thenAcceptBothAsync(g, r = new FailingBiConsumer());
1873        f.complete(3);
1874        checkIncomplete(h);
1875        g.complete(1);
1876        checkCompletedWithWrappedCFException(h);
1877
1878        f = new CompletableFuture<>();
1879        g = new CompletableFuture<>();
1880        f.complete(3);
1881        g.complete(1);
1882        h = f.thenAcceptBothAsync(g, r = new FailingBiConsumer());
1883        checkCompletedWithWrappedCFException(h);
1884    }
1885
1886    /**
1887     * thenAcceptBothAsync result completes exceptionally if either source cancelled
1888     */
1889    public void testThenAcceptBothAsync4() {
1890        CompletableFuture<Integer> f, g;
1891        CompletableFuture<Void> h;
1892        SubtractAction r;
1893
1894        f = new CompletableFuture<>();
1895        g = new CompletableFuture<>();
1896        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1897        assertTrue(f.cancel(true));
1898        checkIncomplete(h);
1899        g.complete(1);
1900        checkCompletedWithWrappedCancellationException(h);
1901
1902        f = new CompletableFuture<>();
1903        g = new CompletableFuture<>();
1904        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1905        assertTrue(g.cancel(true));
1906        checkIncomplete(h);
1907        f.complete(3);
1908        checkCompletedWithWrappedCancellationException(h);
1909
1910        f = new CompletableFuture<>();
1911        g = new CompletableFuture<>();
1912        f.complete(3);
1913        assertTrue(g.cancel(true));
1914        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1915        checkCompletedWithWrappedCancellationException(h);
1916
1917        f = new CompletableFuture<>();
1918        g = new CompletableFuture<>();
1919        assertTrue(f.cancel(true));
1920        g.complete(3);
1921        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1922        checkCompletedWithWrappedCancellationException(h);
1923    }
1924
1925    /**
1926     * runAfterBothAsync result completes normally after normal
1927     * completion of sources
1928     */
1929    public void testRunAfterBothAsync() {
1930        CompletableFuture<Integer> f = new CompletableFuture<>();
1931        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1932        Noop r = new Noop();
1933        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r);
1934        f.complete(one);
1935        checkIncomplete(g);
1936        f2.complete(two);
1937        checkCompletedNormally(g, null);
1938        assertTrue(r.ran);
1939    }
1940
1941    /**
1942     * runAfterBothAsync result completes exceptionally after exceptional
1943     * completion of source
1944     */
1945    public void testRunAfterBothAsync2() {
1946        CompletableFuture<Integer> f = new CompletableFuture<>();
1947        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1948        Noop r = new Noop();
1949        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r);
1950        f.completeExceptionally(new CFException());
1951        f2.complete(two);
1952        checkCompletedWithWrappedCFException(g);
1953
1954        r = new Noop();
1955        f = new CompletableFuture<>();
1956        f2 = new CompletableFuture<>();
1957        g = f.runAfterBothAsync(f2, r);
1958        f.complete(one);
1959        f2.completeExceptionally(new CFException());
1960        checkCompletedWithWrappedCFException(g);
1961    }
1962
1963    /**
1964     * runAfterBothAsync result completes exceptionally if action does
1965     */
1966    public void testRunAfterBothAsync3() {
1967        CompletableFuture<Integer> f = new CompletableFuture<>();
1968        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1969        FailingNoop r = new FailingNoop();
1970        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r);
1971        f.complete(one);
1972        checkIncomplete(g);
1973        f2.complete(two);
1974        checkCompletedWithWrappedCFException(g);
1975    }
1976
1977    /**
1978     * runAfterBothAsync result completes exceptionally if either source cancelled
1979     */
1980    public void testRunAfterBothAsync4() {
1981        CompletableFuture<Integer> f = new CompletableFuture<>();
1982        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1983        Noop r = new Noop();
1984        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r);
1985        assertTrue(f.cancel(true));
1986        f2.complete(two);
1987        checkCompletedWithWrappedCancellationException(g);
1988
1989        r = new Noop();
1990        f = new CompletableFuture<>();
1991        f2 = new CompletableFuture<>();
1992        g = f.runAfterBothAsync(f2, r);
1993        f.complete(one);
1994        assertTrue(f2.cancel(true));
1995        checkCompletedWithWrappedCancellationException(g);
1996    }
1997
1998    /**
2278       * applyToEitherAsync result completes normally after normal
2279       * completion of sources
2280       */
# Line 2072 | Line 2351 | public class CompletableFutureTest exten
2351          CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
2352          f.complete(one);
2353          checkCompletedNormally(g, null);
2354 <        assertEquals(r.value, 2);
2354 >        assertEquals(r.value, (Integer) 2);
2355  
2356          r = new IncAction();
2357          f = new CompletableFuture<>();
# Line 2080 | Line 2359 | public class CompletableFutureTest exten
2359          f2 = new CompletableFuture<>();
2360          g = f.acceptEitherAsync(f2, r);
2361          checkCompletedNormally(g, null);
2362 <        assertEquals(r.value, 2);
2362 >        assertEquals(r.value, (Integer) 2);
2363      }
2364  
2365      /**
# Line 2397 | Line 2676 | public class CompletableFutureTest exten
2676          CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2677          f.complete(one);
2678          checkCompletedNormally(g, null);
2679 <        assertEquals(r.value, 2);
2679 >        assertEquals(r.value, (Integer) 2);
2680      }
2681  
2682      /**
# Line 2435 | Line 2714 | public class CompletableFutureTest exten
2714      }
2715  
2716      /**
2438     * thenCombineAsync result completes normally after normal
2439     * completion of sources
2440     */
2441    public void testThenCombineAsyncE() {
2442        CompletableFuture<Integer> f, g, h;
2443        ThreadExecutor e = new ThreadExecutor();
2444        int count = 0;
2445
2446        f = new CompletableFuture<>();
2447        g = new CompletableFuture<>();
2448        h = f.thenCombineAsync(g, subtract, e);
2449        f.complete(3);
2450        checkIncomplete(h);
2451        g.complete(1);
2452        checkCompletedNormally(h, 2);
2453        assertEquals(++count, e.count.get());
2454
2455        f = new CompletableFuture<>();
2456        g = new CompletableFuture<>();
2457        h = f.thenCombineAsync(g, subtract, e);
2458        g.complete(1);
2459        checkIncomplete(h);
2460        f.complete(3);
2461        checkCompletedNormally(h, 2);
2462        assertEquals(++count, e.count.get());
2463
2464        f = new CompletableFuture<>();
2465        g = new CompletableFuture<>();
2466        g.complete(1);
2467        f.complete(3);
2468        h = f.thenCombineAsync(g, subtract, e);
2469        checkCompletedNormally(h, 2);
2470        assertEquals(++count, e.count.get());
2471    }
2472
2473    /**
2474     * thenCombineAsync result completes exceptionally after exceptional
2475     * completion of either source
2476     */
2477    public void testThenCombineAsync2E() {
2478        CompletableFuture<Integer> f, g, h;
2479        ThreadExecutor e = new ThreadExecutor();
2480        int count = 0;
2481
2482        f = new CompletableFuture<>();
2483        g = new CompletableFuture<>();
2484        h = f.thenCombineAsync(g, subtract, e);
2485        f.completeExceptionally(new CFException());
2486        checkIncomplete(h);
2487        g.complete(1);
2488        checkCompletedWithWrappedCFException(h);
2489
2490        f = new CompletableFuture<>();
2491        g = new CompletableFuture<>();
2492        h = f.thenCombineAsync(g, subtract, e);
2493        g.completeExceptionally(new CFException());
2494        checkIncomplete(h);
2495        f.complete(3);
2496        checkCompletedWithWrappedCFException(h);
2497
2498        f = new CompletableFuture<>();
2499        g = new CompletableFuture<>();
2500        g.completeExceptionally(new CFException());
2501        h = f.thenCombineAsync(g, subtract, e);
2502        checkIncomplete(h);
2503        f.complete(3);
2504        checkCompletedWithWrappedCFException(h);
2505
2506        assertEquals(0, e.count.get());
2507    }
2508
2509    /**
2510     * thenCombineAsync result completes exceptionally if action does
2511     */
2512    public void testThenCombineAsync3E() {
2513        CompletableFuture<Integer> f = new CompletableFuture<>();
2514        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2515        FailingBiFunction r = new FailingBiFunction();
2516        CompletableFuture<Integer> g = f.thenCombineAsync(f2, r, new ThreadExecutor());
2517        f.complete(one);
2518        checkIncomplete(g);
2519        assertFalse(r.ran);
2520        f2.complete(two);
2521        checkCompletedWithWrappedCFException(g);
2522        assertTrue(r.ran);
2523    }
2524
2525    /**
2526     * thenCombineAsync result completes exceptionally if either source cancelled
2527     */
2528    public void testThenCombineAsync4E() {
2529        CompletableFuture<Integer> f, g, h;
2530        ThreadExecutor e = new ThreadExecutor();
2531
2532        f = new CompletableFuture<>();
2533        g = new CompletableFuture<>();
2534        h = f.thenCombineAsync(g, subtract, e);
2535        assertTrue(f.cancel(true));
2536        checkIncomplete(h);
2537        g.complete(1);
2538        checkCompletedWithWrappedCancellationException(h);
2539
2540        f = new CompletableFuture<>();
2541        g = new CompletableFuture<>();
2542        h = f.thenCombineAsync(g, subtract, e);
2543        assertTrue(g.cancel(true));
2544        checkIncomplete(h);
2545        f.complete(3);
2546        checkCompletedWithWrappedCancellationException(h);
2547
2548        f = new CompletableFuture<>();
2549        g = new CompletableFuture<>();
2550        assertTrue(g.cancel(true));
2551        h = f.thenCombineAsync(g, subtract, e);
2552        checkIncomplete(h);
2553        f.complete(3);
2554        checkCompletedWithWrappedCancellationException(h);
2555
2556        f = new CompletableFuture<>();
2557        g = new CompletableFuture<>();
2558        assertTrue(f.cancel(true));
2559        assertTrue(g.cancel(true));
2560        h = f.thenCombineAsync(g, subtract, e);
2561        checkCompletedWithWrappedCancellationException(h);
2562
2563        assertEquals(0, e.count.get());
2564    }
2565
2566    /**
2567     * thenAcceptBothAsync result completes normally after normal
2568     * completion of sources
2569     */
2570    public void testThenAcceptBothAsyncE() {
2571        CompletableFuture<Integer> f, g;
2572        CompletableFuture<Void> h;
2573        SubtractAction r;
2574        ThreadExecutor e = new ThreadExecutor();
2575
2576        f = new CompletableFuture<>();
2577        g = new CompletableFuture<>();
2578        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2579        f.complete(3);
2580        checkIncomplete(h);
2581        g.complete(1);
2582        checkCompletedNormally(h, null);
2583        assertEquals(r.value, 2);
2584
2585        f = new CompletableFuture<>();
2586        g = new CompletableFuture<>();
2587        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2588        g.complete(1);
2589        checkIncomplete(h);
2590        f.complete(3);
2591        checkCompletedNormally(h, null);
2592        assertEquals(r.value, 2);
2593
2594        f = new CompletableFuture<>();
2595        g = new CompletableFuture<>();
2596        g.complete(1);
2597        f.complete(3);
2598        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2599        checkCompletedNormally(h, null);
2600        assertEquals(r.value, 2);
2601
2602        assertEquals(3, e.count.get());
2603    }
2604
2605    /**
2606     * thenAcceptBothAsync result completes exceptionally after exceptional
2607     * completion of source
2608     */
2609    public void testThenAcceptBothAsync2E() {
2610        CompletableFuture<Integer> f, g;
2611        CompletableFuture<Void> h;
2612        SubtractAction r;
2613        ThreadExecutor e = new ThreadExecutor();
2614
2615        f = new CompletableFuture<>();
2616        g = new CompletableFuture<>();
2617        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2618        f.completeExceptionally(new CFException());
2619        checkIncomplete(h);
2620        g.complete(1);
2621        checkCompletedWithWrappedCFException(h);
2622
2623        f = new CompletableFuture<>();
2624        g = new CompletableFuture<>();
2625        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2626        g.completeExceptionally(new CFException());
2627        checkIncomplete(h);
2628        f.complete(3);
2629        checkCompletedWithWrappedCFException(h);
2630
2631        f = new CompletableFuture<>();
2632        g = new CompletableFuture<>();
2633        f.complete(3);
2634        g.completeExceptionally(new CFException());
2635        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2636        checkCompletedWithWrappedCFException(h);
2637
2638        f = new CompletableFuture<>();
2639        g = new CompletableFuture<>();
2640        f.completeExceptionally(new CFException());
2641        g.complete(3);
2642        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2643        checkCompletedWithWrappedCFException(h);
2644
2645        assertEquals(0, e.count.get());
2646    }
2647
2648    /**
2649     * thenAcceptBothAsync result completes exceptionally if action does
2650     */
2651    public void testThenAcceptBothAsync3E() {
2652        CompletableFuture<Integer> f, g;
2653        CompletableFuture<Void> h;
2654        FailingBiConsumer r;
2655        ThreadExecutor e = new ThreadExecutor();
2656
2657        f = new CompletableFuture<>();
2658        g = new CompletableFuture<>();
2659        h = f.thenAcceptBothAsync(g, r = new FailingBiConsumer(), e);
2660        f.complete(3);
2661        checkIncomplete(h);
2662        g.complete(1);
2663        checkCompletedWithWrappedCFException(h);
2664
2665        f = new CompletableFuture<>();
2666        g = new CompletableFuture<>();
2667        f.complete(3);
2668        g.complete(1);
2669        h = f.thenAcceptBothAsync(g, r = new FailingBiConsumer(), e);
2670        checkCompletedWithWrappedCFException(h);
2671
2672        assertEquals(2, e.count.get());
2673    }
2674
2675    /**
2676     * thenAcceptBothAsync result completes exceptionally if either source cancelled
2677     */
2678    public void testThenAcceptBothAsync4E() {
2679        CompletableFuture<Integer> f, g;
2680        CompletableFuture<Void> h;
2681        SubtractAction r;
2682        ThreadExecutor e = new ThreadExecutor();
2683
2684        f = new CompletableFuture<>();
2685        g = new CompletableFuture<>();
2686        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2687        assertTrue(f.cancel(true));
2688        checkIncomplete(h);
2689        g.complete(1);
2690        checkCompletedWithWrappedCancellationException(h);
2691
2692        f = new CompletableFuture<>();
2693        g = new CompletableFuture<>();
2694        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2695        assertTrue(g.cancel(true));
2696        checkIncomplete(h);
2697        f.complete(3);
2698        checkCompletedWithWrappedCancellationException(h);
2699
2700        f = new CompletableFuture<>();
2701        g = new CompletableFuture<>();
2702        f.complete(3);
2703        assertTrue(g.cancel(true));
2704        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2705        checkCompletedWithWrappedCancellationException(h);
2706
2707        f = new CompletableFuture<>();
2708        g = new CompletableFuture<>();
2709        assertTrue(f.cancel(true));
2710        g.complete(3);
2711        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2712        checkCompletedWithWrappedCancellationException(h);
2713
2714        assertEquals(0, e.count.get());
2715    }
2716
2717    /**
2718     * runAfterBothAsync result completes normally after normal
2719     * completion of sources
2720     */
2721    public void testRunAfterBothAsyncE() {
2722        CompletableFuture<Integer> f = new CompletableFuture<>();
2723        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2724        Noop r = new Noop();
2725        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2726        f.complete(one);
2727        checkIncomplete(g);
2728        f2.complete(two);
2729        checkCompletedNormally(g, null);
2730        assertTrue(r.ran);
2731    }
2732
2733    /**
2734     * runAfterBothAsync result completes exceptionally after exceptional
2735     * completion of source
2736     */
2737    public void testRunAfterBothAsync2E() {
2738        CompletableFuture<Integer> f = new CompletableFuture<>();
2739        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2740        Noop r = new Noop();
2741        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2742        f.completeExceptionally(new CFException());
2743        f2.complete(two);
2744        checkCompletedWithWrappedCFException(g);
2745
2746        r = new Noop();
2747        f = new CompletableFuture<>();
2748        f2 = new CompletableFuture<>();
2749        g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2750        f.complete(one);
2751        f2.completeExceptionally(new CFException());
2752        checkCompletedWithWrappedCFException(g);
2753    }
2754
2755    /**
2756     * runAfterBothAsync result completes exceptionally if action does
2757     */
2758    public void testRunAfterBothAsync3E() {
2759        CompletableFuture<Integer> f = new CompletableFuture<>();
2760        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2761        FailingNoop r = new FailingNoop();
2762        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2763        f.complete(one);
2764        checkIncomplete(g);
2765        f2.complete(two);
2766        checkCompletedWithWrappedCFException(g);
2767    }
2768
2769    /**
2770     * runAfterBothAsync result completes exceptionally if either source cancelled
2771     */
2772    public void testRunAfterBothAsync4E() {
2773        CompletableFuture<Integer> f = new CompletableFuture<>();
2774        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2775        Noop r = new Noop();
2776        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2777        assertTrue(f.cancel(true));
2778        f2.complete(two);
2779        checkCompletedWithWrappedCancellationException(g);
2780
2781        r = new Noop();
2782        f = new CompletableFuture<>();
2783        f2 = new CompletableFuture<>();
2784        g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2785        f.complete(one);
2786        assertTrue(f2.cancel(true));
2787        checkCompletedWithWrappedCancellationException(g);
2788    }
2789
2790    /**
2717       * applyToEitherAsync result completes normally after normal
2718       * completion of sources
2719       */
# Line 2864 | Line 2790 | public class CompletableFutureTest exten
2790          CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2791          f.complete(one);
2792          checkCompletedNormally(g, null);
2793 <        assertEquals(r.value, 2);
2793 >        assertEquals(r.value, (Integer) 2);
2794  
2795          r = new IncAction();
2796          f = new CompletableFuture<>();
# Line 2872 | Line 2798 | public class CompletableFutureTest exten
2798          f2 = new CompletableFuture<>();
2799          g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2800          checkCompletedNormally(g, null);
2801 <        assertEquals(r.value, 2);
2801 >        assertEquals(r.value, (Integer) 2);
2802      }
2803  
2804      /**

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines