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.142 by dl, Fri Apr 1 23:18:00 2016 UTC vs.
Revision 1.197 by jsr166, Sun Jul 22 22:08:49 2018 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 41 | Line 41 | import java.util.function.Function;
41   import java.util.function.Predicate;
42   import java.util.function.Supplier;
43  
44 import junit.framework.AssertionFailedError;
44   import junit.framework.Test;
45   import junit.framework.TestSuite;
46  
# Line 59 | Line 58 | public class CompletableFutureTest exten
58      void checkIncomplete(CompletableFuture<?> f) {
59          assertFalse(f.isDone());
60          assertFalse(f.isCancelled());
61 <        assertTrue(f.toString().contains("Not completed"));
61 >        assertTrue(f.toString().matches(".*\\[.*Not completed.*\\]"));
62 >
63 >        Object result = null;
64          try {
65 <            assertNull(f.getNow(null));
65 >            result = f.getNow(null);
66          } catch (Throwable fail) { threadUnexpectedException(fail); }
67 +        assertNull(result);
68 +
69          try {
70 <            f.get(0L, SECONDS);
70 >            f.get(randomExpiredTimeout(), randomTimeUnit());
71              shouldThrow();
72          }
73          catch (TimeoutException success) {}
74          catch (Throwable fail) { threadUnexpectedException(fail); }
75      }
76  
77 <    <T> void checkCompletedNormally(CompletableFuture<T> f, T value) {
78 <        checkTimedGet(f, value);
77 >    <T> void checkCompletedNormally(CompletableFuture<T> f, T expectedValue) {
78 >        checkTimedGet(f, expectedValue);
79  
80 +        assertEquals(expectedValue, f.join());
81 +        assertEquals(expectedValue, f.getNow(null));
82 +
83 +        T result = null;
84          try {
85 <            assertEquals(value, f.join());
79 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
80 <        try {
81 <            assertEquals(value, f.getNow(null));
82 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
83 <        try {
84 <            assertEquals(value, f.get());
85 >            result = f.get();
86          } catch (Throwable fail) { threadUnexpectedException(fail); }
87 +        assertEquals(expectedValue, result);
88 +
89          assertTrue(f.isDone());
90          assertFalse(f.isCancelled());
91          assertFalse(f.isCompletedExceptionally());
92 <        assertTrue(f.toString().contains("[Completed normally]"));
92 >        assertTrue(f.toString().matches(".*\\[.*Completed normally.*\\]"));
93      }
94  
95      /**
96       * Returns the "raw" internal exceptional completion of f,
97       * without any additional wrapping with CompletionException.
98       */
99 <    <U> Throwable exceptionalCompletion(CompletableFuture<U> f) {
100 <        // handle (and whenComplete) can distinguish between "direct"
101 <        // and "wrapped" exceptional completion
102 <        return f.handle((U u, Throwable t) -> t).join();
99 >    Throwable exceptionalCompletion(CompletableFuture<?> f) {
100 >        // handle (and whenComplete and exceptionally) can distinguish
101 >        // between "direct" and "wrapped" exceptional completion
102 >        return f.handle((u, t) -> t).join();
103      }
104  
105      void checkCompletedExceptionally(CompletableFuture<?> f,
# Line 142 | Line 145 | public class CompletableFutureTest exten
145          assertFalse(f.isCancelled());
146          assertTrue(f.isDone());
147          assertTrue(f.isCompletedExceptionally());
148 <        assertTrue(f.toString().contains("[Completed exceptionally]"));
148 >        assertTrue(f.toString().matches(".*\\[.*Completed exceptionally.*\\]"));
149      }
150  
151      void checkCompletedWithWrappedCFException(CompletableFuture<?> f) {
152          checkCompletedExceptionally(f, true,
153 <            (t) -> assertTrue(t instanceof CFException));
153 >            t -> assertTrue(t instanceof CFException));
154      }
155  
156      void checkCompletedWithWrappedCancellationException(CompletableFuture<?> f) {
157          checkCompletedExceptionally(f, true,
158 <            (t) -> assertTrue(t instanceof CancellationException));
158 >            t -> assertTrue(t instanceof CancellationException));
159      }
160  
161      void checkCompletedWithTimeoutException(CompletableFuture<?> f) {
162          checkCompletedExceptionally(f, false,
163 <            (t) -> assertTrue(t instanceof TimeoutException));
163 >            t -> assertTrue(t instanceof TimeoutException));
164      }
165  
166      void checkCompletedWithWrappedException(CompletableFuture<?> f,
167                                              Throwable ex) {
168 <        checkCompletedExceptionally(f, true, (t) -> assertSame(t, ex));
168 >        checkCompletedExceptionally(f, true, t -> assertSame(t, ex));
169      }
170  
171      void checkCompletedExceptionally(CompletableFuture<?> f, Throwable ex) {
172 <        checkCompletedExceptionally(f, false, (t) -> assertSame(t, ex));
172 >        checkCompletedExceptionally(f, false, t -> assertSame(t, ex));
173      }
174  
175      void checkCancelled(CompletableFuture<?> f) {
# Line 197 | Line 200 | public class CompletableFutureTest exten
200          assertTrue(f.isDone());
201          assertTrue(f.isCompletedExceptionally());
202          assertTrue(f.isCancelled());
203 <        assertTrue(f.toString().contains("[Completed exceptionally]"));
203 >        assertTrue(f.toString().matches(".*\\[.*Completed exceptionally.*\\]"));
204      }
205  
206      /**
# Line 296 | Line 299 | public class CompletableFutureTest exten
299          }
300  
301          f = new CompletableFuture<>();
302 <        f.completeExceptionally(ex = new CFException());
302 >        f.completeExceptionally(new CFException());
303          f.obtrudeValue(v1);
304          checkCompletedNormally(f, v1);
305          f.obtrudeException(ex = new CFException());
# Line 333 | Line 336 | public class CompletableFutureTest exten
336      /**
337       * toString indicates current completion state
338       */
339 <    public void testToString() {
340 <        CompletableFuture<String> f;
341 <
342 <        f = new CompletableFuture<String>();
343 <        assertTrue(f.toString().contains("[Not completed]"));
339 >    public void testToString_incomplete() {
340 >        CompletableFuture<String> f = new CompletableFuture<>();
341 >        assertTrue(f.toString().matches(".*\\[.*Not completed.*\\]"));
342 >        if (testImplementationDetails)
343 >            assertEquals(identityString(f) + "[Not completed]",
344 >                         f.toString());
345 >    }
346  
347 +    public void testToString_normal() {
348 +        CompletableFuture<String> f = new CompletableFuture<>();
349          assertTrue(f.complete("foo"));
350 <        assertTrue(f.toString().contains("[Completed normally]"));
350 >        assertTrue(f.toString().matches(".*\\[.*Completed normally.*\\]"));
351 >        if (testImplementationDetails)
352 >            assertEquals(identityString(f) + "[Completed normally]",
353 >                         f.toString());
354 >    }
355  
356 <        f = new CompletableFuture<String>();
356 >    public void testToString_exception() {
357 >        CompletableFuture<String> f = new CompletableFuture<>();
358          assertTrue(f.completeExceptionally(new IndexOutOfBoundsException()));
359 <        assertTrue(f.toString().contains("[Completed exceptionally]"));
359 >        assertTrue(f.toString().matches(".*\\[.*Completed exceptionally.*\\]"));
360 >        if (testImplementationDetails)
361 >            assertTrue(f.toString().startsWith(
362 >                               identityString(f) + "[Completed exceptionally: "));
363 >    }
364  
365 +    public void testToString_cancelled() {
366          for (boolean mayInterruptIfRunning : new boolean[] { true, false }) {
367 <            f = new CompletableFuture<String>();
367 >            CompletableFuture<String> f = new CompletableFuture<>();
368              assertTrue(f.cancel(mayInterruptIfRunning));
369 <            assertTrue(f.toString().contains("[Completed exceptionally]"));
369 >            assertTrue(f.toString().matches(".*\\[.*Completed exceptionally.*\\]"));
370 >            if (testImplementationDetails)
371 >                assertTrue(f.toString().startsWith(
372 >                                   identityString(f) + "[Completed exceptionally: "));
373          }
374      }
375  
# Line 361 | Line 381 | public class CompletableFutureTest exten
381          checkCompletedNormally(f, "test");
382      }
383  
384 <    abstract class CheckedAction {
384 >    abstract static class CheckedAction {
385          int invocationCount = 0;
386          final ExecutionMode m;
387          CheckedAction(ExecutionMode m) { this.m = m; }
# Line 373 | Line 393 | public class CompletableFutureTest exten
393          void assertInvoked() { assertEquals(1, invocationCount); }
394      }
395  
396 <    abstract class CheckedIntegerAction extends CheckedAction {
396 >    abstract static class CheckedIntegerAction extends CheckedAction {
397          Integer value;
398          CheckedIntegerAction(ExecutionMode m) { super(m); }
399          void assertValue(Integer expected) {
# Line 382 | Line 402 | public class CompletableFutureTest exten
402          }
403      }
404  
405 <    class IntegerSupplier extends CheckedAction
405 >    static class IntegerSupplier extends CheckedAction
406          implements Supplier<Integer>
407      {
408          final Integer value;
# Line 401 | Line 421 | public class CompletableFutureTest exten
421          return (x == null) ? null : x + 1;
422      }
423  
424 <    class NoopConsumer extends CheckedIntegerAction
424 >    static class NoopConsumer extends CheckedIntegerAction
425          implements Consumer<Integer>
426      {
427          NoopConsumer(ExecutionMode m) { super(m); }
# Line 411 | Line 431 | public class CompletableFutureTest exten
431          }
432      }
433  
434 <    class IncFunction extends CheckedIntegerAction
434 >    static class IncFunction extends CheckedIntegerAction
435          implements Function<Integer,Integer>
436      {
437          IncFunction(ExecutionMode m) { super(m); }
# Line 429 | Line 449 | public class CompletableFutureTest exten
449              - ((y == null) ? 99 : y.intValue());
450      }
451  
452 <    class SubtractAction extends CheckedIntegerAction
452 >    static class SubtractAction extends CheckedIntegerAction
453          implements BiConsumer<Integer, Integer>
454      {
455          SubtractAction(ExecutionMode m) { super(m); }
# Line 439 | Line 459 | public class CompletableFutureTest exten
459          }
460      }
461  
462 <    class SubtractFunction extends CheckedIntegerAction
462 >    static class SubtractFunction extends CheckedIntegerAction
463          implements BiFunction<Integer, Integer, Integer>
464      {
465          SubtractFunction(ExecutionMode m) { super(m); }
# Line 449 | Line 469 | public class CompletableFutureTest exten
469          }
470      }
471  
472 <    class Noop extends CheckedAction implements Runnable {
472 >    static class Noop extends CheckedAction implements Runnable {
473          Noop(ExecutionMode m) { super(m); }
474          public void run() {
475              invoked();
476          }
477      }
478  
479 <    class FailingSupplier extends CheckedAction
479 >    static class FailingSupplier extends CheckedAction
480          implements Supplier<Integer>
481      {
482 <        FailingSupplier(ExecutionMode m) { super(m); }
482 >        final CFException ex;
483 >        FailingSupplier(ExecutionMode m) { super(m); ex = new CFException(); }
484          public Integer get() {
485              invoked();
486 <            throw new CFException();
486 >            throw ex;
487          }
488      }
489  
490 <    class FailingConsumer extends CheckedIntegerAction
490 >    static class FailingConsumer extends CheckedIntegerAction
491          implements Consumer<Integer>
492      {
493 <        FailingConsumer(ExecutionMode m) { super(m); }
493 >        final CFException ex;
494 >        FailingConsumer(ExecutionMode m) { super(m); ex = new CFException(); }
495          public void accept(Integer x) {
496              invoked();
497              value = x;
498 <            throw new CFException();
498 >            throw ex;
499          }
500      }
501  
502 <    class FailingBiConsumer extends CheckedIntegerAction
502 >    static class FailingBiConsumer extends CheckedIntegerAction
503          implements BiConsumer<Integer, Integer>
504      {
505 <        FailingBiConsumer(ExecutionMode m) { super(m); }
505 >        final CFException ex;
506 >        FailingBiConsumer(ExecutionMode m) { super(m); ex = new CFException(); }
507          public void accept(Integer x, Integer y) {
508              invoked();
509              value = subtract(x, y);
510 <            throw new CFException();
510 >            throw ex;
511          }
512      }
513  
514 <    class FailingFunction extends CheckedIntegerAction
514 >    static class FailingFunction extends CheckedIntegerAction
515          implements Function<Integer, Integer>
516      {
517 <        FailingFunction(ExecutionMode m) { super(m); }
517 >        final CFException ex;
518 >        FailingFunction(ExecutionMode m) { super(m); ex = new CFException(); }
519          public Integer apply(Integer x) {
520              invoked();
521              value = x;
522 <            throw new CFException();
522 >            throw ex;
523          }
524      }
525  
526 <    class FailingBiFunction extends CheckedIntegerAction
526 >    static class FailingBiFunction extends CheckedIntegerAction
527          implements BiFunction<Integer, Integer, Integer>
528      {
529 <        FailingBiFunction(ExecutionMode m) { super(m); }
529 >        final CFException ex;
530 >        FailingBiFunction(ExecutionMode m) { super(m); ex = new CFException(); }
531          public Integer apply(Integer x, Integer y) {
532              invoked();
533              value = subtract(x, y);
534 <            throw new CFException();
534 >            throw ex;
535          }
536      }
537  
538 <    class FailingRunnable extends CheckedAction implements Runnable {
539 <        FailingRunnable(ExecutionMode m) { super(m); }
538 >    static class FailingRunnable extends CheckedAction implements Runnable {
539 >        final CFException ex;
540 >        FailingRunnable(ExecutionMode m) { super(m); ex = new CFException(); }
541          public void run() {
542              invoked();
543 <            throw new CFException();
543 >            throw ex;
544          }
545      }
546  
547 <    class CompletableFutureInc extends CheckedIntegerAction
547 >    static class CompletableFutureInc extends CheckedIntegerAction
548          implements Function<Integer, CompletableFuture<Integer>>
549      {
550          CompletableFutureInc(ExecutionMode m) { super(m); }
# Line 531 | Line 557 | public class CompletableFutureTest exten
557          }
558      }
559  
560 <    class FailingCompletableFutureFunction extends CheckedIntegerAction
560 >    static class FailingCompletableFutureFunction extends CheckedIntegerAction
561          implements Function<Integer, CompletableFuture<Integer>>
562      {
563 <        FailingCompletableFutureFunction(ExecutionMode m) { super(m); }
563 >        final CFException ex;
564 >        FailingCompletableFutureFunction(ExecutionMode m) { super(m); ex = new CFException(); }
565          public CompletableFuture<Integer> apply(Integer x) {
566              invoked();
567              value = x;
568 <            throw new CFException();
568 >            throw ex;
569 >        }
570 >    }
571 >
572 >    static class CountingRejectingExecutor implements Executor {
573 >        final RejectedExecutionException ex = new RejectedExecutionException();
574 >        final AtomicInteger count = new AtomicInteger(0);
575 >        public void execute(Runnable r) {
576 >            count.getAndIncrement();
577 >            throw ex;
578          }
579      }
580  
# Line 640 | Line 676 | public class CompletableFutureTest exten
676  
677          ASYNC {
678              public void checkExecutionMode() {
679 <                // If tests are added that may run across different
680 <                // pools, this needs to be weakened to no-op.
645 <                ForkJoinPool p = ForkJoinTask.getPool();
646 <                assertTrue(p == null ||
647 <                           (defaultExecutorIsCommonPool &&
648 <                            p == ForkJoinPool.commonPool()));
679 >                assertEquals(defaultExecutorIsCommonPool,
680 >                             (ForkJoinPool.commonPool() == ForkJoinTask.getPool()));
681              }
682              public CompletableFuture<Void> runAsync(Runnable a) {
683                  return CompletableFuture.runAsync(a);
# Line 1226 | Line 1258 | public class CompletableFutureTest exten
1258      {
1259          final FailingRunnable r = new FailingRunnable(m);
1260          final CompletableFuture<Void> f = m.runAsync(r);
1261 <        checkCompletedWithWrappedCFException(f);
1261 >        checkCompletedWithWrappedException(f, r.ex);
1262          r.assertInvoked();
1263      }}
1264  
1265 +    @SuppressWarnings("FutureReturnValueIgnored")
1266 +    public void testRunAsync_rejectingExecutor() {
1267 +        CountingRejectingExecutor e = new CountingRejectingExecutor();
1268 +        try {
1269 +            CompletableFuture.runAsync(() -> {}, e);
1270 +            shouldThrow();
1271 +        } catch (Throwable t) {
1272 +            assertSame(e.ex, t);
1273 +        }
1274 +
1275 +        assertEquals(1, e.count.get());
1276 +    }
1277 +
1278      /**
1279       * supplyAsync completes with result of supplier
1280       */
# Line 1260 | Line 1305 | public class CompletableFutureTest exten
1305      {
1306          FailingSupplier r = new FailingSupplier(m);
1307          CompletableFuture<Integer> f = m.supplyAsync(r);
1308 <        checkCompletedWithWrappedCFException(f);
1308 >        checkCompletedWithWrappedException(f, r.ex);
1309          r.assertInvoked();
1310      }}
1311  
1312 +    @SuppressWarnings("FutureReturnValueIgnored")
1313 +    public void testSupplyAsync_rejectingExecutor() {
1314 +        CountingRejectingExecutor e = new CountingRejectingExecutor();
1315 +        try {
1316 +            CompletableFuture.supplyAsync(() -> null, e);
1317 +            shouldThrow();
1318 +        } catch (Throwable t) {
1319 +            assertSame(e.ex, t);
1320 +        }
1321 +
1322 +        assertEquals(1, e.count.get());
1323 +    }
1324 +
1325      // seq completion methods
1326  
1327      /**
# Line 1382 | Line 1440 | public class CompletableFutureTest exten
1440          final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1441          final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1442  
1443 <        checkCompletedWithWrappedCFException(h0);
1444 <        checkCompletedWithWrappedCFException(h1);
1445 <        checkCompletedWithWrappedCFException(h2);
1446 <        checkCompletedWithWrappedCFException(h3);
1447 <        checkCompletedWithWrappedCFException(h4);
1448 <        checkCompletedWithWrappedCFException(h5);
1443 >        checkCompletedWithWrappedException(h0, rs[0].ex);
1444 >        checkCompletedWithWrappedException(h1, rs[1].ex);
1445 >        checkCompletedWithWrappedException(h2, rs[2].ex);
1446 >        checkCompletedWithWrappedException(h3, rs[3].ex);
1447 >        checkCompletedWithWrappedException(h4, rs[4].ex);
1448 >        checkCompletedWithWrappedException(h5, rs[5].ex);
1449          checkCompletedNormally(f, v1);
1450      }}
1451  
# Line 1486 | Line 1544 | public class CompletableFutureTest exten
1544          final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1545          final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1546  
1547 <        checkCompletedWithWrappedCFException(h0);
1548 <        checkCompletedWithWrappedCFException(h1);
1549 <        checkCompletedWithWrappedCFException(h2);
1550 <        checkCompletedWithWrappedCFException(h3);
1547 >        checkCompletedWithWrappedException(h0, rs[0].ex);
1548 >        checkCompletedWithWrappedException(h1, rs[1].ex);
1549 >        checkCompletedWithWrappedException(h2, rs[2].ex);
1550 >        checkCompletedWithWrappedException(h3, rs[3].ex);
1551          checkCompletedNormally(f, v1);
1552      }}
1553  
# Line 1588 | Line 1646 | public class CompletableFutureTest exten
1646          final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1647          final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1648  
1649 <        checkCompletedWithWrappedCFException(h0);
1650 <        checkCompletedWithWrappedCFException(h1);
1651 <        checkCompletedWithWrappedCFException(h2);
1652 <        checkCompletedWithWrappedCFException(h3);
1649 >        checkCompletedWithWrappedException(h0, rs[0].ex);
1650 >        checkCompletedWithWrappedException(h1, rs[1].ex);
1651 >        checkCompletedWithWrappedException(h2, rs[2].ex);
1652 >        checkCompletedWithWrappedException(h3, rs[3].ex);
1653          checkCompletedNormally(f, v1);
1654      }}
1655  
# Line 1753 | Line 1811 | public class CompletableFutureTest exten
1811          assertTrue(snd.complete(w2));
1812          final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1813  
1814 <        checkCompletedWithWrappedCFException(h1);
1815 <        checkCompletedWithWrappedCFException(h2);
1816 <        checkCompletedWithWrappedCFException(h3);
1814 >        checkCompletedWithWrappedException(h1, r1.ex);
1815 >        checkCompletedWithWrappedException(h2, r2.ex);
1816 >        checkCompletedWithWrappedException(h3, r3.ex);
1817          r1.assertInvoked();
1818          r2.assertInvoked();
1819          r3.assertInvoked();
# Line 1917 | Line 1975 | public class CompletableFutureTest exten
1975          assertTrue(snd.complete(w2));
1976          final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1977  
1978 <        checkCompletedWithWrappedCFException(h1);
1979 <        checkCompletedWithWrappedCFException(h2);
1980 <        checkCompletedWithWrappedCFException(h3);
1978 >        checkCompletedWithWrappedException(h1, r1.ex);
1979 >        checkCompletedWithWrappedException(h2, r2.ex);
1980 >        checkCompletedWithWrappedException(h3, r3.ex);
1981          r1.assertInvoked();
1982          r2.assertInvoked();
1983          r3.assertInvoked();
# Line 2081 | Line 2139 | public class CompletableFutureTest exten
2139          assertTrue(snd.complete(w2));
2140          final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2141  
2142 <        checkCompletedWithWrappedCFException(h1);
2143 <        checkCompletedWithWrappedCFException(h2);
2144 <        checkCompletedWithWrappedCFException(h3);
2142 >        checkCompletedWithWrappedException(h1, r1.ex);
2143 >        checkCompletedWithWrappedException(h2, r2.ex);
2144 >        checkCompletedWithWrappedException(h3, r3.ex);
2145          r1.assertInvoked();
2146          r2.assertInvoked();
2147          r3.assertInvoked();
# Line 2373 | Line 2431 | public class CompletableFutureTest exten
2431          f.complete(v1);
2432          final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2433          final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2434 <        checkCompletedWithWrappedCFException(h0);
2435 <        checkCompletedWithWrappedCFException(h1);
2436 <        checkCompletedWithWrappedCFException(h2);
2437 <        checkCompletedWithWrappedCFException(h3);
2434 >        checkCompletedWithWrappedException(h0, rs[0].ex);
2435 >        checkCompletedWithWrappedException(h1, rs[1].ex);
2436 >        checkCompletedWithWrappedException(h2, rs[2].ex);
2437 >        checkCompletedWithWrappedException(h3, rs[3].ex);
2438          for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2439  
2440          g.complete(v2);
# Line 2385 | Line 2443 | public class CompletableFutureTest exten
2443          final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2444          final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2445  
2446 <        checkCompletedWithWrappedCFException(h4);
2446 >        checkCompletedWithWrappedException(h4, rs[4].ex);
2447          assertTrue(Objects.equals(v1, rs[4].value) ||
2448                     Objects.equals(v2, rs[4].value));
2449 <        checkCompletedWithWrappedCFException(h5);
2449 >        checkCompletedWithWrappedException(h5, rs[5].ex);
2450          assertTrue(Objects.equals(v1, rs[5].value) ||
2451                     Objects.equals(v2, rs[5].value));
2452  
# Line 2526 | Line 2584 | public class CompletableFutureTest exten
2584  
2585          // unspecified behavior - both source completions available
2586          try {
2587 <            assertEquals(null, h0.join());
2587 >            assertNull(h0.join());
2588              rs[0].assertValue(v1);
2589          } catch (CompletionException ok) {
2590              checkCompletedWithWrappedException(h0, ex);
2591              rs[0].assertNotInvoked();
2592          }
2593          try {
2594 <            assertEquals(null, h1.join());
2594 >            assertNull(h1.join());
2595              rs[1].assertValue(v1);
2596          } catch (CompletionException ok) {
2597              checkCompletedWithWrappedException(h1, ex);
2598              rs[1].assertNotInvoked();
2599          }
2600          try {
2601 <            assertEquals(null, h2.join());
2601 >            assertNull(h2.join());
2602              rs[2].assertValue(v1);
2603          } catch (CompletionException ok) {
2604              checkCompletedWithWrappedException(h2, ex);
2605              rs[2].assertNotInvoked();
2606          }
2607          try {
2608 <            assertEquals(null, h3.join());
2608 >            assertNull(h3.join());
2609              rs[3].assertValue(v1);
2610          } catch (CompletionException ok) {
2611              checkCompletedWithWrappedException(h3, ex);
# Line 2632 | Line 2690 | public class CompletableFutureTest exten
2690          f.complete(v1);
2691          final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2692          final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2693 <        checkCompletedWithWrappedCFException(h0);
2694 <        checkCompletedWithWrappedCFException(h1);
2695 <        checkCompletedWithWrappedCFException(h2);
2696 <        checkCompletedWithWrappedCFException(h3);
2693 >        checkCompletedWithWrappedException(h0, rs[0].ex);
2694 >        checkCompletedWithWrappedException(h1, rs[1].ex);
2695 >        checkCompletedWithWrappedException(h2, rs[2].ex);
2696 >        checkCompletedWithWrappedException(h3, rs[3].ex);
2697          for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2698  
2699          g.complete(v2);
# Line 2644 | Line 2702 | public class CompletableFutureTest exten
2702          final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2703          final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2704  
2705 <        checkCompletedWithWrappedCFException(h4);
2705 >        checkCompletedWithWrappedException(h4, rs[4].ex);
2706          assertTrue(Objects.equals(v1, rs[4].value) ||
2707                     Objects.equals(v2, rs[4].value));
2708 <        checkCompletedWithWrappedCFException(h5);
2708 >        checkCompletedWithWrappedException(h5, rs[5].ex);
2709          assertTrue(Objects.equals(v1, rs[5].value) ||
2710                     Objects.equals(v2, rs[5].value));
2711  
# Line 2663 | Line 2721 | public class CompletableFutureTest exten
2721          for (ExecutionMode m : ExecutionMode.values())
2722          for (Integer v1 : new Integer[] { 1, null })
2723          for (Integer v2 : new Integer[] { 2, null })
2724 +        for (boolean pushNop : new boolean[] { true, false })
2725      {
2726          final CompletableFuture<Integer> f = new CompletableFuture<>();
2727          final CompletableFuture<Integer> g = new CompletableFuture<>();
# Line 2675 | Line 2734 | public class CompletableFutureTest exten
2734          checkIncomplete(h1);
2735          rs[0].assertNotInvoked();
2736          rs[1].assertNotInvoked();
2737 +        if (pushNop) {          // ad hoc test of intra-completion interference
2738 +            m.thenRun(f, () -> {});
2739 +            m.thenRun(g, () -> {});
2740 +        }
2741          f.complete(v1);
2742          checkCompletedNormally(h0, null);
2743          checkCompletedNormally(h1, null);
# Line 2781 | Line 2844 | public class CompletableFutureTest exten
2844  
2845          // unspecified behavior - both source completions available
2846          try {
2847 <            assertEquals(null, h0.join());
2847 >            assertNull(h0.join());
2848              rs[0].assertInvoked();
2849          } catch (CompletionException ok) {
2850              checkCompletedWithWrappedException(h0, ex);
2851              rs[0].assertNotInvoked();
2852          }
2853          try {
2854 <            assertEquals(null, h1.join());
2854 >            assertNull(h1.join());
2855              rs[1].assertInvoked();
2856          } catch (CompletionException ok) {
2857              checkCompletedWithWrappedException(h1, ex);
2858              rs[1].assertNotInvoked();
2859          }
2860          try {
2861 <            assertEquals(null, h2.join());
2861 >            assertNull(h2.join());
2862              rs[2].assertInvoked();
2863          } catch (CompletionException ok) {
2864              checkCompletedWithWrappedException(h2, ex);
2865              rs[2].assertNotInvoked();
2866          }
2867          try {
2868 <            assertEquals(null, h3.join());
2868 >            assertNull(h3.join());
2869              rs[3].assertInvoked();
2870          } catch (CompletionException ok) {
2871              checkCompletedWithWrappedException(h3, ex);
# Line 2887 | Line 2950 | public class CompletableFutureTest exten
2950          assertTrue(f.complete(v1));
2951          final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2952          final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2953 <        checkCompletedWithWrappedCFException(h0);
2954 <        checkCompletedWithWrappedCFException(h1);
2955 <        checkCompletedWithWrappedCFException(h2);
2956 <        checkCompletedWithWrappedCFException(h3);
2953 >        checkCompletedWithWrappedException(h0, rs[0].ex);
2954 >        checkCompletedWithWrappedException(h1, rs[1].ex);
2955 >        checkCompletedWithWrappedException(h2, rs[2].ex);
2956 >        checkCompletedWithWrappedException(h3, rs[3].ex);
2957          for (int i = 0; i < 4; i++) rs[i].assertInvoked();
2958          assertTrue(g.complete(v2));
2959          final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2960          final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2961 <        checkCompletedWithWrappedCFException(h4);
2962 <        checkCompletedWithWrappedCFException(h5);
2961 >        checkCompletedWithWrappedException(h4, rs[4].ex);
2962 >        checkCompletedWithWrappedException(h5, rs[5].ex);
2963  
2964          checkCompletedNormally(f, v1);
2965          checkCompletedNormally(g, v2);
# Line 2957 | Line 3020 | public class CompletableFutureTest exten
3020          final CompletableFuture<Integer> g = m.thenCompose(f, r);
3021          if (createIncomplete) assertTrue(f.complete(v1));
3022  
3023 <        checkCompletedWithWrappedCFException(g);
3023 >        checkCompletedWithWrappedException(g, r.ex);
3024          checkCompletedNormally(f, v1);
3025      }}
3026  
# Line 3066 | Line 3129 | public class CompletableFutureTest exten
3129          }
3130      }
3131  
3132 <    public void testAllOf_backwards() throws Exception {
3132 >    public void testAllOf_normal_backwards() throws Exception {
3133          for (int k = 1; k < 10; k++) {
3134              CompletableFuture<Integer>[] fs
3135                  = (CompletableFuture<Integer>[]) new CompletableFuture[k];
# Line 3197 | Line 3260 | public class CompletableFutureTest exten
3260      /**
3261       * Completion methods throw NullPointerException with null arguments
3262       */
3263 +    @SuppressWarnings("FutureReturnValueIgnored")
3264      public void testNPE() {
3265          CompletableFuture<Integer> f = new CompletableFuture<>();
3266          CompletableFuture<Integer> g = new CompletableFuture<>();
# Line 3216 | Line 3280 | public class CompletableFutureTest exten
3280  
3281              () -> f.thenApply(null),
3282              () -> f.thenApplyAsync(null),
3283 <            () -> f.thenApplyAsync((x) -> x, null),
3283 >            () -> f.thenApplyAsync(x -> x, null),
3284              () -> f.thenApplyAsync(null, exec),
3285  
3286              () -> f.thenAccept(null),
3287              () -> f.thenAcceptAsync(null),
3288 <            () -> f.thenAcceptAsync((x) -> {} , null),
3288 >            () -> f.thenAcceptAsync(x -> {} , null),
3289              () -> f.thenAcceptAsync(null, exec),
3290  
3291              () -> f.thenRun(null),
# Line 3256 | Line 3320 | public class CompletableFutureTest exten
3320              () -> f.applyToEither(g, null),
3321              () -> f.applyToEitherAsync(g, null),
3322              () -> f.applyToEitherAsync(g, null, exec),
3323 <            () -> f.applyToEither(nullFuture, (x) -> x),
3324 <            () -> f.applyToEitherAsync(nullFuture, (x) -> x),
3325 <            () -> f.applyToEitherAsync(nullFuture, (x) -> x, exec),
3326 <            () -> f.applyToEitherAsync(g, (x) -> x, null),
3323 >            () -> f.applyToEither(nullFuture, x -> x),
3324 >            () -> f.applyToEitherAsync(nullFuture, x -> x),
3325 >            () -> f.applyToEitherAsync(nullFuture, x -> x, exec),
3326 >            () -> f.applyToEitherAsync(g, x -> x, null),
3327  
3328              () -> f.acceptEither(g, null),
3329              () -> f.acceptEitherAsync(g, null),
3330              () -> f.acceptEitherAsync(g, null, exec),
3331 <            () -> f.acceptEither(nullFuture, (x) -> {}),
3332 <            () -> f.acceptEitherAsync(nullFuture, (x) -> {}),
3333 <            () -> f.acceptEitherAsync(nullFuture, (x) -> {}, exec),
3334 <            () -> f.acceptEitherAsync(g, (x) -> {}, null),
3331 >            () -> f.acceptEither(nullFuture, x -> {}),
3332 >            () -> f.acceptEitherAsync(nullFuture, x -> {}),
3333 >            () -> f.acceptEitherAsync(nullFuture, x -> {}, exec),
3334 >            () -> f.acceptEitherAsync(g, x -> {}, null),
3335  
3336              () -> f.runAfterEither(g, null),
3337              () -> f.runAfterEitherAsync(g, null),
# Line 3299 | Line 3363 | public class CompletableFutureTest exten
3363              () -> f.obtrudeException(null),
3364  
3365              () -> CompletableFuture.delayedExecutor(1L, SECONDS, null),
3366 <            () -> CompletableFuture.delayedExecutor(1L, null, new ThreadExecutor()),
3366 >            () -> CompletableFuture.delayedExecutor(1L, null, exec),
3367              () -> CompletableFuture.delayedExecutor(1L, null),
3368  
3369              () -> f.orTimeout(1L, null),
# Line 3314 | Line 3378 | public class CompletableFutureTest exten
3378      }
3379  
3380      /**
3381 +     * Test submissions to an executor that rejects all tasks.
3382 +     */
3383 +    public void testRejectingExecutor() {
3384 +        for (Integer v : new Integer[] { 1, null })
3385 +    {
3386 +        final CountingRejectingExecutor e = new CountingRejectingExecutor();
3387 +
3388 +        final CompletableFuture<Integer> complete = CompletableFuture.completedFuture(v);
3389 +        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
3390 +
3391 +        List<CompletableFuture<?>> futures = new ArrayList<>();
3392 +
3393 +        List<CompletableFuture<Integer>> srcs = new ArrayList<>();
3394 +        srcs.add(complete);
3395 +        srcs.add(incomplete);
3396 +
3397 +        for (CompletableFuture<Integer> src : srcs) {
3398 +            List<CompletableFuture<?>> fs = new ArrayList<>();
3399 +            fs.add(src.thenRunAsync(() -> {}, e));
3400 +            fs.add(src.thenAcceptAsync(z -> {}, e));
3401 +            fs.add(src.thenApplyAsync(z -> z, e));
3402 +
3403 +            fs.add(src.thenCombineAsync(src, (x, y) -> x, e));
3404 +            fs.add(src.thenAcceptBothAsync(src, (x, y) -> {}, e));
3405 +            fs.add(src.runAfterBothAsync(src, () -> {}, e));
3406 +
3407 +            fs.add(src.applyToEitherAsync(src, z -> z, e));
3408 +            fs.add(src.acceptEitherAsync(src, z -> {}, e));
3409 +            fs.add(src.runAfterEitherAsync(src, () -> {}, e));
3410 +
3411 +            fs.add(src.thenComposeAsync(z -> null, e));
3412 +            fs.add(src.whenCompleteAsync((z, t) -> {}, e));
3413 +            fs.add(src.handleAsync((z, t) -> null, e));
3414 +
3415 +            for (CompletableFuture<?> future : fs) {
3416 +                if (src.isDone())
3417 +                    checkCompletedWithWrappedException(future, e.ex);
3418 +                else
3419 +                    checkIncomplete(future);
3420 +            }
3421 +            futures.addAll(fs);
3422 +        }
3423 +
3424 +        {
3425 +            List<CompletableFuture<?>> fs = new ArrayList<>();
3426 +
3427 +            fs.add(complete.thenCombineAsync(incomplete, (x, y) -> x, e));
3428 +            fs.add(incomplete.thenCombineAsync(complete, (x, y) -> x, e));
3429 +
3430 +            fs.add(complete.thenAcceptBothAsync(incomplete, (x, y) -> {}, e));
3431 +            fs.add(incomplete.thenAcceptBothAsync(complete, (x, y) -> {}, e));
3432 +
3433 +            fs.add(complete.runAfterBothAsync(incomplete, () -> {}, e));
3434 +            fs.add(incomplete.runAfterBothAsync(complete, () -> {}, e));
3435 +
3436 +            for (CompletableFuture<?> future : fs)
3437 +                checkIncomplete(future);
3438 +            futures.addAll(fs);
3439 +        }
3440 +
3441 +        {
3442 +            List<CompletableFuture<?>> fs = new ArrayList<>();
3443 +
3444 +            fs.add(complete.applyToEitherAsync(incomplete, z -> z, e));
3445 +            fs.add(incomplete.applyToEitherAsync(complete, z -> z, e));
3446 +
3447 +            fs.add(complete.acceptEitherAsync(incomplete, z -> {}, e));
3448 +            fs.add(incomplete.acceptEitherAsync(complete, z -> {}, e));
3449 +
3450 +            fs.add(complete.runAfterEitherAsync(incomplete, () -> {}, e));
3451 +            fs.add(incomplete.runAfterEitherAsync(complete, () -> {}, e));
3452 +
3453 +            for (CompletableFuture<?> future : fs)
3454 +                checkCompletedWithWrappedException(future, e.ex);
3455 +            futures.addAll(fs);
3456 +        }
3457 +
3458 +        incomplete.complete(v);
3459 +
3460 +        for (CompletableFuture<?> future : futures)
3461 +            checkCompletedWithWrappedException(future, e.ex);
3462 +
3463 +        assertEquals(futures.size(), e.count.get());
3464 +    }}
3465 +
3466 +    /**
3467 +     * Test submissions to an executor that rejects all tasks, but
3468 +     * should never be invoked because the dependent future is
3469 +     * explicitly completed.
3470 +     */
3471 +    public void testRejectingExecutorNeverInvoked() {
3472 +        for (Integer v : new Integer[] { 1, null })
3473 +    {
3474 +        final CountingRejectingExecutor e = new CountingRejectingExecutor();
3475 +
3476 +        final CompletableFuture<Integer> complete = CompletableFuture.completedFuture(v);
3477 +        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
3478 +
3479 +        List<CompletableFuture<?>> futures = new ArrayList<>();
3480 +
3481 +        List<CompletableFuture<Integer>> srcs = new ArrayList<>();
3482 +        srcs.add(complete);
3483 +        srcs.add(incomplete);
3484 +
3485 +        List<CompletableFuture<?>> fs = new ArrayList<>();
3486 +        fs.add(incomplete.thenRunAsync(() -> {}, e));
3487 +        fs.add(incomplete.thenAcceptAsync(z -> {}, e));
3488 +        fs.add(incomplete.thenApplyAsync(z -> z, e));
3489 +
3490 +        fs.add(incomplete.thenCombineAsync(incomplete, (x, y) -> x, e));
3491 +        fs.add(incomplete.thenAcceptBothAsync(incomplete, (x, y) -> {}, e));
3492 +        fs.add(incomplete.runAfterBothAsync(incomplete, () -> {}, e));
3493 +
3494 +        fs.add(incomplete.applyToEitherAsync(incomplete, z -> z, e));
3495 +        fs.add(incomplete.acceptEitherAsync(incomplete, z -> {}, e));
3496 +        fs.add(incomplete.runAfterEitherAsync(incomplete, () -> {}, e));
3497 +
3498 +        fs.add(incomplete.thenComposeAsync(z -> null, e));
3499 +        fs.add(incomplete.whenCompleteAsync((z, t) -> {}, e));
3500 +        fs.add(incomplete.handleAsync((z, t) -> null, e));
3501 +
3502 +        fs.add(complete.thenCombineAsync(incomplete, (x, y) -> x, e));
3503 +        fs.add(incomplete.thenCombineAsync(complete, (x, y) -> x, e));
3504 +
3505 +        fs.add(complete.thenAcceptBothAsync(incomplete, (x, y) -> {}, e));
3506 +        fs.add(incomplete.thenAcceptBothAsync(complete, (x, y) -> {}, e));
3507 +
3508 +        fs.add(complete.runAfterBothAsync(incomplete, () -> {}, e));
3509 +        fs.add(incomplete.runAfterBothAsync(complete, () -> {}, e));
3510 +
3511 +        for (CompletableFuture<?> future : fs)
3512 +            checkIncomplete(future);
3513 +
3514 +        for (CompletableFuture<?> future : fs)
3515 +            future.complete(null);
3516 +
3517 +        incomplete.complete(v);
3518 +
3519 +        for (CompletableFuture<?> future : fs)
3520 +            checkCompletedNormally(future, null);
3521 +
3522 +        assertEquals(0, e.count.get());
3523 +    }}
3524 +
3525 +    /**
3526       * toCompletableFuture returns this CompletableFuture.
3527       */
3528      public void testToCompletableFuture() {
# Line 3346 | Line 3555 | public class CompletableFutureTest exten
3555       */
3556      public void testCompletedStage() {
3557          AtomicInteger x = new AtomicInteger(0);
3558 <        AtomicReference<Throwable> r = new AtomicReference<Throwable>();
3558 >        AtomicReference<Throwable> r = new AtomicReference<>();
3559          CompletionStage<Integer> f = CompletableFuture.completedStage(1);
3560          f.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3561          assertEquals(x.get(), 1);
# Line 3391 | Line 3600 | public class CompletableFutureTest exten
3600       * copy returns a CompletableFuture that is completed normally,
3601       * with the same value, when source is.
3602       */
3603 <    public void testCopy() {
3603 >    public void testCopy_normalCompletion() {
3604 >        for (boolean createIncomplete : new boolean[] { true, false })
3605 >        for (Integer v1 : new Integer[] { 1, null })
3606 >    {
3607          CompletableFuture<Integer> f = new CompletableFuture<>();
3608 +        if (!createIncomplete) assertTrue(f.complete(v1));
3609          CompletableFuture<Integer> g = f.copy();
3610 <        checkIncomplete(f);
3611 <        checkIncomplete(g);
3612 <        f.complete(1);
3613 <        checkCompletedNormally(f, 1);
3614 <        checkCompletedNormally(g, 1);
3615 <    }
3610 >        if (createIncomplete) {
3611 >            checkIncomplete(f);
3612 >            checkIncomplete(g);
3613 >            assertTrue(f.complete(v1));
3614 >        }
3615 >        checkCompletedNormally(f, v1);
3616 >        checkCompletedNormally(g, v1);
3617 >    }}
3618  
3619      /**
3620       * copy returns a CompletableFuture that is completed exceptionally
3621       * when source is.
3622       */
3623 <    public void testCopy2() {
3623 >    public void testCopy_exceptionalCompletion() {
3624 >        for (boolean createIncomplete : new boolean[] { true, false })
3625 >    {
3626 >        CFException ex = new CFException();
3627          CompletableFuture<Integer> f = new CompletableFuture<>();
3628 +        if (!createIncomplete) f.completeExceptionally(ex);
3629          CompletableFuture<Integer> g = f.copy();
3630 <        checkIncomplete(f);
3631 <        checkIncomplete(g);
3632 <        CFException ex = new CFException();
3633 <        f.completeExceptionally(ex);
3630 >        if (createIncomplete) {
3631 >            checkIncomplete(f);
3632 >            checkIncomplete(g);
3633 >            f.completeExceptionally(ex);
3634 >        }
3635          checkCompletedExceptionally(f, ex);
3636          checkCompletedWithWrappedException(g, ex);
3637 +    }}
3638 +
3639 +    /**
3640 +     * Completion of a copy does not complete its source.
3641 +     */
3642 +    public void testCopy_oneWayPropagation() {
3643 +        CompletableFuture<Integer> f = new CompletableFuture<>();
3644 +        assertTrue(f.copy().complete(1));
3645 +        assertTrue(f.copy().complete(null));
3646 +        assertTrue(f.copy().cancel(true));
3647 +        assertTrue(f.copy().cancel(false));
3648 +        assertTrue(f.copy().completeExceptionally(new CFException()));
3649 +        checkIncomplete(f);
3650      }
3651  
3652      /**
# Line 3424 | Line 3657 | public class CompletableFutureTest exten
3657          CompletableFuture<Integer> f = new CompletableFuture<>();
3658          CompletionStage<Integer> g = f.minimalCompletionStage();
3659          AtomicInteger x = new AtomicInteger(0);
3660 <        AtomicReference<Throwable> r = new AtomicReference<Throwable>();
3660 >        AtomicReference<Throwable> r = new AtomicReference<>();
3661          checkIncomplete(f);
3662          g.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3663          f.complete(1);
# Line 3441 | Line 3674 | public class CompletableFutureTest exten
3674          CompletableFuture<Integer> f = new CompletableFuture<>();
3675          CompletionStage<Integer> g = f.minimalCompletionStage();
3676          AtomicInteger x = new AtomicInteger(0);
3677 <        AtomicReference<Throwable> r = new AtomicReference<Throwable>();
3677 >        AtomicReference<Throwable> r = new AtomicReference<>();
3678          g.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3679          checkIncomplete(f);
3680          CFException ex = new CFException();
# Line 3459 | Line 3692 | public class CompletableFutureTest exten
3692          CFException ex = new CFException();
3693          CompletionStage<Integer> f = CompletableFuture.failedStage(ex);
3694          AtomicInteger x = new AtomicInteger(0);
3695 <        AtomicReference<Throwable> r = new AtomicReference<Throwable>();
3695 >        AtomicReference<Throwable> r = new AtomicReference<>();
3696          f.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3697          assertEquals(x.get(), 0);
3698          assertEquals(r.get(), ex);
# Line 3483 | Line 3716 | public class CompletableFutureTest exten
3716      public void testCompleteAsync2() {
3717          CompletableFuture<Integer> f = new CompletableFuture<>();
3718          CFException ex = new CFException();
3719 <        f.completeAsync(() -> {if (true) throw ex; return 1;});
3719 >        f.completeAsync(() -> { throw ex; });
3720          try {
3721              f.join();
3722              shouldThrow();
# Line 3513 | Line 3746 | public class CompletableFutureTest exten
3746          CompletableFuture<Integer> f = new CompletableFuture<>();
3747          CFException ex = new CFException();
3748          ThreadExecutor executor = new ThreadExecutor();
3749 <        f.completeAsync(() -> {if (true) throw ex; return 1;}, executor);
3749 >        f.completeAsync(() -> { throw ex; }, executor);
3750          try {
3751              f.join();
3752              shouldThrow();
# Line 3529 | Line 3762 | public class CompletableFutureTest exten
3762          long timeoutMillis = timeoutMillis();
3763          CompletableFuture<Integer> f = new CompletableFuture<>();
3764          long startTime = System.nanoTime();
3765 <        f.orTimeout(timeoutMillis, MILLISECONDS);
3765 >        assertSame(f, f.orTimeout(timeoutMillis, MILLISECONDS));
3766          checkCompletedWithTimeoutException(f);
3767          assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
3768      }
# Line 3544 | Line 3777 | public class CompletableFutureTest exten
3777          CompletableFuture<Integer> g = new CompletableFuture<>();
3778          long startTime = System.nanoTime();
3779          f.complete(v1);
3780 <        f.orTimeout(LONG_DELAY_MS, MILLISECONDS);
3781 <        g.orTimeout(LONG_DELAY_MS, MILLISECONDS);
3780 >        assertSame(f, f.orTimeout(LONG_DELAY_MS, MILLISECONDS));
3781 >        assertSame(g, g.orTimeout(LONG_DELAY_MS, MILLISECONDS));
3782          g.complete(v1);
3783          checkCompletedNormally(f, v1);
3784          checkCompletedNormally(g, v1);
# Line 3560 | Line 3793 | public class CompletableFutureTest exten
3793                         () -> testCompleteOnTimeout_timesOut(null));
3794      }
3795  
3796 +    /**
3797 +     * completeOnTimeout completes with given value if not complete
3798 +     */
3799      public void testCompleteOnTimeout_timesOut(Integer v) {
3800          long timeoutMillis = timeoutMillis();
3801          CompletableFuture<Integer> f = new CompletableFuture<>();
3802          long startTime = System.nanoTime();
3803 <        f.completeOnTimeout(v, timeoutMillis, MILLISECONDS);
3803 >        assertSame(f, f.completeOnTimeout(v, timeoutMillis, MILLISECONDS));
3804          assertSame(v, f.join());
3805          assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
3806          f.complete(99);         // should have no effect
# Line 3581 | Line 3817 | public class CompletableFutureTest exten
3817          CompletableFuture<Integer> g = new CompletableFuture<>();
3818          long startTime = System.nanoTime();
3819          f.complete(v1);
3820 <        f.completeOnTimeout(-1, LONG_DELAY_MS, MILLISECONDS);
3821 <        g.completeOnTimeout(-1, LONG_DELAY_MS, MILLISECONDS);
3820 >        assertSame(f, f.completeOnTimeout(-1, LONG_DELAY_MS, MILLISECONDS));
3821 >        assertSame(g, g.completeOnTimeout(-1, LONG_DELAY_MS, MILLISECONDS));
3822          g.complete(v1);
3823          checkCompletedNormally(f, v1);
3824          checkCompletedNormally(g, v1);
# Line 3633 | Line 3869 | public class CompletableFutureTest exten
3869      //--- tests of implementation details; not part of official tck ---
3870  
3871      Object resultOf(CompletableFuture<?> f) {
3872 +        SecurityManager sm = System.getSecurityManager();
3873 +        if (sm != null) {
3874 +            try {
3875 +                System.setSecurityManager(null);
3876 +            } catch (SecurityException giveUp) {
3877 +                return "Reflection not available";
3878 +            }
3879 +        }
3880 +
3881          try {
3882              java.lang.reflect.Field resultField
3883                  = CompletableFuture.class.getDeclaredField("result");
3884              resultField.setAccessible(true);
3885              return resultField.get(f);
3886 <        } catch (Throwable t) { throw new AssertionError(t); }
3886 >        } catch (Throwable t) {
3887 >            throw new AssertionError(t);
3888 >        } finally {
3889 >            if (sm != null) System.setSecurityManager(sm);
3890 >        }
3891      }
3892  
3893      public void testExceptionPropagationReusesResultObject() {
# Line 3649 | Line 3898 | public class CompletableFutureTest exten
3898          final CompletableFuture<Integer> v42 = CompletableFuture.completedFuture(42);
3899          final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
3900  
3901 +        final Runnable noopRunnable = new Noop(m);
3902 +        final Consumer<Integer> noopConsumer = new NoopConsumer(m);
3903 +        final Function<Integer, Integer> incFunction = new IncFunction(m);
3904 +
3905          List<Function<CompletableFuture<Integer>, CompletableFuture<?>>> funs
3906              = new ArrayList<>();
3907  
3908 <        funs.add((y) -> m.thenRun(y, new Noop(m)));
3909 <        funs.add((y) -> m.thenAccept(y, new NoopConsumer(m)));
3910 <        funs.add((y) -> m.thenApply(y, new IncFunction(m)));
3911 <
3912 <        funs.add((y) -> m.runAfterEither(y, incomplete, new Noop(m)));
3913 <        funs.add((y) -> m.acceptEither(y, incomplete, new NoopConsumer(m)));
3914 <        funs.add((y) -> m.applyToEither(y, incomplete, new IncFunction(m)));
3915 <
3916 <        funs.add((y) -> m.runAfterBoth(y, v42, new Noop(m)));
3917 <        funs.add((y) -> m.thenAcceptBoth(y, v42, new SubtractAction(m)));
3918 <        funs.add((y) -> m.thenCombine(y, v42, new SubtractFunction(m)));
3919 <
3920 <        funs.add((y) -> m.whenComplete(y, (Integer r, Throwable t) -> {}));
3921 <
3922 <        funs.add((y) -> m.thenCompose(y, new CompletableFutureInc(m)));
3923 <
3924 <        funs.add((y) -> CompletableFuture.allOf(new CompletableFuture<?>[] {y, v42}));
3925 <        funs.add((y) -> CompletableFuture.anyOf(new CompletableFuture<?>[] {y, incomplete}));
3908 >        funs.add(y -> m.thenRun(y, noopRunnable));
3909 >        funs.add(y -> m.thenAccept(y, noopConsumer));
3910 >        funs.add(y -> m.thenApply(y, incFunction));
3911 >
3912 >        funs.add(y -> m.runAfterEither(y, incomplete, noopRunnable));
3913 >        funs.add(y -> m.acceptEither(y, incomplete, noopConsumer));
3914 >        funs.add(y -> m.applyToEither(y, incomplete, incFunction));
3915 >
3916 >        funs.add(y -> m.runAfterBoth(y, v42, noopRunnable));
3917 >        funs.add(y -> m.runAfterBoth(v42, y, noopRunnable));
3918 >        funs.add(y -> m.thenAcceptBoth(y, v42, new SubtractAction(m)));
3919 >        funs.add(y -> m.thenAcceptBoth(v42, y, new SubtractAction(m)));
3920 >        funs.add(y -> m.thenCombine(y, v42, new SubtractFunction(m)));
3921 >        funs.add(y -> m.thenCombine(v42, y, new SubtractFunction(m)));
3922 >
3923 >        funs.add(y -> m.whenComplete(y, (Integer r, Throwable t) -> {}));
3924 >
3925 >        funs.add(y -> m.thenCompose(y, new CompletableFutureInc(m)));
3926 >
3927 >        funs.add(y -> CompletableFuture.allOf(y));
3928 >        funs.add(y -> CompletableFuture.allOf(y, v42));
3929 >        funs.add(y -> CompletableFuture.allOf(v42, y));
3930 >        funs.add(y -> CompletableFuture.anyOf(y));
3931 >        funs.add(y -> CompletableFuture.anyOf(y, incomplete));
3932 >        funs.add(y -> CompletableFuture.anyOf(incomplete, y));
3933  
3934          for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3935                   fun : funs) {
3936              CompletableFuture<Integer> f = new CompletableFuture<>();
3937              f.completeExceptionally(ex);
3938 <            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3938 >            CompletableFuture<Integer> src = m.thenApply(f, incFunction);
3939              checkCompletedWithWrappedException(src, ex);
3940              CompletableFuture<?> dep = fun.apply(src);
3941              checkCompletedWithWrappedException(dep, ex);
# Line 3685 | Line 3945 | public class CompletableFutureTest exten
3945          for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3946                   fun : funs) {
3947              CompletableFuture<Integer> f = new CompletableFuture<>();
3948 <            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3948 >            CompletableFuture<Integer> src = m.thenApply(f, incFunction);
3949              CompletableFuture<?> dep = fun.apply(src);
3950              f.completeExceptionally(ex);
3951              checkCompletedWithWrappedException(src, ex);
# Line 3699 | Line 3959 | public class CompletableFutureTest exten
3959              CompletableFuture<Integer> f = new CompletableFuture<>();
3960              f.cancel(mayInterruptIfRunning);
3961              checkCancelled(f);
3962 <            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3962 >            CompletableFuture<Integer> src = m.thenApply(f, incFunction);
3963              checkCompletedWithWrappedCancellationException(src);
3964              CompletableFuture<?> dep = fun.apply(src);
3965              checkCompletedWithWrappedCancellationException(dep);
# Line 3710 | Line 3970 | public class CompletableFutureTest exten
3970          for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3971                   fun : funs) {
3972              CompletableFuture<Integer> f = new CompletableFuture<>();
3973 <            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3973 >            CompletableFuture<Integer> src = m.thenApply(f, incFunction);
3974              CompletableFuture<?> dep = fun.apply(src);
3975              f.cancel(mayInterruptIfRunning);
3976              checkCancelled(f);
# Line 3721 | Line 3981 | public class CompletableFutureTest exten
3981      }}
3982  
3983      /**
3984 <     * Minimal completion stages throw UOE for all non-CompletionStage methods
3984 >     * Minimal completion stages throw UOE for most non-CompletionStage methods
3985       */
3986      public void testMinimalCompletionStage_minimality() {
3987          if (!testImplementationDetails) return;
3988          Function<Method, String> toSignature =
3989 <            (method) -> method.getName() + Arrays.toString(method.getParameterTypes());
3989 >            method -> method.getName() + Arrays.toString(method.getParameterTypes());
3990          Predicate<Method> isNotStatic =
3991 <            (method) -> (method.getModifiers() & Modifier.STATIC) == 0;
3991 >            method -> (method.getModifiers() & Modifier.STATIC) == 0;
3992          List<Method> minimalMethods =
3993              Stream.of(Object.class, CompletionStage.class)
3994 <            .flatMap((klazz) -> Stream.of(klazz.getMethods()))
3994 >            .flatMap(klazz -> Stream.of(klazz.getMethods()))
3995              .filter(isNotStatic)
3996              .collect(Collectors.toList());
3997          // Methods from CompletableFuture permitted NOT to throw UOE
# Line 3747 | Line 4007 | public class CompletableFutureTest exten
4007              .collect(Collectors.toSet());
4008          List<Method> allMethods = Stream.of(CompletableFuture.class.getMethods())
4009              .filter(isNotStatic)
4010 <            .filter((method) -> !permittedMethodSignatures.contains(toSignature.apply(method)))
4010 >            .filter(method -> !permittedMethodSignatures.contains(toSignature.apply(method)))
4011              .collect(Collectors.toList());
4012  
4013 <        CompletionStage<Integer> minimalStage =
4013 >        List<CompletionStage<Integer>> stages = new ArrayList<>();
4014 >        CompletionStage<Integer> min =
4015              new CompletableFuture<Integer>().minimalCompletionStage();
4016 +        stages.add(min);
4017 +        stages.add(min.thenApply(x -> x));
4018 +        stages.add(CompletableFuture.completedStage(1));
4019 +        stages.add(CompletableFuture.failedStage(new CFException()));
4020  
4021          List<Method> bugs = new ArrayList<>();
4022          for (Method method : allMethods) {
# Line 3767 | Line 4032 | public class CompletableFutureTest exten
4032                  else if (parameterTypes[i] == long.class)
4033                      args[i] = 0L;
4034              }
4035 <            try {
4036 <                method.invoke(minimalStage, args);
4037 <                bugs.add(method);
3773 <            }
3774 <            catch (java.lang.reflect.InvocationTargetException expected) {
3775 <                if (! (expected.getCause() instanceof UnsupportedOperationException)) {
4035 >            for (CompletionStage<Integer> stage : stages) {
4036 >                try {
4037 >                    method.invoke(stage, args);
4038                      bugs.add(method);
3777                    // expected.getCause().printStackTrace();
4039                  }
4040 +                catch (java.lang.reflect.InvocationTargetException expected) {
4041 +                    if (! (expected.getCause() instanceof UnsupportedOperationException)) {
4042 +                        bugs.add(method);
4043 +                        // expected.getCause().printStackTrace();
4044 +                    }
4045 +                }
4046 +                catch (ReflectiveOperationException bad) { throw new Error(bad); }
4047              }
3780            catch (ReflectiveOperationException bad) { throw new Error(bad); }
4048          }
4049          if (!bugs.isEmpty())
4050 <            throw new Error("Methods did not throw UOE: " + bugs.toString());
4050 >            throw new Error("Methods did not throw UOE: " + bugs);
4051 >    }
4052 >
4053 >    /**
4054 >     * minimalStage.toCompletableFuture() returns a CompletableFuture that
4055 >     * is completed normally, with the same value, when source is.
4056 >     */
4057 >    public void testMinimalCompletionStage_toCompletableFuture_normalCompletion() {
4058 >        for (boolean createIncomplete : new boolean[] { true, false })
4059 >        for (Integer v1 : new Integer[] { 1, null })
4060 >    {
4061 >        CompletableFuture<Integer> f = new CompletableFuture<>();
4062 >        CompletionStage<Integer> minimal = f.minimalCompletionStage();
4063 >        if (!createIncomplete) assertTrue(f.complete(v1));
4064 >        CompletableFuture<Integer> g = minimal.toCompletableFuture();
4065 >        if (createIncomplete) {
4066 >            checkIncomplete(f);
4067 >            checkIncomplete(g);
4068 >            assertTrue(f.complete(v1));
4069 >        }
4070 >        checkCompletedNormally(f, v1);
4071 >        checkCompletedNormally(g, v1);
4072 >    }}
4073 >
4074 >    /**
4075 >     * minimalStage.toCompletableFuture() returns a CompletableFuture that
4076 >     * is completed exceptionally when source is.
4077 >     */
4078 >    public void testMinimalCompletionStage_toCompletableFuture_exceptionalCompletion() {
4079 >        for (boolean createIncomplete : new boolean[] { true, false })
4080 >    {
4081 >        CFException ex = new CFException();
4082 >        CompletableFuture<Integer> f = new CompletableFuture<>();
4083 >        CompletionStage<Integer> minimal = f.minimalCompletionStage();
4084 >        if (!createIncomplete) f.completeExceptionally(ex);
4085 >        CompletableFuture<Integer> g = minimal.toCompletableFuture();
4086 >        if (createIncomplete) {
4087 >            checkIncomplete(f);
4088 >            checkIncomplete(g);
4089 >            f.completeExceptionally(ex);
4090 >        }
4091 >        checkCompletedExceptionally(f, ex);
4092 >        checkCompletedWithWrappedException(g, ex);
4093 >    }}
4094 >
4095 >    /**
4096 >     * minimalStage.toCompletableFuture() gives mutable CompletableFuture
4097 >     */
4098 >    public void testMinimalCompletionStage_toCompletableFuture_mutable() {
4099 >        for (Integer v1 : new Integer[] { 1, null })
4100 >    {
4101 >        CompletableFuture<Integer> f = new CompletableFuture<>();
4102 >        CompletionStage minimal = f.minimalCompletionStage();
4103 >        CompletableFuture<Integer> g = minimal.toCompletableFuture();
4104 >        assertTrue(g.complete(v1));
4105 >        checkCompletedNormally(g, v1);
4106 >        checkIncomplete(f);
4107 >        checkIncomplete(minimal.toCompletableFuture());
4108 >    }}
4109 >
4110 >    /**
4111 >     * minimalStage.toCompletableFuture().join() awaits completion
4112 >     */
4113 >    public void testMinimalCompletionStage_toCompletableFuture_join() throws Exception {
4114 >        for (boolean createIncomplete : new boolean[] { true, false })
4115 >        for (Integer v1 : new Integer[] { 1, null })
4116 >    {
4117 >        CompletableFuture<Integer> f = new CompletableFuture<>();
4118 >        if (!createIncomplete) assertTrue(f.complete(v1));
4119 >        CompletionStage<Integer> minimal = f.minimalCompletionStage();
4120 >        if (createIncomplete) assertTrue(f.complete(v1));
4121 >        assertEquals(v1, minimal.toCompletableFuture().join());
4122 >        assertEquals(v1, minimal.toCompletableFuture().get());
4123 >        checkCompletedNormally(minimal.toCompletableFuture(), v1);
4124 >    }}
4125 >
4126 >    /**
4127 >     * Completion of a toCompletableFuture copy of a minimal stage
4128 >     * does not complete its source.
4129 >     */
4130 >    public void testMinimalCompletionStage_toCompletableFuture_oneWayPropagation() {
4131 >        CompletableFuture<Integer> f = new CompletableFuture<>();
4132 >        CompletionStage<Integer> g = f.minimalCompletionStage();
4133 >        assertTrue(g.toCompletableFuture().complete(1));
4134 >        assertTrue(g.toCompletableFuture().complete(null));
4135 >        assertTrue(g.toCompletableFuture().cancel(true));
4136 >        assertTrue(g.toCompletableFuture().cancel(false));
4137 >        assertTrue(g.toCompletableFuture().completeExceptionally(new CFException()));
4138 >        checkIncomplete(g.toCompletableFuture());
4139 >        f.complete(1);
4140 >        checkCompletedNormally(g.toCompletableFuture(), 1);
4141 >    }
4142 >
4143 >    /** Demo utility method for external reliable toCompletableFuture */
4144 >    static <T> CompletableFuture<T> toCompletableFuture(CompletionStage<T> stage) {
4145 >        CompletableFuture<T> f = new CompletableFuture<>();
4146 >        stage.handle((T t, Throwable ex) -> {
4147 >                         if (ex != null) f.completeExceptionally(ex);
4148 >                         else f.complete(t);
4149 >                         return null;
4150 >                     });
4151 >        return f;
4152 >    }
4153 >
4154 >    /** Demo utility method to join a CompletionStage */
4155 >    static <T> T join(CompletionStage<T> stage) {
4156 >        return toCompletableFuture(stage).join();
4157      }
4158  
4159 +    /**
4160 +     * Joining a minimal stage "by hand" works
4161 +     */
4162 +    public void testMinimalCompletionStage_join_by_hand() {
4163 +        for (boolean createIncomplete : new boolean[] { true, false })
4164 +        for (Integer v1 : new Integer[] { 1, null })
4165 +    {
4166 +        CompletableFuture<Integer> f = new CompletableFuture<>();
4167 +        CompletionStage<Integer> minimal = f.minimalCompletionStage();
4168 +        CompletableFuture<Integer> g = new CompletableFuture<>();
4169 +        if (!createIncomplete) assertTrue(f.complete(v1));
4170 +        minimal.thenAccept(x -> g.complete(x));
4171 +        if (createIncomplete) assertTrue(f.complete(v1));
4172 +        g.join();
4173 +        checkCompletedNormally(g, v1);
4174 +        checkCompletedNormally(f, v1);
4175 +        assertEquals(v1, join(minimal));
4176 +    }}
4177 +
4178      static class Monad {
4179          static class ZeroException extends RuntimeException {
4180              public ZeroException() { super("monadic zero"); }
# Line 3799 | Line 4191 | public class CompletableFutureTest exten
4191          static <T,U,V> Function<T, CompletableFuture<V>> compose
4192              (Function<T, CompletableFuture<U>> f,
4193               Function<U, CompletableFuture<V>> g) {
4194 <            return (x) -> f.apply(x).thenCompose(g);
4194 >            return x -> f.apply(x).thenCompose(g);
4195          }
4196  
4197          static void assertZero(CompletableFuture<?> f) {
4198              try {
4199                  f.getNow(null);
4200 <                throw new AssertionFailedError("should throw");
4200 >                throw new AssertionError("should throw");
4201              } catch (CompletionException success) {
4202                  assertTrue(success.getCause() instanceof ZeroException);
4203              }
# Line 3879 | Line 4271 | public class CompletableFutureTest exten
4271  
4272          // Some mutually non-commutative functions
4273          Function<Long, CompletableFuture<Long>> triple
4274 <            = (x) -> Monad.unit(3 * x);
4274 >            = x -> Monad.unit(3 * x);
4275          Function<Long, CompletableFuture<Long>> inc
4276 <            = (x) -> Monad.unit(x + 1);
4276 >            = x -> Monad.unit(x + 1);
4277  
4278          // unit is a right identity: m >>= unit === m
4279          Monad.assertFutureEquals(inc.apply(5L).thenCompose(unit),
# Line 3893 | Line 4285 | public class CompletableFutureTest exten
4285          // associativity: (m >>= f) >>= g === m >>= ( \x -> (f x >>= g) )
4286          Monad.assertFutureEquals(
4287              unit.apply(5L).thenCompose(inc).thenCompose(triple),
4288 <            unit.apply(5L).thenCompose((x) -> inc.apply(x).thenCompose(triple)));
4288 >            unit.apply(5L).thenCompose(x -> inc.apply(x).thenCompose(triple)));
4289  
4290          // The case for CompletableFuture as an additive monad is weaker...
4291  
# Line 3903 | Line 4295 | public class CompletableFutureTest exten
4295          // left zero: zero >>= f === zero
4296          Monad.assertZero(zero.thenCompose(inc));
4297          // right zero: f >>= (\x -> zero) === zero
4298 <        Monad.assertZero(inc.apply(5L).thenCompose((x) -> zero));
4298 >        Monad.assertZero(inc.apply(5L).thenCompose(x -> zero));
4299  
4300          // f plus zero === f
4301          Monad.assertFutureEquals(Monad.unit(5L),
# Line 3929 | Line 4321 | public class CompletableFutureTest exten
4321                                   Monad.plus(godot, Monad.unit(5L)));
4322      }
4323  
4324 +    /** Test long recursive chains of CompletableFutures with cascading completions */
4325 +    @SuppressWarnings("FutureReturnValueIgnored")
4326 +    public void testRecursiveChains() throws Throwable {
4327 +        for (ExecutionMode m : ExecutionMode.values())
4328 +        for (boolean addDeadEnds : new boolean[] { true, false })
4329 +    {
4330 +        final int val = 42;
4331 +        final int n = expensiveTests ? 1_000 : 2;
4332 +        CompletableFuture<Integer> head = new CompletableFuture<>();
4333 +        CompletableFuture<Integer> tail = head;
4334 +        for (int i = 0; i < n; i++) {
4335 +            if (addDeadEnds) m.thenApply(tail, v -> v + 1);
4336 +            tail = m.thenApply(tail, v -> v + 1);
4337 +            if (addDeadEnds) m.applyToEither(tail, tail, v -> v + 1);
4338 +            tail = m.applyToEither(tail, tail, v -> v + 1);
4339 +            if (addDeadEnds) m.thenCombine(tail, tail, (v, w) -> v + 1);
4340 +            tail = m.thenCombine(tail, tail, (v, w) -> v + 1);
4341 +        }
4342 +        head.complete(val);
4343 +        assertEquals(val + 3 * n, (int) tail.join());
4344 +    }}
4345 +
4346      /**
4347       * A single CompletableFuture with many dependents.
4348       * A demo of scalability - runtime is O(n).
4349       */
4350 +    @SuppressWarnings("FutureReturnValueIgnored")
4351      public void testManyDependents() throws Throwable {
4352 <        final int n = 1_000;
4352 >        final int n = expensiveTests ? 1_000_000 : 10;
4353          final CompletableFuture<Void> head = new CompletableFuture<>();
4354          final CompletableFuture<Void> complete = CompletableFuture.completedFuture((Void)null);
4355          final AtomicInteger count = new AtomicInteger(0);
4356          for (int i = 0; i < n; i++) {
4357              head.thenRun(() -> count.getAndIncrement());
4358 <            head.thenAccept((x) -> count.getAndIncrement());
4359 <            head.thenApply((x) -> count.getAndIncrement());
4358 >            head.thenAccept(x -> count.getAndIncrement());
4359 >            head.thenApply(x -> count.getAndIncrement());
4360  
4361              head.runAfterBoth(complete, () -> count.getAndIncrement());
4362              head.thenAcceptBoth(complete, (x, y) -> count.getAndIncrement());
# Line 3951 | Line 4366 | public class CompletableFutureTest exten
4366              complete.thenCombine(head, (x, y) -> count.getAndIncrement());
4367  
4368              head.runAfterEither(new CompletableFuture<Void>(), () -> count.getAndIncrement());
4369 <            head.acceptEither(new CompletableFuture<Void>(), (x) -> count.getAndIncrement());
4370 <            head.applyToEither(new CompletableFuture<Void>(), (x) -> count.getAndIncrement());
4369 >            head.acceptEither(new CompletableFuture<Void>(), x -> count.getAndIncrement());
4370 >            head.applyToEither(new CompletableFuture<Void>(), x -> count.getAndIncrement());
4371              new CompletableFuture<Void>().runAfterEither(head, () -> count.getAndIncrement());
4372 <            new CompletableFuture<Void>().acceptEither(head, (x) -> count.getAndIncrement());
4373 <            new CompletableFuture<Void>().applyToEither(head, (x) -> count.getAndIncrement());
4372 >            new CompletableFuture<Void>().acceptEither(head, x -> count.getAndIncrement());
4373 >            new CompletableFuture<Void>().applyToEither(head, x -> count.getAndIncrement());
4374          }
4375          head.complete(null);
4376          assertEquals(5 * 3 * n, count.get());
4377      }
4378  
4379 +    /** ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest tck */
4380 +    @SuppressWarnings("FutureReturnValueIgnored")
4381 +    public void testCoCompletionGarbageRetention() throws Throwable {
4382 +        final int n = expensiveTests ? 1_000_000 : 10;
4383 +        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
4384 +        CompletableFuture<Integer> f;
4385 +        for (int i = 0; i < n; i++) {
4386 +            f = new CompletableFuture<>();
4387 +            f.runAfterEither(incomplete, () -> {});
4388 +            f.complete(null);
4389 +
4390 +            f = new CompletableFuture<>();
4391 +            f.acceptEither(incomplete, x -> {});
4392 +            f.complete(null);
4393 +
4394 +            f = new CompletableFuture<>();
4395 +            f.applyToEither(incomplete, x -> x);
4396 +            f.complete(null);
4397 +
4398 +            f = new CompletableFuture<>();
4399 +            CompletableFuture.anyOf(f, incomplete);
4400 +            f.complete(null);
4401 +        }
4402 +
4403 +        for (int i = 0; i < n; i++) {
4404 +            f = new CompletableFuture<>();
4405 +            incomplete.runAfterEither(f, () -> {});
4406 +            f.complete(null);
4407 +
4408 +            f = new CompletableFuture<>();
4409 +            incomplete.acceptEither(f, x -> {});
4410 +            f.complete(null);
4411 +
4412 +            f = new CompletableFuture<>();
4413 +            incomplete.applyToEither(f, x -> x);
4414 +            f.complete(null);
4415 +
4416 +            f = new CompletableFuture<>();
4417 +            CompletableFuture.anyOf(incomplete, f);
4418 +            f.complete(null);
4419 +        }
4420 +    }
4421 +
4422 +    /**
4423 +     * Reproduction recipe for:
4424 +     * 8160402: Garbage retention with CompletableFuture.anyOf
4425 +     * 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
4426 +     */
4427 +    public void testAnyOfGarbageRetention() throws Throwable {
4428 +        for (Integer v : new Integer[] { 1, null })
4429 +    {
4430 +        final int n = expensiveTests ? 100_000 : 10;
4431 +        CompletableFuture<Integer>[] fs
4432 +            = (CompletableFuture<Integer>[]) new CompletableFuture<?>[100];
4433 +        for (int i = 0; i < fs.length; i++)
4434 +            fs[i] = new CompletableFuture<>();
4435 +        fs[fs.length - 1].complete(v);
4436 +        for (int i = 0; i < n; i++)
4437 +            checkCompletedNormally(CompletableFuture.anyOf(fs), v);
4438 +    }}
4439 +
4440 +    /**
4441 +     * Checks for garbage retention with allOf.
4442 +     *
4443 +     * As of 2016-07, fails with OOME:
4444 +     * ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest -Djsr166.methodFilter=testCancelledAllOfGarbageRetention tck
4445 +     */
4446 +    public void testCancelledAllOfGarbageRetention() throws Throwable {
4447 +        final int n = expensiveTests ? 100_000 : 10;
4448 +        CompletableFuture<Integer>[] fs
4449 +            = (CompletableFuture<Integer>[]) new CompletableFuture<?>[100];
4450 +        for (int i = 0; i < fs.length; i++)
4451 +            fs[i] = new CompletableFuture<>();
4452 +        for (int i = 0; i < n; i++)
4453 +            assertTrue(CompletableFuture.allOf(fs).cancel(false));
4454 +    }
4455 +
4456 +    /**
4457 +     * Checks for garbage retention when a dependent future is
4458 +     * cancelled and garbage-collected.
4459 +     * 8161600: Garbage retention when source CompletableFutures are never completed
4460 +     *
4461 +     * As of 2016-07, fails with OOME:
4462 +     * ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest -Djsr166.methodFilter=testCancelledGarbageRetention tck
4463 +     */
4464 +    public void testCancelledGarbageRetention() throws Throwable {
4465 +        final int n = expensiveTests ? 100_000 : 10;
4466 +        CompletableFuture<Integer> neverCompleted = new CompletableFuture<>();
4467 +        for (int i = 0; i < n; i++)
4468 +            assertTrue(neverCompleted.thenRun(() -> {}).cancel(true));
4469 +    }
4470 +
4471 +    /**
4472 +     * Checks for garbage retention when MinimalStage.toCompletableFuture()
4473 +     * is invoked many times.
4474 +     * 8161600: Garbage retention when source CompletableFutures are never completed
4475 +     *
4476 +     * As of 2016-07, fails with OOME:
4477 +     * ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest -Djsr166.methodFilter=testToCompletableFutureGarbageRetention tck
4478 +     */
4479 +    public void testToCompletableFutureGarbageRetention() throws Throwable {
4480 +        final int n = expensiveTests ? 900_000 : 10;
4481 +        CompletableFuture<Integer> neverCompleted = new CompletableFuture<>();
4482 +        CompletionStage minimal = neverCompleted.minimalCompletionStage();
4483 +        for (int i = 0; i < n; i++)
4484 +            assertTrue(minimal.toCompletableFuture().cancel(true));
4485 +    }
4486 +
4487   //     static <U> U join(CompletionStage<U> stage) {
4488   //         CompletableFuture<U> f = new CompletableFuture<>();
4489   //         stage.whenComplete((v, ex) -> {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines