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.114 by jsr166, Fri Sep 4 19:59:18 2015 UTC vs.
Revision 1.209 by jsr166, Sun Sep 23 17:02:24 2018 UTC

# Line 7 | Line 7
7  
8   import static java.util.concurrent.TimeUnit.MILLISECONDS;
9   import static java.util.concurrent.TimeUnit.SECONDS;
10 + import static java.util.concurrent.CompletableFuture.completedFuture;
11 + import static java.util.concurrent.CompletableFuture.failedFuture;
12 +
13 + import java.lang.reflect.Method;
14 + import java.lang.reflect.Modifier;
15 +
16 + import java.util.stream.Collectors;
17 + import java.util.stream.Stream;
18  
19   import java.util.ArrayList;
20 + import java.util.Arrays;
21   import java.util.List;
22   import java.util.Objects;
23 + import java.util.Set;
24   import java.util.concurrent.Callable;
25   import java.util.concurrent.CancellationException;
26   import java.util.concurrent.CompletableFuture;
# Line 20 | 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;
24 import java.util.concurrent.TimeUnit;
35   import java.util.concurrent.atomic.AtomicInteger;
36   import java.util.concurrent.atomic.AtomicReference;
37   import java.util.function.BiConsumer;
38   import java.util.function.BiFunction;
39   import java.util.function.Consumer;
40   import java.util.function.Function;
41 + import java.util.function.Predicate;
42   import java.util.function.Supplier;
43  
44   import junit.framework.Test;
# Line 47 | 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());
67 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
68 <        try {
69 <            assertEquals(value, f.getNow(null));
70 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
71 <        try {
72 <            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 <    void checkCompletedWithWrappedCFException(CompletableFuture<?> f) {
96 <        long startTime = System.nanoTime();
97 <        long timeoutMillis = LONG_DELAY_MS;
98 <        try {
99 <            f.get(timeoutMillis, MILLISECONDS);
100 <            shouldThrow();
101 <        } catch (ExecutionException success) {
102 <            assertTrue(success.getCause() instanceof CFException);
103 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
89 <        assertTrue(millisElapsedSince(startTime) < timeoutMillis/2);
95 >    /**
96 >     * Returns the "raw" internal exceptional completion of f,
97 >     * without any additional wrapping with CompletionException.
98 >     */
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 <        try {
106 <            f.join();
107 <            shouldThrow();
108 <        } catch (CompletionException success) {
109 <            assertTrue(success.getCause() instanceof CFException);
105 >    void checkCompletedExceptionally(CompletableFuture<?> f,
106 >                                     boolean wrapped,
107 >                                     Consumer<Throwable> checker) {
108 >        Throwable cause = exceptionalCompletion(f);
109 >        if (wrapped) {
110 >            assertTrue(cause instanceof CompletionException);
111 >            cause = cause.getCause();
112          }
113 <        try {
98 <            f.getNow(null);
99 <            shouldThrow();
100 <        } catch (CompletionException success) {
101 <            assertTrue(success.getCause() instanceof CFException);
102 <        }
103 <        try {
104 <            f.get();
105 <            shouldThrow();
106 <        } catch (ExecutionException success) {
107 <            assertTrue(success.getCause() instanceof CFException);
108 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
109 <        assertTrue(f.isDone());
110 <        assertFalse(f.isCancelled());
111 <        assertTrue(f.toString().contains("[Completed exceptionally]"));
112 <    }
113 >        checker.accept(cause);
114  
114    <U> void checkCompletedExceptionallyWithRootCause(CompletableFuture<U> f,
115                                                      Throwable ex) {
115          long startTime = System.nanoTime();
117        long timeoutMillis = LONG_DELAY_MS;
116          try {
117 <            f.get(timeoutMillis, MILLISECONDS);
117 >            f.get(LONG_DELAY_MS, MILLISECONDS);
118              shouldThrow();
119          } catch (ExecutionException success) {
120 <            assertSame(ex, success.getCause());
120 >            assertSame(cause, success.getCause());
121          } catch (Throwable fail) { threadUnexpectedException(fail); }
122 <        assertTrue(millisElapsedSince(startTime) < timeoutMillis/2);
122 >        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS / 2);
123  
124          try {
125              f.join();
126              shouldThrow();
127          } catch (CompletionException success) {
128 <            assertSame(ex, success.getCause());
129 <        }
128 >            assertSame(cause, success.getCause());
129 >        } catch (Throwable fail) { threadUnexpectedException(fail); }
130 >
131          try {
132              f.getNow(null);
133              shouldThrow();
134          } catch (CompletionException success) {
135 <            assertSame(ex, success.getCause());
136 <        }
135 >            assertSame(cause, success.getCause());
136 >        } catch (Throwable fail) { threadUnexpectedException(fail); }
137 >
138          try {
139              f.get();
140              shouldThrow();
141          } catch (ExecutionException success) {
142 <            assertSame(ex, success.getCause());
142 >            assertSame(cause, success.getCause());
143          } catch (Throwable fail) { threadUnexpectedException(fail); }
144  
145        assertTrue(f.isDone());
145          assertFalse(f.isCancelled());
146 <        assertTrue(f.toString().contains("[Completed exceptionally]"));
146 >        assertTrue(f.isDone());
147 >        assertTrue(f.isCompletedExceptionally());
148 >        assertTrue(f.toString().matches(".*\\[.*Completed exceptionally.*\\]"));
149      }
150  
151 <    <U> void checkCompletedExceptionallyWithTimeout(CompletableFuture<U> f) {
152 <        long startTime = System.nanoTime();
153 <        long timeoutMillis = LONG_DELAY_MS;
154 <        try {
154 <            f.get(timeoutMillis, MILLISECONDS);
155 <            shouldThrow();
156 <        } catch (ExecutionException ex) {
157 <            assertTrue(ex.getCause() instanceof TimeoutException);
158 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
159 <        assertTrue(millisElapsedSince(startTime) < timeoutMillis/2);
160 <
161 <        try {
162 <            f.join();
163 <            shouldThrow();
164 <        } catch (Throwable ex) {
165 <            assertTrue(ex.getCause() instanceof TimeoutException);
166 <        }
167 <
168 <        try {
169 <            f.getNow(null);
170 <            shouldThrow();
171 <        } catch (Throwable ex) {
172 <            assertTrue(ex.getCause() instanceof TimeoutException);
173 <        }
151 >    void checkCompletedWithWrappedCFException(CompletableFuture<?> f) {
152 >        checkCompletedExceptionally(f, true,
153 >            t -> assertTrue(t instanceof CFException));
154 >    }
155  
156 <        try {
157 <            f.get();
158 <            shouldThrow();
159 <        } catch (ExecutionException ex) {
179 <            assertTrue(ex.getCause() instanceof TimeoutException);
180 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
156 >    void checkCompletedWithWrappedCancellationException(CompletableFuture<?> f) {
157 >        checkCompletedExceptionally(f, true,
158 >            t -> assertTrue(t instanceof CancellationException));
159 >    }
160  
161 <        assertTrue(f.isDone());
162 <        assertFalse(f.isCancelled());
163 <        assertTrue(f.toString().contains("[Completed exceptionally]"));
161 >    void checkCompletedWithTimeoutException(CompletableFuture<?> f) {
162 >        checkCompletedExceptionally(f, false,
163 >            t -> assertTrue(t instanceof TimeoutException));
164      }
165  
166 <    <U> void checkCompletedWithWrappedException(CompletableFuture<U> f,
167 <                                                Throwable ex) {
168 <        checkCompletedExceptionallyWithRootCause(f, ex);
190 <        try {
191 <            CompletableFuture<Throwable> spy = f.handle
192 <                ((U u, Throwable t) -> t);
193 <            assertTrue(spy.join() instanceof CompletionException);
194 <            assertSame(ex, spy.join().getCause());
195 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
166 >    void checkCompletedWithWrappedException(CompletableFuture<?> f,
167 >                                            Throwable ex) {
168 >        checkCompletedExceptionally(f, true, t -> assertSame(t, ex));
169      }
170  
171 <    <U> void checkCompletedExceptionally(CompletableFuture<U> f, Throwable ex) {
172 <        checkCompletedExceptionallyWithRootCause(f, ex);
200 <        try {
201 <            CompletableFuture<Throwable> spy = f.handle
202 <                ((U u, Throwable t) -> t);
203 <            assertSame(ex, spy.join());
204 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
171 >    void checkCompletedExceptionally(CompletableFuture<?> f, Throwable ex) {
172 >        checkCompletedExceptionally(f, false, t -> assertSame(t, ex));
173      }
174  
175      void checkCancelled(CompletableFuture<?> f) {
176          long startTime = System.nanoTime();
209        long timeoutMillis = LONG_DELAY_MS;
177          try {
178 <            f.get(timeoutMillis, MILLISECONDS);
178 >            f.get(LONG_DELAY_MS, MILLISECONDS);
179              shouldThrow();
180          } catch (CancellationException success) {
181          } catch (Throwable fail) { threadUnexpectedException(fail); }
182 <        assertTrue(millisElapsedSince(startTime) < timeoutMillis/2);
182 >        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS / 2);
183  
184          try {
185              f.join();
# Line 227 | Line 194 | public class CompletableFutureTest exten
194              shouldThrow();
195          } catch (CancellationException success) {
196          } catch (Throwable fail) { threadUnexpectedException(fail); }
230        assertTrue(f.isDone());
231        assertTrue(f.isCompletedExceptionally());
232        assertTrue(f.isCancelled());
233        assertTrue(f.toString().contains("[Completed exceptionally]"));
234    }
197  
198 <    void checkCompletedWithWrappedCancellationException(CompletableFuture<?> f) {
237 <        long startTime = System.nanoTime();
238 <        long timeoutMillis = LONG_DELAY_MS;
239 <        try {
240 <            f.get(timeoutMillis, MILLISECONDS);
241 <            shouldThrow();
242 <        } catch (ExecutionException success) {
243 <            assertTrue(success.getCause() instanceof CancellationException);
244 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
245 <        assertTrue(millisElapsedSince(startTime) < timeoutMillis/2);
198 >        assertTrue(exceptionalCompletion(f) instanceof CancellationException);
199  
247        try {
248            f.join();
249            shouldThrow();
250        } catch (CompletionException success) {
251            assertTrue(success.getCause() instanceof CancellationException);
252        }
253        try {
254            f.getNow(null);
255            shouldThrow();
256        } catch (CompletionException success) {
257            assertTrue(success.getCause() instanceof CancellationException);
258        }
259        try {
260            f.get();
261            shouldThrow();
262        } catch (ExecutionException success) {
263            assertTrue(success.getCause() instanceof CancellationException);
264        } catch (Throwable fail) { threadUnexpectedException(fail); }
200          assertTrue(f.isDone());
266        assertFalse(f.isCancelled());
201          assertTrue(f.isCompletedExceptionally());
202 <        assertTrue(f.toString().contains("[Completed exceptionally]"));
202 >        assertTrue(f.isCancelled());
203 >        assertTrue(f.toString().matches(".*\\[.*Completed exceptionally.*\\]"));
204      }
205  
206      /**
# Line 364 | 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 401 | 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 429 | 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 441 | 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 450 | 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 469 | 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 479 | 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 497 | 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 507 | 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 517 | 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); }
551          public CompletableFuture<Integer> apply(Integer x) {
552              invoked();
553              value = x;
554 <            CompletableFuture<Integer> f = new CompletableFuture<>();
555 <            assertTrue(f.complete(inc(x)));
556 <            return f;
554 >            return CompletableFuture.completedFuture(inc(x));
555 >        }
556 >    }
557 >
558 >    static class FailingExceptionalCompletableFutureFunction extends CheckedAction
559 >        implements Function<Throwable, CompletableFuture<Integer>>
560 >    {
561 >        final CFException ex;
562 >        FailingExceptionalCompletableFutureFunction(ExecutionMode m) { super(m); ex = new CFException(); }
563 >        public CompletableFuture<Integer> apply(Throwable x) {
564 >            invoked();
565 >            throw ex;
566 >        }
567 >    }
568 >
569 >    static class ExceptionalCompletableFutureFunction extends CheckedAction
570 >        implements Function<Throwable, CompletionStage<Integer>> {
571 >        final Integer value = 3;
572 >        ExceptionalCompletableFutureFunction(ExecutionMode m) { super(m); }
573 >        public CompletionStage<Integer> apply(Throwable x) {
574 >            invoked();
575 >            return CompletableFuture.completedFuture(value);
576          }
577      }
578  
579 <    class FailingCompletableFutureFunction extends CheckedIntegerAction
579 >    static class FailingCompletableFutureFunction extends CheckedIntegerAction
580          implements Function<Integer, CompletableFuture<Integer>>
581      {
582 <        FailingCompletableFutureFunction(ExecutionMode m) { super(m); }
582 >        final CFException ex;
583 >        FailingCompletableFutureFunction(ExecutionMode m) { super(m); ex = new CFException(); }
584          public CompletableFuture<Integer> apply(Integer x) {
585              invoked();
586              value = x;
587 <            throw new CFException();
587 >            throw ex;
588 >        }
589 >    }
590 >
591 >    static class CountingRejectingExecutor implements Executor {
592 >        final RejectedExecutionException ex = new RejectedExecutionException();
593 >        final AtomicInteger count = new AtomicInteger(0);
594 >        public void execute(Runnable r) {
595 >            count.getAndIncrement();
596 >            throw ex;
597          }
598      }
599  
# Line 704 | Line 691 | public class CompletableFutureTest exten
691                   Function<? super T,U> a) {
692                  return f.applyToEither(g, a);
693              }
694 +            public <T> CompletableFuture<T> exceptionally
695 +                (CompletableFuture<T> f,
696 +                 Function<Throwable, ? extends T> fn) {
697 +                return f.exceptionally(fn);
698 +            }
699 +            public <T> CompletableFuture<T> exceptionallyCompose
700 +                (CompletableFuture<T> f, Function<Throwable, ? extends CompletionStage<T>> fn) {
701 +                return f.exceptionallyCompose(fn);
702 +            }
703          },
708
704          ASYNC {
705              public void checkExecutionMode() {
706                  assertEquals(defaultExecutorIsCommonPool,
# Line 778 | Line 773 | public class CompletableFutureTest exten
773                   Function<? super T,U> a) {
774                  return f.applyToEitherAsync(g, a);
775              }
776 +            public <T> CompletableFuture<T> exceptionally
777 +                (CompletableFuture<T> f,
778 +                 Function<Throwable, ? extends T> fn) {
779 +                return f.exceptionallyAsync(fn);
780 +            }
781 +
782 +            public <T> CompletableFuture<T> exceptionallyCompose
783 +                (CompletableFuture<T> f, Function<Throwable, ? extends CompletionStage<T>> fn) {
784 +                return f.exceptionallyComposeAsync(fn);
785 +            }
786 +
787          },
788  
789          EXECUTOR {
# Line 851 | Line 857 | public class CompletableFutureTest exten
857                   Function<? super T,U> a) {
858                  return f.applyToEitherAsync(g, a, new ThreadExecutor());
859              }
860 +            public <T> CompletableFuture<T> exceptionally
861 +                (CompletableFuture<T> f,
862 +                 Function<Throwable, ? extends T> fn) {
863 +                return f.exceptionallyAsync(fn, new ThreadExecutor());
864 +            }
865 +            public <T> CompletableFuture<T> exceptionallyCompose
866 +                (CompletableFuture<T> f, Function<Throwable, ? extends CompletionStage<T>> fn) {
867 +                return f.exceptionallyComposeAsync(fn, new ThreadExecutor());
868 +            }
869 +
870          };
871  
872          public abstract void checkExecutionMode();
# Line 893 | Line 909 | public class CompletableFutureTest exten
909              (CompletableFuture<T> f,
910               CompletionStage<? extends T> g,
911               Function<? super T,U> a);
912 +        public abstract <T> CompletableFuture<T> exceptionally
913 +            (CompletableFuture<T> f,
914 +             Function<Throwable, ? extends T> fn);
915 +        public abstract <T> CompletableFuture<T> exceptionallyCompose
916 +            (CompletableFuture<T> f,
917 +             Function<Throwable, ? extends CompletionStage<T>> fn);
918      }
919  
920      /**
# Line 900 | Line 922 | public class CompletableFutureTest exten
922       * normally, and source result is propagated
923       */
924      public void testExceptionally_normalCompletion() {
925 +        for (ExecutionMode m : ExecutionMode.values())
926          for (boolean createIncomplete : new boolean[] { true, false })
927          for (Integer v1 : new Integer[] { 1, null })
928      {
906        final AtomicInteger a = new AtomicInteger(0);
929          final CompletableFuture<Integer> f = new CompletableFuture<>();
930          if (!createIncomplete) assertTrue(f.complete(v1));
931 <        final CompletableFuture<Integer> g = f.exceptionally
932 <            ((Throwable t) -> {
933 <                // Should not be called
934 <                a.getAndIncrement();
913 <                throw new AssertionError();
931 >        final CompletableFuture<Integer> g = m.exceptionally
932 >            (f, (Throwable t) -> {
933 >                threadFail("should not be called");
934 >                return null;            // unreached
935              });
936          if (createIncomplete) assertTrue(f.complete(v1));
937  
938          checkCompletedNormally(g, v1);
939          checkCompletedNormally(f, v1);
919        assertEquals(0, a.get());
940      }}
941  
942      /**
# Line 924 | Line 944 | public class CompletableFutureTest exten
944       * exception
945       */
946      public void testExceptionally_exceptionalCompletion() {
947 +        for (ExecutionMode m : ExecutionMode.values())
948          for (boolean createIncomplete : new boolean[] { true, false })
949          for (Integer v1 : new Integer[] { 1, null })
950      {
# Line 931 | Line 952 | public class CompletableFutureTest exten
952          final CFException ex = new CFException();
953          final CompletableFuture<Integer> f = new CompletableFuture<>();
954          if (!createIncomplete) f.completeExceptionally(ex);
955 <        final CompletableFuture<Integer> g = f.exceptionally
956 <            ((Throwable t) -> {
957 <                ExecutionMode.SYNC.checkExecutionMode();
955 >        final CompletableFuture<Integer> g = m.exceptionally
956 >            (f, (Throwable t) -> {
957 >                m.checkExecutionMode();
958                  threadAssertSame(t, ex);
959                  a.getAndIncrement();
960                  return v1;
# Line 944 | Line 965 | public class CompletableFutureTest exten
965          assertEquals(1, a.get());
966      }}
967  
968 +    /**
969 +     * If an "exceptionally action" throws an exception, it completes
970 +     * exceptionally with that exception
971 +     */
972      public void testExceptionally_exceptionalCompletionActionFailed() {
973 +        for (ExecutionMode m : ExecutionMode.values())
974          for (boolean createIncomplete : new boolean[] { true, false })
975      {
976          final AtomicInteger a = new AtomicInteger(0);
# Line 952 | Line 978 | public class CompletableFutureTest exten
978          final CFException ex2 = new CFException();
979          final CompletableFuture<Integer> f = new CompletableFuture<>();
980          if (!createIncomplete) f.completeExceptionally(ex1);
981 <        final CompletableFuture<Integer> g = f.exceptionally
982 <            ((Throwable t) -> {
983 <                ExecutionMode.SYNC.checkExecutionMode();
981 >        final CompletableFuture<Integer> g = m.exceptionally
982 >            (f, (Throwable t) -> {
983 >                m.checkExecutionMode();
984                  threadAssertSame(t, ex1);
985                  a.getAndIncrement();
986                  throw ex2;
# Line 962 | Line 988 | public class CompletableFutureTest exten
988          if (createIncomplete) f.completeExceptionally(ex1);
989  
990          checkCompletedWithWrappedException(g, ex2);
991 +        checkCompletedExceptionally(f, ex1);
992          assertEquals(1, a.get());
993      }}
994  
# Line 969 | Line 996 | public class CompletableFutureTest exten
996       * whenComplete action executes on normal completion, propagating
997       * source result.
998       */
999 <    public void testWhenComplete_normalCompletion1() {
999 >    public void testWhenComplete_normalCompletion() {
1000          for (ExecutionMode m : ExecutionMode.values())
1001          for (boolean createIncomplete : new boolean[] { true, false })
1002          for (Integer v1 : new Integer[] { 1, null })
# Line 979 | Line 1006 | public class CompletableFutureTest exten
1006          if (!createIncomplete) assertTrue(f.complete(v1));
1007          final CompletableFuture<Integer> g = m.whenComplete
1008              (f,
1009 <             (Integer x, Throwable t) -> {
1009 >             (Integer result, Throwable t) -> {
1010                  m.checkExecutionMode();
1011 <                threadAssertSame(x, v1);
1011 >                threadAssertSame(result, v1);
1012                  threadAssertNull(t);
1013                  a.getAndIncrement();
1014              });
# Line 1006 | Line 1033 | public class CompletableFutureTest exten
1033          if (!createIncomplete) f.completeExceptionally(ex);
1034          final CompletableFuture<Integer> g = m.whenComplete
1035              (f,
1036 <             (Integer x, Throwable t) -> {
1036 >             (Integer result, Throwable t) -> {
1037                  m.checkExecutionMode();
1038 <                threadAssertNull(x);
1038 >                threadAssertNull(result);
1039                  threadAssertSame(t, ex);
1040                  a.getAndIncrement();
1041              });
# Line 1033 | Line 1060 | public class CompletableFutureTest exten
1060          if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1061          final CompletableFuture<Integer> g = m.whenComplete
1062              (f,
1063 <             (Integer x, Throwable t) -> {
1063 >             (Integer result, Throwable t) -> {
1064                  m.checkExecutionMode();
1065 <                threadAssertNull(x);
1065 >                threadAssertNull(result);
1066                  threadAssertTrue(t instanceof CancellationException);
1067                  a.getAndIncrement();
1068              });
# Line 1050 | Line 1077 | public class CompletableFutureTest exten
1077       * If a whenComplete action throws an exception when triggered by
1078       * a normal completion, it completes exceptionally
1079       */
1080 <    public void testWhenComplete_actionFailed() {
1080 >    public void testWhenComplete_sourceCompletedNormallyActionFailed() {
1081          for (boolean createIncomplete : new boolean[] { true, false })
1082          for (ExecutionMode m : ExecutionMode.values())
1083          for (Integer v1 : new Integer[] { 1, null })
# Line 1061 | Line 1088 | public class CompletableFutureTest exten
1088          if (!createIncomplete) assertTrue(f.complete(v1));
1089          final CompletableFuture<Integer> g = m.whenComplete
1090              (f,
1091 <             (Integer x, Throwable t) -> {
1091 >             (Integer result, Throwable t) -> {
1092                  m.checkExecutionMode();
1093 <                threadAssertSame(x, v1);
1093 >                threadAssertSame(result, v1);
1094                  threadAssertNull(t);
1095                  a.getAndIncrement();
1096                  throw ex;
# Line 1078 | Line 1105 | public class CompletableFutureTest exten
1105      /**
1106       * If a whenComplete action throws an exception when triggered by
1107       * a source completion that also throws an exception, the source
1108 <     * exception takes precedence.
1108 >     * exception takes precedence (unlike handle)
1109       */
1110 <    public void testWhenComplete_actionFailedSourceFailed() {
1110 >    public void testWhenComplete_sourceFailedActionFailed() {
1111          for (boolean createIncomplete : new boolean[] { true, false })
1112          for (ExecutionMode m : ExecutionMode.values())
1113      {
# Line 1092 | Line 1119 | public class CompletableFutureTest exten
1119          if (!createIncomplete) f.completeExceptionally(ex1);
1120          final CompletableFuture<Integer> g = m.whenComplete
1121              (f,
1122 <             (Integer x, Throwable t) -> {
1122 >             (Integer result, Throwable t) -> {
1123                  m.checkExecutionMode();
1124                  threadAssertSame(t, ex1);
1125 <                threadAssertNull(x);
1125 >                threadAssertNull(result);
1126                  a.getAndIncrement();
1127                  throw ex2;
1128              });
# Line 1103 | Line 1130 | public class CompletableFutureTest exten
1130  
1131          checkCompletedWithWrappedException(g, ex1);
1132          checkCompletedExceptionally(f, ex1);
1133 +        if (testImplementationDetails) {
1134 +            assertEquals(1, ex1.getSuppressed().length);
1135 +            assertSame(ex2, ex1.getSuppressed()[0]);
1136 +        }
1137          assertEquals(1, a.get());
1138      }}
1139  
# Line 1120 | Line 1151 | public class CompletableFutureTest exten
1151          if (!createIncomplete) assertTrue(f.complete(v1));
1152          final CompletableFuture<Integer> g = m.handle
1153              (f,
1154 <             (Integer x, Throwable t) -> {
1154 >             (Integer result, Throwable t) -> {
1155                  m.checkExecutionMode();
1156 <                threadAssertSame(x, v1);
1156 >                threadAssertSame(result, v1);
1157                  threadAssertNull(t);
1158                  a.getAndIncrement();
1159                  return inc(v1);
# Line 1149 | Line 1180 | public class CompletableFutureTest exten
1180          if (!createIncomplete) f.completeExceptionally(ex);
1181          final CompletableFuture<Integer> g = m.handle
1182              (f,
1183 <             (Integer x, Throwable t) -> {
1183 >             (Integer result, Throwable t) -> {
1184                  m.checkExecutionMode();
1185 <                threadAssertNull(x);
1185 >                threadAssertNull(result);
1186                  threadAssertSame(t, ex);
1187                  a.getAndIncrement();
1188                  return v1;
# Line 1178 | Line 1209 | public class CompletableFutureTest exten
1209          if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1210          final CompletableFuture<Integer> g = m.handle
1211              (f,
1212 <             (Integer x, Throwable t) -> {
1212 >             (Integer result, Throwable t) -> {
1213                  m.checkExecutionMode();
1214 <                threadAssertNull(x);
1214 >                threadAssertNull(result);
1215                  threadAssertTrue(t instanceof CancellationException);
1216                  a.getAndIncrement();
1217                  return v1;
# Line 1193 | Line 1224 | public class CompletableFutureTest exten
1224      }}
1225  
1226      /**
1227 <     * handle result completes exceptionally if action does
1227 >     * If a "handle action" throws an exception when triggered by
1228 >     * a normal completion, it completes exceptionally
1229       */
1230 <    public void testHandle_sourceFailedActionFailed() {
1230 >    public void testHandle_sourceCompletedNormallyActionFailed() {
1231          for (ExecutionMode m : ExecutionMode.values())
1232          for (boolean createIncomplete : new boolean[] { true, false })
1233 +        for (Integer v1 : new Integer[] { 1, null })
1234      {
1235          final CompletableFuture<Integer> f = new CompletableFuture<>();
1236          final AtomicInteger a = new AtomicInteger(0);
1237 <        final CFException ex1 = new CFException();
1238 <        final CFException ex2 = new CFException();
1206 <        if (!createIncomplete) f.completeExceptionally(ex1);
1237 >        final CFException ex = new CFException();
1238 >        if (!createIncomplete) assertTrue(f.complete(v1));
1239          final CompletableFuture<Integer> g = m.handle
1240              (f,
1241 <             (Integer x, Throwable t) -> {
1241 >             (Integer result, Throwable t) -> {
1242                  m.checkExecutionMode();
1243 <                threadAssertNull(x);
1244 <                threadAssertSame(ex1, t);
1243 >                threadAssertSame(result, v1);
1244 >                threadAssertNull(t);
1245                  a.getAndIncrement();
1246 <                throw ex2;
1246 >                throw ex;
1247              });
1248 <        if (createIncomplete) f.completeExceptionally(ex1);
1248 >        if (createIncomplete) assertTrue(f.complete(v1));
1249  
1250 <        checkCompletedWithWrappedException(g, ex2);
1251 <        checkCompletedExceptionally(f, ex1);
1250 >        checkCompletedWithWrappedException(g, ex);
1251 >        checkCompletedNormally(f, v1);
1252          assertEquals(1, a.get());
1253      }}
1254  
1255 <    public void testHandle_sourceCompletedNormallyActionFailed() {
1256 <        for (ExecutionMode m : ExecutionMode.values())
1255 >    /**
1256 >     * If a "handle action" throws an exception when triggered by
1257 >     * a source completion that also throws an exception, the action
1258 >     * exception takes precedence (unlike whenComplete)
1259 >     */
1260 >    public void testHandle_sourceFailedActionFailed() {
1261          for (boolean createIncomplete : new boolean[] { true, false })
1262 <        for (Integer v1 : new Integer[] { 1, null })
1262 >        for (ExecutionMode m : ExecutionMode.values())
1263      {
1228        final CompletableFuture<Integer> f = new CompletableFuture<>();
1264          final AtomicInteger a = new AtomicInteger(0);
1265 <        final CFException ex = new CFException();
1266 <        if (!createIncomplete) assertTrue(f.complete(v1));
1265 >        final CFException ex1 = new CFException();
1266 >        final CFException ex2 = new CFException();
1267 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1268 >
1269 >        if (!createIncomplete) f.completeExceptionally(ex1);
1270          final CompletableFuture<Integer> g = m.handle
1271              (f,
1272 <             (Integer x, Throwable t) -> {
1272 >             (Integer result, Throwable t) -> {
1273                  m.checkExecutionMode();
1274 <                threadAssertSame(x, v1);
1275 <                threadAssertNull(t);
1274 >                threadAssertNull(result);
1275 >                threadAssertSame(ex1, t);
1276                  a.getAndIncrement();
1277 <                throw ex;
1277 >                throw ex2;
1278              });
1279 <        if (createIncomplete) assertTrue(f.complete(v1));
1279 >        if (createIncomplete) f.completeExceptionally(ex1);
1280  
1281 <        checkCompletedWithWrappedException(g, ex);
1282 <        checkCompletedNormally(f, v1);
1281 >        checkCompletedWithWrappedException(g, ex2);
1282 >        checkCompletedExceptionally(f, ex1);
1283          assertEquals(1, a.get());
1284      }}
1285  
# Line 1274 | Line 1312 | public class CompletableFutureTest exten
1312      {
1313          final FailingRunnable r = new FailingRunnable(m);
1314          final CompletableFuture<Void> f = m.runAsync(r);
1315 <        checkCompletedWithWrappedCFException(f);
1315 >        checkCompletedWithWrappedException(f, r.ex);
1316          r.assertInvoked();
1317      }}
1318  
1319 +    @SuppressWarnings("FutureReturnValueIgnored")
1320 +    public void testRunAsync_rejectingExecutor() {
1321 +        CountingRejectingExecutor e = new CountingRejectingExecutor();
1322 +        try {
1323 +            CompletableFuture.runAsync(() -> {}, e);
1324 +            shouldThrow();
1325 +        } catch (Throwable t) {
1326 +            assertSame(e.ex, t);
1327 +        }
1328 +
1329 +        assertEquals(1, e.count.get());
1330 +    }
1331 +
1332      /**
1333       * supplyAsync completes with result of supplier
1334       */
# Line 1308 | Line 1359 | public class CompletableFutureTest exten
1359      {
1360          FailingSupplier r = new FailingSupplier(m);
1361          CompletableFuture<Integer> f = m.supplyAsync(r);
1362 <        checkCompletedWithWrappedCFException(f);
1362 >        checkCompletedWithWrappedException(f, r.ex);
1363          r.assertInvoked();
1364      }}
1365  
1366 +    @SuppressWarnings("FutureReturnValueIgnored")
1367 +    public void testSupplyAsync_rejectingExecutor() {
1368 +        CountingRejectingExecutor e = new CountingRejectingExecutor();
1369 +        try {
1370 +            CompletableFuture.supplyAsync(() -> null, e);
1371 +            shouldThrow();
1372 +        } catch (Throwable t) {
1373 +            assertSame(e.ex, t);
1374 +        }
1375 +
1376 +        assertEquals(1, e.count.get());
1377 +    }
1378 +
1379      // seq completion methods
1380  
1381      /**
# Line 1430 | Line 1494 | public class CompletableFutureTest exten
1494          final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1495          final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1496  
1497 <        checkCompletedWithWrappedCFException(h0);
1498 <        checkCompletedWithWrappedCFException(h1);
1499 <        checkCompletedWithWrappedCFException(h2);
1500 <        checkCompletedWithWrappedCFException(h3);
1501 <        checkCompletedWithWrappedCFException(h4);
1502 <        checkCompletedWithWrappedCFException(h5);
1497 >        checkCompletedWithWrappedException(h0, rs[0].ex);
1498 >        checkCompletedWithWrappedException(h1, rs[1].ex);
1499 >        checkCompletedWithWrappedException(h2, rs[2].ex);
1500 >        checkCompletedWithWrappedException(h3, rs[3].ex);
1501 >        checkCompletedWithWrappedException(h4, rs[4].ex);
1502 >        checkCompletedWithWrappedException(h5, rs[5].ex);
1503          checkCompletedNormally(f, v1);
1504      }}
1505  
# Line 1534 | Line 1598 | public class CompletableFutureTest exten
1598          final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1599          final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1600  
1601 <        checkCompletedWithWrappedCFException(h0);
1602 <        checkCompletedWithWrappedCFException(h1);
1603 <        checkCompletedWithWrappedCFException(h2);
1604 <        checkCompletedWithWrappedCFException(h3);
1601 >        checkCompletedWithWrappedException(h0, rs[0].ex);
1602 >        checkCompletedWithWrappedException(h1, rs[1].ex);
1603 >        checkCompletedWithWrappedException(h2, rs[2].ex);
1604 >        checkCompletedWithWrappedException(h3, rs[3].ex);
1605          checkCompletedNormally(f, v1);
1606      }}
1607  
# Line 1636 | Line 1700 | public class CompletableFutureTest exten
1700          final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1701          final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1702  
1703 <        checkCompletedWithWrappedCFException(h0);
1704 <        checkCompletedWithWrappedCFException(h1);
1705 <        checkCompletedWithWrappedCFException(h2);
1706 <        checkCompletedWithWrappedCFException(h3);
1703 >        checkCompletedWithWrappedException(h0, rs[0].ex);
1704 >        checkCompletedWithWrappedException(h1, rs[1].ex);
1705 >        checkCompletedWithWrappedException(h2, rs[2].ex);
1706 >        checkCompletedWithWrappedException(h3, rs[3].ex);
1707          checkCompletedNormally(f, v1);
1708      }}
1709  
# Line 1801 | Line 1865 | public class CompletableFutureTest exten
1865          assertTrue(snd.complete(w2));
1866          final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1867  
1868 <        checkCompletedWithWrappedCFException(h1);
1869 <        checkCompletedWithWrappedCFException(h2);
1870 <        checkCompletedWithWrappedCFException(h3);
1868 >        checkCompletedWithWrappedException(h1, r1.ex);
1869 >        checkCompletedWithWrappedException(h2, r2.ex);
1870 >        checkCompletedWithWrappedException(h3, r3.ex);
1871          r1.assertInvoked();
1872          r2.assertInvoked();
1873          r3.assertInvoked();
# Line 1965 | Line 2029 | public class CompletableFutureTest exten
2029          assertTrue(snd.complete(w2));
2030          final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
2031  
2032 <        checkCompletedWithWrappedCFException(h1);
2033 <        checkCompletedWithWrappedCFException(h2);
2034 <        checkCompletedWithWrappedCFException(h3);
2032 >        checkCompletedWithWrappedException(h1, r1.ex);
2033 >        checkCompletedWithWrappedException(h2, r2.ex);
2034 >        checkCompletedWithWrappedException(h3, r3.ex);
2035          r1.assertInvoked();
2036          r2.assertInvoked();
2037          r3.assertInvoked();
# Line 2129 | Line 2193 | public class CompletableFutureTest exten
2193          assertTrue(snd.complete(w2));
2194          final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2195  
2196 <        checkCompletedWithWrappedCFException(h1);
2197 <        checkCompletedWithWrappedCFException(h2);
2198 <        checkCompletedWithWrappedCFException(h3);
2196 >        checkCompletedWithWrappedException(h1, r1.ex);
2197 >        checkCompletedWithWrappedException(h2, r2.ex);
2198 >        checkCompletedWithWrappedException(h3, r3.ex);
2199          r1.assertInvoked();
2200          r2.assertInvoked();
2201          r3.assertInvoked();
# Line 2421 | Line 2485 | public class CompletableFutureTest exten
2485          f.complete(v1);
2486          final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2487          final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2488 <        checkCompletedWithWrappedCFException(h0);
2489 <        checkCompletedWithWrappedCFException(h1);
2490 <        checkCompletedWithWrappedCFException(h2);
2491 <        checkCompletedWithWrappedCFException(h3);
2488 >        checkCompletedWithWrappedException(h0, rs[0].ex);
2489 >        checkCompletedWithWrappedException(h1, rs[1].ex);
2490 >        checkCompletedWithWrappedException(h2, rs[2].ex);
2491 >        checkCompletedWithWrappedException(h3, rs[3].ex);
2492          for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2493  
2494          g.complete(v2);
# Line 2433 | Line 2497 | public class CompletableFutureTest exten
2497          final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2498          final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2499  
2500 <        checkCompletedWithWrappedCFException(h4);
2500 >        checkCompletedWithWrappedException(h4, rs[4].ex);
2501          assertTrue(Objects.equals(v1, rs[4].value) ||
2502                     Objects.equals(v2, rs[4].value));
2503 <        checkCompletedWithWrappedCFException(h5);
2503 >        checkCompletedWithWrappedException(h5, rs[5].ex);
2504          assertTrue(Objects.equals(v1, rs[5].value) ||
2505                     Objects.equals(v2, rs[5].value));
2506  
# Line 2574 | Line 2638 | public class CompletableFutureTest exten
2638  
2639          // unspecified behavior - both source completions available
2640          try {
2641 <            assertEquals(null, h0.join());
2641 >            assertNull(h0.join());
2642              rs[0].assertValue(v1);
2643          } catch (CompletionException ok) {
2644              checkCompletedWithWrappedException(h0, ex);
2645              rs[0].assertNotInvoked();
2646          }
2647          try {
2648 <            assertEquals(null, h1.join());
2648 >            assertNull(h1.join());
2649              rs[1].assertValue(v1);
2650          } catch (CompletionException ok) {
2651              checkCompletedWithWrappedException(h1, ex);
2652              rs[1].assertNotInvoked();
2653          }
2654          try {
2655 <            assertEquals(null, h2.join());
2655 >            assertNull(h2.join());
2656              rs[2].assertValue(v1);
2657          } catch (CompletionException ok) {
2658              checkCompletedWithWrappedException(h2, ex);
2659              rs[2].assertNotInvoked();
2660          }
2661          try {
2662 <            assertEquals(null, h3.join());
2662 >            assertNull(h3.join());
2663              rs[3].assertValue(v1);
2664          } catch (CompletionException ok) {
2665              checkCompletedWithWrappedException(h3, ex);
# Line 2680 | Line 2744 | public class CompletableFutureTest exten
2744          f.complete(v1);
2745          final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2746          final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2747 <        checkCompletedWithWrappedCFException(h0);
2748 <        checkCompletedWithWrappedCFException(h1);
2749 <        checkCompletedWithWrappedCFException(h2);
2750 <        checkCompletedWithWrappedCFException(h3);
2747 >        checkCompletedWithWrappedException(h0, rs[0].ex);
2748 >        checkCompletedWithWrappedException(h1, rs[1].ex);
2749 >        checkCompletedWithWrappedException(h2, rs[2].ex);
2750 >        checkCompletedWithWrappedException(h3, rs[3].ex);
2751          for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2752  
2753          g.complete(v2);
# Line 2692 | Line 2756 | public class CompletableFutureTest exten
2756          final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2757          final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2758  
2759 <        checkCompletedWithWrappedCFException(h4);
2759 >        checkCompletedWithWrappedException(h4, rs[4].ex);
2760          assertTrue(Objects.equals(v1, rs[4].value) ||
2761                     Objects.equals(v2, rs[4].value));
2762 <        checkCompletedWithWrappedCFException(h5);
2762 >        checkCompletedWithWrappedException(h5, rs[5].ex);
2763          assertTrue(Objects.equals(v1, rs[5].value) ||
2764                     Objects.equals(v2, rs[5].value));
2765  
# Line 2711 | Line 2775 | public class CompletableFutureTest exten
2775          for (ExecutionMode m : ExecutionMode.values())
2776          for (Integer v1 : new Integer[] { 1, null })
2777          for (Integer v2 : new Integer[] { 2, null })
2778 +        for (boolean pushNop : new boolean[] { true, false })
2779      {
2780          final CompletableFuture<Integer> f = new CompletableFuture<>();
2781          final CompletableFuture<Integer> g = new CompletableFuture<>();
# Line 2723 | Line 2788 | public class CompletableFutureTest exten
2788          checkIncomplete(h1);
2789          rs[0].assertNotInvoked();
2790          rs[1].assertNotInvoked();
2791 +        if (pushNop) {          // ad hoc test of intra-completion interference
2792 +            m.thenRun(f, () -> {});
2793 +            m.thenRun(g, () -> {});
2794 +        }
2795          f.complete(v1);
2796          checkCompletedNormally(h0, null);
2797          checkCompletedNormally(h1, null);
# Line 2829 | Line 2898 | public class CompletableFutureTest exten
2898  
2899          // unspecified behavior - both source completions available
2900          try {
2901 <            assertEquals(null, h0.join());
2901 >            assertNull(h0.join());
2902              rs[0].assertInvoked();
2903          } catch (CompletionException ok) {
2904              checkCompletedWithWrappedException(h0, ex);
2905              rs[0].assertNotInvoked();
2906          }
2907          try {
2908 <            assertEquals(null, h1.join());
2908 >            assertNull(h1.join());
2909              rs[1].assertInvoked();
2910          } catch (CompletionException ok) {
2911              checkCompletedWithWrappedException(h1, ex);
2912              rs[1].assertNotInvoked();
2913          }
2914          try {
2915 <            assertEquals(null, h2.join());
2915 >            assertNull(h2.join());
2916              rs[2].assertInvoked();
2917          } catch (CompletionException ok) {
2918              checkCompletedWithWrappedException(h2, ex);
2919              rs[2].assertNotInvoked();
2920          }
2921          try {
2922 <            assertEquals(null, h3.join());
2922 >            assertNull(h3.join());
2923              rs[3].assertInvoked();
2924          } catch (CompletionException ok) {
2925              checkCompletedWithWrappedException(h3, ex);
# Line 2935 | Line 3004 | public class CompletableFutureTest exten
3004          assertTrue(f.complete(v1));
3005          final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
3006          final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
3007 <        checkCompletedWithWrappedCFException(h0);
3008 <        checkCompletedWithWrappedCFException(h1);
3009 <        checkCompletedWithWrappedCFException(h2);
3010 <        checkCompletedWithWrappedCFException(h3);
3007 >        checkCompletedWithWrappedException(h0, rs[0].ex);
3008 >        checkCompletedWithWrappedException(h1, rs[1].ex);
3009 >        checkCompletedWithWrappedException(h2, rs[2].ex);
3010 >        checkCompletedWithWrappedException(h3, rs[3].ex);
3011          for (int i = 0; i < 4; i++) rs[i].assertInvoked();
3012          assertTrue(g.complete(v2));
3013          final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
3014          final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
3015 <        checkCompletedWithWrappedCFException(h4);
3016 <        checkCompletedWithWrappedCFException(h5);
3015 >        checkCompletedWithWrappedException(h4, rs[4].ex);
3016 >        checkCompletedWithWrappedException(h5, rs[5].ex);
3017  
3018          checkCompletedNormally(f, v1);
3019          checkCompletedNormally(g, v2);
# Line 3005 | Line 3074 | public class CompletableFutureTest exten
3074          final CompletableFuture<Integer> g = m.thenCompose(f, r);
3075          if (createIncomplete) assertTrue(f.complete(v1));
3076  
3077 <        checkCompletedWithWrappedCFException(g);
3077 >        checkCompletedWithWrappedException(g, r.ex);
3078          checkCompletedNormally(f, v1);
3079      }}
3080  
# Line 3082 | Line 3151 | public class CompletableFutureTest exten
3151          checkCompletedNormally(f, v1);
3152      }}
3153  
3154 +    /**
3155 +     * exceptionallyCompose result completes normally after normal
3156 +     * completion of source
3157 +     */
3158 +    public void testExceptionallyCompose_normalCompletion() {
3159 +        for (ExecutionMode m : ExecutionMode.values())
3160 +        for (boolean createIncomplete : new boolean[] { true, false })
3161 +        for (Integer v1 : new Integer[] { 1, null })
3162 +    {
3163 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
3164 +        final ExceptionalCompletableFutureFunction r =
3165 +            new ExceptionalCompletableFutureFunction(m);
3166 +        if (!createIncomplete) assertTrue(f.complete(v1));
3167 +        final CompletableFuture<Integer> g = m.exceptionallyCompose(f, r);
3168 +        if (createIncomplete) assertTrue(f.complete(v1));
3169 +
3170 +        if (!createIncomplete && testImplementationDetails)
3171 +            assertSame(f, g);   // an optimization
3172 +
3173 +        checkCompletedNormally(f, v1);
3174 +        checkCompletedNormally(g, v1);
3175 +        r.assertNotInvoked();
3176 +    }}
3177 +
3178 +    /**
3179 +     * exceptionallyCompose result completes normally after exceptional
3180 +     * completion of source
3181 +     */
3182 +    public void testExceptionallyCompose_exceptionalCompletion() {
3183 +        for (ExecutionMode m : ExecutionMode.values())
3184 +        for (boolean createIncomplete : new boolean[] { true, false })
3185 +    {
3186 +        final CFException ex = new CFException();
3187 +        final ExceptionalCompletableFutureFunction r =
3188 +            new ExceptionalCompletableFutureFunction(m);
3189 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
3190 +        if (!createIncomplete) f.completeExceptionally(ex);
3191 +        final CompletableFuture<Integer> g = m.exceptionallyCompose(f, r);
3192 +        if (createIncomplete) f.completeExceptionally(ex);
3193 +
3194 +        checkCompletedExceptionally(f, ex);
3195 +        checkCompletedNormally(g, r.value);
3196 +        r.assertInvoked();
3197 +    }}
3198 +
3199 +    /**
3200 +     * exceptionallyCompose completes exceptionally on exception if action does
3201 +     */
3202 +    public void testExceptionallyCompose_actionFailed() {
3203 +        for (ExecutionMode m : ExecutionMode.values())
3204 +        for (boolean createIncomplete : new boolean[] { true, false })
3205 +        for (Integer v1 : new Integer[] { 1, null })
3206 +    {
3207 +        final CFException ex = new CFException();
3208 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
3209 +        final FailingExceptionalCompletableFutureFunction r
3210 +            = new FailingExceptionalCompletableFutureFunction(m);
3211 +        if (!createIncomplete) f.completeExceptionally(ex);
3212 +        final CompletableFuture<Integer> g = m.exceptionallyCompose(f, r);
3213 +        if (createIncomplete) f.completeExceptionally(ex);
3214 +
3215 +        checkCompletedExceptionally(f, ex);
3216 +        checkCompletedWithWrappedException(g, r.ex);
3217 +        r.assertInvoked();
3218 +    }}
3219 +
3220 +    /**
3221 +     * thenComposeExceptionally result completes exceptionally if the
3222 +     * result of the action does
3223 +     */
3224 +    public void testExceptionallyCompose_actionReturnsFailingFuture() {
3225 +        for (ExecutionMode m : ExecutionMode.values())
3226 +        for (int order = 0; order < 6; order++)
3227 +        for (Integer v1 : new Integer[] { 1, null })
3228 +    {
3229 +        final CFException ex0 = new CFException();
3230 +        final CFException ex = new CFException();
3231 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
3232 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
3233 +        final CompletableFuture<Integer> h;
3234 +        // Test all permutations of orders
3235 +        switch (order) {
3236 +        case 0:
3237 +            assertTrue(f.completeExceptionally(ex0));
3238 +            assertTrue(g.completeExceptionally(ex));
3239 +            h = m.exceptionallyCompose(f, (x -> g));
3240 +            break;
3241 +        case 1:
3242 +            assertTrue(f.completeExceptionally(ex0));
3243 +            h = m.exceptionallyCompose(f, (x -> g));
3244 +            assertTrue(g.completeExceptionally(ex));
3245 +            break;
3246 +        case 2:
3247 +            assertTrue(g.completeExceptionally(ex));
3248 +            assertTrue(f.completeExceptionally(ex0));
3249 +            h = m.exceptionallyCompose(f, (x -> g));
3250 +            break;
3251 +        case 3:
3252 +            assertTrue(g.completeExceptionally(ex));
3253 +            h = m.exceptionallyCompose(f, (x -> g));
3254 +            assertTrue(f.completeExceptionally(ex0));
3255 +            break;
3256 +        case 4:
3257 +            h = m.exceptionallyCompose(f, (x -> g));
3258 +            assertTrue(f.completeExceptionally(ex0));
3259 +            assertTrue(g.completeExceptionally(ex));
3260 +            break;
3261 +        case 5:
3262 +            h = m.exceptionallyCompose(f, (x -> g));
3263 +            assertTrue(f.completeExceptionally(ex0));
3264 +            assertTrue(g.completeExceptionally(ex));
3265 +            break;
3266 +        default: throw new AssertionError();
3267 +        }
3268 +
3269 +        checkCompletedExceptionally(g, ex);
3270 +
3271 +        // TODO: should this be: checkCompletedWithWrappedException(h, ex);
3272 +        try {
3273 +            h.join();
3274 +            shouldThrow();
3275 +        } catch (Throwable t) {
3276 +            assertSame(ex, (t instanceof CompletionException) ? t.getCause() : t);
3277 +        }
3278 +
3279 +        checkCompletedExceptionally(f, ex0);
3280 +    }}
3281 +
3282      // other static methods
3283  
3284      /**
# Line 3114 | Line 3311 | public class CompletableFutureTest exten
3311          }
3312      }
3313  
3314 <    public void testAllOf_backwards() throws Exception {
3314 >    public void testAllOf_normal_backwards() throws Exception {
3315          for (int k = 1; k < 10; k++) {
3316              CompletableFuture<Integer>[] fs
3317                  = (CompletableFuture<Integer>[]) new CompletableFuture[k];
# Line 3142 | Line 3339 | public class CompletableFutureTest exten
3339              for (int i = 0; i < k; i++) {
3340                  checkIncomplete(f);
3341                  checkIncomplete(CompletableFuture.allOf(fs));
3342 <                if (i != k/2) {
3342 >                if (i != k / 2) {
3343                      fs[i].complete(i);
3344                      checkCompletedNormally(fs[i], i);
3345                  } else {
# Line 3245 | Line 3442 | public class CompletableFutureTest exten
3442      /**
3443       * Completion methods throw NullPointerException with null arguments
3444       */
3445 +    @SuppressWarnings("FutureReturnValueIgnored")
3446      public void testNPE() {
3447          CompletableFuture<Integer> f = new CompletableFuture<>();
3448          CompletableFuture<Integer> g = new CompletableFuture<>();
# Line 3264 | Line 3462 | public class CompletableFutureTest exten
3462  
3463              () -> f.thenApply(null),
3464              () -> f.thenApplyAsync(null),
3465 <            () -> f.thenApplyAsync((x) -> x, null),
3465 >            () -> f.thenApplyAsync(x -> x, null),
3466              () -> f.thenApplyAsync(null, exec),
3467  
3468              () -> f.thenAccept(null),
3469              () -> f.thenAcceptAsync(null),
3470 <            () -> f.thenAcceptAsync((x) -> {} , null),
3470 >            () -> f.thenAcceptAsync(x -> {} , null),
3471              () -> f.thenAcceptAsync(null, exec),
3472  
3473              () -> f.thenRun(null),
# Line 3304 | Line 3502 | public class CompletableFutureTest exten
3502              () -> f.applyToEither(g, null),
3503              () -> f.applyToEitherAsync(g, null),
3504              () -> f.applyToEitherAsync(g, null, exec),
3505 <            () -> f.applyToEither(nullFuture, (x) -> x),
3506 <            () -> f.applyToEitherAsync(nullFuture, (x) -> x),
3507 <            () -> f.applyToEitherAsync(nullFuture, (x) -> x, exec),
3508 <            () -> f.applyToEitherAsync(g, (x) -> x, null),
3505 >            () -> f.applyToEither(nullFuture, x -> x),
3506 >            () -> f.applyToEitherAsync(nullFuture, x -> x),
3507 >            () -> f.applyToEitherAsync(nullFuture, x -> x, exec),
3508 >            () -> f.applyToEitherAsync(g, x -> x, null),
3509  
3510              () -> f.acceptEither(g, null),
3511              () -> f.acceptEitherAsync(g, null),
3512              () -> f.acceptEitherAsync(g, null, exec),
3513 <            () -> f.acceptEither(nullFuture, (x) -> {}),
3514 <            () -> f.acceptEitherAsync(nullFuture, (x) -> {}),
3515 <            () -> f.acceptEitherAsync(nullFuture, (x) -> {}, exec),
3516 <            () -> f.acceptEitherAsync(g, (x) -> {}, null),
3513 >            () -> f.acceptEither(nullFuture, x -> {}),
3514 >            () -> f.acceptEitherAsync(nullFuture, x -> {}),
3515 >            () -> f.acceptEitherAsync(nullFuture, x -> {}, exec),
3516 >            () -> f.acceptEitherAsync(g, x -> {}, null),
3517  
3518              () -> f.runAfterEither(g, null),
3519              () -> f.runAfterEitherAsync(g, null),
# Line 3345 | Line 3543 | public class CompletableFutureTest exten
3543              () -> CompletableFuture.anyOf(null, f),
3544  
3545              () -> f.obtrudeException(null),
3546 +
3547 +            () -> CompletableFuture.delayedExecutor(1L, SECONDS, null),
3548 +            () -> CompletableFuture.delayedExecutor(1L, null, exec),
3549 +            () -> CompletableFuture.delayedExecutor(1L, null),
3550 +
3551 +            () -> f.orTimeout(1L, null),
3552 +            () -> f.completeOnTimeout(42, 1L, null),
3553 +
3554 +            () -> CompletableFuture.failedFuture(null),
3555 +            () -> CompletableFuture.failedStage(null),
3556          };
3557  
3558          assertThrows(NullPointerException.class, throwingActions);
# Line 3352 | Line 3560 | public class CompletableFutureTest exten
3560      }
3561  
3562      /**
3563 +     * Test submissions to an executor that rejects all tasks.
3564 +     */
3565 +    public void testRejectingExecutor() {
3566 +        for (Integer v : new Integer[] { 1, null })
3567 +    {
3568 +        final CountingRejectingExecutor e = new CountingRejectingExecutor();
3569 +
3570 +        final CompletableFuture<Integer> complete = CompletableFuture.completedFuture(v);
3571 +        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
3572 +
3573 +        List<CompletableFuture<?>> futures = new ArrayList<>();
3574 +
3575 +        List<CompletableFuture<Integer>> srcs = new ArrayList<>();
3576 +        srcs.add(complete);
3577 +        srcs.add(incomplete);
3578 +
3579 +        for (CompletableFuture<Integer> src : srcs) {
3580 +            List<CompletableFuture<?>> fs = new ArrayList<>();
3581 +            fs.add(src.thenRunAsync(() -> {}, e));
3582 +            fs.add(src.thenAcceptAsync(z -> {}, e));
3583 +            fs.add(src.thenApplyAsync(z -> z, e));
3584 +
3585 +            fs.add(src.thenCombineAsync(src, (x, y) -> x, e));
3586 +            fs.add(src.thenAcceptBothAsync(src, (x, y) -> {}, e));
3587 +            fs.add(src.runAfterBothAsync(src, () -> {}, e));
3588 +
3589 +            fs.add(src.applyToEitherAsync(src, z -> z, e));
3590 +            fs.add(src.acceptEitherAsync(src, z -> {}, e));
3591 +            fs.add(src.runAfterEitherAsync(src, () -> {}, e));
3592 +
3593 +            fs.add(src.thenComposeAsync(z -> null, e));
3594 +            fs.add(src.whenCompleteAsync((z, t) -> {}, e));
3595 +            fs.add(src.handleAsync((z, t) -> null, e));
3596 +
3597 +            for (CompletableFuture<?> future : fs) {
3598 +                if (src.isDone())
3599 +                    checkCompletedWithWrappedException(future, e.ex);
3600 +                else
3601 +                    checkIncomplete(future);
3602 +            }
3603 +            futures.addAll(fs);
3604 +        }
3605 +
3606 +        {
3607 +            List<CompletableFuture<?>> fs = new ArrayList<>();
3608 +
3609 +            fs.add(complete.thenCombineAsync(incomplete, (x, y) -> x, e));
3610 +            fs.add(incomplete.thenCombineAsync(complete, (x, y) -> x, e));
3611 +
3612 +            fs.add(complete.thenAcceptBothAsync(incomplete, (x, y) -> {}, e));
3613 +            fs.add(incomplete.thenAcceptBothAsync(complete, (x, y) -> {}, e));
3614 +
3615 +            fs.add(complete.runAfterBothAsync(incomplete, () -> {}, e));
3616 +            fs.add(incomplete.runAfterBothAsync(complete, () -> {}, e));
3617 +
3618 +            for (CompletableFuture<?> future : fs)
3619 +                checkIncomplete(future);
3620 +            futures.addAll(fs);
3621 +        }
3622 +
3623 +        {
3624 +            List<CompletableFuture<?>> fs = new ArrayList<>();
3625 +
3626 +            fs.add(complete.applyToEitherAsync(incomplete, z -> z, e));
3627 +            fs.add(incomplete.applyToEitherAsync(complete, z -> z, e));
3628 +
3629 +            fs.add(complete.acceptEitherAsync(incomplete, z -> {}, e));
3630 +            fs.add(incomplete.acceptEitherAsync(complete, z -> {}, e));
3631 +
3632 +            fs.add(complete.runAfterEitherAsync(incomplete, () -> {}, e));
3633 +            fs.add(incomplete.runAfterEitherAsync(complete, () -> {}, e));
3634 +
3635 +            for (CompletableFuture<?> future : fs)
3636 +                checkCompletedWithWrappedException(future, e.ex);
3637 +            futures.addAll(fs);
3638 +        }
3639 +
3640 +        incomplete.complete(v);
3641 +
3642 +        for (CompletableFuture<?> future : futures)
3643 +            checkCompletedWithWrappedException(future, e.ex);
3644 +
3645 +        assertEquals(futures.size(), e.count.get());
3646 +    }}
3647 +
3648 +    /**
3649 +     * Test submissions to an executor that rejects all tasks, but
3650 +     * should never be invoked because the dependent future is
3651 +     * explicitly completed.
3652 +     */
3653 +    public void testRejectingExecutorNeverInvoked() {
3654 +        for (Integer v : new Integer[] { 1, null })
3655 +    {
3656 +        final CountingRejectingExecutor e = new CountingRejectingExecutor();
3657 +
3658 +        final CompletableFuture<Integer> complete = CompletableFuture.completedFuture(v);
3659 +        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
3660 +
3661 +        List<CompletableFuture<?>> futures = new ArrayList<>();
3662 +
3663 +        List<CompletableFuture<Integer>> srcs = new ArrayList<>();
3664 +        srcs.add(complete);
3665 +        srcs.add(incomplete);
3666 +
3667 +        List<CompletableFuture<?>> fs = new ArrayList<>();
3668 +        fs.add(incomplete.thenRunAsync(() -> {}, e));
3669 +        fs.add(incomplete.thenAcceptAsync(z -> {}, e));
3670 +        fs.add(incomplete.thenApplyAsync(z -> z, e));
3671 +
3672 +        fs.add(incomplete.thenCombineAsync(incomplete, (x, y) -> x, e));
3673 +        fs.add(incomplete.thenAcceptBothAsync(incomplete, (x, y) -> {}, e));
3674 +        fs.add(incomplete.runAfterBothAsync(incomplete, () -> {}, e));
3675 +
3676 +        fs.add(incomplete.applyToEitherAsync(incomplete, z -> z, e));
3677 +        fs.add(incomplete.acceptEitherAsync(incomplete, z -> {}, e));
3678 +        fs.add(incomplete.runAfterEitherAsync(incomplete, () -> {}, e));
3679 +
3680 +        fs.add(incomplete.thenComposeAsync(z -> null, e));
3681 +        fs.add(incomplete.whenCompleteAsync((z, t) -> {}, e));
3682 +        fs.add(incomplete.handleAsync((z, t) -> null, e));
3683 +
3684 +        fs.add(complete.thenCombineAsync(incomplete, (x, y) -> x, e));
3685 +        fs.add(incomplete.thenCombineAsync(complete, (x, y) -> x, e));
3686 +
3687 +        fs.add(complete.thenAcceptBothAsync(incomplete, (x, y) -> {}, e));
3688 +        fs.add(incomplete.thenAcceptBothAsync(complete, (x, y) -> {}, e));
3689 +
3690 +        fs.add(complete.runAfterBothAsync(incomplete, () -> {}, e));
3691 +        fs.add(incomplete.runAfterBothAsync(complete, () -> {}, e));
3692 +
3693 +        for (CompletableFuture<?> future : fs)
3694 +            checkIncomplete(future);
3695 +
3696 +        for (CompletableFuture<?> future : fs)
3697 +            future.complete(null);
3698 +
3699 +        incomplete.complete(v);
3700 +
3701 +        for (CompletableFuture<?> future : fs)
3702 +            checkCompletedNormally(future, null);
3703 +
3704 +        assertEquals(0, e.count.get());
3705 +    }}
3706 +
3707 +    /**
3708       * toCompletableFuture returns this CompletableFuture.
3709       */
3710      public void testToCompletableFuture() {
# Line 3365 | Line 3718 | public class CompletableFutureTest exten
3718       * newIncompleteFuture returns an incomplete CompletableFuture
3719       */
3720      public void testNewIncompleteFuture() {
3721 +        for (Integer v1 : new Integer[] { 1, null })
3722 +    {
3723          CompletableFuture<Integer> f = new CompletableFuture<>();
3724          CompletableFuture<Integer> g = f.newIncompleteFuture();
3725          checkIncomplete(f);
3726          checkIncomplete(g);
3727 <    }
3727 >        f.complete(v1);
3728 >        checkCompletedNormally(f, v1);
3729 >        checkIncomplete(g);
3730 >        g.complete(v1);
3731 >        checkCompletedNormally(g, v1);
3732 >        assertSame(g.getClass(), CompletableFuture.class);
3733 >    }}
3734  
3735      /**
3736       * completedStage returns a completed CompletionStage
3737       */
3738      public void testCompletedStage() {
3739 <        AtomicInteger x = new AtomicInteger();
3740 <        AtomicReference<Throwable> r = new AtomicReference<Throwable>();
3739 >        AtomicInteger x = new AtomicInteger(0);
3740 >        AtomicReference<Throwable> r = new AtomicReference<>();
3741          CompletionStage<Integer> f = CompletableFuture.completedStage(1);
3742          f.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3743          assertEquals(x.get(), 1);
# Line 3404 | Line 3765 | public class CompletableFutureTest exten
3765      public void testFailedFuture() {
3766          CFException ex = new CFException();
3767          CompletableFuture<Integer> f = CompletableFuture.failedFuture(ex);
3768 <        checkCompletedExceptionallyWithRootCause(f, ex);
3768 >        checkCompletedExceptionally(f, ex);
3769      }
3770  
3771      /**
3772       * failedFuture(null) throws NPE
3773       */
3774 <    public void testFailedFuture2() {
3774 >    public void testFailedFuture_null() {
3775          try {
3776              CompletableFuture<Integer> f = CompletableFuture.failedFuture(null);
3777              shouldThrow();
# Line 3421 | Line 3782 | public class CompletableFutureTest exten
3782       * copy returns a CompletableFuture that is completed normally,
3783       * with the same value, when source is.
3784       */
3785 <    public void testCopy() {
3785 >    public void testCopy_normalCompletion() {
3786 >        for (boolean createIncomplete : new boolean[] { true, false })
3787 >        for (Integer v1 : new Integer[] { 1, null })
3788 >    {
3789          CompletableFuture<Integer> f = new CompletableFuture<>();
3790 +        if (!createIncomplete) assertTrue(f.complete(v1));
3791          CompletableFuture<Integer> g = f.copy();
3792 <        checkIncomplete(f);
3793 <        checkIncomplete(g);
3794 <        f.complete(1);
3795 <        checkCompletedNormally(f, 1);
3796 <        checkCompletedNormally(g, 1);
3797 <    }
3792 >        if (createIncomplete) {
3793 >            checkIncomplete(f);
3794 >            checkIncomplete(g);
3795 >            assertTrue(f.complete(v1));
3796 >        }
3797 >        checkCompletedNormally(f, v1);
3798 >        checkCompletedNormally(g, v1);
3799 >    }}
3800  
3801      /**
3802       * copy returns a CompletableFuture that is completed exceptionally
3803       * when source is.
3804       */
3805 <    public void testCopy2() {
3805 >    public void testCopy_exceptionalCompletion() {
3806 >        for (boolean createIncomplete : new boolean[] { true, false })
3807 >    {
3808 >        CFException ex = new CFException();
3809          CompletableFuture<Integer> f = new CompletableFuture<>();
3810 +        if (!createIncomplete) f.completeExceptionally(ex);
3811          CompletableFuture<Integer> g = f.copy();
3812 <        checkIncomplete(f);
3813 <        checkIncomplete(g);
3814 <        CFException ex = new CFException();
3815 <        f.completeExceptionally(ex);
3812 >        if (createIncomplete) {
3813 >            checkIncomplete(f);
3814 >            checkIncomplete(g);
3815 >            f.completeExceptionally(ex);
3816 >        }
3817          checkCompletedExceptionally(f, ex);
3818 <        checkCompletedWithWrappedCFException(g);
3818 >        checkCompletedWithWrappedException(g, ex);
3819 >    }}
3820 >
3821 >    /**
3822 >     * Completion of a copy does not complete its source.
3823 >     */
3824 >    public void testCopy_oneWayPropagation() {
3825 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3826 >        assertTrue(f.copy().complete(1));
3827 >        assertTrue(f.copy().complete(null));
3828 >        assertTrue(f.copy().cancel(true));
3829 >        assertTrue(f.copy().cancel(false));
3830 >        assertTrue(f.copy().completeExceptionally(new CFException()));
3831 >        checkIncomplete(f);
3832      }
3833  
3834      /**
# Line 3453 | Line 3838 | public class CompletableFutureTest exten
3838      public void testMinimalCompletionStage() {
3839          CompletableFuture<Integer> f = new CompletableFuture<>();
3840          CompletionStage<Integer> g = f.minimalCompletionStage();
3841 <        AtomicInteger x = new AtomicInteger();
3842 <        AtomicReference<Throwable> r = new AtomicReference<Throwable>();
3841 >        AtomicInteger x = new AtomicInteger(0);
3842 >        AtomicReference<Throwable> r = new AtomicReference<>();
3843          checkIncomplete(f);
3844          g.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3845          f.complete(1);
# Line 3470 | Line 3855 | public class CompletableFutureTest exten
3855      public void testMinimalCompletionStage2() {
3856          CompletableFuture<Integer> f = new CompletableFuture<>();
3857          CompletionStage<Integer> g = f.minimalCompletionStage();
3858 <        AtomicInteger x = new AtomicInteger();
3859 <        AtomicReference<Throwable> r = new AtomicReference<Throwable>();
3858 >        AtomicInteger x = new AtomicInteger(0);
3859 >        AtomicReference<Throwable> r = new AtomicReference<>();
3860          g.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3861          checkIncomplete(f);
3862          CFException ex = new CFException();
# Line 3488 | Line 3873 | public class CompletableFutureTest exten
3873      public void testFailedStage() {
3874          CFException ex = new CFException();
3875          CompletionStage<Integer> f = CompletableFuture.failedStage(ex);
3876 <        AtomicInteger x = new AtomicInteger();
3877 <        AtomicReference<Throwable> r = new AtomicReference<Throwable>();
3876 >        AtomicInteger x = new AtomicInteger(0);
3877 >        AtomicReference<Throwable> r = new AtomicReference<>();
3878          f.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3879          assertEquals(x.get(), 0);
3880 <        assertEquals(r.get().getCause(), ex);
3880 >        assertEquals(r.get(), ex);
3881      }
3882  
3883      /**
3884       * completeAsync completes with value of given supplier
3885       */
3886      public void testCompleteAsync() {
3887 +        for (Integer v1 : new Integer[] { 1, null })
3888 +    {
3889          CompletableFuture<Integer> f = new CompletableFuture<>();
3890 <        f.completeAsync(() -> 1);
3890 >        f.completeAsync(() -> v1);
3891          f.join();
3892 <        checkCompletedNormally(f, 1);
3893 <    }
3892 >        checkCompletedNormally(f, v1);
3893 >    }}
3894  
3895      /**
3896       * completeAsync completes exceptionally if given supplier throws
# Line 3511 | Line 3898 | public class CompletableFutureTest exten
3898      public void testCompleteAsync2() {
3899          CompletableFuture<Integer> f = new CompletableFuture<>();
3900          CFException ex = new CFException();
3901 <        f.completeAsync(() -> {if (true) throw ex; return 1;});
3901 >        f.completeAsync(() -> { throw ex; });
3902          try {
3903              f.join();
3904              shouldThrow();
3905 <        } catch (Exception success) {}
3906 <        checkCompletedWithWrappedCFException(f);
3905 >        } catch (CompletionException success) {}
3906 >        checkCompletedWithWrappedException(f, ex);
3907      }
3908  
3909      /**
3910       * completeAsync with given executor completes with value of given supplier
3911       */
3912      public void testCompleteAsync3() {
3913 +        for (Integer v1 : new Integer[] { 1, null })
3914 +    {
3915          CompletableFuture<Integer> f = new CompletableFuture<>();
3916 <        f.completeAsync(() -> 1, new ThreadExecutor());
3917 <        f.join();
3918 <        checkCompletedNormally(f, 1);
3919 <    }
3916 >        ThreadExecutor executor = new ThreadExecutor();
3917 >        f.completeAsync(() -> v1, executor);
3918 >        assertSame(v1, f.join());
3919 >        checkCompletedNormally(f, v1);
3920 >        assertEquals(1, executor.count.get());
3921 >    }}
3922  
3923      /**
3924       * completeAsync with given executor completes exceptionally if
# Line 3536 | Line 3927 | public class CompletableFutureTest exten
3927      public void testCompleteAsync4() {
3928          CompletableFuture<Integer> f = new CompletableFuture<>();
3929          CFException ex = new CFException();
3930 <        f.completeAsync(() -> {if (true) throw ex; return 1;}, new ThreadExecutor());
3930 >        ThreadExecutor executor = new ThreadExecutor();
3931 >        f.completeAsync(() -> { throw ex; }, executor);
3932          try {
3933              f.join();
3934              shouldThrow();
3935 <        } catch (Exception success) {}
3936 <        checkCompletedWithWrappedCFException(f);
3935 >        } catch (CompletionException success) {}
3936 >        checkCompletedWithWrappedException(f, ex);
3937 >        assertEquals(1, executor.count.get());
3938      }
3939  
3940      /**
3941       * orTimeout completes with TimeoutException if not complete
3942       */
3943 <    public void testOrTimeout() {
3943 >    public void testOrTimeout_timesOut() {
3944 >        long timeoutMillis = timeoutMillis();
3945          CompletableFuture<Integer> f = new CompletableFuture<>();
3946 <        f.orTimeout(SHORT_DELAY_MS, MILLISECONDS);
3947 <        checkCompletedExceptionallyWithTimeout(f);
3946 >        long startTime = System.nanoTime();
3947 >        assertSame(f, f.orTimeout(timeoutMillis, MILLISECONDS));
3948 >        checkCompletedWithTimeoutException(f);
3949 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
3950      }
3951  
3952      /**
3953       * orTimeout completes normally if completed before timeout
3954       */
3955 <    public void testOrTimeout2() {
3955 >    public void testOrTimeout_completed() {
3956 >        for (Integer v1 : new Integer[] { 1, null })
3957 >    {
3958          CompletableFuture<Integer> f = new CompletableFuture<>();
3959 <        f.complete(1);
3960 <        f.orTimeout(SHORT_DELAY_MS, MILLISECONDS);
3961 <        checkCompletedNormally(f, 1);
3962 <    }
3959 >        CompletableFuture<Integer> g = new CompletableFuture<>();
3960 >        long startTime = System.nanoTime();
3961 >        f.complete(v1);
3962 >        assertSame(f, f.orTimeout(LONG_DELAY_MS, MILLISECONDS));
3963 >        assertSame(g, g.orTimeout(LONG_DELAY_MS, MILLISECONDS));
3964 >        g.complete(v1);
3965 >        checkCompletedNormally(f, v1);
3966 >        checkCompletedNormally(g, v1);
3967 >        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS / 2);
3968 >    }}
3969  
3970      /**
3971       * completeOnTimeout completes with given value if not complete
3972       */
3973 <    public void testCompleteOnTimeout() {
3974 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3975 <        f.completeOnTimeout(-1, SHORT_DELAY_MS, MILLISECONDS);
3572 <        f.join();
3573 <        checkCompletedNormally(f, -1);
3973 >    public void testCompleteOnTimeout_timesOut() {
3974 >        testInParallel(() -> testCompleteOnTimeout_timesOut(42),
3975 >                       () -> testCompleteOnTimeout_timesOut(null));
3976      }
3977  
3978      /**
3979 <     * completeOnTimeout has no effect if completed within timeout
3979 >     * completeOnTimeout completes with given value if not complete
3980       */
3981 <    public void testCompleteOnTimeout2() {
3981 >    public void testCompleteOnTimeout_timesOut(Integer v) {
3982 >        long timeoutMillis = timeoutMillis();
3983          CompletableFuture<Integer> f = new CompletableFuture<>();
3984 <        f.complete(1);
3985 <        f.completeOnTimeout(-1, SHORT_DELAY_MS, MILLISECONDS);
3986 <        checkCompletedNormally(f, 1);
3984 >        long startTime = System.nanoTime();
3985 >        assertSame(f, f.completeOnTimeout(v, timeoutMillis, MILLISECONDS));
3986 >        assertSame(v, f.join());
3987 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
3988 >        f.complete(99);         // should have no effect
3989 >        checkCompletedNormally(f, v);
3990      }
3991  
3992      /**
3993 <     * delayedExecutor returns an executor that delays submission
3993 >     * completeOnTimeout has no effect if completed within timeout
3994       */
3995 <    public void testDelayedExecutor() throws Exception {
3996 <        long timeoutMillis = SMALL_DELAY_MS;
3997 <        Executor d = CompletableFuture.delayedExecutor(timeoutMillis,
3998 <                                                       MILLISECONDS);
3995 >    public void testCompleteOnTimeout_completed() {
3996 >        for (Integer v1 : new Integer[] { 1, null })
3997 >    {
3998 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3999 >        CompletableFuture<Integer> g = new CompletableFuture<>();
4000          long startTime = System.nanoTime();
4001 <        CompletableFuture<Integer> f = CompletableFuture.supplyAsync(() -> 1, d);
4002 <        assertNull(f.getNow(null));
4003 <        assertEquals(1, (int) f.get(LONG_DELAY_MS, MILLISECONDS));
4004 <        assertTrue(millisElapsedSince(startTime) > timeoutMillis/2);
4005 <        checkCompletedNormally(f, 1);
4006 <    }
4001 >        f.complete(v1);
4002 >        assertSame(f, f.completeOnTimeout(-1, LONG_DELAY_MS, MILLISECONDS));
4003 >        assertSame(g, g.completeOnTimeout(-1, LONG_DELAY_MS, MILLISECONDS));
4004 >        g.complete(v1);
4005 >        checkCompletedNormally(f, v1);
4006 >        checkCompletedNormally(g, v1);
4007 >        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS / 2);
4008 >    }}
4009  
4010      /**
4011 <     * delayedExecutor for a given executor returns an executor that
3603 <     * delays submission
4011 >     * delayedExecutor returns an executor that delays submission
4012       */
4013 <    public void testDelayedExecutor2() throws Exception {
4014 <        long timeoutMillis = SMALL_DELAY_MS;
4015 <        Executor d = CompletableFuture.delayedExecutor(timeoutMillis,
4016 <                                                       MILLISECONDS,
4017 <                                                       new ThreadExecutor());
4013 >    public void testDelayedExecutor() {
4014 >        testInParallel(() -> testDelayedExecutor(null, null),
4015 >                       () -> testDelayedExecutor(null, 1),
4016 >                       () -> testDelayedExecutor(new ThreadExecutor(), 1),
4017 >                       () -> testDelayedExecutor(new ThreadExecutor(), 1));
4018 >    }
4019 >
4020 >    public void testDelayedExecutor(Executor executor, Integer v) throws Exception {
4021 >        long timeoutMillis = timeoutMillis();
4022 >        // Use an "unreasonably long" long timeout to catch lingering threads
4023 >        long longTimeoutMillis = 1000 * 60 * 60 * 24;
4024 >        final Executor delayer, longDelayer;
4025 >        if (executor == null) {
4026 >            delayer = CompletableFuture.delayedExecutor(timeoutMillis, MILLISECONDS);
4027 >            longDelayer = CompletableFuture.delayedExecutor(longTimeoutMillis, MILLISECONDS);
4028 >        } else {
4029 >            delayer = CompletableFuture.delayedExecutor(timeoutMillis, MILLISECONDS, executor);
4030 >            longDelayer = CompletableFuture.delayedExecutor(longTimeoutMillis, MILLISECONDS, executor);
4031 >        }
4032          long startTime = System.nanoTime();
4033 <        CompletableFuture<Integer> f = CompletableFuture.supplyAsync(() -> 1, d);
4034 <        assertNull(f.getNow(null));
4035 <        assertEquals(1, (int) f.get(LONG_DELAY_MS, MILLISECONDS));
4036 <        assertTrue(millisElapsedSince(startTime) > timeoutMillis/2);
4037 <        checkCompletedNormally(f, 1);
4033 >        CompletableFuture<Integer> f =
4034 >            CompletableFuture.supplyAsync(() -> v, delayer);
4035 >        CompletableFuture<Integer> g =
4036 >            CompletableFuture.supplyAsync(() -> v, longDelayer);
4037 >
4038 >        assertNull(g.getNow(null));
4039 >
4040 >        assertSame(v, f.get(LONG_DELAY_MS, MILLISECONDS));
4041 >        long millisElapsed = millisElapsedSince(startTime);
4042 >        assertTrue(millisElapsed >= timeoutMillis);
4043 >        assertTrue(millisElapsed < LONG_DELAY_MS / 2);
4044 >
4045 >        checkCompletedNormally(f, v);
4046 >
4047 >        checkIncomplete(g);
4048 >        assertTrue(g.cancel(true));
4049      }
4050  
4051      //--- tests of implementation details; not part of official tck ---
4052  
4053      Object resultOf(CompletableFuture<?> f) {
4054 +        SecurityManager sm = System.getSecurityManager();
4055 +        if (sm != null) {
4056 +            try {
4057 +                System.setSecurityManager(null);
4058 +            } catch (SecurityException giveUp) {
4059 +                return "Reflection not available";
4060 +            }
4061 +        }
4062 +
4063          try {
4064              java.lang.reflect.Field resultField
4065                  = CompletableFuture.class.getDeclaredField("result");
4066              resultField.setAccessible(true);
4067              return resultField.get(f);
4068 <        } catch (Throwable t) { throw new AssertionError(t); }
4068 >        } catch (Throwable t) {
4069 >            throw new AssertionError(t);
4070 >        } finally {
4071 >            if (sm != null) System.setSecurityManager(sm);
4072 >        }
4073      }
4074  
4075      public void testExceptionPropagationReusesResultObject() {
# Line 3634 | Line 4080 | public class CompletableFutureTest exten
4080          final CompletableFuture<Integer> v42 = CompletableFuture.completedFuture(42);
4081          final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
4082  
4083 +        final Runnable noopRunnable = new Noop(m);
4084 +        final Consumer<Integer> noopConsumer = new NoopConsumer(m);
4085 +        final Function<Integer, Integer> incFunction = new IncFunction(m);
4086 +
4087          List<Function<CompletableFuture<Integer>, CompletableFuture<?>>> funs
4088              = new ArrayList<>();
4089  
4090 <        funs.add((y) -> m.thenRun(y, new Noop(m)));
4091 <        funs.add((y) -> m.thenAccept(y, new NoopConsumer(m)));
4092 <        funs.add((y) -> m.thenApply(y, new IncFunction(m)));
4093 <
4094 <        funs.add((y) -> m.runAfterEither(y, incomplete, new Noop(m)));
4095 <        funs.add((y) -> m.acceptEither(y, incomplete, new NoopConsumer(m)));
4096 <        funs.add((y) -> m.applyToEither(y, incomplete, new IncFunction(m)));
4097 <
4098 <        funs.add((y) -> m.runAfterBoth(y, v42, new Noop(m)));
4099 <        funs.add((y) -> m.thenAcceptBoth(y, v42, new SubtractAction(m)));
4100 <        funs.add((y) -> m.thenCombine(y, v42, new SubtractFunction(m)));
4101 <
4102 <        funs.add((y) -> m.whenComplete(y, (Integer x, Throwable t) -> {}));
4103 <
4104 <        funs.add((y) -> m.thenCompose(y, new CompletableFutureInc(m)));
4105 <
4106 <        funs.add((y) -> CompletableFuture.allOf(new CompletableFuture<?>[] {y, v42}));
4107 <        funs.add((y) -> CompletableFuture.anyOf(new CompletableFuture<?>[] {y, incomplete}));
4090 >        funs.add(y -> m.thenRun(y, noopRunnable));
4091 >        funs.add(y -> m.thenAccept(y, noopConsumer));
4092 >        funs.add(y -> m.thenApply(y, incFunction));
4093 >
4094 >        funs.add(y -> m.runAfterEither(y, incomplete, noopRunnable));
4095 >        funs.add(y -> m.acceptEither(y, incomplete, noopConsumer));
4096 >        funs.add(y -> m.applyToEither(y, incomplete, incFunction));
4097 >
4098 >        funs.add(y -> m.runAfterBoth(y, v42, noopRunnable));
4099 >        funs.add(y -> m.runAfterBoth(v42, y, noopRunnable));
4100 >        funs.add(y -> m.thenAcceptBoth(y, v42, new SubtractAction(m)));
4101 >        funs.add(y -> m.thenAcceptBoth(v42, y, new SubtractAction(m)));
4102 >        funs.add(y -> m.thenCombine(y, v42, new SubtractFunction(m)));
4103 >        funs.add(y -> m.thenCombine(v42, y, new SubtractFunction(m)));
4104 >
4105 >        funs.add(y -> m.whenComplete(y, (Integer r, Throwable t) -> {}));
4106 >
4107 >        funs.add(y -> m.thenCompose(y, new CompletableFutureInc(m)));
4108 >
4109 >        funs.add(y -> CompletableFuture.allOf(y));
4110 >        funs.add(y -> CompletableFuture.allOf(y, v42));
4111 >        funs.add(y -> CompletableFuture.allOf(v42, y));
4112 >        funs.add(y -> CompletableFuture.anyOf(y));
4113 >        funs.add(y -> CompletableFuture.anyOf(y, incomplete));
4114 >        funs.add(y -> CompletableFuture.anyOf(incomplete, y));
4115  
4116          for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
4117                   fun : funs) {
4118              CompletableFuture<Integer> f = new CompletableFuture<>();
4119              f.completeExceptionally(ex);
4120 <            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
4120 >            CompletableFuture<Integer> src = m.thenApply(f, incFunction);
4121              checkCompletedWithWrappedException(src, ex);
4122              CompletableFuture<?> dep = fun.apply(src);
4123              checkCompletedWithWrappedException(dep, ex);
# Line 3670 | Line 4127 | public class CompletableFutureTest exten
4127          for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
4128                   fun : funs) {
4129              CompletableFuture<Integer> f = new CompletableFuture<>();
4130 <            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
4130 >            CompletableFuture<Integer> src = m.thenApply(f, incFunction);
4131              CompletableFuture<?> dep = fun.apply(src);
4132              f.completeExceptionally(ex);
4133              checkCompletedWithWrappedException(src, ex);
# Line 3684 | Line 4141 | public class CompletableFutureTest exten
4141              CompletableFuture<Integer> f = new CompletableFuture<>();
4142              f.cancel(mayInterruptIfRunning);
4143              checkCancelled(f);
4144 <            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
4144 >            CompletableFuture<Integer> src = m.thenApply(f, incFunction);
4145              checkCompletedWithWrappedCancellationException(src);
4146              CompletableFuture<?> dep = fun.apply(src);
4147              checkCompletedWithWrappedCancellationException(dep);
# Line 3695 | Line 4152 | public class CompletableFutureTest exten
4152          for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
4153                   fun : funs) {
4154              CompletableFuture<Integer> f = new CompletableFuture<>();
4155 <            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
4155 >            CompletableFuture<Integer> src = m.thenApply(f, incFunction);
4156              CompletableFuture<?> dep = fun.apply(src);
4157              f.cancel(mayInterruptIfRunning);
4158              checkCancelled(f);
# Line 3705 | Line 4162 | public class CompletableFutureTest exten
4162          }
4163      }}
4164  
4165 +    /**
4166 +     * Minimal completion stages throw UOE for most non-CompletionStage methods
4167 +     */
4168 +    public void testMinimalCompletionStage_minimality() {
4169 +        if (!testImplementationDetails) return;
4170 +        Function<Method, String> toSignature =
4171 +            method -> method.getName() + Arrays.toString(method.getParameterTypes());
4172 +        Predicate<Method> isNotStatic =
4173 +            method -> (method.getModifiers() & Modifier.STATIC) == 0;
4174 +        List<Method> minimalMethods =
4175 +            Stream.of(Object.class, CompletionStage.class)
4176 +            .flatMap(klazz -> Stream.of(klazz.getMethods()))
4177 +            .filter(isNotStatic)
4178 +            .collect(Collectors.toList());
4179 +        // Methods from CompletableFuture permitted NOT to throw UOE
4180 +        String[] signatureWhitelist = {
4181 +            "newIncompleteFuture[]",
4182 +            "defaultExecutor[]",
4183 +            "minimalCompletionStage[]",
4184 +            "copy[]",
4185 +        };
4186 +        Set<String> permittedMethodSignatures =
4187 +            Stream.concat(minimalMethods.stream().map(toSignature),
4188 +                          Stream.of(signatureWhitelist))
4189 +            .collect(Collectors.toSet());
4190 +        List<Method> allMethods = Stream.of(CompletableFuture.class.getMethods())
4191 +            .filter(isNotStatic)
4192 +            .filter(method -> !permittedMethodSignatures.contains(toSignature.apply(method)))
4193 +            .collect(Collectors.toList());
4194 +
4195 +        List<CompletionStage<Integer>> stages = new ArrayList<>();
4196 +        CompletionStage<Integer> min =
4197 +            new CompletableFuture<Integer>().minimalCompletionStage();
4198 +        stages.add(min);
4199 +        stages.add(min.thenApply(x -> x));
4200 +        stages.add(CompletableFuture.completedStage(1));
4201 +        stages.add(CompletableFuture.failedStage(new CFException()));
4202 +
4203 +        List<Method> bugs = new ArrayList<>();
4204 +        for (Method method : allMethods) {
4205 +            Class<?>[] parameterTypes = method.getParameterTypes();
4206 +            Object[] args = new Object[parameterTypes.length];
4207 +            // Manufacture boxed primitives for primitive params
4208 +            for (int i = 0; i < args.length; i++) {
4209 +                Class<?> type = parameterTypes[i];
4210 +                if (parameterTypes[i] == boolean.class)
4211 +                    args[i] = false;
4212 +                else if (parameterTypes[i] == int.class)
4213 +                    args[i] = 0;
4214 +                else if (parameterTypes[i] == long.class)
4215 +                    args[i] = 0L;
4216 +            }
4217 +            for (CompletionStage<Integer> stage : stages) {
4218 +                try {
4219 +                    method.invoke(stage, args);
4220 +                    bugs.add(method);
4221 +                }
4222 +                catch (java.lang.reflect.InvocationTargetException expected) {
4223 +                    if (! (expected.getCause() instanceof UnsupportedOperationException)) {
4224 +                        bugs.add(method);
4225 +                        // expected.getCause().printStackTrace();
4226 +                    }
4227 +                }
4228 +                catch (ReflectiveOperationException bad) { throw new Error(bad); }
4229 +            }
4230 +        }
4231 +        if (!bugs.isEmpty())
4232 +            throw new Error("Methods did not throw UOE: " + bugs);
4233 +    }
4234 +
4235 +    /**
4236 +     * minimalStage.toCompletableFuture() returns a CompletableFuture that
4237 +     * is completed normally, with the same value, when source is.
4238 +     */
4239 +    public void testMinimalCompletionStage_toCompletableFuture_normalCompletion() {
4240 +        for (boolean createIncomplete : new boolean[] { true, false })
4241 +        for (Integer v1 : new Integer[] { 1, null })
4242 +    {
4243 +        CompletableFuture<Integer> f = new CompletableFuture<>();
4244 +        CompletionStage<Integer> minimal = f.minimalCompletionStage();
4245 +        if (!createIncomplete) assertTrue(f.complete(v1));
4246 +        CompletableFuture<Integer> g = minimal.toCompletableFuture();
4247 +        if (createIncomplete) {
4248 +            checkIncomplete(f);
4249 +            checkIncomplete(g);
4250 +            assertTrue(f.complete(v1));
4251 +        }
4252 +        checkCompletedNormally(f, v1);
4253 +        checkCompletedNormally(g, v1);
4254 +    }}
4255 +
4256 +    /**
4257 +     * minimalStage.toCompletableFuture() returns a CompletableFuture that
4258 +     * is completed exceptionally when source is.
4259 +     */
4260 +    public void testMinimalCompletionStage_toCompletableFuture_exceptionalCompletion() {
4261 +        for (boolean createIncomplete : new boolean[] { true, false })
4262 +    {
4263 +        CFException ex = new CFException();
4264 +        CompletableFuture<Integer> f = new CompletableFuture<>();
4265 +        CompletionStage<Integer> minimal = f.minimalCompletionStage();
4266 +        if (!createIncomplete) f.completeExceptionally(ex);
4267 +        CompletableFuture<Integer> g = minimal.toCompletableFuture();
4268 +        if (createIncomplete) {
4269 +            checkIncomplete(f);
4270 +            checkIncomplete(g);
4271 +            f.completeExceptionally(ex);
4272 +        }
4273 +        checkCompletedExceptionally(f, ex);
4274 +        checkCompletedWithWrappedException(g, ex);
4275 +    }}
4276 +
4277 +    /**
4278 +     * minimalStage.toCompletableFuture() gives mutable CompletableFuture
4279 +     */
4280 +    public void testMinimalCompletionStage_toCompletableFuture_mutable() {
4281 +        for (Integer v1 : new Integer[] { 1, null })
4282 +    {
4283 +        CompletableFuture<Integer> f = new CompletableFuture<>();
4284 +        CompletionStage minimal = f.minimalCompletionStage();
4285 +        CompletableFuture<Integer> g = minimal.toCompletableFuture();
4286 +        assertTrue(g.complete(v1));
4287 +        checkCompletedNormally(g, v1);
4288 +        checkIncomplete(f);
4289 +        checkIncomplete(minimal.toCompletableFuture());
4290 +    }}
4291 +
4292 +    /**
4293 +     * minimalStage.toCompletableFuture().join() awaits completion
4294 +     */
4295 +    public void testMinimalCompletionStage_toCompletableFuture_join() throws Exception {
4296 +        for (boolean createIncomplete : new boolean[] { true, false })
4297 +        for (Integer v1 : new Integer[] { 1, null })
4298 +    {
4299 +        CompletableFuture<Integer> f = new CompletableFuture<>();
4300 +        if (!createIncomplete) assertTrue(f.complete(v1));
4301 +        CompletionStage<Integer> minimal = f.minimalCompletionStage();
4302 +        if (createIncomplete) assertTrue(f.complete(v1));
4303 +        assertEquals(v1, minimal.toCompletableFuture().join());
4304 +        assertEquals(v1, minimal.toCompletableFuture().get());
4305 +        checkCompletedNormally(minimal.toCompletableFuture(), v1);
4306 +    }}
4307 +
4308 +    /**
4309 +     * Completion of a toCompletableFuture copy of a minimal stage
4310 +     * does not complete its source.
4311 +     */
4312 +    public void testMinimalCompletionStage_toCompletableFuture_oneWayPropagation() {
4313 +        CompletableFuture<Integer> f = new CompletableFuture<>();
4314 +        CompletionStage<Integer> g = f.minimalCompletionStage();
4315 +        assertTrue(g.toCompletableFuture().complete(1));
4316 +        assertTrue(g.toCompletableFuture().complete(null));
4317 +        assertTrue(g.toCompletableFuture().cancel(true));
4318 +        assertTrue(g.toCompletableFuture().cancel(false));
4319 +        assertTrue(g.toCompletableFuture().completeExceptionally(new CFException()));
4320 +        checkIncomplete(g.toCompletableFuture());
4321 +        f.complete(1);
4322 +        checkCompletedNormally(g.toCompletableFuture(), 1);
4323 +    }
4324 +
4325 +    /** Demo utility method for external reliable toCompletableFuture */
4326 +    static <T> CompletableFuture<T> toCompletableFuture(CompletionStage<T> stage) {
4327 +        CompletableFuture<T> f = new CompletableFuture<>();
4328 +        stage.handle((T t, Throwable ex) -> {
4329 +                         if (ex != null) f.completeExceptionally(ex);
4330 +                         else f.complete(t);
4331 +                         return null;
4332 +                     });
4333 +        return f;
4334 +    }
4335 +
4336 +    /** Demo utility method to join a CompletionStage */
4337 +    static <T> T join(CompletionStage<T> stage) {
4338 +        return toCompletableFuture(stage).join();
4339 +    }
4340 +
4341 +    /**
4342 +     * Joining a minimal stage "by hand" works
4343 +     */
4344 +    public void testMinimalCompletionStage_join_by_hand() {
4345 +        for (boolean createIncomplete : new boolean[] { true, false })
4346 +        for (Integer v1 : new Integer[] { 1, null })
4347 +    {
4348 +        CompletableFuture<Integer> f = new CompletableFuture<>();
4349 +        CompletionStage<Integer> minimal = f.minimalCompletionStage();
4350 +        CompletableFuture<Integer> g = new CompletableFuture<>();
4351 +        if (!createIncomplete) assertTrue(f.complete(v1));
4352 +        minimal.thenAccept(x -> g.complete(x));
4353 +        if (createIncomplete) assertTrue(f.complete(v1));
4354 +        g.join();
4355 +        checkCompletedNormally(g, v1);
4356 +        checkCompletedNormally(f, v1);
4357 +        assertEquals(v1, join(minimal));
4358 +    }}
4359 +
4360 +    static class Monad {
4361 +        static class ZeroException extends RuntimeException {
4362 +            public ZeroException() { super("monadic zero"); }
4363 +        }
4364 +        // "return", "unit"
4365 +        static <T> CompletableFuture<T> unit(T value) {
4366 +            return completedFuture(value);
4367 +        }
4368 +        // monadic zero ?
4369 +        static <T> CompletableFuture<T> zero() {
4370 +            return failedFuture(new ZeroException());
4371 +        }
4372 +        // >=>
4373 +        static <T,U,V> Function<T, CompletableFuture<V>> compose
4374 +            (Function<T, CompletableFuture<U>> f,
4375 +             Function<U, CompletableFuture<V>> g) {
4376 +            return x -> f.apply(x).thenCompose(g);
4377 +        }
4378 +
4379 +        static void assertZero(CompletableFuture<?> f) {
4380 +            try {
4381 +                f.getNow(null);
4382 +                throw new AssertionError("should throw");
4383 +            } catch (CompletionException success) {
4384 +                assertTrue(success.getCause() instanceof ZeroException);
4385 +            }
4386 +        }
4387 +
4388 +        static <T> void assertFutureEquals(CompletableFuture<T> f,
4389 +                                           CompletableFuture<T> g) {
4390 +            T fval = null, gval = null;
4391 +            Throwable fex = null, gex = null;
4392 +
4393 +            try { fval = f.get(); }
4394 +            catch (ExecutionException ex) { fex = ex.getCause(); }
4395 +            catch (Throwable ex) { fex = ex; }
4396 +
4397 +            try { gval = g.get(); }
4398 +            catch (ExecutionException ex) { gex = ex.getCause(); }
4399 +            catch (Throwable ex) { gex = ex; }
4400 +
4401 +            if (fex != null || gex != null)
4402 +                assertSame(fex.getClass(), gex.getClass());
4403 +            else
4404 +                assertEquals(fval, gval);
4405 +        }
4406 +
4407 +        static class PlusFuture<T> extends CompletableFuture<T> {
4408 +            AtomicReference<Throwable> firstFailure = new AtomicReference<>(null);
4409 +        }
4410 +
4411 +        /** Implements "monadic plus". */
4412 +        static <T> CompletableFuture<T> plus(CompletableFuture<? extends T> f,
4413 +                                             CompletableFuture<? extends T> g) {
4414 +            PlusFuture<T> plus = new PlusFuture<T>();
4415 +            BiConsumer<T, Throwable> action = (T result, Throwable ex) -> {
4416 +                try {
4417 +                    if (ex == null) {
4418 +                        if (plus.complete(result))
4419 +                            if (plus.firstFailure.get() != null)
4420 +                                plus.firstFailure.set(null);
4421 +                    }
4422 +                    else if (plus.firstFailure.compareAndSet(null, ex)) {
4423 +                        if (plus.isDone())
4424 +                            plus.firstFailure.set(null);
4425 +                    }
4426 +                    else {
4427 +                        // first failure has precedence
4428 +                        Throwable first = plus.firstFailure.getAndSet(null);
4429 +
4430 +                        // may fail with "Self-suppression not permitted"
4431 +                        try { first.addSuppressed(ex); }
4432 +                        catch (Exception ignored) {}
4433 +
4434 +                        plus.completeExceptionally(first);
4435 +                    }
4436 +                } catch (Throwable unexpected) {
4437 +                    plus.completeExceptionally(unexpected);
4438 +                }
4439 +            };
4440 +            f.whenComplete(action);
4441 +            g.whenComplete(action);
4442 +            return plus;
4443 +        }
4444 +    }
4445 +
4446 +    /**
4447 +     * CompletableFuture is an additive monad - sort of.
4448 +     * https://en.wikipedia.org/wiki/Monad_(functional_programming)#Additive_monads
4449 +     */
4450 +    public void testAdditiveMonad() throws Throwable {
4451 +        Function<Long, CompletableFuture<Long>> unit = Monad::unit;
4452 +        CompletableFuture<Long> zero = Monad.zero();
4453 +
4454 +        // Some mutually non-commutative functions
4455 +        Function<Long, CompletableFuture<Long>> triple
4456 +            = x -> Monad.unit(3 * x);
4457 +        Function<Long, CompletableFuture<Long>> inc
4458 +            = x -> Monad.unit(x + 1);
4459 +
4460 +        // unit is a right identity: m >>= unit === m
4461 +        Monad.assertFutureEquals(inc.apply(5L).thenCompose(unit),
4462 +                                 inc.apply(5L));
4463 +        // unit is a left identity: (unit x) >>= f === f x
4464 +        Monad.assertFutureEquals(unit.apply(5L).thenCompose(inc),
4465 +                                 inc.apply(5L));
4466 +
4467 +        // associativity: (m >>= f) >>= g === m >>= ( \x -> (f x >>= g) )
4468 +        Monad.assertFutureEquals(
4469 +            unit.apply(5L).thenCompose(inc).thenCompose(triple),
4470 +            unit.apply(5L).thenCompose(x -> inc.apply(x).thenCompose(triple)));
4471 +
4472 +        // The case for CompletableFuture as an additive monad is weaker...
4473 +
4474 +        // zero is a monadic zero
4475 +        Monad.assertZero(zero);
4476 +
4477 +        // left zero: zero >>= f === zero
4478 +        Monad.assertZero(zero.thenCompose(inc));
4479 +        // right zero: f >>= (\x -> zero) === zero
4480 +        Monad.assertZero(inc.apply(5L).thenCompose(x -> zero));
4481 +
4482 +        // f plus zero === f
4483 +        Monad.assertFutureEquals(Monad.unit(5L),
4484 +                                 Monad.plus(Monad.unit(5L), zero));
4485 +        // zero plus f === f
4486 +        Monad.assertFutureEquals(Monad.unit(5L),
4487 +                                 Monad.plus(zero, Monad.unit(5L)));
4488 +        // zero plus zero === zero
4489 +        Monad.assertZero(Monad.plus(zero, zero));
4490 +        {
4491 +            CompletableFuture<Long> f = Monad.plus(Monad.unit(5L),
4492 +                                                   Monad.unit(8L));
4493 +            // non-determinism
4494 +            assertTrue(f.get() == 5L || f.get() == 8L);
4495 +        }
4496 +
4497 +        CompletableFuture<Long> godot = new CompletableFuture<>();
4498 +        // f plus godot === f (doesn't wait for godot)
4499 +        Monad.assertFutureEquals(Monad.unit(5L),
4500 +                                 Monad.plus(Monad.unit(5L), godot));
4501 +        // godot plus f === f (doesn't wait for godot)
4502 +        Monad.assertFutureEquals(Monad.unit(5L),
4503 +                                 Monad.plus(godot, Monad.unit(5L)));
4504 +    }
4505 +
4506 +    /** Test long recursive chains of CompletableFutures with cascading completions */
4507 +    @SuppressWarnings("FutureReturnValueIgnored")
4508 +    public void testRecursiveChains() throws Throwable {
4509 +        for (ExecutionMode m : ExecutionMode.values())
4510 +        for (boolean addDeadEnds : new boolean[] { true, false })
4511 +    {
4512 +        final int val = 42;
4513 +        final int n = expensiveTests ? 1_000 : 2;
4514 +        CompletableFuture<Integer> head = new CompletableFuture<>();
4515 +        CompletableFuture<Integer> tail = head;
4516 +        for (int i = 0; i < n; i++) {
4517 +            if (addDeadEnds) m.thenApply(tail, v -> v + 1);
4518 +            tail = m.thenApply(tail, v -> v + 1);
4519 +            if (addDeadEnds) m.applyToEither(tail, tail, v -> v + 1);
4520 +            tail = m.applyToEither(tail, tail, v -> v + 1);
4521 +            if (addDeadEnds) m.thenCombine(tail, tail, (v, w) -> v + 1);
4522 +            tail = m.thenCombine(tail, tail, (v, w) -> v + 1);
4523 +        }
4524 +        head.complete(val);
4525 +        assertEquals(val + 3 * n, (int) tail.join());
4526 +    }}
4527 +
4528 +    /**
4529 +     * A single CompletableFuture with many dependents.
4530 +     * A demo of scalability - runtime is O(n).
4531 +     */
4532 +    @SuppressWarnings("FutureReturnValueIgnored")
4533 +    public void testManyDependents() throws Throwable {
4534 +        final int n = expensiveTests ? 1_000_000 : 10;
4535 +        final CompletableFuture<Void> head = new CompletableFuture<>();
4536 +        final CompletableFuture<Void> complete = CompletableFuture.completedFuture((Void)null);
4537 +        final AtomicInteger count = new AtomicInteger(0);
4538 +        for (int i = 0; i < n; i++) {
4539 +            head.thenRun(() -> count.getAndIncrement());
4540 +            head.thenAccept(x -> count.getAndIncrement());
4541 +            head.thenApply(x -> count.getAndIncrement());
4542 +
4543 +            head.runAfterBoth(complete, () -> count.getAndIncrement());
4544 +            head.thenAcceptBoth(complete, (x, y) -> count.getAndIncrement());
4545 +            head.thenCombine(complete, (x, y) -> count.getAndIncrement());
4546 +            complete.runAfterBoth(head, () -> count.getAndIncrement());
4547 +            complete.thenAcceptBoth(head, (x, y) -> count.getAndIncrement());
4548 +            complete.thenCombine(head, (x, y) -> count.getAndIncrement());
4549 +
4550 +            head.runAfterEither(new CompletableFuture<Void>(), () -> count.getAndIncrement());
4551 +            head.acceptEither(new CompletableFuture<Void>(), x -> count.getAndIncrement());
4552 +            head.applyToEither(new CompletableFuture<Void>(), x -> count.getAndIncrement());
4553 +            new CompletableFuture<Void>().runAfterEither(head, () -> count.getAndIncrement());
4554 +            new CompletableFuture<Void>().acceptEither(head, x -> count.getAndIncrement());
4555 +            new CompletableFuture<Void>().applyToEither(head, x -> count.getAndIncrement());
4556 +        }
4557 +        head.complete(null);
4558 +        assertEquals(5 * 3 * n, count.get());
4559 +    }
4560 +
4561 +    /** ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest tck */
4562 +    @SuppressWarnings("FutureReturnValueIgnored")
4563 +    public void testCoCompletionGarbageRetention() throws Throwable {
4564 +        final int n = expensiveTests ? 1_000_000 : 10;
4565 +        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
4566 +        CompletableFuture<Integer> f;
4567 +        for (int i = 0; i < n; i++) {
4568 +            f = new CompletableFuture<>();
4569 +            f.runAfterEither(incomplete, () -> {});
4570 +            f.complete(null);
4571 +
4572 +            f = new CompletableFuture<>();
4573 +            f.acceptEither(incomplete, x -> {});
4574 +            f.complete(null);
4575 +
4576 +            f = new CompletableFuture<>();
4577 +            f.applyToEither(incomplete, x -> x);
4578 +            f.complete(null);
4579 +
4580 +            f = new CompletableFuture<>();
4581 +            CompletableFuture.anyOf(f, incomplete);
4582 +            f.complete(null);
4583 +        }
4584 +
4585 +        for (int i = 0; i < n; i++) {
4586 +            f = new CompletableFuture<>();
4587 +            incomplete.runAfterEither(f, () -> {});
4588 +            f.complete(null);
4589 +
4590 +            f = new CompletableFuture<>();
4591 +            incomplete.acceptEither(f, x -> {});
4592 +            f.complete(null);
4593 +
4594 +            f = new CompletableFuture<>();
4595 +            incomplete.applyToEither(f, x -> x);
4596 +            f.complete(null);
4597 +
4598 +            f = new CompletableFuture<>();
4599 +            CompletableFuture.anyOf(incomplete, f);
4600 +            f.complete(null);
4601 +        }
4602 +    }
4603 +
4604 +    /**
4605 +     * Reproduction recipe for:
4606 +     * 8160402: Garbage retention with CompletableFuture.anyOf
4607 +     * 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
4608 +     */
4609 +    public void testAnyOfGarbageRetention() throws Throwable {
4610 +        for (Integer v : new Integer[] { 1, null })
4611 +    {
4612 +        final int n = expensiveTests ? 100_000 : 10;
4613 +        CompletableFuture<Integer>[] fs
4614 +            = (CompletableFuture<Integer>[]) new CompletableFuture<?>[100];
4615 +        for (int i = 0; i < fs.length; i++)
4616 +            fs[i] = new CompletableFuture<>();
4617 +        fs[fs.length - 1].complete(v);
4618 +        for (int i = 0; i < n; i++)
4619 +            checkCompletedNormally(CompletableFuture.anyOf(fs), v);
4620 +    }}
4621 +
4622 +    /**
4623 +     * Checks for garbage retention with allOf.
4624 +     *
4625 +     * As of 2016-07, fails with OOME:
4626 +     * ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest -Djsr166.methodFilter=testCancelledAllOfGarbageRetention tck
4627 +     */
4628 +    public void testCancelledAllOfGarbageRetention() throws Throwable {
4629 +        final int n = expensiveTests ? 100_000 : 10;
4630 +        CompletableFuture<Integer>[] fs
4631 +            = (CompletableFuture<Integer>[]) new CompletableFuture<?>[100];
4632 +        for (int i = 0; i < fs.length; i++)
4633 +            fs[i] = new CompletableFuture<>();
4634 +        for (int i = 0; i < n; i++)
4635 +            assertTrue(CompletableFuture.allOf(fs).cancel(false));
4636 +    }
4637 +
4638 +    /**
4639 +     * Checks for garbage retention when a dependent future is
4640 +     * cancelled and garbage-collected.
4641 +     * 8161600: Garbage retention when source CompletableFutures are never completed
4642 +     *
4643 +     * As of 2016-07, fails with OOME:
4644 +     * ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest -Djsr166.methodFilter=testCancelledGarbageRetention tck
4645 +     */
4646 +    public void testCancelledGarbageRetention() throws Throwable {
4647 +        final int n = expensiveTests ? 100_000 : 10;
4648 +        CompletableFuture<Integer> neverCompleted = new CompletableFuture<>();
4649 +        for (int i = 0; i < n; i++)
4650 +            assertTrue(neverCompleted.thenRun(() -> {}).cancel(true));
4651 +    }
4652 +
4653 +    /**
4654 +     * Checks for garbage retention when MinimalStage.toCompletableFuture()
4655 +     * is invoked many times.
4656 +     * 8161600: Garbage retention when source CompletableFutures are never completed
4657 +     *
4658 +     * As of 2016-07, fails with OOME:
4659 +     * ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest -Djsr166.methodFilter=testToCompletableFutureGarbageRetention tck
4660 +     */
4661 +    public void testToCompletableFutureGarbageRetention() throws Throwable {
4662 +        final int n = expensiveTests ? 900_000 : 10;
4663 +        CompletableFuture<Integer> neverCompleted = new CompletableFuture<>();
4664 +        CompletionStage minimal = neverCompleted.minimalCompletionStage();
4665 +        for (int i = 0; i < n; i++)
4666 +            assertTrue(minimal.toCompletableFuture().cancel(true));
4667 +    }
4668 +
4669 + //     static <U> U join(CompletionStage<U> stage) {
4670 + //         CompletableFuture<U> f = new CompletableFuture<>();
4671 + //         stage.whenComplete((v, ex) -> {
4672 + //             if (ex != null) f.completeExceptionally(ex); else f.complete(v);
4673 + //         });
4674 + //         return f.join();
4675 + //     }
4676 +
4677 + //     static <U> boolean isDone(CompletionStage<U> stage) {
4678 + //         CompletableFuture<U> f = new CompletableFuture<>();
4679 + //         stage.whenComplete((v, ex) -> {
4680 + //             if (ex != null) f.completeExceptionally(ex); else f.complete(v);
4681 + //         });
4682 + //         return f.isDone();
4683 + //     }
4684 +
4685 + //     static <U> U join2(CompletionStage<U> stage) {
4686 + //         return stage.toCompletableFuture().copy().join();
4687 + //     }
4688 +
4689 + //     static <U> boolean isDone2(CompletionStage<U> stage) {
4690 + //         return stage.toCompletableFuture().copy().isDone();
4691 + //     }
4692 +
4693 +    // For testing default implementations
4694 +    // Only non-default interface methods defined.
4695 +    static final class DelegatedCompletionStage<T> implements CompletionStage<T> {
4696 +        final CompletableFuture<T> cf;
4697 +        DelegatedCompletionStage(CompletableFuture<T> cf) { this.cf = cf; }
4698 +        public CompletableFuture<T> toCompletableFuture() {
4699 +            return cf; }
4700 +        public CompletionStage<Void> thenRun
4701 +            (Runnable action) {
4702 +            return cf.thenRun(action); }
4703 +        public CompletionStage<Void> thenRunAsync
4704 +            (Runnable action) {
4705 +            return cf.thenRunAsync(action); }
4706 +        public CompletionStage<Void> thenRunAsync
4707 +            (Runnable action,
4708 +             Executor executor) {
4709 +            return cf.thenRunAsync(action, executor); }
4710 +        public CompletionStage<Void> thenAccept
4711 +            (Consumer<? super T> action) {
4712 +            return cf.thenAccept(action); }
4713 +        public CompletionStage<Void> thenAcceptAsync
4714 +            (Consumer<? super T> action) {
4715 +            return cf.thenAcceptAsync(action); }
4716 +        public CompletionStage<Void> thenAcceptAsync
4717 +            (Consumer<? super T> action,
4718 +             Executor executor) {
4719 +            return cf.thenAcceptAsync(action, executor); }
4720 +        public <U> CompletionStage<U> thenApply
4721 +            (Function<? super T,? extends U> a) {
4722 +            return cf.thenApply(a); }
4723 +        public <U> CompletionStage<U> thenApplyAsync
4724 +            (Function<? super T,? extends U> fn) {
4725 +            return cf.thenApplyAsync(fn); }
4726 +        public <U> CompletionStage<U> thenApplyAsync
4727 +            (Function<? super T,? extends U> fn,
4728 +             Executor executor) {
4729 +            return cf.thenApplyAsync(fn, executor); }
4730 +        public <U,V> CompletionStage<V> thenCombine
4731 +            (CompletionStage<? extends U> other,
4732 +             BiFunction<? super T,? super U,? extends V> fn) {
4733 +            return cf.thenCombine(other, fn); }
4734 +        public <U,V> CompletionStage<V> thenCombineAsync
4735 +            (CompletionStage<? extends U> other,
4736 +             BiFunction<? super T,? super U,? extends V> fn) {
4737 +            return cf.thenCombineAsync(other, fn); }
4738 +        public <U,V> CompletionStage<V> thenCombineAsync
4739 +            (CompletionStage<? extends U> other,
4740 +             BiFunction<? super T,? super U,? extends V> fn,
4741 +             Executor executor) {
4742 +            return cf.thenCombineAsync(other, fn, executor); }
4743 +        public <U> CompletionStage<Void> thenAcceptBoth
4744 +            (CompletionStage<? extends U> other,
4745 +             BiConsumer<? super T, ? super U> action) {
4746 +            return cf.thenAcceptBoth(other, action); }
4747 +        public <U> CompletionStage<Void> thenAcceptBothAsync
4748 +            (CompletionStage<? extends U> other,
4749 +             BiConsumer<? super T, ? super U> action) {
4750 +            return cf.thenAcceptBothAsync(other, action); }
4751 +        public <U> CompletionStage<Void> thenAcceptBothAsync
4752 +            (CompletionStage<? extends U> other,
4753 +             BiConsumer<? super T, ? super U> action,
4754 +             Executor executor) {
4755 +            return cf.thenAcceptBothAsync(other, action, executor); }
4756 +        public CompletionStage<Void> runAfterBoth
4757 +            (CompletionStage<?> other,
4758 +             Runnable action) {
4759 +            return cf.runAfterBoth(other, action); }
4760 +        public CompletionStage<Void> runAfterBothAsync
4761 +            (CompletionStage<?> other,
4762 +             Runnable action) {
4763 +            return cf.runAfterBothAsync(other, action); }
4764 +        public CompletionStage<Void> runAfterBothAsync
4765 +            (CompletionStage<?> other,
4766 +             Runnable action,
4767 +             Executor executor) {
4768 +            return cf.runAfterBothAsync(other, action, executor); }
4769 +        public <U> CompletionStage<U> applyToEither
4770 +            (CompletionStage<? extends T> other,
4771 +             Function<? super T, U> fn) {
4772 +            return cf.applyToEither(other, fn); }
4773 +        public <U> CompletionStage<U> applyToEitherAsync
4774 +            (CompletionStage<? extends T> other,
4775 +             Function<? super T, U> fn) {
4776 +            return cf.applyToEitherAsync(other, fn); }
4777 +        public <U> CompletionStage<U> applyToEitherAsync
4778 +            (CompletionStage<? extends T> other,
4779 +             Function<? super T, U> fn,
4780 +             Executor executor) {
4781 +            return cf.applyToEitherAsync(other, fn, executor); }
4782 +        public CompletionStage<Void> acceptEither
4783 +            (CompletionStage<? extends T> other,
4784 +             Consumer<? super T> action) {
4785 +            return cf.acceptEither(other, action); }
4786 +        public CompletionStage<Void> acceptEitherAsync
4787 +            (CompletionStage<? extends T> other,
4788 +             Consumer<? super T> action) {
4789 +            return cf.acceptEitherAsync(other, action); }
4790 +        public CompletionStage<Void> acceptEitherAsync
4791 +            (CompletionStage<? extends T> other,
4792 +             Consumer<? super T> action,
4793 +             Executor executor) {
4794 +            return cf.acceptEitherAsync(other, action, executor); }
4795 +        public CompletionStage<Void> runAfterEither
4796 +            (CompletionStage<?> other,
4797 +             Runnable action) {
4798 +            return cf.runAfterEither(other, action); }
4799 +        public CompletionStage<Void> runAfterEitherAsync
4800 +            (CompletionStage<?> other,
4801 +             Runnable action) {
4802 +            return cf.runAfterEitherAsync(other, action); }
4803 +        public CompletionStage<Void> runAfterEitherAsync
4804 +            (CompletionStage<?> other,
4805 +             Runnable action,
4806 +             Executor executor) {
4807 +            return cf.runAfterEitherAsync(other, action, executor); }
4808 +        public <U> CompletionStage<U> thenCompose
4809 +            (Function<? super T, ? extends CompletionStage<U>> fn) {
4810 +            return cf.thenCompose(fn); }
4811 +        public <U> CompletionStage<U> thenComposeAsync
4812 +            (Function<? super T, ? extends CompletionStage<U>> fn) {
4813 +            return cf.thenComposeAsync(fn); }
4814 +        public <U> CompletionStage<U> thenComposeAsync
4815 +            (Function<? super T, ? extends CompletionStage<U>> fn,
4816 +             Executor executor) {
4817 +            return cf.thenComposeAsync(fn, executor); }
4818 +        public <U> CompletionStage<U> handle
4819 +            (BiFunction<? super T, Throwable, ? extends U> fn) {
4820 +            return cf.handle(fn); }
4821 +        public <U> CompletionStage<U> handleAsync
4822 +            (BiFunction<? super T, Throwable, ? extends U> fn) {
4823 +            return cf.handleAsync(fn); }
4824 +        public <U> CompletionStage<U> handleAsync
4825 +            (BiFunction<? super T, Throwable, ? extends U> fn,
4826 +             Executor executor) {
4827 +            return cf.handleAsync(fn, executor); }
4828 +        public CompletionStage<T> whenComplete
4829 +            (BiConsumer<? super T, ? super Throwable> action) {
4830 +            return cf.whenComplete(action); }
4831 +        public CompletionStage<T> whenCompleteAsync
4832 +            (BiConsumer<? super T, ? super Throwable> action) {
4833 +            return cf.whenCompleteAsync(action); }
4834 +        public CompletionStage<T> whenCompleteAsync
4835 +            (BiConsumer<? super T, ? super Throwable> action,
4836 +             Executor executor) {
4837 +            return cf.whenCompleteAsync(action, executor); }
4838 +        public CompletionStage<T> exceptionally
4839 +            (Function<Throwable, ? extends T> fn) {
4840 +            return cf.exceptionally(fn); }
4841 +    }
4842 +
4843 +    /**
4844 +     * default-implemented exceptionallyAsync action is not invoked when
4845 +     * source completes normally, and source result is propagated
4846 +     */
4847 +    public void testDefaultExceptionallyAsync_normalCompletion() {
4848 +        for (boolean createIncomplete : new boolean[] { true, false })
4849 +        for (Integer v1 : new Integer[] { 1, null })
4850 +    {
4851 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
4852 +        final DelegatedCompletionStage<Integer> d =
4853 +            new DelegatedCompletionStage<Integer>(f);
4854 +        if (!createIncomplete) assertTrue(f.complete(v1));
4855 +        final CompletionStage<Integer> g = d.exceptionallyAsync
4856 +            ((Throwable t) -> {
4857 +                threadFail("should not be called");
4858 +                return null;            // unreached
4859 +            });
4860 +        if (createIncomplete) assertTrue(f.complete(v1));
4861 +
4862 +        checkCompletedNormally(g.toCompletableFuture(), v1);
4863 +    }}
4864 +
4865 +    /**
4866 +     * default-implemented exceptionallyAsync action completes with
4867 +     * function value on source exception
4868 +     */
4869 +    public void testDefaultExceptionallyAsync_exceptionalCompletion() {
4870 +        for (boolean createIncomplete : new boolean[] { true, false })
4871 +        for (Integer v1 : new Integer[] { 1, null })
4872 +    {
4873 +        final AtomicInteger a = new AtomicInteger(0);
4874 +        final CFException ex = new CFException();
4875 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
4876 +        final DelegatedCompletionStage<Integer> d =
4877 +            new DelegatedCompletionStage<Integer>(f);
4878 +        if (!createIncomplete) f.completeExceptionally(ex);
4879 +        final CompletionStage<Integer> g = d.exceptionallyAsync
4880 +            ((Throwable t) -> {
4881 +                threadAssertSame(t, ex);
4882 +                a.getAndIncrement();
4883 +                return v1;
4884 +            });
4885 +        if (createIncomplete) f.completeExceptionally(ex);
4886 +
4887 +        checkCompletedNormally(g.toCompletableFuture(), v1);
4888 +        assertEquals(1, a.get());
4889 +    }}
4890 +
4891 +    /**
4892 +     * Under default implementation, if an "exceptionally action"
4893 +     * throws an exception, it completes exceptionally with that
4894 +     * exception
4895 +     */
4896 +    public void testDefaultExceptionallyAsync_exceptionalCompletionActionFailed() {
4897 +        for (boolean createIncomplete : new boolean[] { true, false })
4898 +    {
4899 +        final AtomicInteger a = new AtomicInteger(0);
4900 +        final CFException ex1 = new CFException();
4901 +        final CFException ex2 = new CFException();
4902 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
4903 +        final DelegatedCompletionStage<Integer> d =
4904 +            new DelegatedCompletionStage<Integer>(f);
4905 +        if (!createIncomplete) f.completeExceptionally(ex1);
4906 +        final CompletionStage<Integer> g = d.exceptionallyAsync
4907 +            ((Throwable t) -> {
4908 +                threadAssertSame(t, ex1);
4909 +                a.getAndIncrement();
4910 +                throw ex2;
4911 +            });
4912 +        if (createIncomplete) f.completeExceptionally(ex1);
4913 +
4914 +        checkCompletedWithWrappedException(g.toCompletableFuture(), ex2);
4915 +        checkCompletedExceptionally(f, ex1);
4916 +        checkCompletedExceptionally(d.toCompletableFuture(), ex1);
4917 +        assertEquals(1, a.get());
4918 +    }}
4919 +
4920 +    /**
4921 +     * default exceptionallyCompose result completes normally after normal
4922 +     * completion of source
4923 +     */
4924 +    public void testDefaultExceptionallyCompose_normalCompletion() {
4925 +        for (boolean createIncomplete : new boolean[] { true, false })
4926 +        for (Integer v1 : new Integer[] { 1, null })
4927 +    {
4928 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
4929 +        final ExceptionalCompletableFutureFunction r =
4930 +            new ExceptionalCompletableFutureFunction(ExecutionMode.SYNC);
4931 +        final DelegatedCompletionStage<Integer> d =
4932 +            new DelegatedCompletionStage<Integer>(f);
4933 +        if (!createIncomplete) assertTrue(f.complete(v1));
4934 +        final CompletionStage<Integer> g = d.exceptionallyCompose(r);
4935 +        if (createIncomplete) assertTrue(f.complete(v1));
4936 +
4937 +        checkCompletedNormally(f, v1);
4938 +        checkCompletedNormally(g.toCompletableFuture(), v1);
4939 +        r.assertNotInvoked();
4940 +    }}
4941 +
4942 +    /**
4943 +     * default-implemented exceptionallyCompose result completes
4944 +     * normally after exceptional completion of source
4945 +     */
4946 +    public void testDefaultExceptionallyCompose_exceptionalCompletion() {
4947 +        for (boolean createIncomplete : new boolean[] { true, false })
4948 +    {
4949 +        final CFException ex = new CFException();
4950 +        final ExceptionalCompletableFutureFunction r =
4951 +            new ExceptionalCompletableFutureFunction(ExecutionMode.SYNC);
4952 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
4953 +        final DelegatedCompletionStage<Integer> d =
4954 +            new DelegatedCompletionStage<Integer>(f);
4955 +        if (!createIncomplete) f.completeExceptionally(ex);
4956 +        final CompletionStage<Integer> g = d.exceptionallyCompose(r);
4957 +        if (createIncomplete) f.completeExceptionally(ex);
4958 +
4959 +        checkCompletedExceptionally(f, ex);
4960 +        checkCompletedNormally(g.toCompletableFuture(), r.value);
4961 +        r.assertInvoked();
4962 +    }}
4963 +
4964 +    /**
4965 +     * default-implemented exceptionallyCompose completes
4966 +     * exceptionally on exception if action does
4967 +     */
4968 +    public void testDefaultExceptionallyCompose_actionFailed() {
4969 +        for (boolean createIncomplete : new boolean[] { true, false })
4970 +        for (Integer v1 : new Integer[] { 1, null })
4971 +    {
4972 +        final CFException ex = new CFException();
4973 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
4974 +        final FailingExceptionalCompletableFutureFunction r
4975 +            = new FailingExceptionalCompletableFutureFunction(ExecutionMode.SYNC);
4976 +        final DelegatedCompletionStage<Integer> d =
4977 +            new DelegatedCompletionStage<Integer>(f);
4978 +        if (!createIncomplete) f.completeExceptionally(ex);
4979 +        final CompletionStage<Integer> g = d.exceptionallyCompose(r);
4980 +        if (createIncomplete) f.completeExceptionally(ex);
4981 +
4982 +        checkCompletedExceptionally(f, ex);
4983 +        checkCompletedWithWrappedException(g.toCompletableFuture(), r.ex);
4984 +        r.assertInvoked();
4985 +    }}
4986 +
4987 +    /**
4988 +     * default exceptionallyComposeAsync result completes normally after normal
4989 +     * completion of source
4990 +     */
4991 +    public void testDefaultExceptionallyComposeAsync_normalCompletion() {
4992 +        for (boolean createIncomplete : new boolean[] { true, false })
4993 +        for (Integer v1 : new Integer[] { 1, null })
4994 +    {
4995 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
4996 +        final ExceptionalCompletableFutureFunction r =
4997 +            new ExceptionalCompletableFutureFunction(ExecutionMode.ASYNC);
4998 +        final DelegatedCompletionStage<Integer> d =
4999 +            new DelegatedCompletionStage<Integer>(f);
5000 +        if (!createIncomplete) assertTrue(f.complete(v1));
5001 +        final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r);
5002 +        if (createIncomplete) assertTrue(f.complete(v1));
5003 +
5004 +        checkCompletedNormally(f, v1);
5005 +        checkCompletedNormally(g.toCompletableFuture(), v1);
5006 +        r.assertNotInvoked();
5007 +    }}
5008 +
5009 +    /**
5010 +     * default-implemented exceptionallyComposeAsync result completes
5011 +     * normally after exceptional completion of source
5012 +     */
5013 +    public void testDefaultExceptionallyComposeAsync_exceptionalCompletion() {
5014 +        for (boolean createIncomplete : new boolean[] { true, false })
5015 +    {
5016 +        final CFException ex = new CFException();
5017 +        final ExceptionalCompletableFutureFunction r =
5018 +            new ExceptionalCompletableFutureFunction(ExecutionMode.ASYNC);
5019 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
5020 +        final DelegatedCompletionStage<Integer> d =
5021 +            new DelegatedCompletionStage<Integer>(f);
5022 +        if (!createIncomplete) f.completeExceptionally(ex);
5023 +        final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r);
5024 +        if (createIncomplete) f.completeExceptionally(ex);
5025 +
5026 +        checkCompletedExceptionally(f, ex);
5027 +        checkCompletedNormally(g.toCompletableFuture(), r.value);
5028 +        r.assertInvoked();
5029 +    }}
5030 +
5031 +    /**
5032 +     * default-implemented exceptionallyComposeAsync completes
5033 +     * exceptionally on exception if action does
5034 +     */
5035 +    public void testDefaultExceptionallyComposeAsync_actionFailed() {
5036 +        for (boolean createIncomplete : new boolean[] { true, false })
5037 +        for (Integer v1 : new Integer[] { 1, null })
5038 +    {
5039 +        final CFException ex = new CFException();
5040 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
5041 +        final FailingExceptionalCompletableFutureFunction r
5042 +            = new FailingExceptionalCompletableFutureFunction(ExecutionMode.ASYNC);
5043 +        final DelegatedCompletionStage<Integer> d =
5044 +            new DelegatedCompletionStage<Integer>(f);
5045 +        if (!createIncomplete) f.completeExceptionally(ex);
5046 +        final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r);
5047 +        if (createIncomplete) f.completeExceptionally(ex);
5048 +
5049 +        checkCompletedExceptionally(f, ex);
5050 +        checkCompletedWithWrappedException(g.toCompletableFuture(), r.ex);
5051 +        r.assertInvoked();
5052 +    }}
5053 +
5054 +
5055 +    /**
5056 +     * default exceptionallyComposeAsync result completes normally after normal
5057 +     * completion of source
5058 +     */
5059 +    public void testDefaultExceptionallyComposeAsyncExecutor_normalCompletion() {
5060 +        for (boolean createIncomplete : new boolean[] { true, false })
5061 +        for (Integer v1 : new Integer[] { 1, null })
5062 +    {
5063 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
5064 +        final ExceptionalCompletableFutureFunction r =
5065 +            new ExceptionalCompletableFutureFunction(ExecutionMode.EXECUTOR);
5066 +        final DelegatedCompletionStage<Integer> d =
5067 +            new DelegatedCompletionStage<Integer>(f);
5068 +        if (!createIncomplete) assertTrue(f.complete(v1));
5069 +        final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r, new ThreadExecutor());
5070 +        if (createIncomplete) assertTrue(f.complete(v1));
5071 +
5072 +        checkCompletedNormally(f, v1);
5073 +        checkCompletedNormally(g.toCompletableFuture(), v1);
5074 +        r.assertNotInvoked();
5075 +    }}
5076 +
5077 +    /**
5078 +     * default-implemented exceptionallyComposeAsync result completes
5079 +     * normally after exceptional completion of source
5080 +     */
5081 +    public void testDefaultExceptionallyComposeAsyncExecutor_exceptionalCompletion() {
5082 +        for (boolean createIncomplete : new boolean[] { true, false })
5083 +    {
5084 +        final CFException ex = new CFException();
5085 +        final ExceptionalCompletableFutureFunction r =
5086 +            new ExceptionalCompletableFutureFunction(ExecutionMode.EXECUTOR);
5087 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
5088 +        final DelegatedCompletionStage<Integer> d =
5089 +            new DelegatedCompletionStage<Integer>(f);
5090 +        if (!createIncomplete) f.completeExceptionally(ex);
5091 +        final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r, new ThreadExecutor());
5092 +        if (createIncomplete) f.completeExceptionally(ex);
5093 +
5094 +        checkCompletedExceptionally(f, ex);
5095 +        checkCompletedNormally(g.toCompletableFuture(), r.value);
5096 +        r.assertInvoked();
5097 +    }}
5098 +
5099 +    /**
5100 +     * default-implemented exceptionallyComposeAsync completes
5101 +     * exceptionally on exception if action does
5102 +     */
5103 +    public void testDefaultExceptionallyComposeAsyncExecutor_actionFailed() {
5104 +        for (boolean createIncomplete : new boolean[] { true, false })
5105 +        for (Integer v1 : new Integer[] { 1, null })
5106 +    {
5107 +        final CFException ex = new CFException();
5108 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
5109 +        final FailingExceptionalCompletableFutureFunction r
5110 +            = new FailingExceptionalCompletableFutureFunction(ExecutionMode.EXECUTOR);
5111 +        final DelegatedCompletionStage<Integer> d =
5112 +            new DelegatedCompletionStage<Integer>(f);
5113 +        if (!createIncomplete) f.completeExceptionally(ex);
5114 +        final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r, new ThreadExecutor());
5115 +        if (createIncomplete) f.completeExceptionally(ex);
5116 +
5117 +        checkCompletedExceptionally(f, ex);
5118 +        checkCompletedWithWrappedException(g.toCompletableFuture(), r.ex);
5119 +        r.assertInvoked();
5120 +    }}
5121 +
5122   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines