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.183 by jsr166, Wed Jan 4 06:09:58 2017 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 93 | Line 93 | public class CompletableFutureTest exten
93       * Returns the "raw" internal exceptional completion of f,
94       * without any additional wrapping with CompletionException.
95       */
96 <    <U> Throwable exceptionalCompletion(CompletableFuture<U> f) {
97 <        // handle (and whenComplete) can distinguish between "direct"
98 <        // and "wrapped" exceptional completion
99 <        return f.handle((U u, Throwable t) -> t).join();
96 >    Throwable exceptionalCompletion(CompletableFuture<?> f) {
97 >        // handle (and whenComplete and exceptionally) can distinguish
98 >        // between "direct" and "wrapped" exceptional completion
99 >        return f.handle((u, t) -> t).join();
100      }
101  
102      void checkCompletedExceptionally(CompletableFuture<?> f,
# Line 147 | Line 147 | public class CompletableFutureTest exten
147  
148      void checkCompletedWithWrappedCFException(CompletableFuture<?> f) {
149          checkCompletedExceptionally(f, true,
150 <            (t) -> assertTrue(t instanceof CFException));
150 >            t -> assertTrue(t instanceof CFException));
151      }
152  
153      void checkCompletedWithWrappedCancellationException(CompletableFuture<?> f) {
154          checkCompletedExceptionally(f, true,
155 <            (t) -> assertTrue(t instanceof CancellationException));
155 >            t -> assertTrue(t instanceof CancellationException));
156      }
157  
158      void checkCompletedWithTimeoutException(CompletableFuture<?> f) {
159          checkCompletedExceptionally(f, false,
160 <            (t) -> assertTrue(t instanceof TimeoutException));
160 >            t -> assertTrue(t instanceof TimeoutException));
161      }
162  
163      void checkCompletedWithWrappedException(CompletableFuture<?> f,
164                                              Throwable ex) {
165 <        checkCompletedExceptionally(f, true, (t) -> assertSame(t, ex));
165 >        checkCompletedExceptionally(f, true, t -> assertSame(t, ex));
166      }
167  
168      void checkCompletedExceptionally(CompletableFuture<?> f, Throwable ex) {
169 <        checkCompletedExceptionally(f, false, (t) -> assertSame(t, ex));
169 >        checkCompletedExceptionally(f, false, t -> assertSame(t, ex));
170      }
171  
172      void checkCancelled(CompletableFuture<?> f) {
# Line 361 | 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 373 | 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 382 | 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 401 | 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 411 | 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 429 | 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 439 | 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 449 | 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 531 | 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 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 3196 | Line 3257 | public class CompletableFutureTest exten
3257  
3258              () -> f.thenApply(null),
3259              () -> f.thenApplyAsync(null),
3260 <            () -> f.thenApplyAsync((x) -> x, null),
3260 >            () -> f.thenApplyAsync(x -> x, null),
3261              () -> f.thenApplyAsync(null, exec),
3262  
3263              () -> f.thenAccept(null),
3264              () -> f.thenAcceptAsync(null),
3265 <            () -> f.thenAcceptAsync((x) -> {} , null),
3265 >            () -> f.thenAcceptAsync(x -> {} , null),
3266              () -> f.thenAcceptAsync(null, exec),
3267  
3268              () -> f.thenRun(null),
# Line 3236 | Line 3297 | public class CompletableFutureTest exten
3297              () -> f.applyToEither(g, null),
3298              () -> f.applyToEitherAsync(g, null),
3299              () -> f.applyToEitherAsync(g, null, exec),
3300 <            () -> f.applyToEither(nullFuture, (x) -> x),
3301 <            () -> f.applyToEitherAsync(nullFuture, (x) -> x),
3302 <            () -> f.applyToEitherAsync(nullFuture, (x) -> x, exec),
3303 <            () -> f.applyToEitherAsync(g, (x) -> x, null),
3300 >            () -> f.applyToEither(nullFuture, x -> x),
3301 >            () -> f.applyToEitherAsync(nullFuture, x -> x),
3302 >            () -> f.applyToEitherAsync(nullFuture, x -> x, exec),
3303 >            () -> f.applyToEitherAsync(g, x -> x, null),
3304  
3305              () -> f.acceptEither(g, null),
3306              () -> f.acceptEitherAsync(g, null),
3307              () -> f.acceptEitherAsync(g, null, exec),
3308 <            () -> f.acceptEither(nullFuture, (x) -> {}),
3309 <            () -> f.acceptEitherAsync(nullFuture, (x) -> {}),
3310 <            () -> f.acceptEitherAsync(nullFuture, (x) -> {}, exec),
3311 <            () -> f.acceptEitherAsync(g, (x) -> {}, null),
3308 >            () -> f.acceptEither(nullFuture, x -> {}),
3309 >            () -> f.acceptEitherAsync(nullFuture, x -> {}),
3310 >            () -> f.acceptEitherAsync(nullFuture, x -> {}, exec),
3311 >            () -> f.acceptEitherAsync(g, x -> {}, null),
3312  
3313              () -> f.runAfterEither(g, null),
3314              () -> f.runAfterEitherAsync(g, null),
# 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 3326 | Line 3532 | public class CompletableFutureTest exten
3532       */
3533      public void testCompletedStage() {
3534          AtomicInteger x = new AtomicInteger(0);
3535 <        AtomicReference<Throwable> r = new AtomicReference<Throwable>();
3535 >        AtomicReference<Throwable> r = new AtomicReference<>();
3536          CompletionStage<Integer> f = CompletableFuture.completedStage(1);
3537          f.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3538          assertEquals(x.get(), 1);
# Line 3371 | 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 3404 | Line 3634 | public class CompletableFutureTest exten
3634          CompletableFuture<Integer> f = new CompletableFuture<>();
3635          CompletionStage<Integer> g = f.minimalCompletionStage();
3636          AtomicInteger x = new AtomicInteger(0);
3637 <        AtomicReference<Throwable> r = new AtomicReference<Throwable>();
3637 >        AtomicReference<Throwable> r = new AtomicReference<>();
3638          checkIncomplete(f);
3639          g.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3640          f.complete(1);
# Line 3421 | Line 3651 | public class CompletableFutureTest exten
3651          CompletableFuture<Integer> f = new CompletableFuture<>();
3652          CompletionStage<Integer> g = f.minimalCompletionStage();
3653          AtomicInteger x = new AtomicInteger(0);
3654 <        AtomicReference<Throwable> r = new AtomicReference<Throwable>();
3654 >        AtomicReference<Throwable> r = new AtomicReference<>();
3655          g.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3656          checkIncomplete(f);
3657          CFException ex = new CFException();
# Line 3439 | Line 3669 | public class CompletableFutureTest exten
3669          CFException ex = new CFException();
3670          CompletionStage<Integer> f = CompletableFuture.failedStage(ex);
3671          AtomicInteger x = new AtomicInteger(0);
3672 <        AtomicReference<Throwable> r = new AtomicReference<Throwable>();
3672 >        AtomicReference<Throwable> r = new AtomicReference<>();
3673          f.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3674          assertEquals(x.get(), 0);
3675          assertEquals(r.get(), ex);
# Line 3463 | Line 3693 | public class CompletableFutureTest exten
3693      public void testCompleteAsync2() {
3694          CompletableFuture<Integer> f = new CompletableFuture<>();
3695          CFException ex = new CFException();
3696 <        f.completeAsync(() -> {if (true) throw ex; return 1;});
3696 >        f.completeAsync(() -> { throw ex; });
3697          try {
3698              f.join();
3699              shouldThrow();
# Line 3493 | Line 3723 | public class CompletableFutureTest exten
3723          CompletableFuture<Integer> f = new CompletableFuture<>();
3724          CFException ex = new CFException();
3725          ThreadExecutor executor = new ThreadExecutor();
3726 <        f.completeAsync(() -> {if (true) throw ex; return 1;}, executor);
3726 >        f.completeAsync(() -> { throw ex; }, executor);
3727          try {
3728              f.join();
3729              shouldThrow();
# Line 3509 | 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 3524 | 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 3540 | 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 3561 | 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 3613 | 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 3629 | 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)));
3892 <
3893 <        funs.add((y) -> m.runAfterBoth(y, v42, new Noop(m)));
3894 <        funs.add((y) -> m.thenAcceptBoth(y, v42, new SubtractAction(m)));
3895 <        funs.add((y) -> m.thenCombine(y, v42, new SubtractFunction(m)));
3896 <
3897 <        funs.add((y) -> m.whenComplete(y, (Integer x, Throwable t) -> {}));
3898 <
3899 <        funs.add((y) -> m.thenCompose(y, new CompletableFutureInc(m)));
3900 <
3901 <        funs.add((y) -> CompletableFuture.allOf(new CompletableFuture<?>[] {y, v42}));
3902 <        funs.add((y) -> CompletableFuture.anyOf(new CompletableFuture<?>[] {y, incomplete}));
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, 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 r, Throwable t) -> {}));
3901 >
3902 >        funs.add(y -> m.thenCompose(y, new CompletableFutureInc(m)));
3903 >
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 3665 | 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 3679 | 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 3690 | 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 3701 | 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());
3966 >            method -> method.getName() + Arrays.toString(method.getParameterTypes());
3967          Predicate<Method> isNotStatic =
3968 <            (method) -> (method.getModifiers() & Modifier.STATIC) == 0;
3968 >            method -> (method.getModifiers() & Modifier.STATIC) == 0;
3969          List<Method> minimalMethods =
3970              Stream.of(Object.class, CompletionStage.class)
3971 <            .flatMap((klazz) -> Stream.of(klazz.getMethods()))
3971 >            .flatMap(klazz -> Stream.of(klazz.getMethods()))
3972              .filter(isNotStatic)
3973              .collect(Collectors.toList());
3974          // Methods from CompletableFuture permitted NOT to throw UOE
# Line 3727 | Line 3984 | public class CompletableFutureTest exten
3984              .collect(Collectors.toSet());
3985          List<Method> allMethods = Stream.of(CompletableFuture.class.getMethods())
3986              .filter(isNotStatic)
3987 <            .filter((method) -> !permittedMethodSignatures.contains(toSignature.apply(method)))
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 3747 | 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);
3753 <            }
3754 <            catch (java.lang.reflect.InvocationTargetException expected) {
3755 <                if (! (expected.getCause() instanceof UnsupportedOperationException)) {
4012 >            for (CompletionStage<Integer> stage : stages) {
4013 >                try {
4014 >                    method.invoke(stage, args);
4015                      bugs.add(method);
3757                    // 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              }
3760            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() returns a CompletableFuture that
4032 +     * is completed normally, with the same value, when source is.
4033 +     */
4034 +    public void testMinimalCompletionStage_toCompletableFuture_normalCompletion() {
4035 +        for (boolean createIncomplete : new boolean[] { true, false })
4036 +        for (Integer v1 : new Integer[] { 1, null })
4037 +    {
4038 +        CompletableFuture<Integer> f = new CompletableFuture<>();
4039 +        CompletionStage<Integer> minimal = f.minimalCompletionStage();
4040 +        if (!createIncomplete) assertTrue(f.complete(v1));
4041 +        CompletableFuture<Integer> g = minimal.toCompletableFuture();
4042 +        if (createIncomplete) {
4043 +            checkIncomplete(f);
4044 +            checkIncomplete(g);
4045 +            assertTrue(f.complete(v1));
4046 +        }
4047 +        checkCompletedNormally(f, v1);
4048 +        checkCompletedNormally(g, v1);
4049 +    }}
4050 +
4051 +    /**
4052 +     * minimalStage.toCompletableFuture() returns a CompletableFuture that
4053 +     * is completed exceptionally when source is.
4054 +     */
4055 +    public void testMinimalCompletionStage_toCompletableFuture_exceptionalCompletion() {
4056 +        for (boolean createIncomplete : new boolean[] { true, false })
4057 +    {
4058 +        CFException ex = new CFException();
4059 +        CompletableFuture<Integer> f = new CompletableFuture<>();
4060 +        CompletionStage<Integer> minimal = f.minimalCompletionStage();
4061 +        if (!createIncomplete) f.completeExceptionally(ex);
4062 +        CompletableFuture<Integer> g = minimal.toCompletableFuture();
4063 +        if (createIncomplete) {
4064 +            checkIncomplete(f);
4065 +            checkIncomplete(g);
4066 +            f.completeExceptionally(ex);
4067 +        }
4068 +        checkCompletedExceptionally(f, ex);
4069 +        checkCompletedWithWrappedException(g, ex);
4070 +    }}
4071 +
4072 +    /**
4073 +     * minimalStage.toCompletableFuture() gives mutable CompletableFuture
4074 +     */
4075 +    public void testMinimalCompletionStage_toCompletableFuture_mutable() {
4076 +        for (Integer v1 : new Integer[] { 1, null })
4077 +    {
4078 +        CompletableFuture<Integer> f = new CompletableFuture<>();
4079 +        CompletionStage minimal = f.minimalCompletionStage();
4080 +        CompletableFuture<Integer> g = minimal.toCompletableFuture();
4081 +        assertTrue(g.complete(v1));
4082 +        checkCompletedNormally(g, v1);
4083 +        checkIncomplete(f);
4084 +        checkIncomplete(minimal.toCompletableFuture());
4085 +    }}
4086 +
4087 +    /**
4088 +     * minimalStage.toCompletableFuture().join() awaits completion
4089 +     */
4090 +    public void testMinimalCompletionStage_toCompletableFuture_join() throws Exception {
4091 +        for (boolean createIncomplete : new boolean[] { true, false })
4092 +        for (Integer v1 : new Integer[] { 1, null })
4093 +    {
4094 +        CompletableFuture<Integer> f = new CompletableFuture<>();
4095 +        if (!createIncomplete) assertTrue(f.complete(v1));
4096 +        CompletionStage<Integer> minimal = f.minimalCompletionStage();
4097 +        if (createIncomplete) assertTrue(f.complete(v1));
4098 +        assertEquals(v1, minimal.toCompletableFuture().join());
4099 +        assertEquals(v1, minimal.toCompletableFuture().get());
4100 +        checkCompletedNormally(minimal.toCompletableFuture(), v1);
4101 +    }}
4102 +
4103 +    /**
4104 +     * Completion of a toCompletableFuture copy of a minimal stage
4105 +     * does not complete its source.
4106 +     */
4107 +    public void testMinimalCompletionStage_toCompletableFuture_oneWayPropagation() {
4108 +        CompletableFuture<Integer> f = new CompletableFuture<>();
4109 +        CompletionStage<Integer> g = f.minimalCompletionStage();
4110 +        assertTrue(g.toCompletableFuture().complete(1));
4111 +        assertTrue(g.toCompletableFuture().complete(null));
4112 +        assertTrue(g.toCompletableFuture().cancel(true));
4113 +        assertTrue(g.toCompletableFuture().cancel(false));
4114 +        assertTrue(g.toCompletableFuture().completeExceptionally(new CFException()));
4115 +        checkIncomplete(g.toCompletableFuture());
4116 +        f.complete(1);
4117 +        checkCompletedNormally(g.toCompletableFuture(), 1);
4118 +    }
4119 +
4120 +    /** Demo utility method for external reliable toCompletableFuture */
4121 +    static <T> CompletableFuture<T> toCompletableFuture(CompletionStage<T> stage) {
4122 +        CompletableFuture<T> f = new CompletableFuture<>();
4123 +        stage.handle((T t, Throwable ex) -> {
4124 +                         if (ex != null) f.completeExceptionally(ex);
4125 +                         else f.complete(t);
4126 +                         return null;
4127 +                     });
4128 +        return f;
4129 +    }
4130 +
4131 +    /** Demo utility method to join a CompletionStage */
4132 +    static <T> T join(CompletionStage<T> stage) {
4133 +        return toCompletableFuture(stage).join();
4134 +    }
4135 +
4136 +    /**
4137 +     * Joining a minimal stage "by hand" works
4138 +     */
4139 +    public void testMinimalCompletionStage_join_by_hand() {
4140 +        for (boolean createIncomplete : new boolean[] { true, false })
4141 +        for (Integer v1 : new Integer[] { 1, null })
4142 +    {
4143 +        CompletableFuture<Integer> f = new CompletableFuture<>();
4144 +        CompletionStage<Integer> minimal = f.minimalCompletionStage();
4145 +        CompletableFuture<Integer> g = new CompletableFuture<>();
4146 +        if (!createIncomplete) assertTrue(f.complete(v1));
4147 +        minimal.thenAccept(x -> g.complete(x));
4148 +        if (createIncomplete) assertTrue(f.complete(v1));
4149 +        g.join();
4150 +        checkCompletedNormally(g, v1);
4151 +        checkCompletedNormally(f, v1);
4152 +        assertEquals(v1, join(minimal));
4153 +    }}
4154 +
4155      static class Monad {
4156 <        static class MonadError extends Error {
4157 <            public MonadError() { super("monadic zero"); }
4156 >        static class ZeroException extends RuntimeException {
4157 >            public ZeroException() { super("monadic zero"); }
4158          }
4159          // "return", "unit"
4160          static <T> CompletableFuture<T> unit(T value) {
# Line 3773 | Line 4162 | public class CompletableFutureTest exten
4162          }
4163          // monadic zero ?
4164          static <T> CompletableFuture<T> zero() {
4165 <            return failedFuture(new MonadError());
4165 >            return failedFuture(new ZeroException());
4166          }
4167          // >=>
4168          static <T,U,V> Function<T, CompletableFuture<V>> compose
4169              (Function<T, CompletableFuture<U>> f,
4170               Function<U, CompletableFuture<V>> g) {
4171 <            return (x) -> f.apply(x).thenCompose(g);
4171 >            return x -> f.apply(x).thenCompose(g);
4172          }
4173  
4174          static void assertZero(CompletableFuture<?> f) {
# Line 3787 | Line 4176 | public class CompletableFutureTest exten
4176                  f.getNow(null);
4177                  throw new AssertionFailedError("should throw");
4178              } catch (CompletionException success) {
4179 <                assertTrue(success.getCause() instanceof MonadError);
4179 >                assertTrue(success.getCause() instanceof ZeroException);
4180              }
4181          }
4182  
# Line 3814 | Line 4203 | public class CompletableFutureTest exten
4203              AtomicReference<Throwable> firstFailure = new AtomicReference<>(null);
4204          }
4205  
4206 <        // Monadic "plus"
4206 >        /** Implements "monadic plus". */
4207          static <T> CompletableFuture<T> plus(CompletableFuture<? extends T> f,
4208                                               CompletableFuture<? extends T> g) {
4209              PlusFuture<T> plus = new PlusFuture<T>();
4210              BiConsumer<T, Throwable> action = (T result, Throwable ex) -> {
4211 <                if (ex == null) {
4212 <                    if (plus.complete(result))
4213 <                        if (plus.firstFailure.get() != null)
4211 >                try {
4212 >                    if (ex == null) {
4213 >                        if (plus.complete(result))
4214 >                            if (plus.firstFailure.get() != null)
4215 >                                plus.firstFailure.set(null);
4216 >                    }
4217 >                    else if (plus.firstFailure.compareAndSet(null, ex)) {
4218 >                        if (plus.isDone())
4219                              plus.firstFailure.set(null);
4220 <                }
4221 <                else if (plus.firstFailure.compareAndSet(null, ex)) {
4222 <                    if (plus.isDone())
4223 <                        plus.firstFailure.set(null);
4224 <                } else {
4225 <                    // prefer failing with first failure
4226 <                    plus.completeExceptionally(plus.firstFailure.getAndSet(null));
4220 >                    }
4221 >                    else {
4222 >                        // first failure has precedence
4223 >                        Throwable first = plus.firstFailure.getAndSet(null);
4224 >
4225 >                        // may fail with "Self-suppression not permitted"
4226 >                        try { first.addSuppressed(ex); }
4227 >                        catch (Exception ignored) {}
4228 >
4229 >                        plus.completeExceptionally(first);
4230 >                    }
4231 >                } catch (Throwable unexpected) {
4232 >                    plus.completeExceptionally(unexpected);
4233                  }
4234              };
4235              f.whenComplete(action);
# Line 3848 | Line 4248 | public class CompletableFutureTest exten
4248  
4249          // Some mutually non-commutative functions
4250          Function<Long, CompletableFuture<Long>> triple
4251 <            = (x) -> Monad.unit(3 * x);
4251 >            = x -> Monad.unit(3 * x);
4252          Function<Long, CompletableFuture<Long>> inc
4253 <            = (x) -> Monad.unit(x + 1);
4253 >            = x -> Monad.unit(x + 1);
4254  
4255          // unit is a right identity: m >>= unit === m
4256          Monad.assertFutureEquals(inc.apply(5L).thenCompose(unit),
# Line 3862 | Line 4262 | public class CompletableFutureTest exten
4262          // associativity: (m >>= f) >>= g === m >>= ( \x -> (f x >>= g) )
4263          Monad.assertFutureEquals(
4264              unit.apply(5L).thenCompose(inc).thenCompose(triple),
4265 <            unit.apply(5L).thenCompose((x) -> inc.apply(x).thenCompose(triple)));
4265 >            unit.apply(5L).thenCompose(x -> inc.apply(x).thenCompose(triple)));
4266  
4267          // The case for CompletableFuture as an additive monad is weaker...
4268  
# Line 3872 | Line 4272 | public class CompletableFutureTest exten
4272          // left zero: zero >>= f === zero
4273          Monad.assertZero(zero.thenCompose(inc));
4274          // right zero: f >>= (\x -> zero) === zero
4275 <        Monad.assertZero(inc.apply(5L).thenCompose((x) -> zero));
4275 >        Monad.assertZero(inc.apply(5L).thenCompose(x -> zero));
4276  
4277          // f plus zero === f
4278          Monad.assertFutureEquals(Monad.unit(5L),
# Line 3898 | Line 4298 | public class CompletableFutureTest exten
4298                                   Monad.plus(godot, Monad.unit(5L)));
4299      }
4300  
4301 +    /** Test long recursive chains of CompletableFutures with cascading completions */
4302 +    public void testRecursiveChains() throws Throwable {
4303 +        for (ExecutionMode m : ExecutionMode.values())
4304 +        for (boolean addDeadEnds : new boolean[] { true, false })
4305 +    {
4306 +        final int val = 42;
4307 +        final int n = expensiveTests ? 1_000 : 2;
4308 +        CompletableFuture<Integer> head = new CompletableFuture<>();
4309 +        CompletableFuture<Integer> tail = head;
4310 +        for (int i = 0; i < n; i++) {
4311 +            if (addDeadEnds) m.thenApply(tail, v -> v + 1);
4312 +            tail = m.thenApply(tail, v -> v + 1);
4313 +            if (addDeadEnds) m.applyToEither(tail, tail, v -> v + 1);
4314 +            tail = m.applyToEither(tail, tail, v -> v + 1);
4315 +            if (addDeadEnds) m.thenCombine(tail, tail, (v, w) -> v + 1);
4316 +            tail = m.thenCombine(tail, tail, (v, w) -> v + 1);
4317 +        }
4318 +        head.complete(val);
4319 +        assertEquals(val + 3 * n, (int) tail.join());
4320 +    }}
4321 +
4322 +    /**
4323 +     * A single CompletableFuture with many dependents.
4324 +     * A demo of scalability - runtime is O(n).
4325 +     */
4326 +    public void testManyDependents() throws Throwable {
4327 +        final int n = expensiveTests ? 1_000_000 : 10;
4328 +        final CompletableFuture<Void> head = new CompletableFuture<>();
4329 +        final CompletableFuture<Void> complete = CompletableFuture.completedFuture((Void)null);
4330 +        final AtomicInteger count = new AtomicInteger(0);
4331 +        for (int i = 0; i < n; i++) {
4332 +            head.thenRun(() -> count.getAndIncrement());
4333 +            head.thenAccept(x -> count.getAndIncrement());
4334 +            head.thenApply(x -> count.getAndIncrement());
4335 +
4336 +            head.runAfterBoth(complete, () -> count.getAndIncrement());
4337 +            head.thenAcceptBoth(complete, (x, y) -> count.getAndIncrement());
4338 +            head.thenCombine(complete, (x, y) -> count.getAndIncrement());
4339 +            complete.runAfterBoth(head, () -> count.getAndIncrement());
4340 +            complete.thenAcceptBoth(head, (x, y) -> count.getAndIncrement());
4341 +            complete.thenCombine(head, (x, y) -> count.getAndIncrement());
4342 +
4343 +            head.runAfterEither(new CompletableFuture<Void>(), () -> count.getAndIncrement());
4344 +            head.acceptEither(new CompletableFuture<Void>(), x -> count.getAndIncrement());
4345 +            head.applyToEither(new CompletableFuture<Void>(), x -> count.getAndIncrement());
4346 +            new CompletableFuture<Void>().runAfterEither(head, () -> count.getAndIncrement());
4347 +            new CompletableFuture<Void>().acceptEither(head, x -> count.getAndIncrement());
4348 +            new CompletableFuture<Void>().applyToEither(head, x -> count.getAndIncrement());
4349 +        }
4350 +        head.complete(null);
4351 +        assertEquals(5 * 3 * n, count.get());
4352 +    }
4353 +
4354 +    /** ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest tck */
4355 +    public void testCoCompletionGarbageRetention() throws Throwable {
4356 +        final int n = expensiveTests ? 1_000_000 : 10;
4357 +        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
4358 +        CompletableFuture<Integer> f;
4359 +        for (int i = 0; i < n; i++) {
4360 +            f = new CompletableFuture<>();
4361 +            f.runAfterEither(incomplete, () -> {});
4362 +            f.complete(null);
4363 +
4364 +            f = new CompletableFuture<>();
4365 +            f.acceptEither(incomplete, x -> {});
4366 +            f.complete(null);
4367 +
4368 +            f = new CompletableFuture<>();
4369 +            f.applyToEither(incomplete, x -> x);
4370 +            f.complete(null);
4371 +
4372 +            f = new CompletableFuture<>();
4373 +            CompletableFuture.anyOf(new CompletableFuture<?>[] { f, incomplete });
4374 +            f.complete(null);
4375 +        }
4376 +
4377 +        for (int i = 0; i < n; i++) {
4378 +            f = new CompletableFuture<>();
4379 +            incomplete.runAfterEither(f, () -> {});
4380 +            f.complete(null);
4381 +
4382 +            f = new CompletableFuture<>();
4383 +            incomplete.acceptEither(f, x -> {});
4384 +            f.complete(null);
4385 +
4386 +            f = new CompletableFuture<>();
4387 +            incomplete.applyToEither(f, x -> x);
4388 +            f.complete(null);
4389 +
4390 +            f = new CompletableFuture<>();
4391 +            CompletableFuture.anyOf(new CompletableFuture<?>[] { incomplete, f });
4392 +            f.complete(null);
4393 +        }
4394 +    }
4395 +
4396 +    /**
4397 +     * Reproduction recipe for:
4398 +     * 8160402: Garbage retention with CompletableFuture.anyOf
4399 +     * 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
4400 +     */
4401 +    public void testAnyOfGarbageRetention() throws Throwable {
4402 +        for (Integer v : new Integer[] { 1, null })
4403 +    {
4404 +        final int n = expensiveTests ? 100_000 : 10;
4405 +        CompletableFuture<Integer>[] fs
4406 +            = (CompletableFuture<Integer>[]) new CompletableFuture<?>[100];
4407 +        for (int i = 0; i < fs.length; i++)
4408 +            fs[i] = new CompletableFuture<>();
4409 +        fs[fs.length - 1].complete(v);
4410 +        for (int i = 0; i < n; i++)
4411 +            checkCompletedNormally(CompletableFuture.anyOf(fs), v);
4412 +    }}
4413 +
4414 +    /**
4415 +     * Checks for garbage retention with allOf.
4416 +     *
4417 +     * As of 2016-07, fails with OOME:
4418 +     * ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest -Djsr166.methodFilter=testCancelledAllOfGarbageRetention tck
4419 +     */
4420 +    public void testCancelledAllOfGarbageRetention() throws Throwable {
4421 +        final int n = expensiveTests ? 100_000 : 10;
4422 +        CompletableFuture<Integer>[] fs
4423 +            = (CompletableFuture<Integer>[]) new CompletableFuture<?>[100];
4424 +        for (int i = 0; i < fs.length; i++)
4425 +            fs[i] = new CompletableFuture<>();
4426 +        for (int i = 0; i < n; i++)
4427 +            assertTrue(CompletableFuture.allOf(fs).cancel(false));
4428 +    }
4429 +
4430 +    /**
4431 +     * Checks for garbage retention when a dependent future is
4432 +     * cancelled and garbage-collected.
4433 +     * 8161600: Garbage retention when source CompletableFutures are never completed
4434 +     *
4435 +     * As of 2016-07, fails with OOME:
4436 +     * ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest -Djsr166.methodFilter=testCancelledGarbageRetention tck
4437 +     */
4438 +    public void testCancelledGarbageRetention() throws Throwable {
4439 +        final int n = expensiveTests ? 100_000 : 10;
4440 +        CompletableFuture<Integer> neverCompleted = new CompletableFuture<>();
4441 +        for (int i = 0; i < n; i++)
4442 +            assertTrue(neverCompleted.thenRun(() -> {}).cancel(true));
4443 +    }
4444 +
4445 +    /**
4446 +     * Checks for garbage retention when MinimalStage.toCompletableFuture()
4447 +     * is invoked many times.
4448 +     * 8161600: Garbage retention when source CompletableFutures are never completed
4449 +     *
4450 +     * As of 2016-07, fails with OOME:
4451 +     * ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest -Djsr166.methodFilter=testToCompletableFutureGarbageRetention tck
4452 +     */
4453 +    public void testToCompletableFutureGarbageRetention() throws Throwable {
4454 +        final int n = expensiveTests ? 900_000 : 10;
4455 +        CompletableFuture<Integer> neverCompleted = new CompletableFuture<>();
4456 +        CompletionStage minimal = neverCompleted.minimalCompletionStage();
4457 +        for (int i = 0; i < n; i++)
4458 +            assertTrue(minimal.toCompletableFuture().cancel(true));
4459 +    }
4460 +
4461   //     static <U> U join(CompletionStage<U> stage) {
4462   //         CompletableFuture<U> f = new CompletableFuture<>();
4463   //         stage.whenComplete((v, ex) -> {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines