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.128 by jsr166, Sun Nov 15 00:37:50 2015 UTC vs.
Revision 1.163 by jsr166, Sun Jul 3 18:33:17 2016 UTC

# Line 30 | Line 30 | import java.util.concurrent.ExecutionExc
30   import java.util.concurrent.Executor;
31   import java.util.concurrent.ForkJoinPool;
32   import java.util.concurrent.ForkJoinTask;
33 + import java.util.concurrent.RejectedExecutionException;
34   import java.util.concurrent.TimeoutException;
35   import java.util.concurrent.TimeUnit;
36   import java.util.concurrent.atomic.AtomicInteger;
# Line 459 | Line 460 | public class CompletableFutureTest exten
460      class FailingSupplier extends CheckedAction
461          implements Supplier<Integer>
462      {
463 <        FailingSupplier(ExecutionMode m) { super(m); }
463 >        final CFException ex;
464 >        FailingSupplier(ExecutionMode m) { super(m); ex = new CFException(); }
465          public Integer get() {
466              invoked();
467 <            throw new CFException();
467 >            throw ex;
468          }
469      }
470  
471      class FailingConsumer extends CheckedIntegerAction
472          implements Consumer<Integer>
473      {
474 <        FailingConsumer(ExecutionMode m) { super(m); }
474 >        final CFException ex;
475 >        FailingConsumer(ExecutionMode m) { super(m); ex = new CFException(); }
476          public void accept(Integer x) {
477              invoked();
478              value = x;
479 <            throw new CFException();
479 >            throw ex;
480          }
481      }
482  
483      class FailingBiConsumer extends CheckedIntegerAction
484          implements BiConsumer<Integer, Integer>
485      {
486 <        FailingBiConsumer(ExecutionMode m) { super(m); }
486 >        final CFException ex;
487 >        FailingBiConsumer(ExecutionMode m) { super(m); ex = new CFException(); }
488          public void accept(Integer x, Integer y) {
489              invoked();
490              value = subtract(x, y);
491 <            throw new CFException();
491 >            throw ex;
492          }
493      }
494  
495      class FailingFunction extends CheckedIntegerAction
496          implements Function<Integer, Integer>
497      {
498 <        FailingFunction(ExecutionMode m) { super(m); }
498 >        final CFException ex;
499 >        FailingFunction(ExecutionMode m) { super(m); ex = new CFException(); }
500          public Integer apply(Integer x) {
501              invoked();
502              value = x;
503 <            throw new CFException();
503 >            throw ex;
504          }
505      }
506  
507      class FailingBiFunction extends CheckedIntegerAction
508          implements BiFunction<Integer, Integer, Integer>
509      {
510 <        FailingBiFunction(ExecutionMode m) { super(m); }
510 >        final CFException ex;
511 >        FailingBiFunction(ExecutionMode m) { super(m); ex = new CFException(); }
512          public Integer apply(Integer x, Integer y) {
513              invoked();
514              value = subtract(x, y);
515 <            throw new CFException();
515 >            throw ex;
516          }
517      }
518  
519      class FailingRunnable extends CheckedAction implements Runnable {
520 <        FailingRunnable(ExecutionMode m) { super(m); }
520 >        final CFException ex;
521 >        FailingRunnable(ExecutionMode m) { super(m); ex = new CFException(); }
522          public void run() {
523              invoked();
524 <            throw new CFException();
524 >            throw ex;
525          }
526      }
527  
# Line 534 | Line 541 | public class CompletableFutureTest exten
541      class FailingCompletableFutureFunction extends CheckedIntegerAction
542          implements Function<Integer, CompletableFuture<Integer>>
543      {
544 <        FailingCompletableFutureFunction(ExecutionMode m) { super(m); }
544 >        final CFException ex;
545 >        FailingCompletableFutureFunction(ExecutionMode m) { super(m); ex = new CFException(); }
546          public CompletableFuture<Integer> apply(Integer x) {
547              invoked();
548              value = x;
549 <            throw new CFException();
549 >            throw ex;
550 >        }
551 >    }
552 >
553 >    static class CountingRejectingExecutor implements Executor {
554 >        final RejectedExecutionException ex = new RejectedExecutionException();
555 >        final AtomicInteger count = new AtomicInteger(0);
556 >        public void execute(Runnable r) {
557 >            count.getAndIncrement();
558 >            throw ex;
559          }
560      }
561  
# Line 876 | Line 893 | public class CompletableFutureTest exten
893          assertEquals(1, a.get());
894      }}
895  
896 +    /**
897 +     * If an "exceptionally action" throws an exception, it completes
898 +     * exceptionally with that exception
899 +     */
900      public void testExceptionally_exceptionalCompletionActionFailed() {
901          for (boolean createIncomplete : new boolean[] { true, false })
902      {
# Line 894 | Line 915 | public class CompletableFutureTest exten
915          if (createIncomplete) f.completeExceptionally(ex1);
916  
917          checkCompletedWithWrappedException(g, ex2);
918 +        checkCompletedExceptionally(f, ex1);
919          assertEquals(1, a.get());
920      }}
921  
# Line 911 | Line 933 | public class CompletableFutureTest exten
933          if (!createIncomplete) assertTrue(f.complete(v1));
934          final CompletableFuture<Integer> g = m.whenComplete
935              (f,
936 <             (Integer x, Throwable t) -> {
936 >             (Integer result, Throwable t) -> {
937                  m.checkExecutionMode();
938 <                threadAssertSame(x, v1);
938 >                threadAssertSame(result, v1);
939                  threadAssertNull(t);
940                  a.getAndIncrement();
941              });
# Line 938 | Line 960 | public class CompletableFutureTest exten
960          if (!createIncomplete) f.completeExceptionally(ex);
961          final CompletableFuture<Integer> g = m.whenComplete
962              (f,
963 <             (Integer x, Throwable t) -> {
963 >             (Integer result, Throwable t) -> {
964                  m.checkExecutionMode();
965 <                threadAssertNull(x);
965 >                threadAssertNull(result);
966                  threadAssertSame(t, ex);
967                  a.getAndIncrement();
968              });
# Line 965 | Line 987 | public class CompletableFutureTest exten
987          if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
988          final CompletableFuture<Integer> g = m.whenComplete
989              (f,
990 <             (Integer x, Throwable t) -> {
990 >             (Integer result, Throwable t) -> {
991                  m.checkExecutionMode();
992 <                threadAssertNull(x);
992 >                threadAssertNull(result);
993                  threadAssertTrue(t instanceof CancellationException);
994                  a.getAndIncrement();
995              });
# Line 982 | Line 1004 | public class CompletableFutureTest exten
1004       * If a whenComplete action throws an exception when triggered by
1005       * a normal completion, it completes exceptionally
1006       */
1007 <    public void testWhenComplete_actionFailed() {
1007 >    public void testWhenComplete_sourceCompletedNormallyActionFailed() {
1008          for (boolean createIncomplete : new boolean[] { true, false })
1009          for (ExecutionMode m : ExecutionMode.values())
1010          for (Integer v1 : new Integer[] { 1, null })
# Line 993 | Line 1015 | public class CompletableFutureTest exten
1015          if (!createIncomplete) assertTrue(f.complete(v1));
1016          final CompletableFuture<Integer> g = m.whenComplete
1017              (f,
1018 <             (Integer x, Throwable t) -> {
1018 >             (Integer result, Throwable t) -> {
1019                  m.checkExecutionMode();
1020 <                threadAssertSame(x, v1);
1020 >                threadAssertSame(result, v1);
1021                  threadAssertNull(t);
1022                  a.getAndIncrement();
1023                  throw ex;
# Line 1010 | Line 1032 | public class CompletableFutureTest exten
1032      /**
1033       * If a whenComplete action throws an exception when triggered by
1034       * a source completion that also throws an exception, the source
1035 <     * exception takes precedence.
1035 >     * exception takes precedence (unlike handle)
1036       */
1037 <    public void testWhenComplete_actionFailedSourceFailed() {
1037 >    public void testWhenComplete_sourceFailedActionFailed() {
1038          for (boolean createIncomplete : new boolean[] { true, false })
1039          for (ExecutionMode m : ExecutionMode.values())
1040      {
# Line 1024 | Line 1046 | public class CompletableFutureTest exten
1046          if (!createIncomplete) f.completeExceptionally(ex1);
1047          final CompletableFuture<Integer> g = m.whenComplete
1048              (f,
1049 <             (Integer x, Throwable t) -> {
1049 >             (Integer result, Throwable t) -> {
1050                  m.checkExecutionMode();
1051                  threadAssertSame(t, ex1);
1052 <                threadAssertNull(x);
1052 >                threadAssertNull(result);
1053                  a.getAndIncrement();
1054                  throw ex2;
1055              });
# Line 1035 | Line 1057 | public class CompletableFutureTest exten
1057  
1058          checkCompletedWithWrappedException(g, ex1);
1059          checkCompletedExceptionally(f, ex1);
1060 +        if (testImplementationDetails) {
1061 +            assertEquals(1, ex1.getSuppressed().length);
1062 +            assertSame(ex2, ex1.getSuppressed()[0]);
1063 +        }
1064          assertEquals(1, a.get());
1065      }}
1066  
# Line 1052 | Line 1078 | public class CompletableFutureTest exten
1078          if (!createIncomplete) assertTrue(f.complete(v1));
1079          final CompletableFuture<Integer> g = m.handle
1080              (f,
1081 <             (Integer x, Throwable t) -> {
1081 >             (Integer result, Throwable t) -> {
1082                  m.checkExecutionMode();
1083 <                threadAssertSame(x, v1);
1083 >                threadAssertSame(result, v1);
1084                  threadAssertNull(t);
1085                  a.getAndIncrement();
1086                  return inc(v1);
# Line 1081 | Line 1107 | public class CompletableFutureTest exten
1107          if (!createIncomplete) f.completeExceptionally(ex);
1108          final CompletableFuture<Integer> g = m.handle
1109              (f,
1110 <             (Integer x, Throwable t) -> {
1110 >             (Integer result, Throwable t) -> {
1111                  m.checkExecutionMode();
1112 <                threadAssertNull(x);
1112 >                threadAssertNull(result);
1113                  threadAssertSame(t, ex);
1114                  a.getAndIncrement();
1115                  return v1;
# Line 1110 | Line 1136 | public class CompletableFutureTest exten
1136          if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1137          final CompletableFuture<Integer> g = m.handle
1138              (f,
1139 <             (Integer x, Throwable t) -> {
1139 >             (Integer result, Throwable t) -> {
1140                  m.checkExecutionMode();
1141 <                threadAssertNull(x);
1141 >                threadAssertNull(result);
1142                  threadAssertTrue(t instanceof CancellationException);
1143                  a.getAndIncrement();
1144                  return v1;
# Line 1125 | Line 1151 | public class CompletableFutureTest exten
1151      }}
1152  
1153      /**
1154 <     * handle result completes exceptionally if action does
1154 >     * If a "handle action" throws an exception when triggered by
1155 >     * a normal completion, it completes exceptionally
1156       */
1157 <    public void testHandle_sourceFailedActionFailed() {
1157 >    public void testHandle_sourceCompletedNormallyActionFailed() {
1158          for (ExecutionMode m : ExecutionMode.values())
1159          for (boolean createIncomplete : new boolean[] { true, false })
1160 +        for (Integer v1 : new Integer[] { 1, null })
1161      {
1162          final CompletableFuture<Integer> f = new CompletableFuture<>();
1163          final AtomicInteger a = new AtomicInteger(0);
1164 <        final CFException ex1 = new CFException();
1165 <        final CFException ex2 = new CFException();
1138 <        if (!createIncomplete) f.completeExceptionally(ex1);
1164 >        final CFException ex = new CFException();
1165 >        if (!createIncomplete) assertTrue(f.complete(v1));
1166          final CompletableFuture<Integer> g = m.handle
1167              (f,
1168 <             (Integer x, Throwable t) -> {
1168 >             (Integer result, Throwable t) -> {
1169                  m.checkExecutionMode();
1170 <                threadAssertNull(x);
1171 <                threadAssertSame(ex1, t);
1170 >                threadAssertSame(result, v1);
1171 >                threadAssertNull(t);
1172                  a.getAndIncrement();
1173 <                throw ex2;
1173 >                throw ex;
1174              });
1175 <        if (createIncomplete) f.completeExceptionally(ex1);
1175 >        if (createIncomplete) assertTrue(f.complete(v1));
1176  
1177 <        checkCompletedWithWrappedException(g, ex2);
1178 <        checkCompletedExceptionally(f, ex1);
1177 >        checkCompletedWithWrappedException(g, ex);
1178 >        checkCompletedNormally(f, v1);
1179          assertEquals(1, a.get());
1180      }}
1181  
1182 <    public void testHandle_sourceCompletedNormallyActionFailed() {
1183 <        for (ExecutionMode m : ExecutionMode.values())
1182 >    /**
1183 >     * If a "handle action" throws an exception when triggered by
1184 >     * a source completion that also throws an exception, the action
1185 >     * exception takes precedence (unlike whenComplete)
1186 >     */
1187 >    public void testHandle_sourceFailedActionFailed() {
1188          for (boolean createIncomplete : new boolean[] { true, false })
1189 <        for (Integer v1 : new Integer[] { 1, null })
1189 >        for (ExecutionMode m : ExecutionMode.values())
1190      {
1160        final CompletableFuture<Integer> f = new CompletableFuture<>();
1191          final AtomicInteger a = new AtomicInteger(0);
1192 <        final CFException ex = new CFException();
1193 <        if (!createIncomplete) assertTrue(f.complete(v1));
1192 >        final CFException ex1 = new CFException();
1193 >        final CFException ex2 = new CFException();
1194 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1195 >
1196 >        if (!createIncomplete) f.completeExceptionally(ex1);
1197          final CompletableFuture<Integer> g = m.handle
1198              (f,
1199 <             (Integer x, Throwable t) -> {
1199 >             (Integer result, Throwable t) -> {
1200                  m.checkExecutionMode();
1201 <                threadAssertSame(x, v1);
1202 <                threadAssertNull(t);
1201 >                threadAssertNull(result);
1202 >                threadAssertSame(ex1, t);
1203                  a.getAndIncrement();
1204 <                throw ex;
1204 >                throw ex2;
1205              });
1206 <        if (createIncomplete) assertTrue(f.complete(v1));
1206 >        if (createIncomplete) f.completeExceptionally(ex1);
1207  
1208 <        checkCompletedWithWrappedException(g, ex);
1209 <        checkCompletedNormally(f, v1);
1208 >        checkCompletedWithWrappedException(g, ex2);
1209 >        checkCompletedExceptionally(f, ex1);
1210          assertEquals(1, a.get());
1211      }}
1212  
# Line 1206 | Line 1239 | public class CompletableFutureTest exten
1239      {
1240          final FailingRunnable r = new FailingRunnable(m);
1241          final CompletableFuture<Void> f = m.runAsync(r);
1242 <        checkCompletedWithWrappedCFException(f);
1242 >        checkCompletedWithWrappedException(f, r.ex);
1243          r.assertInvoked();
1244      }}
1245  
1246 +    public void testRunAsync_rejectingExecutor() {
1247 +        CountingRejectingExecutor e = new CountingRejectingExecutor();
1248 +        try {
1249 +            CompletableFuture.runAsync(() -> {}, e);
1250 +            shouldThrow();
1251 +        } catch (Throwable t) {
1252 +            assertSame(e.ex, t);
1253 +        }
1254 +
1255 +        assertEquals(1, e.count.get());
1256 +    }
1257 +
1258      /**
1259       * supplyAsync completes with result of supplier
1260       */
# Line 1240 | Line 1285 | public class CompletableFutureTest exten
1285      {
1286          FailingSupplier r = new FailingSupplier(m);
1287          CompletableFuture<Integer> f = m.supplyAsync(r);
1288 <        checkCompletedWithWrappedCFException(f);
1288 >        checkCompletedWithWrappedException(f, r.ex);
1289          r.assertInvoked();
1290      }}
1291  
1292 +    public void testSupplyAsync_rejectingExecutor() {
1293 +        CountingRejectingExecutor e = new CountingRejectingExecutor();
1294 +        try {
1295 +            CompletableFuture.supplyAsync(() -> null, e);
1296 +            shouldThrow();
1297 +        } catch (Throwable t) {
1298 +            assertSame(e.ex, t);
1299 +        }
1300 +
1301 +        assertEquals(1, e.count.get());
1302 +    }
1303 +
1304      // seq completion methods
1305  
1306      /**
# Line 1362 | Line 1419 | public class CompletableFutureTest exten
1419          final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1420          final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1421  
1422 <        checkCompletedWithWrappedCFException(h0);
1423 <        checkCompletedWithWrappedCFException(h1);
1424 <        checkCompletedWithWrappedCFException(h2);
1425 <        checkCompletedWithWrappedCFException(h3);
1426 <        checkCompletedWithWrappedCFException(h4);
1427 <        checkCompletedWithWrappedCFException(h5);
1422 >        checkCompletedWithWrappedException(h0, rs[0].ex);
1423 >        checkCompletedWithWrappedException(h1, rs[1].ex);
1424 >        checkCompletedWithWrappedException(h2, rs[2].ex);
1425 >        checkCompletedWithWrappedException(h3, rs[3].ex);
1426 >        checkCompletedWithWrappedException(h4, rs[4].ex);
1427 >        checkCompletedWithWrappedException(h5, rs[5].ex);
1428          checkCompletedNormally(f, v1);
1429      }}
1430  
# Line 1466 | Line 1523 | public class CompletableFutureTest exten
1523          final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1524          final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1525  
1526 <        checkCompletedWithWrappedCFException(h0);
1527 <        checkCompletedWithWrappedCFException(h1);
1528 <        checkCompletedWithWrappedCFException(h2);
1529 <        checkCompletedWithWrappedCFException(h3);
1526 >        checkCompletedWithWrappedException(h0, rs[0].ex);
1527 >        checkCompletedWithWrappedException(h1, rs[1].ex);
1528 >        checkCompletedWithWrappedException(h2, rs[2].ex);
1529 >        checkCompletedWithWrappedException(h3, rs[3].ex);
1530          checkCompletedNormally(f, v1);
1531      }}
1532  
# Line 1568 | Line 1625 | public class CompletableFutureTest exten
1625          final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1626          final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1627  
1628 <        checkCompletedWithWrappedCFException(h0);
1629 <        checkCompletedWithWrappedCFException(h1);
1630 <        checkCompletedWithWrappedCFException(h2);
1631 <        checkCompletedWithWrappedCFException(h3);
1628 >        checkCompletedWithWrappedException(h0, rs[0].ex);
1629 >        checkCompletedWithWrappedException(h1, rs[1].ex);
1630 >        checkCompletedWithWrappedException(h2, rs[2].ex);
1631 >        checkCompletedWithWrappedException(h3, rs[3].ex);
1632          checkCompletedNormally(f, v1);
1633      }}
1634  
# Line 1733 | Line 1790 | public class CompletableFutureTest exten
1790          assertTrue(snd.complete(w2));
1791          final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1792  
1793 <        checkCompletedWithWrappedCFException(h1);
1794 <        checkCompletedWithWrappedCFException(h2);
1795 <        checkCompletedWithWrappedCFException(h3);
1793 >        checkCompletedWithWrappedException(h1, r1.ex);
1794 >        checkCompletedWithWrappedException(h2, r2.ex);
1795 >        checkCompletedWithWrappedException(h3, r3.ex);
1796          r1.assertInvoked();
1797          r2.assertInvoked();
1798          r3.assertInvoked();
# Line 1897 | Line 1954 | public class CompletableFutureTest exten
1954          assertTrue(snd.complete(w2));
1955          final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1956  
1957 <        checkCompletedWithWrappedCFException(h1);
1958 <        checkCompletedWithWrappedCFException(h2);
1959 <        checkCompletedWithWrappedCFException(h3);
1957 >        checkCompletedWithWrappedException(h1, r1.ex);
1958 >        checkCompletedWithWrappedException(h2, r2.ex);
1959 >        checkCompletedWithWrappedException(h3, r3.ex);
1960          r1.assertInvoked();
1961          r2.assertInvoked();
1962          r3.assertInvoked();
# Line 2061 | Line 2118 | public class CompletableFutureTest exten
2118          assertTrue(snd.complete(w2));
2119          final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2120  
2121 <        checkCompletedWithWrappedCFException(h1);
2122 <        checkCompletedWithWrappedCFException(h2);
2123 <        checkCompletedWithWrappedCFException(h3);
2121 >        checkCompletedWithWrappedException(h1, r1.ex);
2122 >        checkCompletedWithWrappedException(h2, r2.ex);
2123 >        checkCompletedWithWrappedException(h3, r3.ex);
2124          r1.assertInvoked();
2125          r2.assertInvoked();
2126          r3.assertInvoked();
# Line 2353 | Line 2410 | public class CompletableFutureTest exten
2410          f.complete(v1);
2411          final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2412          final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2413 <        checkCompletedWithWrappedCFException(h0);
2414 <        checkCompletedWithWrappedCFException(h1);
2415 <        checkCompletedWithWrappedCFException(h2);
2416 <        checkCompletedWithWrappedCFException(h3);
2413 >        checkCompletedWithWrappedException(h0, rs[0].ex);
2414 >        checkCompletedWithWrappedException(h1, rs[1].ex);
2415 >        checkCompletedWithWrappedException(h2, rs[2].ex);
2416 >        checkCompletedWithWrappedException(h3, rs[3].ex);
2417          for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2418  
2419          g.complete(v2);
# Line 2365 | Line 2422 | public class CompletableFutureTest exten
2422          final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2423          final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2424  
2425 <        checkCompletedWithWrappedCFException(h4);
2425 >        checkCompletedWithWrappedException(h4, rs[4].ex);
2426          assertTrue(Objects.equals(v1, rs[4].value) ||
2427                     Objects.equals(v2, rs[4].value));
2428 <        checkCompletedWithWrappedCFException(h5);
2428 >        checkCompletedWithWrappedException(h5, rs[5].ex);
2429          assertTrue(Objects.equals(v1, rs[5].value) ||
2430                     Objects.equals(v2, rs[5].value));
2431  
# Line 2612 | Line 2669 | public class CompletableFutureTest exten
2669          f.complete(v1);
2670          final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2671          final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2672 <        checkCompletedWithWrappedCFException(h0);
2673 <        checkCompletedWithWrappedCFException(h1);
2674 <        checkCompletedWithWrappedCFException(h2);
2675 <        checkCompletedWithWrappedCFException(h3);
2672 >        checkCompletedWithWrappedException(h0, rs[0].ex);
2673 >        checkCompletedWithWrappedException(h1, rs[1].ex);
2674 >        checkCompletedWithWrappedException(h2, rs[2].ex);
2675 >        checkCompletedWithWrappedException(h3, rs[3].ex);
2676          for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2677  
2678          g.complete(v2);
# Line 2624 | Line 2681 | public class CompletableFutureTest exten
2681          final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2682          final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2683  
2684 <        checkCompletedWithWrappedCFException(h4);
2684 >        checkCompletedWithWrappedException(h4, rs[4].ex);
2685          assertTrue(Objects.equals(v1, rs[4].value) ||
2686                     Objects.equals(v2, rs[4].value));
2687 <        checkCompletedWithWrappedCFException(h5);
2687 >        checkCompletedWithWrappedException(h5, rs[5].ex);
2688          assertTrue(Objects.equals(v1, rs[5].value) ||
2689                     Objects.equals(v2, rs[5].value));
2690  
# Line 2643 | Line 2700 | public class CompletableFutureTest exten
2700          for (ExecutionMode m : ExecutionMode.values())
2701          for (Integer v1 : new Integer[] { 1, null })
2702          for (Integer v2 : new Integer[] { 2, null })
2703 +        for (boolean pushNop : new boolean[] { true, false })
2704      {
2705          final CompletableFuture<Integer> f = new CompletableFuture<>();
2706          final CompletableFuture<Integer> g = new CompletableFuture<>();
# Line 2655 | Line 2713 | public class CompletableFutureTest exten
2713          checkIncomplete(h1);
2714          rs[0].assertNotInvoked();
2715          rs[1].assertNotInvoked();
2716 +        if (pushNop) {          // ad hoc test of intra-completion interference
2717 +            m.thenRun(f, () -> {});
2718 +            m.thenRun(g, () -> {});
2719 +        }
2720          f.complete(v1);
2721          checkCompletedNormally(h0, null);
2722          checkCompletedNormally(h1, null);
# Line 2867 | Line 2929 | public class CompletableFutureTest exten
2929          assertTrue(f.complete(v1));
2930          final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2931          final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2932 <        checkCompletedWithWrappedCFException(h0);
2933 <        checkCompletedWithWrappedCFException(h1);
2934 <        checkCompletedWithWrappedCFException(h2);
2935 <        checkCompletedWithWrappedCFException(h3);
2932 >        checkCompletedWithWrappedException(h0, rs[0].ex);
2933 >        checkCompletedWithWrappedException(h1, rs[1].ex);
2934 >        checkCompletedWithWrappedException(h2, rs[2].ex);
2935 >        checkCompletedWithWrappedException(h3, rs[3].ex);
2936          for (int i = 0; i < 4; i++) rs[i].assertInvoked();
2937          assertTrue(g.complete(v2));
2938          final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2939          final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2940 <        checkCompletedWithWrappedCFException(h4);
2941 <        checkCompletedWithWrappedCFException(h5);
2940 >        checkCompletedWithWrappedException(h4, rs[4].ex);
2941 >        checkCompletedWithWrappedException(h5, rs[5].ex);
2942  
2943          checkCompletedNormally(f, v1);
2944          checkCompletedNormally(g, v2);
# Line 2937 | Line 2999 | public class CompletableFutureTest exten
2999          final CompletableFuture<Integer> g = m.thenCompose(f, r);
3000          if (createIncomplete) assertTrue(f.complete(v1));
3001  
3002 <        checkCompletedWithWrappedCFException(g);
3002 >        checkCompletedWithWrappedException(g, r.ex);
3003          checkCompletedNormally(f, v1);
3004      }}
3005  
# Line 3046 | Line 3108 | public class CompletableFutureTest exten
3108          }
3109      }
3110  
3111 <    public void testAllOf_backwards() throws Exception {
3111 >    public void testAllOf_normal_backwards() throws Exception {
3112          for (int k = 1; k < 10; k++) {
3113              CompletableFuture<Integer>[] fs
3114                  = (CompletableFuture<Integer>[]) new CompletableFuture[k];
# Line 3279 | Line 3341 | public class CompletableFutureTest exten
3341              () -> f.obtrudeException(null),
3342  
3343              () -> CompletableFuture.delayedExecutor(1L, SECONDS, null),
3344 <            () -> CompletableFuture.delayedExecutor(1L, null, new ThreadExecutor()),
3344 >            () -> CompletableFuture.delayedExecutor(1L, null, exec),
3345              () -> CompletableFuture.delayedExecutor(1L, null),
3346  
3347              () -> f.orTimeout(1L, null),
# Line 3294 | Line 3356 | public class CompletableFutureTest exten
3356      }
3357  
3358      /**
3359 +     * Test submissions to an executor that rejects all tasks.
3360 +     */
3361 +    public void testRejectingExecutor() {
3362 +        for (Integer v : new Integer[] { 1, null })
3363 +    {
3364 +        final CountingRejectingExecutor e = new CountingRejectingExecutor();
3365 +
3366 +        final CompletableFuture<Integer> complete = CompletableFuture.completedFuture(v);
3367 +        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
3368 +
3369 +        List<CompletableFuture<?>> futures = new ArrayList<>();
3370 +
3371 +        List<CompletableFuture<Integer>> srcs = new ArrayList<>();
3372 +        srcs.add(complete);
3373 +        srcs.add(incomplete);
3374 +
3375 +        for (CompletableFuture<Integer> src : srcs) {
3376 +            List<CompletableFuture<?>> fs = new ArrayList<>();
3377 +            fs.add(src.thenRunAsync(() -> {}, e));
3378 +            fs.add(src.thenAcceptAsync((z) -> {}, e));
3379 +            fs.add(src.thenApplyAsync((z) -> z, e));
3380 +
3381 +            fs.add(src.thenCombineAsync(src, (x, y) -> x, e));
3382 +            fs.add(src.thenAcceptBothAsync(src, (x, y) -> {}, e));
3383 +            fs.add(src.runAfterBothAsync(src, () -> {}, e));
3384 +
3385 +            fs.add(src.applyToEitherAsync(src, (z) -> z, e));
3386 +            fs.add(src.acceptEitherAsync(src, (z) -> {}, e));
3387 +            fs.add(src.runAfterEitherAsync(src, () -> {}, e));
3388 +
3389 +            fs.add(src.thenComposeAsync((z) -> null, e));
3390 +            fs.add(src.whenCompleteAsync((z, t) -> {}, e));
3391 +            fs.add(src.handleAsync((z, t) -> null, e));
3392 +
3393 +            for (CompletableFuture<?> future : fs) {
3394 +                if (src.isDone())
3395 +                    checkCompletedWithWrappedException(future, e.ex);
3396 +                else
3397 +                    checkIncomplete(future);
3398 +            }
3399 +            futures.addAll(fs);
3400 +        }
3401 +
3402 +        {
3403 +            List<CompletableFuture<?>> fs = new ArrayList<>();
3404 +
3405 +            fs.add(complete.thenCombineAsync(incomplete, (x, y) -> x, e));
3406 +            fs.add(incomplete.thenCombineAsync(complete, (x, y) -> x, e));
3407 +
3408 +            fs.add(complete.thenAcceptBothAsync(incomplete, (x, y) -> {}, e));
3409 +            fs.add(incomplete.thenAcceptBothAsync(complete, (x, y) -> {}, e));
3410 +
3411 +            fs.add(complete.runAfterBothAsync(incomplete, () -> {}, e));
3412 +            fs.add(incomplete.runAfterBothAsync(complete, () -> {}, e));
3413 +
3414 +            for (CompletableFuture<?> future : fs)
3415 +                checkIncomplete(future);
3416 +            futures.addAll(fs);
3417 +        }
3418 +
3419 +        {
3420 +            List<CompletableFuture<?>> fs = new ArrayList<>();
3421 +
3422 +            fs.add(complete.applyToEitherAsync(incomplete, (z) -> z, e));
3423 +            fs.add(incomplete.applyToEitherAsync(complete, (z) -> z, e));
3424 +
3425 +            fs.add(complete.acceptEitherAsync(incomplete, (z) -> {}, e));
3426 +            fs.add(incomplete.acceptEitherAsync(complete, (z) -> {}, e));
3427 +
3428 +            fs.add(complete.runAfterEitherAsync(incomplete, () -> {}, e));
3429 +            fs.add(incomplete.runAfterEitherAsync(complete, () -> {}, e));
3430 +
3431 +            for (CompletableFuture<?> future : fs)
3432 +                checkCompletedWithWrappedException(future, e.ex);
3433 +            futures.addAll(fs);
3434 +        }
3435 +
3436 +        incomplete.complete(v);
3437 +
3438 +        for (CompletableFuture<?> future : futures)
3439 +            checkCompletedWithWrappedException(future, e.ex);
3440 +
3441 +        assertEquals(futures.size(), e.count.get());
3442 +    }}
3443 +
3444 +    /**
3445 +     * Test submissions to an executor that rejects all tasks, but
3446 +     * should never be invoked because the dependent future is
3447 +     * explicitly completed.
3448 +     */
3449 +    public void testRejectingExecutorNeverInvoked() {
3450 +        for (Integer v : new Integer[] { 1, null })
3451 +    {
3452 +        final CountingRejectingExecutor e = new CountingRejectingExecutor();
3453 +
3454 +        final CompletableFuture<Integer> complete = CompletableFuture.completedFuture(v);
3455 +        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
3456 +
3457 +        List<CompletableFuture<?>> futures = new ArrayList<>();
3458 +
3459 +        List<CompletableFuture<Integer>> srcs = new ArrayList<>();
3460 +        srcs.add(complete);
3461 +        srcs.add(incomplete);
3462 +
3463 +        List<CompletableFuture<?>> fs = new ArrayList<>();
3464 +        fs.add(incomplete.thenRunAsync(() -> {}, e));
3465 +        fs.add(incomplete.thenAcceptAsync((z) -> {}, e));
3466 +        fs.add(incomplete.thenApplyAsync((z) -> z, e));
3467 +
3468 +        fs.add(incomplete.thenCombineAsync(incomplete, (x, y) -> x, e));
3469 +        fs.add(incomplete.thenAcceptBothAsync(incomplete, (x, y) -> {}, e));
3470 +        fs.add(incomplete.runAfterBothAsync(incomplete, () -> {}, e));
3471 +
3472 +        fs.add(incomplete.applyToEitherAsync(incomplete, (z) -> z, e));
3473 +        fs.add(incomplete.acceptEitherAsync(incomplete, (z) -> {}, e));
3474 +        fs.add(incomplete.runAfterEitherAsync(incomplete, () -> {}, e));
3475 +
3476 +        fs.add(incomplete.thenComposeAsync((z) -> null, e));
3477 +        fs.add(incomplete.whenCompleteAsync((z, t) -> {}, e));
3478 +        fs.add(incomplete.handleAsync((z, t) -> null, e));
3479 +
3480 +        fs.add(complete.thenCombineAsync(incomplete, (x, y) -> x, e));
3481 +        fs.add(incomplete.thenCombineAsync(complete, (x, y) -> x, e));
3482 +
3483 +        fs.add(complete.thenAcceptBothAsync(incomplete, (x, y) -> {}, e));
3484 +        fs.add(incomplete.thenAcceptBothAsync(complete, (x, y) -> {}, e));
3485 +
3486 +        fs.add(complete.runAfterBothAsync(incomplete, () -> {}, e));
3487 +        fs.add(incomplete.runAfterBothAsync(complete, () -> {}, e));
3488 +
3489 +        for (CompletableFuture<?> future : fs)
3490 +            checkIncomplete(future);
3491 +
3492 +        for (CompletableFuture<?> future : fs)
3493 +            future.complete(null);
3494 +
3495 +        incomplete.complete(v);
3496 +
3497 +        for (CompletableFuture<?> future : fs)
3498 +            checkCompletedNormally(future, null);
3499 +
3500 +        assertEquals(0, e.count.get());
3501 +    }}
3502 +
3503 +    /**
3504       * toCompletableFuture returns this CompletableFuture.
3505       */
3506      public void testToCompletableFuture() {
# Line 3509 | Line 3716 | public class CompletableFutureTest exten
3716          long timeoutMillis = timeoutMillis();
3717          CompletableFuture<Integer> f = new CompletableFuture<>();
3718          long startTime = System.nanoTime();
3719 <        f.orTimeout(timeoutMillis, MILLISECONDS);
3719 >        assertSame(f, f.orTimeout(timeoutMillis, MILLISECONDS));
3720          checkCompletedWithTimeoutException(f);
3721          assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
3722      }
# Line 3524 | Line 3731 | public class CompletableFutureTest exten
3731          CompletableFuture<Integer> g = new CompletableFuture<>();
3732          long startTime = System.nanoTime();
3733          f.complete(v1);
3734 <        f.orTimeout(LONG_DELAY_MS, MILLISECONDS);
3735 <        g.orTimeout(LONG_DELAY_MS, MILLISECONDS);
3734 >        assertSame(f, f.orTimeout(LONG_DELAY_MS, MILLISECONDS));
3735 >        assertSame(g, g.orTimeout(LONG_DELAY_MS, MILLISECONDS));
3736          g.complete(v1);
3737          checkCompletedNormally(f, v1);
3738          checkCompletedNormally(g, v1);
# Line 3540 | Line 3747 | public class CompletableFutureTest exten
3747                         () -> testCompleteOnTimeout_timesOut(null));
3748      }
3749  
3750 +    /**
3751 +     * completeOnTimeout completes with given value if not complete
3752 +     */
3753      public void testCompleteOnTimeout_timesOut(Integer v) {
3754          long timeoutMillis = timeoutMillis();
3755          CompletableFuture<Integer> f = new CompletableFuture<>();
3756          long startTime = System.nanoTime();
3757 <        f.completeOnTimeout(v, timeoutMillis, MILLISECONDS);
3757 >        assertSame(f, f.completeOnTimeout(v, timeoutMillis, MILLISECONDS));
3758          assertSame(v, f.join());
3759          assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
3760          f.complete(99);         // should have no effect
# Line 3561 | Line 3771 | public class CompletableFutureTest exten
3771          CompletableFuture<Integer> g = new CompletableFuture<>();
3772          long startTime = System.nanoTime();
3773          f.complete(v1);
3774 <        f.completeOnTimeout(-1, LONG_DELAY_MS, MILLISECONDS);
3775 <        g.completeOnTimeout(-1, LONG_DELAY_MS, MILLISECONDS);
3774 >        assertSame(f, f.completeOnTimeout(-1, LONG_DELAY_MS, MILLISECONDS));
3775 >        assertSame(g, g.completeOnTimeout(-1, LONG_DELAY_MS, MILLISECONDS));
3776          g.complete(v1);
3777          checkCompletedNormally(f, v1);
3778          checkCompletedNormally(g, v1);
# Line 3613 | Line 3823 | public class CompletableFutureTest exten
3823      //--- tests of implementation details; not part of official tck ---
3824  
3825      Object resultOf(CompletableFuture<?> f) {
3826 +        SecurityManager sm = System.getSecurityManager();
3827 +        if (sm != null) {
3828 +            try {
3829 +                System.setSecurityManager(null);
3830 +            } catch (SecurityException giveUp) {
3831 +                return "Reflection not available";
3832 +            }
3833 +        }
3834 +
3835          try {
3836              java.lang.reflect.Field resultField
3837                  = CompletableFuture.class.getDeclaredField("result");
3838              resultField.setAccessible(true);
3839              return resultField.get(f);
3840 <        } catch (Throwable t) { throw new AssertionError(t); }
3840 >        } catch (Throwable t) {
3841 >            throw new AssertionError(t);
3842 >        } finally {
3843 >            if (sm != null) System.setSecurityManager(sm);
3844 >        }
3845      }
3846  
3847      public void testExceptionPropagationReusesResultObject() {
# Line 3641 | Line 3864 | public class CompletableFutureTest exten
3864          funs.add((y) -> m.applyToEither(y, incomplete, new IncFunction(m)));
3865  
3866          funs.add((y) -> m.runAfterBoth(y, v42, new Noop(m)));
3867 +        funs.add((y) -> m.runAfterBoth(v42, y, new Noop(m)));
3868          funs.add((y) -> m.thenAcceptBoth(y, v42, new SubtractAction(m)));
3869 +        funs.add((y) -> m.thenAcceptBoth(v42, y, new SubtractAction(m)));
3870          funs.add((y) -> m.thenCombine(y, v42, new SubtractFunction(m)));
3871 +        funs.add((y) -> m.thenCombine(v42, y, new SubtractFunction(m)));
3872  
3873 <        funs.add((y) -> m.whenComplete(y, (Integer x, Throwable t) -> {}));
3873 >        funs.add((y) -> m.whenComplete(y, (Integer r, Throwable t) -> {}));
3874  
3875          funs.add((y) -> m.thenCompose(y, new CompletableFutureInc(m)));
3876  
3877 +        funs.add((y) -> CompletableFuture.allOf(new CompletableFuture<?>[] {y}));
3878          funs.add((y) -> CompletableFuture.allOf(new CompletableFuture<?>[] {y, v42}));
3879 +        funs.add((y) -> CompletableFuture.allOf(new CompletableFuture<?>[] {v42, y}));
3880 +        funs.add((y) -> CompletableFuture.anyOf(new CompletableFuture<?>[] {y}));
3881          funs.add((y) -> CompletableFuture.anyOf(new CompletableFuture<?>[] {y, incomplete}));
3882 +        funs.add((y) -> CompletableFuture.anyOf(new CompletableFuture<?>[] {incomplete, y}));
3883  
3884          for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3885                   fun : funs) {
# Line 3764 | Line 3994 | public class CompletableFutureTest exten
3994      }
3995  
3996      static class Monad {
3997 <        static class MonadError extends Error {
3998 <            public MonadError() { super("monadic zero"); }
3997 >        static class ZeroException extends RuntimeException {
3998 >            public ZeroException() { super("monadic zero"); }
3999          }
4000          // "return", "unit"
4001          static <T> CompletableFuture<T> unit(T value) {
4002              return completedFuture(value);
4003          }
4004          // monadic zero ?
4005 <        static <T> CompletableFuture<T> zero(T value) {
4006 <            return failedFuture(new MonadError());
4005 >        static <T> CompletableFuture<T> zero() {
4006 >            return failedFuture(new ZeroException());
4007          }
4008          // >=>
4009          static <T,U,V> Function<T, CompletableFuture<V>> compose
# Line 3787 | Line 4017 | public class CompletableFutureTest exten
4017                  f.getNow(null);
4018                  throw new AssertionFailedError("should throw");
4019              } catch (CompletionException success) {
4020 <                assertTrue(success.getCause() instanceof MonadError);
4020 >                assertTrue(success.getCause() instanceof ZeroException);
4021              }
4022          }
4023  
# Line 3814 | Line 4044 | public class CompletableFutureTest exten
4044              AtomicReference<Throwable> firstFailure = new AtomicReference<>(null);
4045          }
4046  
4047 <        // Monadic "plus"
4047 >        /** Implements "monadic plus". */
4048          static <T> CompletableFuture<T> plus(CompletableFuture<? extends T> f,
4049                                               CompletableFuture<? extends T> g) {
4050              PlusFuture<T> plus = new PlusFuture<T>();
4051 <            BiConsumer<T, Throwable> action = (T result, Throwable fail) -> {
4052 <                if (result != null) {
4053 <                    if (plus.complete(result))
4054 <                        if (plus.firstFailure.get() != null)
4051 >            BiConsumer<T, Throwable> action = (T result, Throwable ex) -> {
4052 >                try {
4053 >                    if (ex == null) {
4054 >                        if (plus.complete(result))
4055 >                            if (plus.firstFailure.get() != null)
4056 >                                plus.firstFailure.set(null);
4057 >                    }
4058 >                    else if (plus.firstFailure.compareAndSet(null, ex)) {
4059 >                        if (plus.isDone())
4060                              plus.firstFailure.set(null);
4061 <                }
4062 <                else if (plus.firstFailure.compareAndSet(null, fail)) {
4063 <                    if (plus.isDone())
4064 <                        plus.firstFailure.set(null);
4065 <                } else {
4066 <                    if (plus.completeExceptionally(fail))
4067 <                        plus.firstFailure.set(null);
4061 >                    }
4062 >                    else {
4063 >                        // first failure has precedence
4064 >                        Throwable first = plus.firstFailure.getAndSet(null);
4065 >
4066 >                        // may fail with "Self-suppression not permitted"
4067 >                        try { first.addSuppressed(ex); }
4068 >                        catch (Exception ignored) {}
4069 >
4070 >                        plus.completeExceptionally(first);
4071 >                    }
4072 >                } catch (Throwable unexpected) {
4073 >                    plus.completeExceptionally(unexpected);
4074                  }
4075              };
4076              f.whenComplete(action);
# Line 3843 | Line 4084 | public class CompletableFutureTest exten
4084       * https://en.wikipedia.org/wiki/Monad_(functional_programming)#Additive_monads
4085       */
4086      public void testAdditiveMonad() throws Throwable {
4087 +        Function<Long, CompletableFuture<Long>> unit = Monad::unit;
4088 +        CompletableFuture<Long> zero = Monad.zero();
4089 +
4090          // Some mutually non-commutative functions
4091          Function<Long, CompletableFuture<Long>> triple
4092 <            = (x) -> completedFuture(3 * x);
4092 >            = (x) -> Monad.unit(3 * x);
4093          Function<Long, CompletableFuture<Long>> inc
4094 <            = (x) -> completedFuture(x + 1);
3851 <
3852 <        Function<Long, CompletableFuture<Long>> unit = Monad::unit;
3853 <        Function<Long, CompletableFuture<Long>> zero = Monad::zero;
4094 >            = (x) -> Monad.unit(x + 1);
4095  
4096          // unit is a right identity: m >>= unit === m
4097 <        Monad.assertFutureEquals(
4098 <            inc.apply(5L).thenCompose(unit),
3858 <            inc.apply(5L));
4097 >        Monad.assertFutureEquals(inc.apply(5L).thenCompose(unit),
4098 >                                 inc.apply(5L));
4099          // unit is a left identity: (unit x) >>= f === f x
4100 <        Monad.assertFutureEquals(
4101 <            unit.apply(5L).thenCompose(inc),
4102 <            inc.apply(5L));
4100 >        Monad.assertFutureEquals(unit.apply(5L).thenCompose(inc),
4101 >                                 inc.apply(5L));
4102 >
4103          // associativity: (m >>= f) >>= g === m >>= ( \x -> (f x >>= g) )
4104          Monad.assertFutureEquals(
4105              unit.apply(5L).thenCompose(inc).thenCompose(triple),
4106              unit.apply(5L).thenCompose((x) -> inc.apply(x).thenCompose(triple)));
4107  
4108 +        // The case for CompletableFuture as an additive monad is weaker...
4109 +
4110          // zero is a monadic zero
4111 <        Monad.assertZero(zero.apply(5L));
3870 <        // left zero: zero >>= f === zero
3871 <        Monad.assertZero(zero.apply(5L).thenCompose(inc));
3872 <        // right zero: f >>= zero === zero
3873 <        Monad.assertZero(inc.apply(5L).thenCompose(zero));
4111 >        Monad.assertZero(zero);
4112  
4113 <        // inc plus zero === inc
4114 <        Monad.assertFutureEquals(
4115 <            inc.apply(5L),
4116 <            Monad.plus(inc.apply(5L), zero.apply(5L)));
4117 <        // zero plus inc === inc
4118 <        Monad.assertFutureEquals(
4119 <            inc.apply(5L),
4120 <            Monad.plus(zero.apply(5L), inc.apply(5L)));
4113 >        // left zero: zero >>= f === zero
4114 >        Monad.assertZero(zero.thenCompose(inc));
4115 >        // right zero: f >>= (\x -> zero) === zero
4116 >        Monad.assertZero(inc.apply(5L).thenCompose((x) -> zero));
4117 >
4118 >        // f plus zero === f
4119 >        Monad.assertFutureEquals(Monad.unit(5L),
4120 >                                 Monad.plus(Monad.unit(5L), zero));
4121 >        // zero plus f === f
4122 >        Monad.assertFutureEquals(Monad.unit(5L),
4123 >                                 Monad.plus(zero, Monad.unit(5L)));
4124          // zero plus zero === zero
4125 <        Monad.assertZero(Monad.plus(zero.apply(5L), zero.apply(5L)));
4125 >        Monad.assertZero(Monad.plus(zero, zero));
4126          {
4127 <            CompletableFuture<Long> f = Monad.plus(inc.apply(5L), inc.apply(8L));
4128 <            assertTrue(f.get() == 6L || f.get() == 9L);
4127 >            CompletableFuture<Long> f = Monad.plus(Monad.unit(5L),
4128 >                                                   Monad.unit(8L));
4129 >            // non-determinism
4130 >            assertTrue(f.get() == 5L || f.get() == 8L);
4131          }
4132  
4133          CompletableFuture<Long> godot = new CompletableFuture<>();
4134 <        // inc plus godot === inc (doesn't wait for godot)
4135 <        Monad.assertFutureEquals(
4136 <            inc.apply(5L),
4137 <            Monad.plus(inc.apply(5L), godot));
4138 <        // godot plus inc === inc (doesn't wait for godot)
4139 <        Monad.assertFutureEquals(
4140 <            inc.apply(5L),
4141 <            Monad.plus(godot, inc.apply(5L)));
4134 >        // f plus godot === f (doesn't wait for godot)
4135 >        Monad.assertFutureEquals(Monad.unit(5L),
4136 >                                 Monad.plus(Monad.unit(5L), godot));
4137 >        // godot plus f === f (doesn't wait for godot)
4138 >        Monad.assertFutureEquals(Monad.unit(5L),
4139 >                                 Monad.plus(godot, Monad.unit(5L)));
4140 >    }
4141 >
4142 >    /** Test long recursive chains of CompletableFutures with cascading completions */
4143 >    public void testRecursiveChains() throws Throwable {
4144 >        for (ExecutionMode m : ExecutionMode.values())
4145 >        for (boolean addDeadEnds : new boolean[] { true, false })
4146 >    {
4147 >        final int val = 42;
4148 >        final int n = expensiveTests ? 1_000 : 2;
4149 >        CompletableFuture<Integer> head = new CompletableFuture<>();
4150 >        CompletableFuture<Integer> tail = head;
4151 >        for (int i = 0; i < n; i++) {
4152 >            if (addDeadEnds) m.thenApply(tail, v -> v + 1);
4153 >            tail = m.thenApply(tail, v -> v + 1);
4154 >            if (addDeadEnds) m.applyToEither(tail, tail, v -> v + 1);
4155 >            tail = m.applyToEither(tail, tail, v -> v + 1);
4156 >            if (addDeadEnds) m.thenCombine(tail, tail, (v, w) -> v + 1);
4157 >            tail = m.thenCombine(tail, tail, (v, w) -> v + 1);
4158 >        }
4159 >        head.complete(val);
4160 >        assertEquals(val + 3 * n, (int) tail.join());
4161 >    }}
4162 >
4163 >    /**
4164 >     * A single CompletableFuture with many dependents.
4165 >     * A demo of scalability - runtime is O(n).
4166 >     */
4167 >    public void testManyDependents() throws Throwable {
4168 >        final int n = expensiveTests ? 1_000_000 : 10;
4169 >        final CompletableFuture<Void> head = new CompletableFuture<>();
4170 >        final CompletableFuture<Void> complete = CompletableFuture.completedFuture((Void)null);
4171 >        final AtomicInteger count = new AtomicInteger(0);
4172 >        for (int i = 0; i < n; i++) {
4173 >            head.thenRun(() -> count.getAndIncrement());
4174 >            head.thenAccept((x) -> count.getAndIncrement());
4175 >            head.thenApply((x) -> count.getAndIncrement());
4176 >
4177 >            head.runAfterBoth(complete, () -> count.getAndIncrement());
4178 >            head.thenAcceptBoth(complete, (x, y) -> count.getAndIncrement());
4179 >            head.thenCombine(complete, (x, y) -> count.getAndIncrement());
4180 >            complete.runAfterBoth(head, () -> count.getAndIncrement());
4181 >            complete.thenAcceptBoth(head, (x, y) -> count.getAndIncrement());
4182 >            complete.thenCombine(head, (x, y) -> count.getAndIncrement());
4183 >
4184 >            head.runAfterEither(new CompletableFuture<Void>(), () -> count.getAndIncrement());
4185 >            head.acceptEither(new CompletableFuture<Void>(), (x) -> count.getAndIncrement());
4186 >            head.applyToEither(new CompletableFuture<Void>(), (x) -> count.getAndIncrement());
4187 >            new CompletableFuture<Void>().runAfterEither(head, () -> count.getAndIncrement());
4188 >            new CompletableFuture<Void>().acceptEither(head, (x) -> count.getAndIncrement());
4189 >            new CompletableFuture<Void>().applyToEither(head, (x) -> count.getAndIncrement());
4190 >        }
4191 >        head.complete(null);
4192 >        assertEquals(5 * 3 * n, count.get());
4193 >    }
4194 >
4195 >    /** ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest tck */
4196 >    public void testCoCompletionGarbageRetention() throws Throwable {
4197 >        final int n = expensiveTests ? 1_000_000 : 10;
4198 >        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
4199 >        CompletableFuture<Integer> f;
4200 >        for (int i = 0; i < n; i++) {
4201 >            f = new CompletableFuture<>();
4202 >            f.runAfterEither(incomplete, () -> {});
4203 >            f.complete(null);
4204 >
4205 >            f = new CompletableFuture<>();
4206 >            f.acceptEither(incomplete, (x) -> {});
4207 >            f.complete(null);
4208 >
4209 >            f = new CompletableFuture<>();
4210 >            f.applyToEither(incomplete, (x) -> x);
4211 >            f.complete(null);
4212 >
4213 >            f = new CompletableFuture<>();
4214 >            CompletableFuture.anyOf(new CompletableFuture<?>[] { f, incomplete });
4215 >            f.complete(null);
4216 >        }
4217 >
4218 >        for (int i = 0; i < n; i++) {
4219 >            f = new CompletableFuture<>();
4220 >            incomplete.runAfterEither(f, () -> {});
4221 >            f.complete(null);
4222 >
4223 >            f = new CompletableFuture<>();
4224 >            incomplete.acceptEither(f, (x) -> {});
4225 >            f.complete(null);
4226 >
4227 >            f = new CompletableFuture<>();
4228 >            incomplete.applyToEither(f, (x) -> x);
4229 >            f.complete(null);
4230 >
4231 >            f = new CompletableFuture<>();
4232 >            CompletableFuture.anyOf(new CompletableFuture<?>[] { incomplete, f });
4233 >            f.complete(null);
4234 >        }
4235 >    }
4236 >
4237 >    /*
4238 >     * Tests below currently fail in stress mode due to memory retention.
4239 >     * ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest tck
4240 >     */
4241 >
4242 >    /** Checks for garbage retention with anyOf. */
4243 >    public void testAnyOfGarbageRetention() throws Throwable {
4244 >        for (Integer v : new Integer[] { 1, null })
4245 >    {
4246 >        final int n = expensiveTests ? 100_000 : 10;
4247 >        CompletableFuture<Integer>[] fs
4248 >            = (CompletableFuture<Integer>[]) new CompletableFuture<?>[100];
4249 >        for (int i = 0; i < fs.length; i++)
4250 >            fs[i] = new CompletableFuture<>();
4251 >        fs[fs.length - 1].complete(v);
4252 >        for (int i = 0; i < n; i++)
4253 >            checkCompletedNormally(CompletableFuture.anyOf(fs), v);
4254 >    }}
4255 >
4256 >    /** Checks for garbage retention with allOf. */
4257 >    public void testCancelledAllOfGarbageRetention() throws Throwable {
4258 >        final int n = expensiveTests ? 100_000 : 10;
4259 >        CompletableFuture<Integer>[] fs
4260 >            = (CompletableFuture<Integer>[]) new CompletableFuture<?>[100];
4261 >        for (int i = 0; i < fs.length; i++)
4262 >            fs[i] = new CompletableFuture<>();
4263 >        for (int i = 0; i < n; i++)
4264 >            assertTrue(CompletableFuture.allOf(fs).cancel(false));
4265      }
4266  
4267   //     static <U> U join(CompletionStage<U> stage) {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines