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.123 by jsr166, Tue Sep 8 19:45:35 2015 UTC vs.
Revision 1.175 by jsr166, Wed Sep 21 18:07:37 2016 UTC

# Line 7 | Line 7
7  
8   import static java.util.concurrent.TimeUnit.MILLISECONDS;
9   import static java.util.concurrent.TimeUnit.SECONDS;
10 + import static java.util.concurrent.CompletableFuture.completedFuture;
11 + import static java.util.concurrent.CompletableFuture.failedFuture;
12  
13   import java.lang.reflect.Method;
14   import java.lang.reflect.Modifier;
# Line 28 | 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;
32 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;
38   import java.util.function.BiFunction;
39   import java.util.function.Consumer;
40   import java.util.function.Function;
41 + import java.util.function.Predicate;
42   import java.util.function.Supplier;
43  
44 + import junit.framework.AssertionFailedError;
45   import junit.framework.Test;
46   import junit.framework.TestSuite;
47  
# Line 357 | Line 361 | public class CompletableFutureTest exten
361          checkCompletedNormally(f, "test");
362      }
363  
364 <    abstract class CheckedAction {
364 >    abstract static class CheckedAction {
365          int invocationCount = 0;
366          final ExecutionMode m;
367          CheckedAction(ExecutionMode m) { this.m = m; }
# Line 369 | Line 373 | public class CompletableFutureTest exten
373          void assertInvoked() { assertEquals(1, invocationCount); }
374      }
375  
376 <    abstract class CheckedIntegerAction extends CheckedAction {
376 >    abstract static class CheckedIntegerAction extends CheckedAction {
377          Integer value;
378          CheckedIntegerAction(ExecutionMode m) { super(m); }
379          void assertValue(Integer expected) {
# Line 378 | Line 382 | public class CompletableFutureTest exten
382          }
383      }
384  
385 <    class IntegerSupplier extends CheckedAction
385 >    static class IntegerSupplier extends CheckedAction
386          implements Supplier<Integer>
387      {
388          final Integer value;
# Line 397 | Line 401 | public class CompletableFutureTest exten
401          return (x == null) ? null : x + 1;
402      }
403  
404 <    class NoopConsumer extends CheckedIntegerAction
404 >    static class NoopConsumer extends CheckedIntegerAction
405          implements Consumer<Integer>
406      {
407          NoopConsumer(ExecutionMode m) { super(m); }
# Line 407 | Line 411 | public class CompletableFutureTest exten
411          }
412      }
413  
414 <    class IncFunction extends CheckedIntegerAction
414 >    static class IncFunction extends CheckedIntegerAction
415          implements Function<Integer,Integer>
416      {
417          IncFunction(ExecutionMode m) { super(m); }
# Line 425 | Line 429 | public class CompletableFutureTest exten
429              - ((y == null) ? 99 : y.intValue());
430      }
431  
432 <    class SubtractAction extends CheckedIntegerAction
432 >    static class SubtractAction extends CheckedIntegerAction
433          implements BiConsumer<Integer, Integer>
434      {
435          SubtractAction(ExecutionMode m) { super(m); }
# Line 435 | Line 439 | public class CompletableFutureTest exten
439          }
440      }
441  
442 <    class SubtractFunction extends CheckedIntegerAction
442 >    static class SubtractFunction extends CheckedIntegerAction
443          implements BiFunction<Integer, Integer, Integer>
444      {
445          SubtractFunction(ExecutionMode m) { super(m); }
# Line 445 | Line 449 | public class CompletableFutureTest exten
449          }
450      }
451  
452 <    class Noop extends CheckedAction implements Runnable {
452 >    static class Noop extends CheckedAction implements Runnable {
453          Noop(ExecutionMode m) { super(m); }
454          public void run() {
455              invoked();
456          }
457      }
458  
459 <    class FailingSupplier extends CheckedAction
459 >    static 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
470 >    static 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
482 >    static 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
494 >    static 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
506 >    static 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); }
518 >    static class FailingRunnable extends CheckedAction implements Runnable {
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  
527 <    class CompletableFutureInc extends CheckedIntegerAction
527 >    static class CompletableFutureInc extends CheckedIntegerAction
528          implements Function<Integer, CompletableFuture<Integer>>
529      {
530          CompletableFutureInc(ExecutionMode m) { super(m); }
# Line 527 | Line 537 | public class CompletableFutureTest exten
537          }
538      }
539  
540 <    class FailingCompletableFutureFunction extends CheckedIntegerAction
540 >    static 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 836 | Line 856 | public class CompletableFutureTest exten
856          if (!createIncomplete) assertTrue(f.complete(v1));
857          final CompletableFuture<Integer> g = f.exceptionally
858              ((Throwable t) -> {
839                // Should not be called
859                  a.getAndIncrement();
860 <                throw new AssertionError();
860 >                threadFail("should not be called");
861 >                return null;            // unreached
862              });
863          if (createIncomplete) assertTrue(f.complete(v1));
864  
# Line 872 | 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 890 | 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 897 | Line 922 | public class CompletableFutureTest exten
922       * whenComplete action executes on normal completion, propagating
923       * source result.
924       */
925 <    public void testWhenComplete_normalCompletion1() {
925 >    public void testWhenComplete_normalCompletion() {
926          for (ExecutionMode m : ExecutionMode.values())
927          for (boolean createIncomplete : new boolean[] { true, false })
928          for (Integer v1 : new Integer[] { 1, null })
# Line 907 | 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 934 | 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 961 | 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 978 | 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 989 | 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 1006 | 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 1020 | 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 1031 | 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 1048 | 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 1077 | 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 1106 | 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 1121 | 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();
1134 <        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      {
1156        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 1202 | 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 1236 | 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 1358 | 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 1462 | 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 1564 | 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 1729 | 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 1893 | 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 2057 | 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 2349 | 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 2361 | 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 2608 | 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 2620 | 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 2639 | 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 2651 | 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 2863 | 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 2933 | 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 3042 | 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 3275 | 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 3290 | 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 3367 | Line 3577 | public class CompletableFutureTest exten
3577       * copy returns a CompletableFuture that is completed normally,
3578       * with the same value, when source is.
3579       */
3580 <    public void testCopy() {
3580 >    public void testCopy_normalCompletion() {
3581 >        for (boolean createIncomplete : new boolean[] { true, false })
3582 >        for (Integer v1 : new Integer[] { 1, null })
3583 >    {
3584          CompletableFuture<Integer> f = new CompletableFuture<>();
3585 +        if (!createIncomplete) assertTrue(f.complete(v1));
3586          CompletableFuture<Integer> g = f.copy();
3587 <        checkIncomplete(f);
3588 <        checkIncomplete(g);
3589 <        f.complete(1);
3590 <        checkCompletedNormally(f, 1);
3591 <        checkCompletedNormally(g, 1);
3592 <    }
3587 >        if (createIncomplete) {
3588 >            checkIncomplete(f);
3589 >            checkIncomplete(g);
3590 >            assertTrue(f.complete(v1));
3591 >        }
3592 >        checkCompletedNormally(f, v1);
3593 >        checkCompletedNormally(g, v1);
3594 >    }}
3595  
3596      /**
3597       * copy returns a CompletableFuture that is completed exceptionally
3598       * when source is.
3599       */
3600 <    public void testCopy2() {
3600 >    public void testCopy_exceptionalCompletion() {
3601 >        for (boolean createIncomplete : new boolean[] { true, false })
3602 >    {
3603 >        CFException ex = new CFException();
3604          CompletableFuture<Integer> f = new CompletableFuture<>();
3605 +        if (!createIncomplete) f.completeExceptionally(ex);
3606          CompletableFuture<Integer> g = f.copy();
3607 <        checkIncomplete(f);
3608 <        checkIncomplete(g);
3609 <        CFException ex = new CFException();
3610 <        f.completeExceptionally(ex);
3607 >        if (createIncomplete) {
3608 >            checkIncomplete(f);
3609 >            checkIncomplete(g);
3610 >            f.completeExceptionally(ex);
3611 >        }
3612          checkCompletedExceptionally(f, ex);
3613          checkCompletedWithWrappedException(g, ex);
3614 +    }}
3615 +
3616 +    /**
3617 +     * Completion of a copy does not complete its source.
3618 +     */
3619 +    public void testCopy_oneWayPropagation() {
3620 +        CompletableFuture<Integer> f = new CompletableFuture<>();
3621 +        assertTrue(f.copy().complete(1));
3622 +        assertTrue(f.copy().complete(null));
3623 +        assertTrue(f.copy().cancel(true));
3624 +        assertTrue(f.copy().cancel(false));
3625 +        assertTrue(f.copy().completeExceptionally(new CFException()));
3626 +        checkIncomplete(f);
3627      }
3628  
3629      /**
# Line 3505 | Line 3739 | public class CompletableFutureTest exten
3739          long timeoutMillis = timeoutMillis();
3740          CompletableFuture<Integer> f = new CompletableFuture<>();
3741          long startTime = System.nanoTime();
3742 <        f.orTimeout(timeoutMillis, MILLISECONDS);
3742 >        assertSame(f, f.orTimeout(timeoutMillis, MILLISECONDS));
3743          checkCompletedWithTimeoutException(f);
3744          assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
3745      }
# Line 3520 | Line 3754 | public class CompletableFutureTest exten
3754          CompletableFuture<Integer> g = new CompletableFuture<>();
3755          long startTime = System.nanoTime();
3756          f.complete(v1);
3757 <        f.orTimeout(LONG_DELAY_MS, MILLISECONDS);
3758 <        g.orTimeout(LONG_DELAY_MS, MILLISECONDS);
3757 >        assertSame(f, f.orTimeout(LONG_DELAY_MS, MILLISECONDS));
3758 >        assertSame(g, g.orTimeout(LONG_DELAY_MS, MILLISECONDS));
3759          g.complete(v1);
3760          checkCompletedNormally(f, v1);
3761          checkCompletedNormally(g, v1);
# Line 3536 | Line 3770 | public class CompletableFutureTest exten
3770                         () -> testCompleteOnTimeout_timesOut(null));
3771      }
3772  
3773 +    /**
3774 +     * completeOnTimeout completes with given value if not complete
3775 +     */
3776      public void testCompleteOnTimeout_timesOut(Integer v) {
3777          long timeoutMillis = timeoutMillis();
3778          CompletableFuture<Integer> f = new CompletableFuture<>();
3779          long startTime = System.nanoTime();
3780 <        f.completeOnTimeout(v, timeoutMillis, MILLISECONDS);
3780 >        assertSame(f, f.completeOnTimeout(v, timeoutMillis, MILLISECONDS));
3781          assertSame(v, f.join());
3782          assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
3783          f.complete(99);         // should have no effect
# Line 3557 | Line 3794 | public class CompletableFutureTest exten
3794          CompletableFuture<Integer> g = new CompletableFuture<>();
3795          long startTime = System.nanoTime();
3796          f.complete(v1);
3797 <        f.completeOnTimeout(-1, LONG_DELAY_MS, MILLISECONDS);
3798 <        g.completeOnTimeout(-1, LONG_DELAY_MS, MILLISECONDS);
3797 >        assertSame(f, f.completeOnTimeout(-1, LONG_DELAY_MS, MILLISECONDS));
3798 >        assertSame(g, g.completeOnTimeout(-1, LONG_DELAY_MS, MILLISECONDS));
3799          g.complete(v1);
3800          checkCompletedNormally(f, v1);
3801          checkCompletedNormally(g, v1);
# Line 3609 | Line 3846 | public class CompletableFutureTest exten
3846      //--- tests of implementation details; not part of official tck ---
3847  
3848      Object resultOf(CompletableFuture<?> f) {
3849 +        SecurityManager sm = System.getSecurityManager();
3850 +        if (sm != null) {
3851 +            try {
3852 +                System.setSecurityManager(null);
3853 +            } catch (SecurityException giveUp) {
3854 +                return "Reflection not available";
3855 +            }
3856 +        }
3857 +
3858          try {
3859              java.lang.reflect.Field resultField
3860                  = CompletableFuture.class.getDeclaredField("result");
3861              resultField.setAccessible(true);
3862              return resultField.get(f);
3863 <        } catch (Throwable t) { throw new AssertionError(t); }
3863 >        } catch (Throwable t) {
3864 >            throw new AssertionError(t);
3865 >        } finally {
3866 >            if (sm != null) System.setSecurityManager(sm);
3867 >        }
3868      }
3869  
3870      public void testExceptionPropagationReusesResultObject() {
# Line 3625 | Line 3875 | public class CompletableFutureTest exten
3875          final CompletableFuture<Integer> v42 = CompletableFuture.completedFuture(42);
3876          final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
3877  
3878 +        final Runnable noopRunnable = new Noop(m);
3879 +        final Consumer<Integer> noopConsumer = new NoopConsumer(m);
3880 +        final Function<Integer, Integer> incFunction = new IncFunction(m);
3881 +
3882          List<Function<CompletableFuture<Integer>, CompletableFuture<?>>> funs
3883              = new ArrayList<>();
3884  
3885 <        funs.add((y) -> m.thenRun(y, new Noop(m)));
3886 <        funs.add((y) -> m.thenAccept(y, new NoopConsumer(m)));
3887 <        funs.add((y) -> m.thenApply(y, new IncFunction(m)));
3888 <
3889 <        funs.add((y) -> m.runAfterEither(y, incomplete, new Noop(m)));
3890 <        funs.add((y) -> m.acceptEither(y, incomplete, new NoopConsumer(m)));
3891 <        funs.add((y) -> m.applyToEither(y, incomplete, new IncFunction(m)));
3885 >        funs.add((y) -> m.thenRun(y, noopRunnable));
3886 >        funs.add((y) -> m.thenAccept(y, noopConsumer));
3887 >        funs.add((y) -> m.thenApply(y, incFunction));
3888 >
3889 >        funs.add((y) -> m.runAfterEither(y, incomplete, noopRunnable));
3890 >        funs.add((y) -> m.acceptEither(y, incomplete, noopConsumer));
3891 >        funs.add((y) -> m.applyToEither(y, incomplete, incFunction));
3892  
3893 <        funs.add((y) -> m.runAfterBoth(y, v42, new Noop(m)));
3893 >        funs.add((y) -> m.runAfterBoth(y, v42, noopRunnable));
3894 >        funs.add((y) -> m.runAfterBoth(v42, y, noopRunnable));
3895          funs.add((y) -> m.thenAcceptBoth(y, v42, new SubtractAction(m)));
3896 +        funs.add((y) -> m.thenAcceptBoth(v42, y, new SubtractAction(m)));
3897          funs.add((y) -> m.thenCombine(y, v42, new SubtractFunction(m)));
3898 +        funs.add((y) -> m.thenCombine(v42, y, new SubtractFunction(m)));
3899  
3900 <        funs.add((y) -> m.whenComplete(y, (Integer x, Throwable t) -> {}));
3900 >        funs.add((y) -> m.whenComplete(y, (Integer r, Throwable t) -> {}));
3901  
3902          funs.add((y) -> m.thenCompose(y, new CompletableFutureInc(m)));
3903  
3904 <        funs.add((y) -> CompletableFuture.allOf(new CompletableFuture<?>[] {y, v42}));
3905 <        funs.add((y) -> CompletableFuture.anyOf(new CompletableFuture<?>[] {y, incomplete}));
3904 >        funs.add((y) -> CompletableFuture.allOf(y));
3905 >        funs.add((y) -> CompletableFuture.allOf(y, v42));
3906 >        funs.add((y) -> CompletableFuture.allOf(v42, y));
3907 >        funs.add((y) -> CompletableFuture.anyOf(y));
3908 >        funs.add((y) -> CompletableFuture.anyOf(y, incomplete));
3909 >        funs.add((y) -> CompletableFuture.anyOf(incomplete, y));
3910  
3911          for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3912                   fun : funs) {
3913              CompletableFuture<Integer> f = new CompletableFuture<>();
3914              f.completeExceptionally(ex);
3915 <            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3915 >            CompletableFuture<Integer> src = m.thenApply(f, incFunction);
3916              checkCompletedWithWrappedException(src, ex);
3917              CompletableFuture<?> dep = fun.apply(src);
3918              checkCompletedWithWrappedException(dep, ex);
# Line 3661 | Line 3922 | public class CompletableFutureTest exten
3922          for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3923                   fun : funs) {
3924              CompletableFuture<Integer> f = new CompletableFuture<>();
3925 <            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3925 >            CompletableFuture<Integer> src = m.thenApply(f, incFunction);
3926              CompletableFuture<?> dep = fun.apply(src);
3927              f.completeExceptionally(ex);
3928              checkCompletedWithWrappedException(src, ex);
# Line 3675 | Line 3936 | public class CompletableFutureTest exten
3936              CompletableFuture<Integer> f = new CompletableFuture<>();
3937              f.cancel(mayInterruptIfRunning);
3938              checkCancelled(f);
3939 <            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3939 >            CompletableFuture<Integer> src = m.thenApply(f, incFunction);
3940              checkCompletedWithWrappedCancellationException(src);
3941              CompletableFuture<?> dep = fun.apply(src);
3942              checkCompletedWithWrappedCancellationException(dep);
# Line 3686 | Line 3947 | public class CompletableFutureTest exten
3947          for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3948                   fun : funs) {
3949              CompletableFuture<Integer> f = new CompletableFuture<>();
3950 <            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3950 >            CompletableFuture<Integer> src = m.thenApply(f, incFunction);
3951              CompletableFuture<?> dep = fun.apply(src);
3952              f.cancel(mayInterruptIfRunning);
3953              checkCancelled(f);
# Line 3697 | Line 3958 | public class CompletableFutureTest exten
3958      }}
3959  
3960      /**
3961 <     * Minimal completion stages throw UOE for all non-CompletionStage methods
3961 >     * Minimal completion stages throw UOE for most non-CompletionStage methods
3962       */
3963      public void testMinimalCompletionStage_minimality() {
3964          if (!testImplementationDetails) return;
3965          Function<Method, String> toSignature =
3966              (method) -> method.getName() + Arrays.toString(method.getParameterTypes());
3967 +        Predicate<Method> isNotStatic =
3968 +            (method) -> (method.getModifiers() & Modifier.STATIC) == 0;
3969          List<Method> minimalMethods =
3970              Stream.of(Object.class, CompletionStage.class)
3971 <            .map((klazz) -> Stream.of(klazz.getMethods()))
3972 <            .reduce(Stream::concat)
3710 <            .orElseGet(Stream::empty)
3711 <            .filter((method) -> (method.getModifiers() & Modifier.STATIC) == 0)
3971 >            .flatMap((klazz) -> Stream.of(klazz.getMethods()))
3972 >            .filter(isNotStatic)
3973              .collect(Collectors.toList());
3974          // Methods from CompletableFuture permitted NOT to throw UOE
3975          String[] signatureWhitelist = {
# Line 3722 | Line 3983 | public class CompletableFutureTest exten
3983                            Stream.of(signatureWhitelist))
3984              .collect(Collectors.toSet());
3985          List<Method> allMethods = Stream.of(CompletableFuture.class.getMethods())
3986 <            .filter((method) -> (method.getModifiers() & Modifier.STATIC) == 0)
3986 >            .filter(isNotStatic)
3987              .filter((method) -> !permittedMethodSignatures.contains(toSignature.apply(method)))
3988              .collect(Collectors.toList());
3989  
3990 <        CompletionStage<Integer> minimalStage =
3990 >        List<CompletionStage<Integer>> stages = new ArrayList<>();
3991 >        CompletionStage<Integer> min =
3992              new CompletableFuture<Integer>().minimalCompletionStage();
3993 +        stages.add(min);
3994 +        stages.add(min.thenApply(x -> x));
3995 +        stages.add(CompletableFuture.completedStage(1));
3996 +        stages.add(CompletableFuture.failedStage(new CFException()));
3997  
3998          List<Method> bugs = new ArrayList<>();
3999          for (Method method : allMethods) {
# Line 3743 | Line 4009 | public class CompletableFutureTest exten
4009                  else if (parameterTypes[i] == long.class)
4010                      args[i] = 0L;
4011              }
4012 <            try {
4013 <                method.invoke(minimalStage, args);
4014 <                bugs.add(method);
3749 <            }
3750 <            catch (java.lang.reflect.InvocationTargetException expected) {
3751 <                if (! (expected.getCause() instanceof UnsupportedOperationException)) {
4012 >            for (CompletionStage<Integer> stage : stages) {
4013 >                try {
4014 >                    method.invoke(stage, args);
4015                      bugs.add(method);
3753                    // expected.getCause().printStackTrace();
4016                  }
4017 +                catch (java.lang.reflect.InvocationTargetException expected) {
4018 +                    if (! (expected.getCause() instanceof UnsupportedOperationException)) {
4019 +                        bugs.add(method);
4020 +                        // expected.getCause().printStackTrace();
4021 +                    }
4022 +                }
4023 +                catch (ReflectiveOperationException bad) { throw new Error(bad); }
4024              }
3756            catch (ReflectiveOperationException bad) { throw new Error(bad); }
4025          }
4026          if (!bugs.isEmpty())
4027 <            throw new Error("Methods did not throw UOE: " + bugs.toString());
4027 >            throw new Error("Methods did not throw UOE: " + bugs);
4028 >    }
4029 >
4030 >    /**
4031 >     * minimalStage.toCompletableFuture() gives mutable CompletableFuture
4032 >     */
4033 >    public void testMinimalCompletionStage_toCompletableFuture_mutable() {
4034 >        for (Integer v1 : new Integer[] { 1, null })
4035 >    {
4036 >        CompletableFuture<Integer> f = new CompletableFuture<>();
4037 >        CompletionStage minimal = f.minimalCompletionStage();
4038 >        CompletableFuture<Integer> g = minimal.toCompletableFuture();
4039 >        g.complete(v1);
4040 >        checkCompletedNormally(g, v1);
4041 >        checkIncomplete(f);
4042 >        checkIncomplete(minimal.toCompletableFuture());
4043 >    }}
4044 >
4045 >    /**
4046 >     * minimalStage.toCompletableFuture().join() awaits completion
4047 >     */
4048 >    public void testMinimalCompletionStage_toCompletableFuture_join() throws Exception {
4049 >        for (boolean createIncomplete : new boolean[] { true, false })
4050 >        for (Integer v1 : new Integer[] { 1, null })
4051 >    {
4052 >        CompletableFuture<Integer> f = new CompletableFuture<>();
4053 >        if (!createIncomplete) assertTrue(f.complete(v1));
4054 >        CompletionStage<Integer> minimal = f.minimalCompletionStage();
4055 >        if (createIncomplete) assertTrue(f.complete(v1));
4056 >        assertEquals(v1, minimal.toCompletableFuture().join());
4057 >        assertEquals(v1, minimal.toCompletableFuture().get());
4058 >        checkCompletedNormally(minimal.toCompletableFuture(), v1);
4059 >    }}
4060 >
4061 >    /**
4062 >     * Completion of a toCompletableFuture copy of a minimal stage
4063 >     * does not complete its source.
4064 >     */
4065 >    public void testMinimalCompletionStage_toCompletableFuture_oneWayPropagation() {
4066 >        CompletableFuture<Integer> f = new CompletableFuture<>();
4067 >        CompletionStage<Integer> g = f.minimalCompletionStage();
4068 >        assertTrue(g.toCompletableFuture().complete(1));
4069 >        assertTrue(g.toCompletableFuture().complete(null));
4070 >        assertTrue(g.toCompletableFuture().cancel(true));
4071 >        assertTrue(g.toCompletableFuture().cancel(false));
4072 >        assertTrue(g.toCompletableFuture().completeExceptionally(new CFException()));
4073 >        checkIncomplete(g.toCompletableFuture());
4074 >        f.complete(1);
4075 >        checkCompletedNormally(g.toCompletableFuture(), 1);
4076 >    }
4077 >
4078 >    /** Demo utility method for external reliable toCompletableFuture */
4079 >    static <T> CompletableFuture<T> toCompletableFuture(CompletionStage<T> stage) {
4080 >        CompletableFuture<T> f = new CompletableFuture<>();
4081 >        stage.handle((T t, Throwable ex) -> {
4082 >                         if (ex != null) f.completeExceptionally(ex);
4083 >                         else f.complete(t);
4084 >                         return null;
4085 >                     });
4086 >        return f;
4087 >    }
4088 >
4089 >    /** Demo utility method to join a CompletionStage */
4090 >    static <T> T join(CompletionStage<T> stage) {
4091 >        return toCompletableFuture(stage).join();
4092 >    }
4093 >
4094 >    /**
4095 >     * Joining a minimal stage "by hand" works
4096 >     */
4097 >    public void testMinimalCompletionStage_join_by_hand() {
4098 >        for (boolean createIncomplete : new boolean[] { true, false })
4099 >        for (Integer v1 : new Integer[] { 1, null })
4100 >    {
4101 >        CompletableFuture<Integer> f = new CompletableFuture<>();
4102 >        CompletionStage<Integer> minimal = f.minimalCompletionStage();
4103 >        CompletableFuture<Integer> g = new CompletableFuture<>();
4104 >        if (!createIncomplete) assertTrue(f.complete(v1));
4105 >        minimal.thenAccept((x) -> g.complete(x));
4106 >        if (createIncomplete) assertTrue(f.complete(v1));
4107 >        g.join();
4108 >        checkCompletedNormally(g, v1);
4109 >        checkCompletedNormally(f, v1);
4110 >        assertEquals(v1, join(minimal));
4111 >    }}
4112 >
4113 >    static class Monad {
4114 >        static class ZeroException extends RuntimeException {
4115 >            public ZeroException() { super("monadic zero"); }
4116 >        }
4117 >        // "return", "unit"
4118 >        static <T> CompletableFuture<T> unit(T value) {
4119 >            return completedFuture(value);
4120 >        }
4121 >        // monadic zero ?
4122 >        static <T> CompletableFuture<T> zero() {
4123 >            return failedFuture(new ZeroException());
4124 >        }
4125 >        // >=>
4126 >        static <T,U,V> Function<T, CompletableFuture<V>> compose
4127 >            (Function<T, CompletableFuture<U>> f,
4128 >             Function<U, CompletableFuture<V>> g) {
4129 >            return (x) -> f.apply(x).thenCompose(g);
4130 >        }
4131 >
4132 >        static void assertZero(CompletableFuture<?> f) {
4133 >            try {
4134 >                f.getNow(null);
4135 >                throw new AssertionFailedError("should throw");
4136 >            } catch (CompletionException success) {
4137 >                assertTrue(success.getCause() instanceof ZeroException);
4138 >            }
4139 >        }
4140 >
4141 >        static <T> void assertFutureEquals(CompletableFuture<T> f,
4142 >                                           CompletableFuture<T> g) {
4143 >            T fval = null, gval = null;
4144 >            Throwable fex = null, gex = null;
4145 >
4146 >            try { fval = f.get(); }
4147 >            catch (ExecutionException ex) { fex = ex.getCause(); }
4148 >            catch (Throwable ex) { fex = ex; }
4149 >
4150 >            try { gval = g.get(); }
4151 >            catch (ExecutionException ex) { gex = ex.getCause(); }
4152 >            catch (Throwable ex) { gex = ex; }
4153 >
4154 >            if (fex != null || gex != null)
4155 >                assertSame(fex.getClass(), gex.getClass());
4156 >            else
4157 >                assertEquals(fval, gval);
4158 >        }
4159 >
4160 >        static class PlusFuture<T> extends CompletableFuture<T> {
4161 >            AtomicReference<Throwable> firstFailure = new AtomicReference<>(null);
4162 >        }
4163 >
4164 >        /** Implements "monadic plus". */
4165 >        static <T> CompletableFuture<T> plus(CompletableFuture<? extends T> f,
4166 >                                             CompletableFuture<? extends T> g) {
4167 >            PlusFuture<T> plus = new PlusFuture<T>();
4168 >            BiConsumer<T, Throwable> action = (T result, Throwable ex) -> {
4169 >                try {
4170 >                    if (ex == null) {
4171 >                        if (plus.complete(result))
4172 >                            if (plus.firstFailure.get() != null)
4173 >                                plus.firstFailure.set(null);
4174 >                    }
4175 >                    else if (plus.firstFailure.compareAndSet(null, ex)) {
4176 >                        if (plus.isDone())
4177 >                            plus.firstFailure.set(null);
4178 >                    }
4179 >                    else {
4180 >                        // first failure has precedence
4181 >                        Throwable first = plus.firstFailure.getAndSet(null);
4182 >
4183 >                        // may fail with "Self-suppression not permitted"
4184 >                        try { first.addSuppressed(ex); }
4185 >                        catch (Exception ignored) {}
4186 >
4187 >                        plus.completeExceptionally(first);
4188 >                    }
4189 >                } catch (Throwable unexpected) {
4190 >                    plus.completeExceptionally(unexpected);
4191 >                }
4192 >            };
4193 >            f.whenComplete(action);
4194 >            g.whenComplete(action);
4195 >            return plus;
4196 >        }
4197 >    }
4198 >
4199 >    /**
4200 >     * CompletableFuture is an additive monad - sort of.
4201 >     * https://en.wikipedia.org/wiki/Monad_(functional_programming)#Additive_monads
4202 >     */
4203 >    public void testAdditiveMonad() throws Throwable {
4204 >        Function<Long, CompletableFuture<Long>> unit = Monad::unit;
4205 >        CompletableFuture<Long> zero = Monad.zero();
4206 >
4207 >        // Some mutually non-commutative functions
4208 >        Function<Long, CompletableFuture<Long>> triple
4209 >            = (x) -> Monad.unit(3 * x);
4210 >        Function<Long, CompletableFuture<Long>> inc
4211 >            = (x) -> Monad.unit(x + 1);
4212 >
4213 >        // unit is a right identity: m >>= unit === m
4214 >        Monad.assertFutureEquals(inc.apply(5L).thenCompose(unit),
4215 >                                 inc.apply(5L));
4216 >        // unit is a left identity: (unit x) >>= f === f x
4217 >        Monad.assertFutureEquals(unit.apply(5L).thenCompose(inc),
4218 >                                 inc.apply(5L));
4219 >
4220 >        // associativity: (m >>= f) >>= g === m >>= ( \x -> (f x >>= g) )
4221 >        Monad.assertFutureEquals(
4222 >            unit.apply(5L).thenCompose(inc).thenCompose(triple),
4223 >            unit.apply(5L).thenCompose((x) -> inc.apply(x).thenCompose(triple)));
4224 >
4225 >        // The case for CompletableFuture as an additive monad is weaker...
4226 >
4227 >        // zero is a monadic zero
4228 >        Monad.assertZero(zero);
4229 >
4230 >        // left zero: zero >>= f === zero
4231 >        Monad.assertZero(zero.thenCompose(inc));
4232 >        // right zero: f >>= (\x -> zero) === zero
4233 >        Monad.assertZero(inc.apply(5L).thenCompose((x) -> zero));
4234 >
4235 >        // f plus zero === f
4236 >        Monad.assertFutureEquals(Monad.unit(5L),
4237 >                                 Monad.plus(Monad.unit(5L), zero));
4238 >        // zero plus f === f
4239 >        Monad.assertFutureEquals(Monad.unit(5L),
4240 >                                 Monad.plus(zero, Monad.unit(5L)));
4241 >        // zero plus zero === zero
4242 >        Monad.assertZero(Monad.plus(zero, zero));
4243 >        {
4244 >            CompletableFuture<Long> f = Monad.plus(Monad.unit(5L),
4245 >                                                   Monad.unit(8L));
4246 >            // non-determinism
4247 >            assertTrue(f.get() == 5L || f.get() == 8L);
4248 >        }
4249 >
4250 >        CompletableFuture<Long> godot = new CompletableFuture<>();
4251 >        // f plus godot === f (doesn't wait for godot)
4252 >        Monad.assertFutureEquals(Monad.unit(5L),
4253 >                                 Monad.plus(Monad.unit(5L), godot));
4254 >        // godot plus f === f (doesn't wait for godot)
4255 >        Monad.assertFutureEquals(Monad.unit(5L),
4256 >                                 Monad.plus(godot, Monad.unit(5L)));
4257 >    }
4258 >
4259 >    /** Test long recursive chains of CompletableFutures with cascading completions */
4260 >    public void testRecursiveChains() throws Throwable {
4261 >        for (ExecutionMode m : ExecutionMode.values())
4262 >        for (boolean addDeadEnds : new boolean[] { true, false })
4263 >    {
4264 >        final int val = 42;
4265 >        final int n = expensiveTests ? 1_000 : 2;
4266 >        CompletableFuture<Integer> head = new CompletableFuture<>();
4267 >        CompletableFuture<Integer> tail = head;
4268 >        for (int i = 0; i < n; i++) {
4269 >            if (addDeadEnds) m.thenApply(tail, v -> v + 1);
4270 >            tail = m.thenApply(tail, v -> v + 1);
4271 >            if (addDeadEnds) m.applyToEither(tail, tail, v -> v + 1);
4272 >            tail = m.applyToEither(tail, tail, v -> v + 1);
4273 >            if (addDeadEnds) m.thenCombine(tail, tail, (v, w) -> v + 1);
4274 >            tail = m.thenCombine(tail, tail, (v, w) -> v + 1);
4275 >        }
4276 >        head.complete(val);
4277 >        assertEquals(val + 3 * n, (int) tail.join());
4278 >    }}
4279 >
4280 >    /**
4281 >     * A single CompletableFuture with many dependents.
4282 >     * A demo of scalability - runtime is O(n).
4283 >     */
4284 >    public void testManyDependents() throws Throwable {
4285 >        final int n = expensiveTests ? 1_000_000 : 10;
4286 >        final CompletableFuture<Void> head = new CompletableFuture<>();
4287 >        final CompletableFuture<Void> complete = CompletableFuture.completedFuture((Void)null);
4288 >        final AtomicInteger count = new AtomicInteger(0);
4289 >        for (int i = 0; i < n; i++) {
4290 >            head.thenRun(() -> count.getAndIncrement());
4291 >            head.thenAccept((x) -> count.getAndIncrement());
4292 >            head.thenApply((x) -> count.getAndIncrement());
4293 >
4294 >            head.runAfterBoth(complete, () -> count.getAndIncrement());
4295 >            head.thenAcceptBoth(complete, (x, y) -> count.getAndIncrement());
4296 >            head.thenCombine(complete, (x, y) -> count.getAndIncrement());
4297 >            complete.runAfterBoth(head, () -> count.getAndIncrement());
4298 >            complete.thenAcceptBoth(head, (x, y) -> count.getAndIncrement());
4299 >            complete.thenCombine(head, (x, y) -> count.getAndIncrement());
4300 >
4301 >            head.runAfterEither(new CompletableFuture<Void>(), () -> count.getAndIncrement());
4302 >            head.acceptEither(new CompletableFuture<Void>(), (x) -> count.getAndIncrement());
4303 >            head.applyToEither(new CompletableFuture<Void>(), (x) -> count.getAndIncrement());
4304 >            new CompletableFuture<Void>().runAfterEither(head, () -> count.getAndIncrement());
4305 >            new CompletableFuture<Void>().acceptEither(head, (x) -> count.getAndIncrement());
4306 >            new CompletableFuture<Void>().applyToEither(head, (x) -> count.getAndIncrement());
4307 >        }
4308 >        head.complete(null);
4309 >        assertEquals(5 * 3 * n, count.get());
4310 >    }
4311 >
4312 >    /** ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest tck */
4313 >    public void testCoCompletionGarbageRetention() throws Throwable {
4314 >        final int n = expensiveTests ? 1_000_000 : 10;
4315 >        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
4316 >        CompletableFuture<Integer> f;
4317 >        for (int i = 0; i < n; i++) {
4318 >            f = new CompletableFuture<>();
4319 >            f.runAfterEither(incomplete, () -> {});
4320 >            f.complete(null);
4321 >
4322 >            f = new CompletableFuture<>();
4323 >            f.acceptEither(incomplete, (x) -> {});
4324 >            f.complete(null);
4325 >
4326 >            f = new CompletableFuture<>();
4327 >            f.applyToEither(incomplete, (x) -> x);
4328 >            f.complete(null);
4329 >
4330 >            f = new CompletableFuture<>();
4331 >            CompletableFuture.anyOf(new CompletableFuture<?>[] { f, incomplete });
4332 >            f.complete(null);
4333 >        }
4334 >
4335 >        for (int i = 0; i < n; i++) {
4336 >            f = new CompletableFuture<>();
4337 >            incomplete.runAfterEither(f, () -> {});
4338 >            f.complete(null);
4339 >
4340 >            f = new CompletableFuture<>();
4341 >            incomplete.acceptEither(f, (x) -> {});
4342 >            f.complete(null);
4343 >
4344 >            f = new CompletableFuture<>();
4345 >            incomplete.applyToEither(f, (x) -> x);
4346 >            f.complete(null);
4347 >
4348 >            f = new CompletableFuture<>();
4349 >            CompletableFuture.anyOf(new CompletableFuture<?>[] { incomplete, f });
4350 >            f.complete(null);
4351 >        }
4352 >    }
4353 >
4354 >    /**
4355 >     * Reproduction recipe for:
4356 >     * 8160402: Garbage retention with CompletableFuture.anyOf
4357 >     * 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
4358 >     */
4359 >    public void testAnyOfGarbageRetention() throws Throwable {
4360 >        for (Integer v : new Integer[] { 1, null })
4361 >    {
4362 >        final int n = expensiveTests ? 100_000 : 10;
4363 >        CompletableFuture<Integer>[] fs
4364 >            = (CompletableFuture<Integer>[]) new CompletableFuture<?>[100];
4365 >        for (int i = 0; i < fs.length; i++)
4366 >            fs[i] = new CompletableFuture<>();
4367 >        fs[fs.length - 1].complete(v);
4368 >        for (int i = 0; i < n; i++)
4369 >            checkCompletedNormally(CompletableFuture.anyOf(fs), v);
4370 >    }}
4371 >
4372 >    /**
4373 >     * Checks for garbage retention with allOf.
4374 >     *
4375 >     * As of 2016-07, fails with OOME:
4376 >     * ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest -Djsr166.methodFilter=testCancelledAllOfGarbageRetention tck
4377 >     */
4378 >    public void testCancelledAllOfGarbageRetention() throws Throwable {
4379 >        final int n = expensiveTests ? 100_000 : 10;
4380 >        CompletableFuture<Integer>[] fs
4381 >            = (CompletableFuture<Integer>[]) new CompletableFuture<?>[100];
4382 >        for (int i = 0; i < fs.length; i++)
4383 >            fs[i] = new CompletableFuture<>();
4384 >        for (int i = 0; i < n; i++)
4385 >            assertTrue(CompletableFuture.allOf(fs).cancel(false));
4386 >    }
4387 >
4388 >    /**
4389 >     * Checks for garbage retention when a dependent future is
4390 >     * cancelled and garbage-collected.
4391 >     * 8161600: Garbage retention when source CompletableFutures are never completed
4392 >     *
4393 >     * As of 2016-07, fails with OOME:
4394 >     * ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest -Djsr166.methodFilter=testCancelledGarbageRetention tck
4395 >     */
4396 >    public void testCancelledGarbageRetention() throws Throwable {
4397 >        final int n = expensiveTests ? 100_000 : 10;
4398 >        CompletableFuture<Integer> neverCompleted = new CompletableFuture<>();
4399 >        for (int i = 0; i < n; i++)
4400 >            assertTrue(neverCompleted.thenRun(() -> {}).cancel(true));
4401      }
4402  
4403   //     static <U> U join(CompletionStage<U> stage) {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines