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.129 by jsr166, Sun Nov 15 01:33:02 2015 UTC vs.
Revision 1.147 by jsr166, Sat Jun 4 23:49:29 2016 UTC

# Line 876 | Line 876 | public class CompletableFutureTest exten
876          assertEquals(1, a.get());
877      }}
878  
879 +    /**
880 +     * If an "exceptionally action" throws an exception, it completes
881 +     * exceptionally with that exception
882 +     */
883      public void testExceptionally_exceptionalCompletionActionFailed() {
884          for (boolean createIncomplete : new boolean[] { true, false })
885      {
# Line 894 | Line 898 | public class CompletableFutureTest exten
898          if (createIncomplete) f.completeExceptionally(ex1);
899  
900          checkCompletedWithWrappedException(g, ex2);
901 +        checkCompletedExceptionally(f, ex1);
902          assertEquals(1, a.get());
903      }}
904  
# Line 911 | Line 916 | public class CompletableFutureTest exten
916          if (!createIncomplete) assertTrue(f.complete(v1));
917          final CompletableFuture<Integer> g = m.whenComplete
918              (f,
919 <             (Integer x, Throwable t) -> {
919 >             (Integer result, Throwable t) -> {
920                  m.checkExecutionMode();
921 <                threadAssertSame(x, v1);
921 >                threadAssertSame(result, v1);
922                  threadAssertNull(t);
923                  a.getAndIncrement();
924              });
# Line 938 | Line 943 | public class CompletableFutureTest exten
943          if (!createIncomplete) f.completeExceptionally(ex);
944          final CompletableFuture<Integer> g = m.whenComplete
945              (f,
946 <             (Integer x, Throwable t) -> {
946 >             (Integer result, Throwable t) -> {
947                  m.checkExecutionMode();
948 <                threadAssertNull(x);
948 >                threadAssertNull(result);
949                  threadAssertSame(t, ex);
950                  a.getAndIncrement();
951              });
# Line 965 | Line 970 | public class CompletableFutureTest exten
970          if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
971          final CompletableFuture<Integer> g = m.whenComplete
972              (f,
973 <             (Integer x, Throwable t) -> {
973 >             (Integer result, Throwable t) -> {
974                  m.checkExecutionMode();
975 <                threadAssertNull(x);
975 >                threadAssertNull(result);
976                  threadAssertTrue(t instanceof CancellationException);
977                  a.getAndIncrement();
978              });
# Line 982 | Line 987 | public class CompletableFutureTest exten
987       * If a whenComplete action throws an exception when triggered by
988       * a normal completion, it completes exceptionally
989       */
990 <    public void testWhenComplete_actionFailed() {
990 >    public void testWhenComplete_sourceCompletedNormallyActionFailed() {
991          for (boolean createIncomplete : new boolean[] { true, false })
992          for (ExecutionMode m : ExecutionMode.values())
993          for (Integer v1 : new Integer[] { 1, null })
# Line 993 | Line 998 | public class CompletableFutureTest exten
998          if (!createIncomplete) assertTrue(f.complete(v1));
999          final CompletableFuture<Integer> g = m.whenComplete
1000              (f,
1001 <             (Integer x, Throwable t) -> {
1001 >             (Integer result, Throwable t) -> {
1002                  m.checkExecutionMode();
1003 <                threadAssertSame(x, v1);
1003 >                threadAssertSame(result, v1);
1004                  threadAssertNull(t);
1005                  a.getAndIncrement();
1006                  throw ex;
# Line 1010 | Line 1015 | public class CompletableFutureTest exten
1015      /**
1016       * If a whenComplete action throws an exception when triggered by
1017       * a source completion that also throws an exception, the source
1018 <     * exception takes precedence.
1018 >     * exception takes precedence (unlike handle)
1019       */
1020 <    public void testWhenComplete_actionFailedSourceFailed() {
1020 >    public void testWhenComplete_sourceFailedActionFailed() {
1021          for (boolean createIncomplete : new boolean[] { true, false })
1022          for (ExecutionMode m : ExecutionMode.values())
1023      {
# Line 1024 | Line 1029 | public class CompletableFutureTest exten
1029          if (!createIncomplete) f.completeExceptionally(ex1);
1030          final CompletableFuture<Integer> g = m.whenComplete
1031              (f,
1032 <             (Integer x, Throwable t) -> {
1032 >             (Integer result, Throwable t) -> {
1033                  m.checkExecutionMode();
1034                  threadAssertSame(t, ex1);
1035 <                threadAssertNull(x);
1035 >                threadAssertNull(result);
1036                  a.getAndIncrement();
1037                  throw ex2;
1038              });
# Line 1035 | Line 1040 | public class CompletableFutureTest exten
1040  
1041          checkCompletedWithWrappedException(g, ex1);
1042          checkCompletedExceptionally(f, ex1);
1043 +        if (testImplementationDetails) {
1044 +            assertEquals(1, ex1.getSuppressed().length);
1045 +            assertSame(ex2, ex1.getSuppressed()[0]);
1046 +        }
1047          assertEquals(1, a.get());
1048      }}
1049  
# Line 1052 | Line 1061 | public class CompletableFutureTest exten
1061          if (!createIncomplete) assertTrue(f.complete(v1));
1062          final CompletableFuture<Integer> g = m.handle
1063              (f,
1064 <             (Integer x, Throwable t) -> {
1064 >             (Integer result, Throwable t) -> {
1065                  m.checkExecutionMode();
1066 <                threadAssertSame(x, v1);
1066 >                threadAssertSame(result, v1);
1067                  threadAssertNull(t);
1068                  a.getAndIncrement();
1069                  return inc(v1);
# Line 1081 | Line 1090 | public class CompletableFutureTest exten
1090          if (!createIncomplete) f.completeExceptionally(ex);
1091          final CompletableFuture<Integer> g = m.handle
1092              (f,
1093 <             (Integer x, Throwable t) -> {
1093 >             (Integer result, Throwable t) -> {
1094                  m.checkExecutionMode();
1095 <                threadAssertNull(x);
1095 >                threadAssertNull(result);
1096                  threadAssertSame(t, ex);
1097                  a.getAndIncrement();
1098                  return v1;
# Line 1110 | Line 1119 | public class CompletableFutureTest exten
1119          if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1120          final CompletableFuture<Integer> g = m.handle
1121              (f,
1122 <             (Integer x, Throwable t) -> {
1122 >             (Integer result, Throwable t) -> {
1123                  m.checkExecutionMode();
1124 <                threadAssertNull(x);
1124 >                threadAssertNull(result);
1125                  threadAssertTrue(t instanceof CancellationException);
1126                  a.getAndIncrement();
1127                  return v1;
# Line 1125 | Line 1134 | public class CompletableFutureTest exten
1134      }}
1135  
1136      /**
1137 <     * handle result completes exceptionally if action does
1137 >     * If a "handle action" throws an exception when triggered by
1138 >     * a normal completion, it completes exceptionally
1139       */
1140 <    public void testHandle_sourceFailedActionFailed() {
1140 >    public void testHandle_sourceCompletedNormallyActionFailed() {
1141          for (ExecutionMode m : ExecutionMode.values())
1142          for (boolean createIncomplete : new boolean[] { true, false })
1143 +        for (Integer v1 : new Integer[] { 1, null })
1144      {
1145          final CompletableFuture<Integer> f = new CompletableFuture<>();
1146          final AtomicInteger a = new AtomicInteger(0);
1147 <        final CFException ex1 = new CFException();
1148 <        final CFException ex2 = new CFException();
1138 <        if (!createIncomplete) f.completeExceptionally(ex1);
1147 >        final CFException ex = new CFException();
1148 >        if (!createIncomplete) assertTrue(f.complete(v1));
1149          final CompletableFuture<Integer> g = m.handle
1150              (f,
1151 <             (Integer x, Throwable t) -> {
1151 >             (Integer result, Throwable t) -> {
1152                  m.checkExecutionMode();
1153 <                threadAssertNull(x);
1154 <                threadAssertSame(ex1, t);
1153 >                threadAssertSame(result, v1);
1154 >                threadAssertNull(t);
1155                  a.getAndIncrement();
1156 <                throw ex2;
1156 >                throw ex;
1157              });
1158 <        if (createIncomplete) f.completeExceptionally(ex1);
1158 >        if (createIncomplete) assertTrue(f.complete(v1));
1159  
1160 <        checkCompletedWithWrappedException(g, ex2);
1161 <        checkCompletedExceptionally(f, ex1);
1160 >        checkCompletedWithWrappedException(g, ex);
1161 >        checkCompletedNormally(f, v1);
1162          assertEquals(1, a.get());
1163      }}
1164  
1165 <    public void testHandle_sourceCompletedNormallyActionFailed() {
1166 <        for (ExecutionMode m : ExecutionMode.values())
1165 >    /**
1166 >     * If a "handle action" throws an exception when triggered by
1167 >     * a source completion that also throws an exception, the action
1168 >     * exception takes precedence (unlike whenComplete)
1169 >     */
1170 >    public void testHandle_sourceFailedActionFailed() {
1171          for (boolean createIncomplete : new boolean[] { true, false })
1172 <        for (Integer v1 : new Integer[] { 1, null })
1172 >        for (ExecutionMode m : ExecutionMode.values())
1173      {
1160        final CompletableFuture<Integer> f = new CompletableFuture<>();
1174          final AtomicInteger a = new AtomicInteger(0);
1175 <        final CFException ex = new CFException();
1176 <        if (!createIncomplete) assertTrue(f.complete(v1));
1175 >        final CFException ex1 = new CFException();
1176 >        final CFException ex2 = new CFException();
1177 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1178 >
1179 >        if (!createIncomplete) f.completeExceptionally(ex1);
1180          final CompletableFuture<Integer> g = m.handle
1181              (f,
1182 <             (Integer x, Throwable t) -> {
1182 >             (Integer result, Throwable t) -> {
1183                  m.checkExecutionMode();
1184 <                threadAssertSame(x, v1);
1185 <                threadAssertNull(t);
1184 >                threadAssertNull(result);
1185 >                threadAssertSame(ex1, t);
1186                  a.getAndIncrement();
1187 <                throw ex;
1187 >                throw ex2;
1188              });
1189 <        if (createIncomplete) assertTrue(f.complete(v1));
1189 >        if (createIncomplete) f.completeExceptionally(ex1);
1190  
1191 <        checkCompletedWithWrappedException(g, ex);
1192 <        checkCompletedNormally(f, v1);
1191 >        checkCompletedWithWrappedException(g, ex2);
1192 >        checkCompletedExceptionally(f, ex1);
1193          assertEquals(1, a.get());
1194      }}
1195  
# Line 3279 | Line 3295 | public class CompletableFutureTest exten
3295              () -> f.obtrudeException(null),
3296  
3297              () -> CompletableFuture.delayedExecutor(1L, SECONDS, null),
3298 <            () -> CompletableFuture.delayedExecutor(1L, null, new ThreadExecutor()),
3298 >            () -> CompletableFuture.delayedExecutor(1L, null, exec),
3299              () -> CompletableFuture.delayedExecutor(1L, null),
3300  
3301              () -> f.orTimeout(1L, null),
# Line 3509 | Line 3525 | public class CompletableFutureTest exten
3525          long timeoutMillis = timeoutMillis();
3526          CompletableFuture<Integer> f = new CompletableFuture<>();
3527          long startTime = System.nanoTime();
3528 <        f.orTimeout(timeoutMillis, MILLISECONDS);
3528 >        assertSame(f, f.orTimeout(timeoutMillis, MILLISECONDS));
3529          checkCompletedWithTimeoutException(f);
3530          assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
3531      }
# Line 3524 | Line 3540 | public class CompletableFutureTest exten
3540          CompletableFuture<Integer> g = new CompletableFuture<>();
3541          long startTime = System.nanoTime();
3542          f.complete(v1);
3543 <        f.orTimeout(LONG_DELAY_MS, MILLISECONDS);
3544 <        g.orTimeout(LONG_DELAY_MS, MILLISECONDS);
3543 >        assertSame(f, f.orTimeout(LONG_DELAY_MS, MILLISECONDS));
3544 >        assertSame(g, g.orTimeout(LONG_DELAY_MS, MILLISECONDS));
3545          g.complete(v1);
3546          checkCompletedNormally(f, v1);
3547          checkCompletedNormally(g, v1);
# Line 3540 | Line 3556 | public class CompletableFutureTest exten
3556                         () -> testCompleteOnTimeout_timesOut(null));
3557      }
3558  
3559 +    /**
3560 +     * completeOnTimeout completes with given value if not complete
3561 +     */
3562      public void testCompleteOnTimeout_timesOut(Integer v) {
3563          long timeoutMillis = timeoutMillis();
3564          CompletableFuture<Integer> f = new CompletableFuture<>();
3565          long startTime = System.nanoTime();
3566 <        f.completeOnTimeout(v, timeoutMillis, MILLISECONDS);
3566 >        assertSame(f, f.completeOnTimeout(v, timeoutMillis, MILLISECONDS));
3567          assertSame(v, f.join());
3568          assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
3569          f.complete(99);         // should have no effect
# Line 3561 | Line 3580 | public class CompletableFutureTest exten
3580          CompletableFuture<Integer> g = new CompletableFuture<>();
3581          long startTime = System.nanoTime();
3582          f.complete(v1);
3583 <        f.completeOnTimeout(-1, LONG_DELAY_MS, MILLISECONDS);
3584 <        g.completeOnTimeout(-1, LONG_DELAY_MS, MILLISECONDS);
3583 >        assertSame(f, f.completeOnTimeout(-1, LONG_DELAY_MS, MILLISECONDS));
3584 >        assertSame(g, g.completeOnTimeout(-1, LONG_DELAY_MS, MILLISECONDS));
3585          g.complete(v1);
3586          checkCompletedNormally(f, v1);
3587          checkCompletedNormally(g, v1);
# Line 3613 | Line 3632 | public class CompletableFutureTest exten
3632      //--- tests of implementation details; not part of official tck ---
3633  
3634      Object resultOf(CompletableFuture<?> f) {
3635 +        SecurityManager sm = System.getSecurityManager();
3636 +        if (sm != null) {
3637 +            try {
3638 +                System.setSecurityManager(null);
3639 +            } catch (SecurityException giveUp) {
3640 +                return "Reflection not available";
3641 +            }
3642 +        }
3643 +
3644          try {
3645              java.lang.reflect.Field resultField
3646                  = CompletableFuture.class.getDeclaredField("result");
3647              resultField.setAccessible(true);
3648              return resultField.get(f);
3649 <        } catch (Throwable t) { throw new AssertionError(t); }
3649 >        } catch (Throwable t) {
3650 >            throw new AssertionError(t);
3651 >        } finally {
3652 >            if (sm != null) System.setSecurityManager(sm);
3653 >        }
3654      }
3655  
3656      public void testExceptionPropagationReusesResultObject() {
# Line 3644 | Line 3676 | public class CompletableFutureTest exten
3676          funs.add((y) -> m.thenAcceptBoth(y, v42, new SubtractAction(m)));
3677          funs.add((y) -> m.thenCombine(y, v42, new SubtractFunction(m)));
3678  
3679 <        funs.add((y) -> m.whenComplete(y, (Integer x, Throwable t) -> {}));
3679 >        funs.add((y) -> m.whenComplete(y, (Integer r, Throwable t) -> {}));
3680  
3681          funs.add((y) -> m.thenCompose(y, new CompletableFutureInc(m)));
3682  
# Line 3764 | Line 3796 | public class CompletableFutureTest exten
3796      }
3797  
3798      static class Monad {
3799 <        static class MonadError extends Error {
3800 <            public MonadError() { super("monadic zero"); }
3799 >        static class ZeroException extends RuntimeException {
3800 >            public ZeroException() { super("monadic zero"); }
3801          }
3802          // "return", "unit"
3803          static <T> CompletableFuture<T> unit(T value) {
# Line 3773 | Line 3805 | public class CompletableFutureTest exten
3805          }
3806          // monadic zero ?
3807          static <T> CompletableFuture<T> zero() {
3808 <            return failedFuture(new MonadError());
3808 >            return failedFuture(new ZeroException());
3809          }
3810          // >=>
3811          static <T,U,V> Function<T, CompletableFuture<V>> compose
# Line 3787 | Line 3819 | public class CompletableFutureTest exten
3819                  f.getNow(null);
3820                  throw new AssertionFailedError("should throw");
3821              } catch (CompletionException success) {
3822 <                assertTrue(success.getCause() instanceof MonadError);
3822 >                assertTrue(success.getCause() instanceof ZeroException);
3823              }
3824          }
3825  
# Line 3814 | Line 3846 | public class CompletableFutureTest exten
3846              AtomicReference<Throwable> firstFailure = new AtomicReference<>(null);
3847          }
3848  
3849 <        // Monadic "plus"
3849 >        /** Implements "monadic plus". */
3850          static <T> CompletableFuture<T> plus(CompletableFuture<? extends T> f,
3851                                               CompletableFuture<? extends T> g) {
3852              PlusFuture<T> plus = new PlusFuture<T>();
3853              BiConsumer<T, Throwable> action = (T result, Throwable ex) -> {
3854 <                if (result != null) {
3855 <                    if (plus.complete(result))
3856 <                        if (plus.firstFailure.get() != null)
3854 >                try {
3855 >                    if (ex == null) {
3856 >                        if (plus.complete(result))
3857 >                            if (plus.firstFailure.get() != null)
3858 >                                plus.firstFailure.set(null);
3859 >                    }
3860 >                    else if (plus.firstFailure.compareAndSet(null, ex)) {
3861 >                        if (plus.isDone())
3862                              plus.firstFailure.set(null);
3863 <                }
3864 <                else if (plus.firstFailure.compareAndSet(null, ex)) {
3865 <                    if (plus.isDone())
3866 <                        plus.firstFailure.set(null);
3867 <                } else {
3868 <                    if (plus.completeExceptionally(ex))
3869 <                        plus.firstFailure.set(null);
3863 >                    }
3864 >                    else {
3865 >                        // first failure has precedence
3866 >                        Throwable first = plus.firstFailure.getAndSet(null);
3867 >
3868 >                        // may fail with "Self-suppression not permitted"
3869 >                        try { first.addSuppressed(ex); }
3870 >                        catch (Exception ignored) {}
3871 >
3872 >                        plus.completeExceptionally(first);
3873 >                    }
3874 >                } catch (Throwable unexpected) {
3875 >                    plus.completeExceptionally(unexpected);
3876                  }
3877              };
3878              f.whenComplete(action);
# Line 3898 | Line 3941 | public class CompletableFutureTest exten
3941                                   Monad.plus(godot, Monad.unit(5L)));
3942      }
3943  
3944 +    /**
3945 +     * A single CompletableFuture with many dependents.
3946 +     * A demo of scalability - runtime is O(n).
3947 +     */
3948 +    public void testManyDependents() throws Throwable {
3949 +        final int n = 1_000;
3950 +        final CompletableFuture<Void> head = new CompletableFuture<>();
3951 +        final CompletableFuture<Void> complete = CompletableFuture.completedFuture((Void)null);
3952 +        final AtomicInteger count = new AtomicInteger(0);
3953 +        for (int i = 0; i < n; i++) {
3954 +            head.thenRun(() -> count.getAndIncrement());
3955 +            head.thenAccept((x) -> count.getAndIncrement());
3956 +            head.thenApply((x) -> count.getAndIncrement());
3957 +
3958 +            head.runAfterBoth(complete, () -> count.getAndIncrement());
3959 +            head.thenAcceptBoth(complete, (x, y) -> count.getAndIncrement());
3960 +            head.thenCombine(complete, (x, y) -> count.getAndIncrement());
3961 +            complete.runAfterBoth(head, () -> count.getAndIncrement());
3962 +            complete.thenAcceptBoth(head, (x, y) -> count.getAndIncrement());
3963 +            complete.thenCombine(head, (x, y) -> count.getAndIncrement());
3964 +
3965 +            head.runAfterEither(new CompletableFuture<Void>(), () -> count.getAndIncrement());
3966 +            head.acceptEither(new CompletableFuture<Void>(), (x) -> count.getAndIncrement());
3967 +            head.applyToEither(new CompletableFuture<Void>(), (x) -> count.getAndIncrement());
3968 +            new CompletableFuture<Void>().runAfterEither(head, () -> count.getAndIncrement());
3969 +            new CompletableFuture<Void>().acceptEither(head, (x) -> count.getAndIncrement());
3970 +            new CompletableFuture<Void>().applyToEither(head, (x) -> count.getAndIncrement());
3971 +        }
3972 +        head.complete(null);
3973 +        assertEquals(5 * 3 * n, count.get());
3974 +    }
3975 +
3976   //     static <U> U join(CompletionStage<U> stage) {
3977   //         CompletableFuture<U> f = new CompletableFuture<>();
3978   //         stage.whenComplete((v, ex) -> {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines