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.130 by jsr166, Sun Nov 15 17:21:44 2015 UTC vs.
Revision 1.171 by jsr166, Wed Aug 24 22:22:39 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;
34 import java.util.concurrent.TimeUnit;
35   import java.util.concurrent.atomic.AtomicInteger;
36   import java.util.concurrent.atomic.AtomicReference;
37   import java.util.function.BiConsumer;
# Line 459 | Line 459 | public class CompletableFutureTest exten
459      class FailingSupplier extends CheckedAction
460          implements Supplier<Integer>
461      {
462 <        FailingSupplier(ExecutionMode m) { super(m); }
462 >        final CFException ex;
463 >        FailingSupplier(ExecutionMode m) { super(m); ex = new CFException(); }
464          public Integer get() {
465              invoked();
466 <            throw new CFException();
466 >            throw ex;
467          }
468      }
469  
470      class FailingConsumer extends CheckedIntegerAction
471          implements Consumer<Integer>
472      {
473 <        FailingConsumer(ExecutionMode m) { super(m); }
473 >        final CFException ex;
474 >        FailingConsumer(ExecutionMode m) { super(m); ex = new CFException(); }
475          public void accept(Integer x) {
476              invoked();
477              value = x;
478 <            throw new CFException();
478 >            throw ex;
479          }
480      }
481  
482      class FailingBiConsumer extends CheckedIntegerAction
483          implements BiConsumer<Integer, Integer>
484      {
485 <        FailingBiConsumer(ExecutionMode m) { super(m); }
485 >        final CFException ex;
486 >        FailingBiConsumer(ExecutionMode m) { super(m); ex = new CFException(); }
487          public void accept(Integer x, Integer y) {
488              invoked();
489              value = subtract(x, y);
490 <            throw new CFException();
490 >            throw ex;
491          }
492      }
493  
494      class FailingFunction extends CheckedIntegerAction
495          implements Function<Integer, Integer>
496      {
497 <        FailingFunction(ExecutionMode m) { super(m); }
497 >        final CFException ex;
498 >        FailingFunction(ExecutionMode m) { super(m); ex = new CFException(); }
499          public Integer apply(Integer x) {
500              invoked();
501              value = x;
502 <            throw new CFException();
502 >            throw ex;
503          }
504      }
505  
506      class FailingBiFunction extends CheckedIntegerAction
507          implements BiFunction<Integer, Integer, Integer>
508      {
509 <        FailingBiFunction(ExecutionMode m) { super(m); }
509 >        final CFException ex;
510 >        FailingBiFunction(ExecutionMode m) { super(m); ex = new CFException(); }
511          public Integer apply(Integer x, Integer y) {
512              invoked();
513              value = subtract(x, y);
514 <            throw new CFException();
514 >            throw ex;
515          }
516      }
517  
518      class FailingRunnable extends CheckedAction implements Runnable {
519 <        FailingRunnable(ExecutionMode m) { super(m); }
519 >        final CFException ex;
520 >        FailingRunnable(ExecutionMode m) { super(m); ex = new CFException(); }
521          public void run() {
522              invoked();
523 <            throw new CFException();
523 >            throw ex;
524          }
525      }
526  
# Line 534 | Line 540 | public class CompletableFutureTest exten
540      class FailingCompletableFutureFunction extends CheckedIntegerAction
541          implements Function<Integer, CompletableFuture<Integer>>
542      {
543 <        FailingCompletableFutureFunction(ExecutionMode m) { super(m); }
543 >        final CFException ex;
544 >        FailingCompletableFutureFunction(ExecutionMode m) { super(m); ex = new CFException(); }
545          public CompletableFuture<Integer> apply(Integer x) {
546              invoked();
547              value = x;
548 <            throw new CFException();
548 >            throw ex;
549 >        }
550 >    }
551 >
552 >    static class CountingRejectingExecutor implements Executor {
553 >        final RejectedExecutionException ex = new RejectedExecutionException();
554 >        final AtomicInteger count = new AtomicInteger(0);
555 >        public void execute(Runnable r) {
556 >            count.getAndIncrement();
557 >            throw ex;
558          }
559      }
560  
# Line 876 | Line 892 | public class CompletableFutureTest exten
892          assertEquals(1, a.get());
893      }}
894  
895 +    /**
896 +     * If an "exceptionally action" throws an exception, it completes
897 +     * exceptionally with that exception
898 +     */
899      public void testExceptionally_exceptionalCompletionActionFailed() {
900          for (boolean createIncomplete : new boolean[] { true, false })
901      {
# Line 894 | Line 914 | public class CompletableFutureTest exten
914          if (createIncomplete) f.completeExceptionally(ex1);
915  
916          checkCompletedWithWrappedException(g, ex2);
917 +        checkCompletedExceptionally(f, ex1);
918          assertEquals(1, a.get());
919      }}
920  
# Line 911 | Line 932 | public class CompletableFutureTest exten
932          if (!createIncomplete) assertTrue(f.complete(v1));
933          final CompletableFuture<Integer> g = m.whenComplete
934              (f,
935 <             (Integer x, Throwable t) -> {
935 >             (Integer result, Throwable t) -> {
936                  m.checkExecutionMode();
937 <                threadAssertSame(x, v1);
937 >                threadAssertSame(result, v1);
938                  threadAssertNull(t);
939                  a.getAndIncrement();
940              });
# Line 938 | Line 959 | public class CompletableFutureTest exten
959          if (!createIncomplete) f.completeExceptionally(ex);
960          final CompletableFuture<Integer> g = m.whenComplete
961              (f,
962 <             (Integer x, Throwable t) -> {
962 >             (Integer result, Throwable t) -> {
963                  m.checkExecutionMode();
964 <                threadAssertNull(x);
964 >                threadAssertNull(result);
965                  threadAssertSame(t, ex);
966                  a.getAndIncrement();
967              });
# Line 965 | Line 986 | public class CompletableFutureTest exten
986          if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
987          final CompletableFuture<Integer> g = m.whenComplete
988              (f,
989 <             (Integer x, Throwable t) -> {
989 >             (Integer result, Throwable t) -> {
990                  m.checkExecutionMode();
991 <                threadAssertNull(x);
991 >                threadAssertNull(result);
992                  threadAssertTrue(t instanceof CancellationException);
993                  a.getAndIncrement();
994              });
# Line 982 | Line 1003 | public class CompletableFutureTest exten
1003       * If a whenComplete action throws an exception when triggered by
1004       * a normal completion, it completes exceptionally
1005       */
1006 <    public void testWhenComplete_actionFailed() {
1006 >    public void testWhenComplete_sourceCompletedNormallyActionFailed() {
1007          for (boolean createIncomplete : new boolean[] { true, false })
1008          for (ExecutionMode m : ExecutionMode.values())
1009          for (Integer v1 : new Integer[] { 1, null })
# Line 993 | Line 1014 | public class CompletableFutureTest exten
1014          if (!createIncomplete) assertTrue(f.complete(v1));
1015          final CompletableFuture<Integer> g = m.whenComplete
1016              (f,
1017 <             (Integer x, Throwable t) -> {
1017 >             (Integer result, Throwable t) -> {
1018                  m.checkExecutionMode();
1019 <                threadAssertSame(x, v1);
1019 >                threadAssertSame(result, v1);
1020                  threadAssertNull(t);
1021                  a.getAndIncrement();
1022                  throw ex;
# Line 1010 | Line 1031 | public class CompletableFutureTest exten
1031      /**
1032       * If a whenComplete action throws an exception when triggered by
1033       * a source completion that also throws an exception, the source
1034 <     * exception takes precedence.
1034 >     * exception takes precedence (unlike handle)
1035       */
1036 <    public void testWhenComplete_actionFailedSourceFailed() {
1036 >    public void testWhenComplete_sourceFailedActionFailed() {
1037          for (boolean createIncomplete : new boolean[] { true, false })
1038          for (ExecutionMode m : ExecutionMode.values())
1039      {
# Line 1024 | Line 1045 | public class CompletableFutureTest exten
1045          if (!createIncomplete) f.completeExceptionally(ex1);
1046          final CompletableFuture<Integer> g = m.whenComplete
1047              (f,
1048 <             (Integer x, Throwable t) -> {
1048 >             (Integer result, Throwable t) -> {
1049                  m.checkExecutionMode();
1050                  threadAssertSame(t, ex1);
1051 <                threadAssertNull(x);
1051 >                threadAssertNull(result);
1052                  a.getAndIncrement();
1053                  throw ex2;
1054              });
# Line 1035 | Line 1056 | public class CompletableFutureTest exten
1056  
1057          checkCompletedWithWrappedException(g, ex1);
1058          checkCompletedExceptionally(f, ex1);
1059 +        if (testImplementationDetails) {
1060 +            assertEquals(1, ex1.getSuppressed().length);
1061 +            assertSame(ex2, ex1.getSuppressed()[0]);
1062 +        }
1063          assertEquals(1, a.get());
1064      }}
1065  
# Line 1052 | Line 1077 | public class CompletableFutureTest exten
1077          if (!createIncomplete) assertTrue(f.complete(v1));
1078          final CompletableFuture<Integer> g = m.handle
1079              (f,
1080 <             (Integer x, Throwable t) -> {
1080 >             (Integer result, Throwable t) -> {
1081                  m.checkExecutionMode();
1082 <                threadAssertSame(x, v1);
1082 >                threadAssertSame(result, v1);
1083                  threadAssertNull(t);
1084                  a.getAndIncrement();
1085                  return inc(v1);
# Line 1081 | Line 1106 | public class CompletableFutureTest exten
1106          if (!createIncomplete) f.completeExceptionally(ex);
1107          final CompletableFuture<Integer> g = m.handle
1108              (f,
1109 <             (Integer x, Throwable t) -> {
1109 >             (Integer result, Throwable t) -> {
1110                  m.checkExecutionMode();
1111 <                threadAssertNull(x);
1111 >                threadAssertNull(result);
1112                  threadAssertSame(t, ex);
1113                  a.getAndIncrement();
1114                  return v1;
# Line 1110 | Line 1135 | public class CompletableFutureTest exten
1135          if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1136          final CompletableFuture<Integer> g = m.handle
1137              (f,
1138 <             (Integer x, Throwable t) -> {
1138 >             (Integer result, Throwable t) -> {
1139                  m.checkExecutionMode();
1140 <                threadAssertNull(x);
1140 >                threadAssertNull(result);
1141                  threadAssertTrue(t instanceof CancellationException);
1142                  a.getAndIncrement();
1143                  return v1;
# Line 1125 | Line 1150 | public class CompletableFutureTest exten
1150      }}
1151  
1152      /**
1153 <     * handle result completes exceptionally if action does
1153 >     * If a "handle action" throws an exception when triggered by
1154 >     * a normal completion, it completes exceptionally
1155       */
1156 <    public void testHandle_sourceFailedActionFailed() {
1156 >    public void testHandle_sourceCompletedNormallyActionFailed() {
1157          for (ExecutionMode m : ExecutionMode.values())
1158          for (boolean createIncomplete : new boolean[] { true, false })
1159 +        for (Integer v1 : new Integer[] { 1, null })
1160      {
1161          final CompletableFuture<Integer> f = new CompletableFuture<>();
1162          final AtomicInteger a = new AtomicInteger(0);
1163 <        final CFException ex1 = new CFException();
1164 <        final CFException ex2 = new CFException();
1138 <        if (!createIncomplete) f.completeExceptionally(ex1);
1163 >        final CFException ex = new CFException();
1164 >        if (!createIncomplete) assertTrue(f.complete(v1));
1165          final CompletableFuture<Integer> g = m.handle
1166              (f,
1167 <             (Integer x, Throwable t) -> {
1167 >             (Integer result, Throwable t) -> {
1168                  m.checkExecutionMode();
1169 <                threadAssertNull(x);
1170 <                threadAssertSame(ex1, t);
1169 >                threadAssertSame(result, v1);
1170 >                threadAssertNull(t);
1171                  a.getAndIncrement();
1172 <                throw ex2;
1172 >                throw ex;
1173              });
1174 <        if (createIncomplete) f.completeExceptionally(ex1);
1174 >        if (createIncomplete) assertTrue(f.complete(v1));
1175  
1176 <        checkCompletedWithWrappedException(g, ex2);
1177 <        checkCompletedExceptionally(f, ex1);
1176 >        checkCompletedWithWrappedException(g, ex);
1177 >        checkCompletedNormally(f, v1);
1178          assertEquals(1, a.get());
1179      }}
1180  
1181 <    public void testHandle_sourceCompletedNormallyActionFailed() {
1182 <        for (ExecutionMode m : ExecutionMode.values())
1181 >    /**
1182 >     * If a "handle action" throws an exception when triggered by
1183 >     * a source completion that also throws an exception, the action
1184 >     * exception takes precedence (unlike whenComplete)
1185 >     */
1186 >    public void testHandle_sourceFailedActionFailed() {
1187          for (boolean createIncomplete : new boolean[] { true, false })
1188 <        for (Integer v1 : new Integer[] { 1, null })
1188 >        for (ExecutionMode m : ExecutionMode.values())
1189      {
1160        final CompletableFuture<Integer> f = new CompletableFuture<>();
1190          final AtomicInteger a = new AtomicInteger(0);
1191 <        final CFException ex = new CFException();
1192 <        if (!createIncomplete) assertTrue(f.complete(v1));
1191 >        final CFException ex1 = new CFException();
1192 >        final CFException ex2 = new CFException();
1193 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1194 >
1195 >        if (!createIncomplete) f.completeExceptionally(ex1);
1196          final CompletableFuture<Integer> g = m.handle
1197              (f,
1198 <             (Integer x, Throwable t) -> {
1198 >             (Integer result, Throwable t) -> {
1199                  m.checkExecutionMode();
1200 <                threadAssertSame(x, v1);
1201 <                threadAssertNull(t);
1200 >                threadAssertNull(result);
1201 >                threadAssertSame(ex1, t);
1202                  a.getAndIncrement();
1203 <                throw ex;
1203 >                throw ex2;
1204              });
1205 <        if (createIncomplete) assertTrue(f.complete(v1));
1205 >        if (createIncomplete) f.completeExceptionally(ex1);
1206  
1207 <        checkCompletedWithWrappedException(g, ex);
1208 <        checkCompletedNormally(f, v1);
1207 >        checkCompletedWithWrappedException(g, ex2);
1208 >        checkCompletedExceptionally(f, ex1);
1209          assertEquals(1, a.get());
1210      }}
1211  
# Line 1206 | Line 1238 | public class CompletableFutureTest exten
1238      {
1239          final FailingRunnable r = new FailingRunnable(m);
1240          final CompletableFuture<Void> f = m.runAsync(r);
1241 <        checkCompletedWithWrappedCFException(f);
1241 >        checkCompletedWithWrappedException(f, r.ex);
1242          r.assertInvoked();
1243      }}
1244  
1245 +    public void testRunAsync_rejectingExecutor() {
1246 +        CountingRejectingExecutor e = new CountingRejectingExecutor();
1247 +        try {
1248 +            CompletableFuture.runAsync(() -> {}, e);
1249 +            shouldThrow();
1250 +        } catch (Throwable t) {
1251 +            assertSame(e.ex, t);
1252 +        }
1253 +
1254 +        assertEquals(1, e.count.get());
1255 +    }
1256 +
1257      /**
1258       * supplyAsync completes with result of supplier
1259       */
# Line 1240 | Line 1284 | public class CompletableFutureTest exten
1284      {
1285          FailingSupplier r = new FailingSupplier(m);
1286          CompletableFuture<Integer> f = m.supplyAsync(r);
1287 <        checkCompletedWithWrappedCFException(f);
1287 >        checkCompletedWithWrappedException(f, r.ex);
1288          r.assertInvoked();
1289      }}
1290  
1291 +    public void testSupplyAsync_rejectingExecutor() {
1292 +        CountingRejectingExecutor e = new CountingRejectingExecutor();
1293 +        try {
1294 +            CompletableFuture.supplyAsync(() -> null, e);
1295 +            shouldThrow();
1296 +        } catch (Throwable t) {
1297 +            assertSame(e.ex, t);
1298 +        }
1299 +
1300 +        assertEquals(1, e.count.get());
1301 +    }
1302 +
1303      // seq completion methods
1304  
1305      /**
# Line 1362 | Line 1418 | public class CompletableFutureTest exten
1418          final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1419          final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1420  
1421 <        checkCompletedWithWrappedCFException(h0);
1422 <        checkCompletedWithWrappedCFException(h1);
1423 <        checkCompletedWithWrappedCFException(h2);
1424 <        checkCompletedWithWrappedCFException(h3);
1425 <        checkCompletedWithWrappedCFException(h4);
1426 <        checkCompletedWithWrappedCFException(h5);
1421 >        checkCompletedWithWrappedException(h0, rs[0].ex);
1422 >        checkCompletedWithWrappedException(h1, rs[1].ex);
1423 >        checkCompletedWithWrappedException(h2, rs[2].ex);
1424 >        checkCompletedWithWrappedException(h3, rs[3].ex);
1425 >        checkCompletedWithWrappedException(h4, rs[4].ex);
1426 >        checkCompletedWithWrappedException(h5, rs[5].ex);
1427          checkCompletedNormally(f, v1);
1428      }}
1429  
# Line 1466 | Line 1522 | public class CompletableFutureTest exten
1522          final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1523          final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1524  
1525 <        checkCompletedWithWrappedCFException(h0);
1526 <        checkCompletedWithWrappedCFException(h1);
1527 <        checkCompletedWithWrappedCFException(h2);
1528 <        checkCompletedWithWrappedCFException(h3);
1525 >        checkCompletedWithWrappedException(h0, rs[0].ex);
1526 >        checkCompletedWithWrappedException(h1, rs[1].ex);
1527 >        checkCompletedWithWrappedException(h2, rs[2].ex);
1528 >        checkCompletedWithWrappedException(h3, rs[3].ex);
1529          checkCompletedNormally(f, v1);
1530      }}
1531  
# Line 1568 | Line 1624 | public class CompletableFutureTest exten
1624          final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1625          final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1626  
1627 <        checkCompletedWithWrappedCFException(h0);
1628 <        checkCompletedWithWrappedCFException(h1);
1629 <        checkCompletedWithWrappedCFException(h2);
1630 <        checkCompletedWithWrappedCFException(h3);
1627 >        checkCompletedWithWrappedException(h0, rs[0].ex);
1628 >        checkCompletedWithWrappedException(h1, rs[1].ex);
1629 >        checkCompletedWithWrappedException(h2, rs[2].ex);
1630 >        checkCompletedWithWrappedException(h3, rs[3].ex);
1631          checkCompletedNormally(f, v1);
1632      }}
1633  
# Line 1733 | Line 1789 | public class CompletableFutureTest exten
1789          assertTrue(snd.complete(w2));
1790          final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1791  
1792 <        checkCompletedWithWrappedCFException(h1);
1793 <        checkCompletedWithWrappedCFException(h2);
1794 <        checkCompletedWithWrappedCFException(h3);
1792 >        checkCompletedWithWrappedException(h1, r1.ex);
1793 >        checkCompletedWithWrappedException(h2, r2.ex);
1794 >        checkCompletedWithWrappedException(h3, r3.ex);
1795          r1.assertInvoked();
1796          r2.assertInvoked();
1797          r3.assertInvoked();
# Line 1897 | Line 1953 | public class CompletableFutureTest exten
1953          assertTrue(snd.complete(w2));
1954          final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1955  
1956 <        checkCompletedWithWrappedCFException(h1);
1957 <        checkCompletedWithWrappedCFException(h2);
1958 <        checkCompletedWithWrappedCFException(h3);
1956 >        checkCompletedWithWrappedException(h1, r1.ex);
1957 >        checkCompletedWithWrappedException(h2, r2.ex);
1958 >        checkCompletedWithWrappedException(h3, r3.ex);
1959          r1.assertInvoked();
1960          r2.assertInvoked();
1961          r3.assertInvoked();
# Line 2061 | Line 2117 | public class CompletableFutureTest exten
2117          assertTrue(snd.complete(w2));
2118          final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2119  
2120 <        checkCompletedWithWrappedCFException(h1);
2121 <        checkCompletedWithWrappedCFException(h2);
2122 <        checkCompletedWithWrappedCFException(h3);
2120 >        checkCompletedWithWrappedException(h1, r1.ex);
2121 >        checkCompletedWithWrappedException(h2, r2.ex);
2122 >        checkCompletedWithWrappedException(h3, r3.ex);
2123          r1.assertInvoked();
2124          r2.assertInvoked();
2125          r3.assertInvoked();
# Line 2353 | Line 2409 | public class CompletableFutureTest exten
2409          f.complete(v1);
2410          final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2411          final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2412 <        checkCompletedWithWrappedCFException(h0);
2413 <        checkCompletedWithWrappedCFException(h1);
2414 <        checkCompletedWithWrappedCFException(h2);
2415 <        checkCompletedWithWrappedCFException(h3);
2412 >        checkCompletedWithWrappedException(h0, rs[0].ex);
2413 >        checkCompletedWithWrappedException(h1, rs[1].ex);
2414 >        checkCompletedWithWrappedException(h2, rs[2].ex);
2415 >        checkCompletedWithWrappedException(h3, rs[3].ex);
2416          for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2417  
2418          g.complete(v2);
# Line 2365 | Line 2421 | public class CompletableFutureTest exten
2421          final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2422          final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2423  
2424 <        checkCompletedWithWrappedCFException(h4);
2424 >        checkCompletedWithWrappedException(h4, rs[4].ex);
2425          assertTrue(Objects.equals(v1, rs[4].value) ||
2426                     Objects.equals(v2, rs[4].value));
2427 <        checkCompletedWithWrappedCFException(h5);
2427 >        checkCompletedWithWrappedException(h5, rs[5].ex);
2428          assertTrue(Objects.equals(v1, rs[5].value) ||
2429                     Objects.equals(v2, rs[5].value));
2430  
# Line 2612 | Line 2668 | public class CompletableFutureTest exten
2668          f.complete(v1);
2669          final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2670          final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2671 <        checkCompletedWithWrappedCFException(h0);
2672 <        checkCompletedWithWrappedCFException(h1);
2673 <        checkCompletedWithWrappedCFException(h2);
2674 <        checkCompletedWithWrappedCFException(h3);
2671 >        checkCompletedWithWrappedException(h0, rs[0].ex);
2672 >        checkCompletedWithWrappedException(h1, rs[1].ex);
2673 >        checkCompletedWithWrappedException(h2, rs[2].ex);
2674 >        checkCompletedWithWrappedException(h3, rs[3].ex);
2675          for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2676  
2677          g.complete(v2);
# Line 2624 | Line 2680 | public class CompletableFutureTest exten
2680          final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2681          final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2682  
2683 <        checkCompletedWithWrappedCFException(h4);
2683 >        checkCompletedWithWrappedException(h4, rs[4].ex);
2684          assertTrue(Objects.equals(v1, rs[4].value) ||
2685                     Objects.equals(v2, rs[4].value));
2686 <        checkCompletedWithWrappedCFException(h5);
2686 >        checkCompletedWithWrappedException(h5, rs[5].ex);
2687          assertTrue(Objects.equals(v1, rs[5].value) ||
2688                     Objects.equals(v2, rs[5].value));
2689  
# Line 2643 | Line 2699 | public class CompletableFutureTest exten
2699          for (ExecutionMode m : ExecutionMode.values())
2700          for (Integer v1 : new Integer[] { 1, null })
2701          for (Integer v2 : new Integer[] { 2, null })
2702 +        for (boolean pushNop : new boolean[] { true, false })
2703      {
2704          final CompletableFuture<Integer> f = new CompletableFuture<>();
2705          final CompletableFuture<Integer> g = new CompletableFuture<>();
# Line 2655 | Line 2712 | public class CompletableFutureTest exten
2712          checkIncomplete(h1);
2713          rs[0].assertNotInvoked();
2714          rs[1].assertNotInvoked();
2715 +        if (pushNop) {          // ad hoc test of intra-completion interference
2716 +            m.thenRun(f, () -> {});
2717 +            m.thenRun(g, () -> {});
2718 +        }
2719          f.complete(v1);
2720          checkCompletedNormally(h0, null);
2721          checkCompletedNormally(h1, null);
# Line 2867 | Line 2928 | public class CompletableFutureTest exten
2928          assertTrue(f.complete(v1));
2929          final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2930          final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2931 <        checkCompletedWithWrappedCFException(h0);
2932 <        checkCompletedWithWrappedCFException(h1);
2933 <        checkCompletedWithWrappedCFException(h2);
2934 <        checkCompletedWithWrappedCFException(h3);
2931 >        checkCompletedWithWrappedException(h0, rs[0].ex);
2932 >        checkCompletedWithWrappedException(h1, rs[1].ex);
2933 >        checkCompletedWithWrappedException(h2, rs[2].ex);
2934 >        checkCompletedWithWrappedException(h3, rs[3].ex);
2935          for (int i = 0; i < 4; i++) rs[i].assertInvoked();
2936          assertTrue(g.complete(v2));
2937          final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2938          final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2939 <        checkCompletedWithWrappedCFException(h4);
2940 <        checkCompletedWithWrappedCFException(h5);
2939 >        checkCompletedWithWrappedException(h4, rs[4].ex);
2940 >        checkCompletedWithWrappedException(h5, rs[5].ex);
2941  
2942          checkCompletedNormally(f, v1);
2943          checkCompletedNormally(g, v2);
# Line 2937 | Line 2998 | public class CompletableFutureTest exten
2998          final CompletableFuture<Integer> g = m.thenCompose(f, r);
2999          if (createIncomplete) assertTrue(f.complete(v1));
3000  
3001 <        checkCompletedWithWrappedCFException(g);
3001 >        checkCompletedWithWrappedException(g, r.ex);
3002          checkCompletedNormally(f, v1);
3003      }}
3004  
# Line 3046 | Line 3107 | public class CompletableFutureTest exten
3107          }
3108      }
3109  
3110 <    public void testAllOf_backwards() throws Exception {
3110 >    public void testAllOf_normal_backwards() throws Exception {
3111          for (int k = 1; k < 10; k++) {
3112              CompletableFuture<Integer>[] fs
3113                  = (CompletableFuture<Integer>[]) new CompletableFuture[k];
# Line 3279 | Line 3340 | public class CompletableFutureTest exten
3340              () -> f.obtrudeException(null),
3341  
3342              () -> CompletableFuture.delayedExecutor(1L, SECONDS, null),
3343 <            () -> CompletableFuture.delayedExecutor(1L, null, new ThreadExecutor()),
3343 >            () -> CompletableFuture.delayedExecutor(1L, null, exec),
3344              () -> CompletableFuture.delayedExecutor(1L, null),
3345  
3346              () -> f.orTimeout(1L, null),
# Line 3294 | Line 3355 | public class CompletableFutureTest exten
3355      }
3356  
3357      /**
3358 +     * Test submissions to an executor that rejects all tasks.
3359 +     */
3360 +    public void testRejectingExecutor() {
3361 +        for (Integer v : new Integer[] { 1, null })
3362 +    {
3363 +        final CountingRejectingExecutor e = new CountingRejectingExecutor();
3364 +
3365 +        final CompletableFuture<Integer> complete = CompletableFuture.completedFuture(v);
3366 +        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
3367 +
3368 +        List<CompletableFuture<?>> futures = new ArrayList<>();
3369 +
3370 +        List<CompletableFuture<Integer>> srcs = new ArrayList<>();
3371 +        srcs.add(complete);
3372 +        srcs.add(incomplete);
3373 +
3374 +        for (CompletableFuture<Integer> src : srcs) {
3375 +            List<CompletableFuture<?>> fs = new ArrayList<>();
3376 +            fs.add(src.thenRunAsync(() -> {}, e));
3377 +            fs.add(src.thenAcceptAsync((z) -> {}, e));
3378 +            fs.add(src.thenApplyAsync((z) -> z, e));
3379 +
3380 +            fs.add(src.thenCombineAsync(src, (x, y) -> x, e));
3381 +            fs.add(src.thenAcceptBothAsync(src, (x, y) -> {}, e));
3382 +            fs.add(src.runAfterBothAsync(src, () -> {}, e));
3383 +
3384 +            fs.add(src.applyToEitherAsync(src, (z) -> z, e));
3385 +            fs.add(src.acceptEitherAsync(src, (z) -> {}, e));
3386 +            fs.add(src.runAfterEitherAsync(src, () -> {}, e));
3387 +
3388 +            fs.add(src.thenComposeAsync((z) -> null, e));
3389 +            fs.add(src.whenCompleteAsync((z, t) -> {}, e));
3390 +            fs.add(src.handleAsync((z, t) -> null, e));
3391 +
3392 +            for (CompletableFuture<?> future : fs) {
3393 +                if (src.isDone())
3394 +                    checkCompletedWithWrappedException(future, e.ex);
3395 +                else
3396 +                    checkIncomplete(future);
3397 +            }
3398 +            futures.addAll(fs);
3399 +        }
3400 +
3401 +        {
3402 +            List<CompletableFuture<?>> fs = new ArrayList<>();
3403 +
3404 +            fs.add(complete.thenCombineAsync(incomplete, (x, y) -> x, e));
3405 +            fs.add(incomplete.thenCombineAsync(complete, (x, y) -> x, e));
3406 +
3407 +            fs.add(complete.thenAcceptBothAsync(incomplete, (x, y) -> {}, e));
3408 +            fs.add(incomplete.thenAcceptBothAsync(complete, (x, y) -> {}, e));
3409 +
3410 +            fs.add(complete.runAfterBothAsync(incomplete, () -> {}, e));
3411 +            fs.add(incomplete.runAfterBothAsync(complete, () -> {}, e));
3412 +
3413 +            for (CompletableFuture<?> future : fs)
3414 +                checkIncomplete(future);
3415 +            futures.addAll(fs);
3416 +        }
3417 +
3418 +        {
3419 +            List<CompletableFuture<?>> fs = new ArrayList<>();
3420 +
3421 +            fs.add(complete.applyToEitherAsync(incomplete, (z) -> z, e));
3422 +            fs.add(incomplete.applyToEitherAsync(complete, (z) -> z, e));
3423 +
3424 +            fs.add(complete.acceptEitherAsync(incomplete, (z) -> {}, e));
3425 +            fs.add(incomplete.acceptEitherAsync(complete, (z) -> {}, e));
3426 +
3427 +            fs.add(complete.runAfterEitherAsync(incomplete, () -> {}, e));
3428 +            fs.add(incomplete.runAfterEitherAsync(complete, () -> {}, e));
3429 +
3430 +            for (CompletableFuture<?> future : fs)
3431 +                checkCompletedWithWrappedException(future, e.ex);
3432 +            futures.addAll(fs);
3433 +        }
3434 +
3435 +        incomplete.complete(v);
3436 +
3437 +        for (CompletableFuture<?> future : futures)
3438 +            checkCompletedWithWrappedException(future, e.ex);
3439 +
3440 +        assertEquals(futures.size(), e.count.get());
3441 +    }}
3442 +
3443 +    /**
3444 +     * Test submissions to an executor that rejects all tasks, but
3445 +     * should never be invoked because the dependent future is
3446 +     * explicitly completed.
3447 +     */
3448 +    public void testRejectingExecutorNeverInvoked() {
3449 +        for (Integer v : new Integer[] { 1, null })
3450 +    {
3451 +        final CountingRejectingExecutor e = new CountingRejectingExecutor();
3452 +
3453 +        final CompletableFuture<Integer> complete = CompletableFuture.completedFuture(v);
3454 +        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
3455 +
3456 +        List<CompletableFuture<?>> futures = new ArrayList<>();
3457 +
3458 +        List<CompletableFuture<Integer>> srcs = new ArrayList<>();
3459 +        srcs.add(complete);
3460 +        srcs.add(incomplete);
3461 +
3462 +        List<CompletableFuture<?>> fs = new ArrayList<>();
3463 +        fs.add(incomplete.thenRunAsync(() -> {}, e));
3464 +        fs.add(incomplete.thenAcceptAsync((z) -> {}, e));
3465 +        fs.add(incomplete.thenApplyAsync((z) -> z, e));
3466 +
3467 +        fs.add(incomplete.thenCombineAsync(incomplete, (x, y) -> x, e));
3468 +        fs.add(incomplete.thenAcceptBothAsync(incomplete, (x, y) -> {}, e));
3469 +        fs.add(incomplete.runAfterBothAsync(incomplete, () -> {}, e));
3470 +
3471 +        fs.add(incomplete.applyToEitherAsync(incomplete, (z) -> z, e));
3472 +        fs.add(incomplete.acceptEitherAsync(incomplete, (z) -> {}, e));
3473 +        fs.add(incomplete.runAfterEitherAsync(incomplete, () -> {}, e));
3474 +
3475 +        fs.add(incomplete.thenComposeAsync((z) -> null, e));
3476 +        fs.add(incomplete.whenCompleteAsync((z, t) -> {}, e));
3477 +        fs.add(incomplete.handleAsync((z, t) -> null, e));
3478 +
3479 +        fs.add(complete.thenCombineAsync(incomplete, (x, y) -> x, e));
3480 +        fs.add(incomplete.thenCombineAsync(complete, (x, y) -> x, e));
3481 +
3482 +        fs.add(complete.thenAcceptBothAsync(incomplete, (x, y) -> {}, e));
3483 +        fs.add(incomplete.thenAcceptBothAsync(complete, (x, y) -> {}, e));
3484 +
3485 +        fs.add(complete.runAfterBothAsync(incomplete, () -> {}, e));
3486 +        fs.add(incomplete.runAfterBothAsync(complete, () -> {}, e));
3487 +
3488 +        for (CompletableFuture<?> future : fs)
3489 +            checkIncomplete(future);
3490 +
3491 +        for (CompletableFuture<?> future : fs)
3492 +            future.complete(null);
3493 +
3494 +        incomplete.complete(v);
3495 +
3496 +        for (CompletableFuture<?> future : fs)
3497 +            checkCompletedNormally(future, null);
3498 +
3499 +        assertEquals(0, e.count.get());
3500 +    }}
3501 +
3502 +    /**
3503       * toCompletableFuture returns this CompletableFuture.
3504       */
3505      public void testToCompletableFuture() {
# Line 3509 | Line 3715 | public class CompletableFutureTest exten
3715          long timeoutMillis = timeoutMillis();
3716          CompletableFuture<Integer> f = new CompletableFuture<>();
3717          long startTime = System.nanoTime();
3718 <        f.orTimeout(timeoutMillis, MILLISECONDS);
3718 >        assertSame(f, f.orTimeout(timeoutMillis, MILLISECONDS));
3719          checkCompletedWithTimeoutException(f);
3720          assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
3721      }
# Line 3524 | Line 3730 | public class CompletableFutureTest exten
3730          CompletableFuture<Integer> g = new CompletableFuture<>();
3731          long startTime = System.nanoTime();
3732          f.complete(v1);
3733 <        f.orTimeout(LONG_DELAY_MS, MILLISECONDS);
3734 <        g.orTimeout(LONG_DELAY_MS, MILLISECONDS);
3733 >        assertSame(f, f.orTimeout(LONG_DELAY_MS, MILLISECONDS));
3734 >        assertSame(g, g.orTimeout(LONG_DELAY_MS, MILLISECONDS));
3735          g.complete(v1);
3736          checkCompletedNormally(f, v1);
3737          checkCompletedNormally(g, v1);
# Line 3540 | Line 3746 | public class CompletableFutureTest exten
3746                         () -> testCompleteOnTimeout_timesOut(null));
3747      }
3748  
3749 +    /**
3750 +     * completeOnTimeout completes with given value if not complete
3751 +     */
3752      public void testCompleteOnTimeout_timesOut(Integer v) {
3753          long timeoutMillis = timeoutMillis();
3754          CompletableFuture<Integer> f = new CompletableFuture<>();
3755          long startTime = System.nanoTime();
3756 <        f.completeOnTimeout(v, timeoutMillis, MILLISECONDS);
3756 >        assertSame(f, f.completeOnTimeout(v, timeoutMillis, MILLISECONDS));
3757          assertSame(v, f.join());
3758          assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
3759          f.complete(99);         // should have no effect
# Line 3561 | Line 3770 | public class CompletableFutureTest exten
3770          CompletableFuture<Integer> g = new CompletableFuture<>();
3771          long startTime = System.nanoTime();
3772          f.complete(v1);
3773 <        f.completeOnTimeout(-1, LONG_DELAY_MS, MILLISECONDS);
3774 <        g.completeOnTimeout(-1, LONG_DELAY_MS, MILLISECONDS);
3773 >        assertSame(f, f.completeOnTimeout(-1, LONG_DELAY_MS, MILLISECONDS));
3774 >        assertSame(g, g.completeOnTimeout(-1, LONG_DELAY_MS, MILLISECONDS));
3775          g.complete(v1);
3776          checkCompletedNormally(f, v1);
3777          checkCompletedNormally(g, v1);
# Line 3613 | Line 3822 | public class CompletableFutureTest exten
3822      //--- tests of implementation details; not part of official tck ---
3823  
3824      Object resultOf(CompletableFuture<?> f) {
3825 +        SecurityManager sm = System.getSecurityManager();
3826 +        if (sm != null) {
3827 +            try {
3828 +                System.setSecurityManager(null);
3829 +            } catch (SecurityException giveUp) {
3830 +                return "Reflection not available";
3831 +            }
3832 +        }
3833 +
3834          try {
3835              java.lang.reflect.Field resultField
3836                  = CompletableFuture.class.getDeclaredField("result");
3837              resultField.setAccessible(true);
3838              return resultField.get(f);
3839 <        } catch (Throwable t) { throw new AssertionError(t); }
3839 >        } catch (Throwable t) {
3840 >            throw new AssertionError(t);
3841 >        } finally {
3842 >            if (sm != null) System.setSecurityManager(sm);
3843 >        }
3844      }
3845  
3846      public void testExceptionPropagationReusesResultObject() {
# Line 3629 | Line 3851 | public class CompletableFutureTest exten
3851          final CompletableFuture<Integer> v42 = CompletableFuture.completedFuture(42);
3852          final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
3853  
3854 +        final Runnable noopRunnable = new Noop(m);
3855 +        final Consumer<Integer> noopConsumer = new NoopConsumer(m);
3856 +        final Function<Integer, Integer> incFunction = new IncFunction(m);
3857 +
3858          List<Function<CompletableFuture<Integer>, CompletableFuture<?>>> funs
3859              = new ArrayList<>();
3860  
3861 <        funs.add((y) -> m.thenRun(y, new Noop(m)));
3862 <        funs.add((y) -> m.thenAccept(y, new NoopConsumer(m)));
3863 <        funs.add((y) -> m.thenApply(y, new IncFunction(m)));
3864 <
3865 <        funs.add((y) -> m.runAfterEither(y, incomplete, new Noop(m)));
3866 <        funs.add((y) -> m.acceptEither(y, incomplete, new NoopConsumer(m)));
3867 <        funs.add((y) -> m.applyToEither(y, incomplete, new IncFunction(m)));
3861 >        funs.add((y) -> m.thenRun(y, noopRunnable));
3862 >        funs.add((y) -> m.thenAccept(y, noopConsumer));
3863 >        funs.add((y) -> m.thenApply(y, incFunction));
3864 >
3865 >        funs.add((y) -> m.runAfterEither(y, incomplete, noopRunnable));
3866 >        funs.add((y) -> m.acceptEither(y, incomplete, noopConsumer));
3867 >        funs.add((y) -> m.applyToEither(y, incomplete, incFunction));
3868  
3869 <        funs.add((y) -> m.runAfterBoth(y, v42, new Noop(m)));
3869 >        funs.add((y) -> m.runAfterBoth(y, v42, noopRunnable));
3870 >        funs.add((y) -> m.runAfterBoth(v42, y, noopRunnable));
3871          funs.add((y) -> m.thenAcceptBoth(y, v42, new SubtractAction(m)));
3872 +        funs.add((y) -> m.thenAcceptBoth(v42, y, new SubtractAction(m)));
3873          funs.add((y) -> m.thenCombine(y, v42, new SubtractFunction(m)));
3874 +        funs.add((y) -> m.thenCombine(v42, y, new SubtractFunction(m)));
3875  
3876 <        funs.add((y) -> m.whenComplete(y, (Integer x, Throwable t) -> {}));
3876 >        funs.add((y) -> m.whenComplete(y, (Integer r, Throwable t) -> {}));
3877  
3878          funs.add((y) -> m.thenCompose(y, new CompletableFutureInc(m)));
3879  
3880 <        funs.add((y) -> CompletableFuture.allOf(new CompletableFuture<?>[] {y, v42}));
3881 <        funs.add((y) -> CompletableFuture.anyOf(new CompletableFuture<?>[] {y, incomplete}));
3880 >        funs.add((y) -> CompletableFuture.allOf(y));
3881 >        funs.add((y) -> CompletableFuture.allOf(y, v42));
3882 >        funs.add((y) -> CompletableFuture.allOf(v42, y));
3883 >        funs.add((y) -> CompletableFuture.anyOf(y));
3884 >        funs.add((y) -> CompletableFuture.anyOf(y, incomplete));
3885 >        funs.add((y) -> CompletableFuture.anyOf(incomplete, y));
3886  
3887          for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3888                   fun : funs) {
3889              CompletableFuture<Integer> f = new CompletableFuture<>();
3890              f.completeExceptionally(ex);
3891 <            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3891 >            CompletableFuture<Integer> src = m.thenApply(f, incFunction);
3892              checkCompletedWithWrappedException(src, ex);
3893              CompletableFuture<?> dep = fun.apply(src);
3894              checkCompletedWithWrappedException(dep, ex);
# Line 3665 | Line 3898 | public class CompletableFutureTest exten
3898          for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3899                   fun : funs) {
3900              CompletableFuture<Integer> f = new CompletableFuture<>();
3901 <            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3901 >            CompletableFuture<Integer> src = m.thenApply(f, incFunction);
3902              CompletableFuture<?> dep = fun.apply(src);
3903              f.completeExceptionally(ex);
3904              checkCompletedWithWrappedException(src, ex);
# Line 3679 | Line 3912 | public class CompletableFutureTest exten
3912              CompletableFuture<Integer> f = new CompletableFuture<>();
3913              f.cancel(mayInterruptIfRunning);
3914              checkCancelled(f);
3915 <            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3915 >            CompletableFuture<Integer> src = m.thenApply(f, incFunction);
3916              checkCompletedWithWrappedCancellationException(src);
3917              CompletableFuture<?> dep = fun.apply(src);
3918              checkCompletedWithWrappedCancellationException(dep);
# Line 3690 | Line 3923 | public class CompletableFutureTest exten
3923          for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3924                   fun : funs) {
3925              CompletableFuture<Integer> f = new CompletableFuture<>();
3926 <            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3926 >            CompletableFuture<Integer> src = m.thenApply(f, incFunction);
3927              CompletableFuture<?> dep = fun.apply(src);
3928              f.cancel(mayInterruptIfRunning);
3929              checkCancelled(f);
# Line 3701 | Line 3934 | public class CompletableFutureTest exten
3934      }}
3935  
3936      /**
3937 <     * Minimal completion stages throw UOE for all non-CompletionStage methods
3937 >     * Minimal completion stages throw UOE for most non-CompletionStage methods
3938       */
3939      public void testMinimalCompletionStage_minimality() {
3940          if (!testImplementationDetails) return;
# Line 3730 | Line 3963 | public class CompletableFutureTest exten
3963              .filter((method) -> !permittedMethodSignatures.contains(toSignature.apply(method)))
3964              .collect(Collectors.toList());
3965  
3966 <        CompletionStage<Integer> minimalStage =
3967 <            new CompletableFuture<Integer>().minimalCompletionStage();
3966 >        List<CompletionStage<Integer>> stages = new ArrayList<>();
3967 >        stages.add(new CompletableFuture<Integer>().minimalCompletionStage());
3968 >        stages.add(CompletableFuture.completedStage(1));
3969 >        stages.add(CompletableFuture.failedStage(new CFException()));
3970  
3971          List<Method> bugs = new ArrayList<>();
3972          for (Method method : allMethods) {
# Line 3747 | Line 3982 | public class CompletableFutureTest exten
3982                  else if (parameterTypes[i] == long.class)
3983                      args[i] = 0L;
3984              }
3985 <            try {
3986 <                method.invoke(minimalStage, args);
3987 <                bugs.add(method);
3753 <            }
3754 <            catch (java.lang.reflect.InvocationTargetException expected) {
3755 <                if (! (expected.getCause() instanceof UnsupportedOperationException)) {
3985 >            for (CompletionStage<Integer> stage : stages) {
3986 >                try {
3987 >                    method.invoke(stage, args);
3988                      bugs.add(method);
3757                    // expected.getCause().printStackTrace();
3989                  }
3990 +                catch (java.lang.reflect.InvocationTargetException expected) {
3991 +                    if (! (expected.getCause() instanceof UnsupportedOperationException)) {
3992 +                        bugs.add(method);
3993 +                        // expected.getCause().printStackTrace();
3994 +                    }
3995 +                }
3996 +                catch (ReflectiveOperationException bad) { throw new Error(bad); }
3997              }
3760            catch (ReflectiveOperationException bad) { throw new Error(bad); }
3998          }
3999          if (!bugs.isEmpty())
4000 <            throw new Error("Methods did not throw UOE: " + bugs.toString());
4000 >            throw new Error("Methods did not throw UOE: " + bugs);
4001      }
4002  
4003      static class Monad {
4004 <        static class MonadError extends Error {
4005 <            public MonadError() { super("monadic zero"); }
4004 >        static class ZeroException extends RuntimeException {
4005 >            public ZeroException() { super("monadic zero"); }
4006          }
4007          // "return", "unit"
4008          static <T> CompletableFuture<T> unit(T value) {
# Line 3773 | Line 4010 | public class CompletableFutureTest exten
4010          }
4011          // monadic zero ?
4012          static <T> CompletableFuture<T> zero() {
4013 <            return failedFuture(new MonadError());
4013 >            return failedFuture(new ZeroException());
4014          }
4015          // >=>
4016          static <T,U,V> Function<T, CompletableFuture<V>> compose
# Line 3787 | Line 4024 | public class CompletableFutureTest exten
4024                  f.getNow(null);
4025                  throw new AssertionFailedError("should throw");
4026              } catch (CompletionException success) {
4027 <                assertTrue(success.getCause() instanceof MonadError);
4027 >                assertTrue(success.getCause() instanceof ZeroException);
4028              }
4029          }
4030  
# Line 3814 | Line 4051 | public class CompletableFutureTest exten
4051              AtomicReference<Throwable> firstFailure = new AtomicReference<>(null);
4052          }
4053  
4054 <        // Monadic "plus"
4054 >        /** Implements "monadic plus". */
4055          static <T> CompletableFuture<T> plus(CompletableFuture<? extends T> f,
4056                                               CompletableFuture<? extends T> g) {
4057              PlusFuture<T> plus = new PlusFuture<T>();
4058              BiConsumer<T, Throwable> action = (T result, Throwable ex) -> {
4059 <                if (ex == null) {
4060 <                    if (plus.complete(result))
4061 <                        if (plus.firstFailure.get() != null)
4059 >                try {
4060 >                    if (ex == null) {
4061 >                        if (plus.complete(result))
4062 >                            if (plus.firstFailure.get() != null)
4063 >                                plus.firstFailure.set(null);
4064 >                    }
4065 >                    else if (plus.firstFailure.compareAndSet(null, ex)) {
4066 >                        if (plus.isDone())
4067                              plus.firstFailure.set(null);
4068 <                }
4069 <                else if (plus.firstFailure.compareAndSet(null, ex)) {
4070 <                    if (plus.isDone())
4071 <                        plus.firstFailure.set(null);
4072 <                } else {
4073 <                    // prefer failing with first failure
4074 <                    plus.completeExceptionally(plus.firstFailure.getAndSet(null));
4068 >                    }
4069 >                    else {
4070 >                        // first failure has precedence
4071 >                        Throwable first = plus.firstFailure.getAndSet(null);
4072 >
4073 >                        // may fail with "Self-suppression not permitted"
4074 >                        try { first.addSuppressed(ex); }
4075 >                        catch (Exception ignored) {}
4076 >
4077 >                        plus.completeExceptionally(first);
4078 >                    }
4079 >                } catch (Throwable unexpected) {
4080 >                    plus.completeExceptionally(unexpected);
4081                  }
4082              };
4083              f.whenComplete(action);
# Line 3898 | Line 4146 | public class CompletableFutureTest exten
4146                                   Monad.plus(godot, Monad.unit(5L)));
4147      }
4148  
4149 +    /** Test long recursive chains of CompletableFutures with cascading completions */
4150 +    public void testRecursiveChains() throws Throwable {
4151 +        for (ExecutionMode m : ExecutionMode.values())
4152 +        for (boolean addDeadEnds : new boolean[] { true, false })
4153 +    {
4154 +        final int val = 42;
4155 +        final int n = expensiveTests ? 1_000 : 2;
4156 +        CompletableFuture<Integer> head = new CompletableFuture<>();
4157 +        CompletableFuture<Integer> tail = head;
4158 +        for (int i = 0; i < n; i++) {
4159 +            if (addDeadEnds) m.thenApply(tail, v -> v + 1);
4160 +            tail = m.thenApply(tail, v -> v + 1);
4161 +            if (addDeadEnds) m.applyToEither(tail, tail, v -> v + 1);
4162 +            tail = m.applyToEither(tail, tail, v -> v + 1);
4163 +            if (addDeadEnds) m.thenCombine(tail, tail, (v, w) -> v + 1);
4164 +            tail = m.thenCombine(tail, tail, (v, w) -> v + 1);
4165 +        }
4166 +        head.complete(val);
4167 +        assertEquals(val + 3 * n, (int) tail.join());
4168 +    }}
4169 +
4170 +    /**
4171 +     * A single CompletableFuture with many dependents.
4172 +     * A demo of scalability - runtime is O(n).
4173 +     */
4174 +    public void testManyDependents() throws Throwable {
4175 +        final int n = expensiveTests ? 1_000_000 : 10;
4176 +        final CompletableFuture<Void> head = new CompletableFuture<>();
4177 +        final CompletableFuture<Void> complete = CompletableFuture.completedFuture((Void)null);
4178 +        final AtomicInteger count = new AtomicInteger(0);
4179 +        for (int i = 0; i < n; i++) {
4180 +            head.thenRun(() -> count.getAndIncrement());
4181 +            head.thenAccept((x) -> count.getAndIncrement());
4182 +            head.thenApply((x) -> count.getAndIncrement());
4183 +
4184 +            head.runAfterBoth(complete, () -> count.getAndIncrement());
4185 +            head.thenAcceptBoth(complete, (x, y) -> count.getAndIncrement());
4186 +            head.thenCombine(complete, (x, y) -> count.getAndIncrement());
4187 +            complete.runAfterBoth(head, () -> count.getAndIncrement());
4188 +            complete.thenAcceptBoth(head, (x, y) -> count.getAndIncrement());
4189 +            complete.thenCombine(head, (x, y) -> count.getAndIncrement());
4190 +
4191 +            head.runAfterEither(new CompletableFuture<Void>(), () -> count.getAndIncrement());
4192 +            head.acceptEither(new CompletableFuture<Void>(), (x) -> count.getAndIncrement());
4193 +            head.applyToEither(new CompletableFuture<Void>(), (x) -> count.getAndIncrement());
4194 +            new CompletableFuture<Void>().runAfterEither(head, () -> count.getAndIncrement());
4195 +            new CompletableFuture<Void>().acceptEither(head, (x) -> count.getAndIncrement());
4196 +            new CompletableFuture<Void>().applyToEither(head, (x) -> count.getAndIncrement());
4197 +        }
4198 +        head.complete(null);
4199 +        assertEquals(5 * 3 * n, count.get());
4200 +    }
4201 +
4202 +    /** ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest tck */
4203 +    public void testCoCompletionGarbageRetention() throws Throwable {
4204 +        final int n = expensiveTests ? 1_000_000 : 10;
4205 +        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
4206 +        CompletableFuture<Integer> f;
4207 +        for (int i = 0; i < n; i++) {
4208 +            f = new CompletableFuture<>();
4209 +            f.runAfterEither(incomplete, () -> {});
4210 +            f.complete(null);
4211 +
4212 +            f = new CompletableFuture<>();
4213 +            f.acceptEither(incomplete, (x) -> {});
4214 +            f.complete(null);
4215 +
4216 +            f = new CompletableFuture<>();
4217 +            f.applyToEither(incomplete, (x) -> x);
4218 +            f.complete(null);
4219 +
4220 +            f = new CompletableFuture<>();
4221 +            CompletableFuture.anyOf(new CompletableFuture<?>[] { f, incomplete });
4222 +            f.complete(null);
4223 +        }
4224 +
4225 +        for (int i = 0; i < n; i++) {
4226 +            f = new CompletableFuture<>();
4227 +            incomplete.runAfterEither(f, () -> {});
4228 +            f.complete(null);
4229 +
4230 +            f = new CompletableFuture<>();
4231 +            incomplete.acceptEither(f, (x) -> {});
4232 +            f.complete(null);
4233 +
4234 +            f = new CompletableFuture<>();
4235 +            incomplete.applyToEither(f, (x) -> x);
4236 +            f.complete(null);
4237 +
4238 +            f = new CompletableFuture<>();
4239 +            CompletableFuture.anyOf(new CompletableFuture<?>[] { incomplete, f });
4240 +            f.complete(null);
4241 +        }
4242 +    }
4243 +
4244 +    /**
4245 +     * Reproduction recipe for:
4246 +     * 8160402: Garbage retention with CompletableFuture.anyOf
4247 +     * cvs update -D '2016-05-01' ./src/main/java/util/concurrent/CompletableFuture.java && ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest -Djsr166.methodFilter=testAnyOfGarbageRetention tck; cvs update -A
4248 +     */
4249 +    public void testAnyOfGarbageRetention() throws Throwable {
4250 +        for (Integer v : new Integer[] { 1, null })
4251 +    {
4252 +        final int n = expensiveTests ? 100_000 : 10;
4253 +        CompletableFuture<Integer>[] fs
4254 +            = (CompletableFuture<Integer>[]) new CompletableFuture<?>[100];
4255 +        for (int i = 0; i < fs.length; i++)
4256 +            fs[i] = new CompletableFuture<>();
4257 +        fs[fs.length - 1].complete(v);
4258 +        for (int i = 0; i < n; i++)
4259 +            checkCompletedNormally(CompletableFuture.anyOf(fs), v);
4260 +    }}
4261 +
4262 +    /**
4263 +     * Checks for garbage retention with allOf.
4264 +     *
4265 +     * As of 2016-07, fails with OOME:
4266 +     * ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest -Djsr166.methodFilter=testCancelledAllOfGarbageRetention tck
4267 +     */
4268 +    public void testCancelledAllOfGarbageRetention() throws Throwable {
4269 +        final int n = expensiveTests ? 100_000 : 10;
4270 +        CompletableFuture<Integer>[] fs
4271 +            = (CompletableFuture<Integer>[]) new CompletableFuture<?>[100];
4272 +        for (int i = 0; i < fs.length; i++)
4273 +            fs[i] = new CompletableFuture<>();
4274 +        for (int i = 0; i < n; i++)
4275 +            assertTrue(CompletableFuture.allOf(fs).cancel(false));
4276 +    }
4277 +
4278 +    /**
4279 +     * Checks for garbage retention when a dependent future is
4280 +     * cancelled and garbage-collected.
4281 +     * 8161600: Garbage retention when source CompletableFutures are never completed
4282 +     *
4283 +     * As of 2016-07, fails with OOME:
4284 +     * ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest -Djsr166.methodFilter=testCancelledGarbageRetention tck
4285 +     */
4286 +    public void testCancelledGarbageRetention() throws Throwable {
4287 +        final int n = expensiveTests ? 100_000 : 10;
4288 +        CompletableFuture<Integer> neverCompleted = new CompletableFuture<>();
4289 +        for (int i = 0; i < n; i++)
4290 +            assertTrue(neverCompleted.thenRun(() -> {}).cancel(true));
4291 +    }
4292 +
4293   //     static <U> U join(CompletionStage<U> stage) {
4294   //         CompletableFuture<U> f = new CompletableFuture<>();
4295   //         stage.whenComplete((v, ex) -> {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines