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.108 by jsr166, Thu Sep 3 17:45:22 2015 UTC vs.
Revision 1.222 by jsr166, Mon Dec 16 21:18:49 2019 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<>();
597 <            assertTrue(f.complete(inc(x)));
598 <            return f;
554 >            return CompletableFuture.completedFuture(inc(x));
555          }
556      }
557  
558 <    class FailingCompletableFutureFunction extends CheckedIntegerAction
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 >    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      {
929 <        final AtomicInteger a = new AtomicInteger(0);
929 >        final AtomicInteger ran = new AtomicInteger(0);
930          final CompletableFuture<Integer> f = new CompletableFuture<>();
931          if (!createIncomplete) assertTrue(f.complete(v1));
932 <        final CompletableFuture<Integer> g = f.exceptionally
933 <            ((Throwable t) -> {
934 <                // Should not be called
935 <                a.getAndIncrement();
913 <                throw new AssertionError();
932 >        final CompletableFuture<Integer> g = m.exceptionally
933 >            (f, (Throwable t) -> {
934 >                ran.getAndIncrement();
935 >                throw new AssertionError("should not be called");
936              });
937          if (createIncomplete) assertTrue(f.complete(v1));
938  
939          checkCompletedNormally(g, v1);
940          checkCompletedNormally(f, v1);
941 <        assertEquals(0, a.get());
941 >        assertEquals(0, ran.get());
942      }}
943  
944      /**
# Line 924 | Line 946 | public class CompletableFutureTest exten
946       * exception
947       */
948      public void testExceptionally_exceptionalCompletion() {
949 +        for (ExecutionMode m : ExecutionMode.values())
950          for (boolean createIncomplete : new boolean[] { true, false })
951          for (Integer v1 : new Integer[] { 1, null })
952      {
953 <        final AtomicInteger a = new AtomicInteger(0);
953 >        final AtomicInteger ran = new AtomicInteger(0);
954          final CFException ex = new CFException();
955          final CompletableFuture<Integer> f = new CompletableFuture<>();
956          if (!createIncomplete) f.completeExceptionally(ex);
957 <        final CompletableFuture<Integer> g = f.exceptionally
958 <            ((Throwable t) -> {
959 <                ExecutionMode.SYNC.checkExecutionMode();
960 <                threadAssertSame(t, ex);
961 <                a.getAndIncrement();
957 >        final CompletableFuture<Integer> g = m.exceptionally
958 >            (f, (Throwable t) -> {
959 >                m.checkExecutionMode();
960 >                assertSame(t, ex);
961 >                ran.getAndIncrement();
962                  return v1;
963              });
964          if (createIncomplete) f.completeExceptionally(ex);
965  
966          checkCompletedNormally(g, v1);
967 <        assertEquals(1, a.get());
967 >        assertEquals(1, ran.get());
968      }}
969  
970 +    /**
971 +     * If an "exceptionally action" throws an exception, it completes
972 +     * exceptionally with that exception
973 +     */
974      public void testExceptionally_exceptionalCompletionActionFailed() {
975 +        for (ExecutionMode m : ExecutionMode.values())
976          for (boolean createIncomplete : new boolean[] { true, false })
977      {
978 <        final AtomicInteger a = new AtomicInteger(0);
978 >        final AtomicInteger ran = new AtomicInteger(0);
979          final CFException ex1 = new CFException();
980          final CFException ex2 = new CFException();
981          final CompletableFuture<Integer> f = new CompletableFuture<>();
982          if (!createIncomplete) f.completeExceptionally(ex1);
983 <        final CompletableFuture<Integer> g = f.exceptionally
984 <            ((Throwable t) -> {
985 <                ExecutionMode.SYNC.checkExecutionMode();
986 <                threadAssertSame(t, ex1);
987 <                a.getAndIncrement();
983 >        final CompletableFuture<Integer> g = m.exceptionally
984 >            (f, (Throwable t) -> {
985 >                m.checkExecutionMode();
986 >                assertSame(t, ex1);
987 >                ran.getAndIncrement();
988                  throw ex2;
989              });
990          if (createIncomplete) f.completeExceptionally(ex1);
991  
992          checkCompletedWithWrappedException(g, ex2);
993 <        assertEquals(1, a.get());
993 >        checkCompletedExceptionally(f, ex1);
994 >        assertEquals(1, ran.get());
995      }}
996  
997      /**
998       * whenComplete action executes on normal completion, propagating
999       * source result.
1000       */
1001 <    public void testWhenComplete_normalCompletion1() {
1001 >    public void testWhenComplete_normalCompletion() {
1002          for (ExecutionMode m : ExecutionMode.values())
1003          for (boolean createIncomplete : new boolean[] { true, false })
1004          for (Integer v1 : new Integer[] { 1, null })
1005      {
1006 <        final AtomicInteger a = new AtomicInteger(0);
1006 >        final AtomicInteger ran = new AtomicInteger(0);
1007          final CompletableFuture<Integer> f = new CompletableFuture<>();
1008          if (!createIncomplete) assertTrue(f.complete(v1));
1009          final CompletableFuture<Integer> g = m.whenComplete
1010              (f,
1011 <             (Integer x, Throwable t) -> {
1011 >             (Integer result, Throwable t) -> {
1012                  m.checkExecutionMode();
1013 <                threadAssertSame(x, v1);
1014 <                threadAssertNull(t);
1015 <                a.getAndIncrement();
1013 >                assertSame(result, v1);
1014 >                assertNull(t);
1015 >                ran.getAndIncrement();
1016              });
1017          if (createIncomplete) assertTrue(f.complete(v1));
1018  
1019          checkCompletedNormally(g, v1);
1020          checkCompletedNormally(f, v1);
1021 <        assertEquals(1, a.get());
1021 >        assertEquals(1, ran.get());
1022      }}
1023  
1024      /**
# Line 1000 | Line 1029 | public class CompletableFutureTest exten
1029          for (ExecutionMode m : ExecutionMode.values())
1030          for (boolean createIncomplete : new boolean[] { true, false })
1031      {
1032 <        final AtomicInteger a = new AtomicInteger(0);
1032 >        final AtomicInteger ran = new AtomicInteger(0);
1033          final CFException ex = new CFException();
1034          final CompletableFuture<Integer> f = new CompletableFuture<>();
1035          if (!createIncomplete) f.completeExceptionally(ex);
1036          final CompletableFuture<Integer> g = m.whenComplete
1037              (f,
1038 <             (Integer x, Throwable t) -> {
1038 >             (Integer result, Throwable t) -> {
1039                  m.checkExecutionMode();
1040 <                threadAssertNull(x);
1041 <                threadAssertSame(t, ex);
1042 <                a.getAndIncrement();
1040 >                assertNull(result);
1041 >                assertSame(t, ex);
1042 >                ran.getAndIncrement();
1043              });
1044          if (createIncomplete) f.completeExceptionally(ex);
1045  
1046          checkCompletedWithWrappedException(g, ex);
1047          checkCompletedExceptionally(f, ex);
1048 <        assertEquals(1, a.get());
1048 >        assertEquals(1, ran.get());
1049      }}
1050  
1051      /**
# Line 1028 | Line 1057 | public class CompletableFutureTest exten
1057          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1058          for (boolean createIncomplete : new boolean[] { true, false })
1059      {
1060 <        final AtomicInteger a = new AtomicInteger(0);
1060 >        final AtomicInteger ran = new AtomicInteger(0);
1061          final CompletableFuture<Integer> f = new CompletableFuture<>();
1062          if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1063          final CompletableFuture<Integer> g = m.whenComplete
1064              (f,
1065 <             (Integer x, Throwable t) -> {
1065 >             (Integer result, Throwable t) -> {
1066                  m.checkExecutionMode();
1067 <                threadAssertNull(x);
1068 <                threadAssertTrue(t instanceof CancellationException);
1069 <                a.getAndIncrement();
1067 >                assertNull(result);
1068 >                assertTrue(t instanceof CancellationException);
1069 >                ran.getAndIncrement();
1070              });
1071          if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1072  
1073          checkCompletedWithWrappedCancellationException(g);
1074          checkCancelled(f);
1075 <        assertEquals(1, a.get());
1075 >        assertEquals(1, ran.get());
1076      }}
1077  
1078      /**
1079       * If a whenComplete action throws an exception when triggered by
1080       * a normal completion, it completes exceptionally
1081       */
1082 <    public void testWhenComplete_actionFailed() {
1082 >    public void testWhenComplete_sourceCompletedNormallyActionFailed() {
1083          for (boolean createIncomplete : new boolean[] { true, false })
1084          for (ExecutionMode m : ExecutionMode.values())
1085          for (Integer v1 : new Integer[] { 1, null })
1086      {
1087 <        final AtomicInteger a = new AtomicInteger(0);
1087 >        final AtomicInteger ran = new AtomicInteger(0);
1088          final CFException ex = new CFException();
1089          final CompletableFuture<Integer> f = new CompletableFuture<>();
1090          if (!createIncomplete) assertTrue(f.complete(v1));
1091          final CompletableFuture<Integer> g = m.whenComplete
1092              (f,
1093 <             (Integer x, Throwable t) -> {
1093 >             (Integer result, Throwable t) -> {
1094                  m.checkExecutionMode();
1095 <                threadAssertSame(x, v1);
1096 <                threadAssertNull(t);
1097 <                a.getAndIncrement();
1095 >                assertSame(result, v1);
1096 >                assertNull(t);
1097 >                ran.getAndIncrement();
1098                  throw ex;
1099              });
1100          if (createIncomplete) assertTrue(f.complete(v1));
1101  
1102          checkCompletedWithWrappedException(g, ex);
1103          checkCompletedNormally(f, v1);
1104 <        assertEquals(1, a.get());
1104 >        assertEquals(1, ran.get());
1105      }}
1106  
1107      /**
1108       * If a whenComplete action throws an exception when triggered by
1109       * a source completion that also throws an exception, the source
1110 <     * exception takes precedence.
1110 >     * exception takes precedence (unlike handle)
1111       */
1112 <    public void testWhenComplete_actionFailedSourceFailed() {
1112 >    public void testWhenComplete_sourceFailedActionFailed() {
1113          for (boolean createIncomplete : new boolean[] { true, false })
1114          for (ExecutionMode m : ExecutionMode.values())
1115      {
1116 <        final AtomicInteger a = new AtomicInteger(0);
1116 >        final AtomicInteger ran = new AtomicInteger(0);
1117          final CFException ex1 = new CFException();
1118          final CFException ex2 = new CFException();
1119          final CompletableFuture<Integer> f = new CompletableFuture<>();
# Line 1092 | Line 1121 | public class CompletableFutureTest exten
1121          if (!createIncomplete) f.completeExceptionally(ex1);
1122          final CompletableFuture<Integer> g = m.whenComplete
1123              (f,
1124 <             (Integer x, Throwable t) -> {
1124 >             (Integer result, Throwable t) -> {
1125                  m.checkExecutionMode();
1126 <                threadAssertSame(t, ex1);
1127 <                threadAssertNull(x);
1128 <                a.getAndIncrement();
1126 >                assertSame(t, ex1);
1127 >                assertNull(result);
1128 >                ran.getAndIncrement();
1129                  throw ex2;
1130              });
1131          if (createIncomplete) f.completeExceptionally(ex1);
1132  
1133          checkCompletedWithWrappedException(g, ex1);
1134          checkCompletedExceptionally(f, ex1);
1135 <        assertEquals(1, a.get());
1135 >        if (testImplementationDetails) {
1136 >            assertEquals(1, ex1.getSuppressed().length);
1137 >            assertSame(ex2, ex1.getSuppressed()[0]);
1138 >        }
1139 >        assertEquals(1, ran.get());
1140      }}
1141  
1142      /**
# Line 1116 | Line 1149 | public class CompletableFutureTest exten
1149          for (Integer v1 : new Integer[] { 1, null })
1150      {
1151          final CompletableFuture<Integer> f = new CompletableFuture<>();
1152 <        final AtomicInteger a = new AtomicInteger(0);
1152 >        final AtomicInteger ran = new AtomicInteger(0);
1153          if (!createIncomplete) assertTrue(f.complete(v1));
1154          final CompletableFuture<Integer> g = m.handle
1155              (f,
1156 <             (Integer x, Throwable t) -> {
1156 >             (Integer result, Throwable t) -> {
1157                  m.checkExecutionMode();
1158 <                threadAssertSame(x, v1);
1159 <                threadAssertNull(t);
1160 <                a.getAndIncrement();
1158 >                assertSame(result, v1);
1159 >                assertNull(t);
1160 >                ran.getAndIncrement();
1161                  return inc(v1);
1162              });
1163          if (createIncomplete) assertTrue(f.complete(v1));
1164  
1165          checkCompletedNormally(g, inc(v1));
1166          checkCompletedNormally(f, v1);
1167 <        assertEquals(1, a.get());
1167 >        assertEquals(1, ran.get());
1168      }}
1169  
1170      /**
# Line 1144 | Line 1177 | public class CompletableFutureTest exten
1177          for (Integer v1 : new Integer[] { 1, null })
1178      {
1179          final CompletableFuture<Integer> f = new CompletableFuture<>();
1180 <        final AtomicInteger a = new AtomicInteger(0);
1180 >        final AtomicInteger ran = new AtomicInteger(0);
1181          final CFException ex = new CFException();
1182          if (!createIncomplete) f.completeExceptionally(ex);
1183          final CompletableFuture<Integer> g = m.handle
1184              (f,
1185 <             (Integer x, Throwable t) -> {
1185 >             (Integer result, Throwable t) -> {
1186                  m.checkExecutionMode();
1187 <                threadAssertNull(x);
1188 <                threadAssertSame(t, ex);
1189 <                a.getAndIncrement();
1187 >                assertNull(result);
1188 >                assertSame(t, ex);
1189 >                ran.getAndIncrement();
1190                  return v1;
1191              });
1192          if (createIncomplete) f.completeExceptionally(ex);
1193  
1194          checkCompletedNormally(g, v1);
1195          checkCompletedExceptionally(f, ex);
1196 <        assertEquals(1, a.get());
1196 >        assertEquals(1, ran.get());
1197      }}
1198  
1199      /**
# Line 1174 | Line 1207 | public class CompletableFutureTest exten
1207          for (Integer v1 : new Integer[] { 1, null })
1208      {
1209          final CompletableFuture<Integer> f = new CompletableFuture<>();
1210 <        final AtomicInteger a = new AtomicInteger(0);
1210 >        final AtomicInteger ran = new AtomicInteger(0);
1211          if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1212          final CompletableFuture<Integer> g = m.handle
1213              (f,
1214 <             (Integer x, Throwable t) -> {
1214 >             (Integer result, Throwable t) -> {
1215                  m.checkExecutionMode();
1216 <                threadAssertNull(x);
1217 <                threadAssertTrue(t instanceof CancellationException);
1218 <                a.getAndIncrement();
1216 >                assertNull(result);
1217 >                assertTrue(t instanceof CancellationException);
1218 >                ran.getAndIncrement();
1219                  return v1;
1220              });
1221          if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1222  
1223          checkCompletedNormally(g, v1);
1224          checkCancelled(f);
1225 <        assertEquals(1, a.get());
1225 >        assertEquals(1, ran.get());
1226      }}
1227  
1228      /**
1229 <     * handle result completes exceptionally if action does
1229 >     * If a "handle action" throws an exception when triggered by
1230 >     * a normal completion, it completes exceptionally
1231       */
1232 <    public void testHandle_sourceFailedActionFailed() {
1232 >    public void testHandle_sourceCompletedNormallyActionFailed() {
1233          for (ExecutionMode m : ExecutionMode.values())
1234          for (boolean createIncomplete : new boolean[] { true, false })
1235 +        for (Integer v1 : new Integer[] { 1, null })
1236      {
1237          final CompletableFuture<Integer> f = new CompletableFuture<>();
1238 <        final AtomicInteger a = new AtomicInteger(0);
1239 <        final CFException ex1 = new CFException();
1240 <        final CFException ex2 = new CFException();
1206 <        if (!createIncomplete) f.completeExceptionally(ex1);
1238 >        final AtomicInteger ran = new AtomicInteger(0);
1239 >        final CFException ex = new CFException();
1240 >        if (!createIncomplete) assertTrue(f.complete(v1));
1241          final CompletableFuture<Integer> g = m.handle
1242              (f,
1243 <             (Integer x, Throwable t) -> {
1243 >             (Integer result, Throwable t) -> {
1244                  m.checkExecutionMode();
1245 <                threadAssertNull(x);
1246 <                threadAssertSame(ex1, t);
1247 <                a.getAndIncrement();
1248 <                throw ex2;
1245 >                assertSame(result, v1);
1246 >                assertNull(t);
1247 >                ran.getAndIncrement();
1248 >                throw ex;
1249              });
1250 <        if (createIncomplete) f.completeExceptionally(ex1);
1250 >        if (createIncomplete) assertTrue(f.complete(v1));
1251  
1252 <        checkCompletedWithWrappedException(g, ex2);
1253 <        checkCompletedExceptionally(f, ex1);
1254 <        assertEquals(1, a.get());
1252 >        checkCompletedWithWrappedException(g, ex);
1253 >        checkCompletedNormally(f, v1);
1254 >        assertEquals(1, ran.get());
1255      }}
1256  
1257 <    public void testHandle_sourceCompletedNormallyActionFailed() {
1258 <        for (ExecutionMode m : ExecutionMode.values())
1257 >    /**
1258 >     * If a "handle action" throws an exception when triggered by
1259 >     * a source completion that also throws an exception, the action
1260 >     * exception takes precedence (unlike whenComplete)
1261 >     */
1262 >    public void testHandle_sourceFailedActionFailed() {
1263          for (boolean createIncomplete : new boolean[] { true, false })
1264 <        for (Integer v1 : new Integer[] { 1, null })
1264 >        for (ExecutionMode m : ExecutionMode.values())
1265      {
1266 +        final AtomicInteger ran = new AtomicInteger(0);
1267 +        final CFException ex1 = new CFException();
1268 +        final CFException ex2 = new CFException();
1269          final CompletableFuture<Integer> f = new CompletableFuture<>();
1270 <        final AtomicInteger a = new AtomicInteger(0);
1271 <        final CFException ex = new CFException();
1231 <        if (!createIncomplete) assertTrue(f.complete(v1));
1270 >
1271 >        if (!createIncomplete) f.completeExceptionally(ex1);
1272          final CompletableFuture<Integer> g = m.handle
1273              (f,
1274 <             (Integer x, Throwable t) -> {
1274 >             (Integer result, Throwable t) -> {
1275                  m.checkExecutionMode();
1276 <                threadAssertSame(x, v1);
1277 <                threadAssertNull(t);
1278 <                a.getAndIncrement();
1279 <                throw ex;
1276 >                assertNull(result);
1277 >                assertSame(ex1, t);
1278 >                ran.getAndIncrement();
1279 >                throw ex2;
1280              });
1281 <        if (createIncomplete) assertTrue(f.complete(v1));
1281 >        if (createIncomplete) f.completeExceptionally(ex1);
1282  
1283 <        checkCompletedWithWrappedException(g, ex);
1284 <        checkCompletedNormally(f, v1);
1285 <        assertEquals(1, a.get());
1283 >        checkCompletedWithWrappedException(g, ex2);
1284 >        checkCompletedExceptionally(f, ex1);
1285 >        assertEquals(1, ran.get());
1286      }}
1287  
1288      /**
# Line 1274 | Line 1314 | public class CompletableFutureTest exten
1314      {
1315          final FailingRunnable r = new FailingRunnable(m);
1316          final CompletableFuture<Void> f = m.runAsync(r);
1317 <        checkCompletedWithWrappedCFException(f);
1317 >        checkCompletedWithWrappedException(f, r.ex);
1318          r.assertInvoked();
1319      }}
1320  
1321 +    @SuppressWarnings("FutureReturnValueIgnored")
1322 +    public void testRunAsync_rejectingExecutor() {
1323 +        CountingRejectingExecutor e = new CountingRejectingExecutor();
1324 +        try {
1325 +            CompletableFuture.runAsync(() -> {}, e);
1326 +            shouldThrow();
1327 +        } catch (Throwable t) {
1328 +            assertSame(e.ex, t);
1329 +        }
1330 +
1331 +        assertEquals(1, e.count.get());
1332 +    }
1333 +
1334      /**
1335       * supplyAsync completes with result of supplier
1336       */
# Line 1308 | Line 1361 | public class CompletableFutureTest exten
1361      {
1362          FailingSupplier r = new FailingSupplier(m);
1363          CompletableFuture<Integer> f = m.supplyAsync(r);
1364 <        checkCompletedWithWrappedCFException(f);
1364 >        checkCompletedWithWrappedException(f, r.ex);
1365          r.assertInvoked();
1366      }}
1367  
1368 +    @SuppressWarnings("FutureReturnValueIgnored")
1369 +    public void testSupplyAsync_rejectingExecutor() {
1370 +        CountingRejectingExecutor e = new CountingRejectingExecutor();
1371 +        try {
1372 +            CompletableFuture.supplyAsync(() -> null, e);
1373 +            shouldThrow();
1374 +        } catch (Throwable t) {
1375 +            assertSame(e.ex, t);
1376 +        }
1377 +
1378 +        assertEquals(1, e.count.get());
1379 +    }
1380 +
1381      // seq completion methods
1382  
1383      /**
# Line 1430 | Line 1496 | public class CompletableFutureTest exten
1496          final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1497          final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1498  
1499 <        checkCompletedWithWrappedCFException(h0);
1500 <        checkCompletedWithWrappedCFException(h1);
1501 <        checkCompletedWithWrappedCFException(h2);
1502 <        checkCompletedWithWrappedCFException(h3);
1503 <        checkCompletedWithWrappedCFException(h4);
1504 <        checkCompletedWithWrappedCFException(h5);
1499 >        checkCompletedWithWrappedException(h0, rs[0].ex);
1500 >        checkCompletedWithWrappedException(h1, rs[1].ex);
1501 >        checkCompletedWithWrappedException(h2, rs[2].ex);
1502 >        checkCompletedWithWrappedException(h3, rs[3].ex);
1503 >        checkCompletedWithWrappedException(h4, rs[4].ex);
1504 >        checkCompletedWithWrappedException(h5, rs[5].ex);
1505          checkCompletedNormally(f, v1);
1506      }}
1507  
# Line 1534 | Line 1600 | public class CompletableFutureTest exten
1600          final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1601          final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1602  
1603 <        checkCompletedWithWrappedCFException(h0);
1604 <        checkCompletedWithWrappedCFException(h1);
1605 <        checkCompletedWithWrappedCFException(h2);
1606 <        checkCompletedWithWrappedCFException(h3);
1603 >        checkCompletedWithWrappedException(h0, rs[0].ex);
1604 >        checkCompletedWithWrappedException(h1, rs[1].ex);
1605 >        checkCompletedWithWrappedException(h2, rs[2].ex);
1606 >        checkCompletedWithWrappedException(h3, rs[3].ex);
1607          checkCompletedNormally(f, v1);
1608      }}
1609  
# Line 1636 | Line 1702 | public class CompletableFutureTest exten
1702          final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1703          final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1704  
1705 <        checkCompletedWithWrappedCFException(h0);
1706 <        checkCompletedWithWrappedCFException(h1);
1707 <        checkCompletedWithWrappedCFException(h2);
1708 <        checkCompletedWithWrappedCFException(h3);
1705 >        checkCompletedWithWrappedException(h0, rs[0].ex);
1706 >        checkCompletedWithWrappedException(h1, rs[1].ex);
1707 >        checkCompletedWithWrappedException(h2, rs[2].ex);
1708 >        checkCompletedWithWrappedException(h3, rs[3].ex);
1709          checkCompletedNormally(f, v1);
1710      }}
1711  
# Line 1801 | Line 1867 | public class CompletableFutureTest exten
1867          assertTrue(snd.complete(w2));
1868          final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1869  
1870 <        checkCompletedWithWrappedCFException(h1);
1871 <        checkCompletedWithWrappedCFException(h2);
1872 <        checkCompletedWithWrappedCFException(h3);
1870 >        checkCompletedWithWrappedException(h1, r1.ex);
1871 >        checkCompletedWithWrappedException(h2, r2.ex);
1872 >        checkCompletedWithWrappedException(h3, r3.ex);
1873          r1.assertInvoked();
1874          r2.assertInvoked();
1875          r3.assertInvoked();
# Line 1965 | Line 2031 | public class CompletableFutureTest exten
2031          assertTrue(snd.complete(w2));
2032          final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
2033  
2034 <        checkCompletedWithWrappedCFException(h1);
2035 <        checkCompletedWithWrappedCFException(h2);
2036 <        checkCompletedWithWrappedCFException(h3);
2034 >        checkCompletedWithWrappedException(h1, r1.ex);
2035 >        checkCompletedWithWrappedException(h2, r2.ex);
2036 >        checkCompletedWithWrappedException(h3, r3.ex);
2037          r1.assertInvoked();
2038          r2.assertInvoked();
2039          r3.assertInvoked();
# Line 2129 | Line 2195 | public class CompletableFutureTest exten
2195          assertTrue(snd.complete(w2));
2196          final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2197  
2198 <        checkCompletedWithWrappedCFException(h1);
2199 <        checkCompletedWithWrappedCFException(h2);
2200 <        checkCompletedWithWrappedCFException(h3);
2198 >        checkCompletedWithWrappedException(h1, r1.ex);
2199 >        checkCompletedWithWrappedException(h2, r2.ex);
2200 >        checkCompletedWithWrappedException(h3, r3.ex);
2201          r1.assertInvoked();
2202          r2.assertInvoked();
2203          r3.assertInvoked();
# Line 2421 | Line 2487 | public class CompletableFutureTest exten
2487          f.complete(v1);
2488          final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2489          final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2490 <        checkCompletedWithWrappedCFException(h0);
2491 <        checkCompletedWithWrappedCFException(h1);
2492 <        checkCompletedWithWrappedCFException(h2);
2493 <        checkCompletedWithWrappedCFException(h3);
2490 >        checkCompletedWithWrappedException(h0, rs[0].ex);
2491 >        checkCompletedWithWrappedException(h1, rs[1].ex);
2492 >        checkCompletedWithWrappedException(h2, rs[2].ex);
2493 >        checkCompletedWithWrappedException(h3, rs[3].ex);
2494          for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2495  
2496          g.complete(v2);
# Line 2433 | Line 2499 | public class CompletableFutureTest exten
2499          final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2500          final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2501  
2502 <        checkCompletedWithWrappedCFException(h4);
2502 >        checkCompletedWithWrappedException(h4, rs[4].ex);
2503          assertTrue(Objects.equals(v1, rs[4].value) ||
2504                     Objects.equals(v2, rs[4].value));
2505 <        checkCompletedWithWrappedCFException(h5);
2505 >        checkCompletedWithWrappedException(h5, rs[5].ex);
2506          assertTrue(Objects.equals(v1, rs[5].value) ||
2507                     Objects.equals(v2, rs[5].value));
2508  
# Line 2574 | Line 2640 | public class CompletableFutureTest exten
2640  
2641          // unspecified behavior - both source completions available
2642          try {
2643 <            assertEquals(null, h0.join());
2643 >            assertNull(h0.join());
2644              rs[0].assertValue(v1);
2645          } catch (CompletionException ok) {
2646              checkCompletedWithWrappedException(h0, ex);
2647              rs[0].assertNotInvoked();
2648          }
2649          try {
2650 <            assertEquals(null, h1.join());
2650 >            assertNull(h1.join());
2651              rs[1].assertValue(v1);
2652          } catch (CompletionException ok) {
2653              checkCompletedWithWrappedException(h1, ex);
2654              rs[1].assertNotInvoked();
2655          }
2656          try {
2657 <            assertEquals(null, h2.join());
2657 >            assertNull(h2.join());
2658              rs[2].assertValue(v1);
2659          } catch (CompletionException ok) {
2660              checkCompletedWithWrappedException(h2, ex);
2661              rs[2].assertNotInvoked();
2662          }
2663          try {
2664 <            assertEquals(null, h3.join());
2664 >            assertNull(h3.join());
2665              rs[3].assertValue(v1);
2666          } catch (CompletionException ok) {
2667              checkCompletedWithWrappedException(h3, ex);
# Line 2680 | Line 2746 | public class CompletableFutureTest exten
2746          f.complete(v1);
2747          final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2748          final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2749 <        checkCompletedWithWrappedCFException(h0);
2750 <        checkCompletedWithWrappedCFException(h1);
2751 <        checkCompletedWithWrappedCFException(h2);
2752 <        checkCompletedWithWrappedCFException(h3);
2749 >        checkCompletedWithWrappedException(h0, rs[0].ex);
2750 >        checkCompletedWithWrappedException(h1, rs[1].ex);
2751 >        checkCompletedWithWrappedException(h2, rs[2].ex);
2752 >        checkCompletedWithWrappedException(h3, rs[3].ex);
2753          for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2754  
2755          g.complete(v2);
# Line 2692 | Line 2758 | public class CompletableFutureTest exten
2758          final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2759          final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2760  
2761 <        checkCompletedWithWrappedCFException(h4);
2761 >        checkCompletedWithWrappedException(h4, rs[4].ex);
2762          assertTrue(Objects.equals(v1, rs[4].value) ||
2763                     Objects.equals(v2, rs[4].value));
2764 <        checkCompletedWithWrappedCFException(h5);
2764 >        checkCompletedWithWrappedException(h5, rs[5].ex);
2765          assertTrue(Objects.equals(v1, rs[5].value) ||
2766                     Objects.equals(v2, rs[5].value));
2767  
# Line 2711 | Line 2777 | public class CompletableFutureTest exten
2777          for (ExecutionMode m : ExecutionMode.values())
2778          for (Integer v1 : new Integer[] { 1, null })
2779          for (Integer v2 : new Integer[] { 2, null })
2780 +        for (boolean pushNop : new boolean[] { true, false })
2781      {
2782          final CompletableFuture<Integer> f = new CompletableFuture<>();
2783          final CompletableFuture<Integer> g = new CompletableFuture<>();
# Line 2723 | Line 2790 | public class CompletableFutureTest exten
2790          checkIncomplete(h1);
2791          rs[0].assertNotInvoked();
2792          rs[1].assertNotInvoked();
2793 +        if (pushNop) {          // ad hoc test of intra-completion interference
2794 +            m.thenRun(f, () -> {});
2795 +            m.thenRun(g, () -> {});
2796 +        }
2797          f.complete(v1);
2798          checkCompletedNormally(h0, null);
2799          checkCompletedNormally(h1, null);
# Line 2829 | Line 2900 | public class CompletableFutureTest exten
2900  
2901          // unspecified behavior - both source completions available
2902          try {
2903 <            assertEquals(null, h0.join());
2903 >            assertNull(h0.join());
2904              rs[0].assertInvoked();
2905          } catch (CompletionException ok) {
2906              checkCompletedWithWrappedException(h0, ex);
2907              rs[0].assertNotInvoked();
2908          }
2909          try {
2910 <            assertEquals(null, h1.join());
2910 >            assertNull(h1.join());
2911              rs[1].assertInvoked();
2912          } catch (CompletionException ok) {
2913              checkCompletedWithWrappedException(h1, ex);
2914              rs[1].assertNotInvoked();
2915          }
2916          try {
2917 <            assertEquals(null, h2.join());
2917 >            assertNull(h2.join());
2918              rs[2].assertInvoked();
2919          } catch (CompletionException ok) {
2920              checkCompletedWithWrappedException(h2, ex);
2921              rs[2].assertNotInvoked();
2922          }
2923          try {
2924 <            assertEquals(null, h3.join());
2924 >            assertNull(h3.join());
2925              rs[3].assertInvoked();
2926          } catch (CompletionException ok) {
2927              checkCompletedWithWrappedException(h3, ex);
# Line 2935 | Line 3006 | public class CompletableFutureTest exten
3006          assertTrue(f.complete(v1));
3007          final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
3008          final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
3009 <        checkCompletedWithWrappedCFException(h0);
3010 <        checkCompletedWithWrappedCFException(h1);
3011 <        checkCompletedWithWrappedCFException(h2);
3012 <        checkCompletedWithWrappedCFException(h3);
3009 >        checkCompletedWithWrappedException(h0, rs[0].ex);
3010 >        checkCompletedWithWrappedException(h1, rs[1].ex);
3011 >        checkCompletedWithWrappedException(h2, rs[2].ex);
3012 >        checkCompletedWithWrappedException(h3, rs[3].ex);
3013          for (int i = 0; i < 4; i++) rs[i].assertInvoked();
3014          assertTrue(g.complete(v2));
3015          final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
3016          final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
3017 <        checkCompletedWithWrappedCFException(h4);
3018 <        checkCompletedWithWrappedCFException(h5);
3017 >        checkCompletedWithWrappedException(h4, rs[4].ex);
3018 >        checkCompletedWithWrappedException(h5, rs[5].ex);
3019  
3020          checkCompletedNormally(f, v1);
3021          checkCompletedNormally(g, v2);
# Line 3005 | Line 3076 | public class CompletableFutureTest exten
3076          final CompletableFuture<Integer> g = m.thenCompose(f, r);
3077          if (createIncomplete) assertTrue(f.complete(v1));
3078  
3079 <        checkCompletedWithWrappedCFException(g);
3079 >        checkCompletedWithWrappedException(g, r.ex);
3080          checkCompletedNormally(f, v1);
3081      }}
3082  
# Line 3047 | Line 3118 | public class CompletableFutureTest exten
3118          case 0:
3119              assertTrue(f.complete(v1));
3120              assertTrue(g.completeExceptionally(ex));
3121 <            h = m.thenCompose(f, (x -> g));
3121 >            h = m.thenCompose(f, x -> g);
3122              break;
3123          case 1:
3124              assertTrue(f.complete(v1));
3125 <            h = m.thenCompose(f, (x -> g));
3125 >            h = m.thenCompose(f, x -> g);
3126              assertTrue(g.completeExceptionally(ex));
3127              break;
3128          case 2:
3129              assertTrue(g.completeExceptionally(ex));
3130              assertTrue(f.complete(v1));
3131 <            h = m.thenCompose(f, (x -> g));
3131 >            h = m.thenCompose(f, x -> g);
3132              break;
3133          case 3:
3134              assertTrue(g.completeExceptionally(ex));
3135 <            h = m.thenCompose(f, (x -> g));
3135 >            h = m.thenCompose(f, x -> g);
3136              assertTrue(f.complete(v1));
3137              break;
3138          case 4:
3139 <            h = m.thenCompose(f, (x -> g));
3139 >            h = m.thenCompose(f, x -> g);
3140              assertTrue(f.complete(v1));
3141              assertTrue(g.completeExceptionally(ex));
3142              break;
3143          case 5:
3144 <            h = m.thenCompose(f, (x -> g));
3144 >            h = m.thenCompose(f, x -> g);
3145              assertTrue(f.complete(v1));
3146              assertTrue(g.completeExceptionally(ex));
3147              break;
# Line 3082 | Line 3153 | public class CompletableFutureTest exten
3153          checkCompletedNormally(f, v1);
3154      }}
3155  
3156 +    /**
3157 +     * exceptionallyCompose result completes normally after normal
3158 +     * completion of source
3159 +     */
3160 +    public void testExceptionallyCompose_normalCompletion() {
3161 +        for (ExecutionMode m : ExecutionMode.values())
3162 +        for (boolean createIncomplete : new boolean[] { true, false })
3163 +        for (Integer v1 : new Integer[] { 1, null })
3164 +    {
3165 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
3166 +        final ExceptionalCompletableFutureFunction r =
3167 +            new ExceptionalCompletableFutureFunction(m);
3168 +        if (!createIncomplete) assertTrue(f.complete(v1));
3169 +        final CompletableFuture<Integer> g = m.exceptionallyCompose(f, r);
3170 +        if (createIncomplete) assertTrue(f.complete(v1));
3171 +
3172 +        checkCompletedNormally(f, v1);
3173 +        checkCompletedNormally(g, v1);
3174 +        r.assertNotInvoked();
3175 +    }}
3176 +
3177 +    /**
3178 +     * exceptionallyCompose result completes normally after exceptional
3179 +     * completion of source
3180 +     */
3181 +    public void testExceptionallyCompose_exceptionalCompletion() {
3182 +        for (ExecutionMode m : ExecutionMode.values())
3183 +        for (boolean createIncomplete : new boolean[] { true, false })
3184 +    {
3185 +        final CFException ex = new CFException();
3186 +        final ExceptionalCompletableFutureFunction r =
3187 +            new ExceptionalCompletableFutureFunction(m);
3188 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
3189 +        if (!createIncomplete) f.completeExceptionally(ex);
3190 +        final CompletableFuture<Integer> g = m.exceptionallyCompose(f, r);
3191 +        if (createIncomplete) f.completeExceptionally(ex);
3192 +
3193 +        checkCompletedExceptionally(f, ex);
3194 +        checkCompletedNormally(g, r.value);
3195 +        r.assertInvoked();
3196 +    }}
3197 +
3198 +    /**
3199 +     * exceptionallyCompose completes exceptionally on exception if action does
3200 +     */
3201 +    public void testExceptionallyCompose_actionFailed() {
3202 +        for (ExecutionMode m : ExecutionMode.values())
3203 +        for (boolean createIncomplete : new boolean[] { true, false })
3204 +    {
3205 +        final CFException ex = new CFException();
3206 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
3207 +        final FailingExceptionalCompletableFutureFunction r
3208 +            = new FailingExceptionalCompletableFutureFunction(m);
3209 +        if (!createIncomplete) f.completeExceptionally(ex);
3210 +        final CompletableFuture<Integer> g = m.exceptionallyCompose(f, r);
3211 +        if (createIncomplete) f.completeExceptionally(ex);
3212 +
3213 +        checkCompletedExceptionally(f, ex);
3214 +        checkCompletedWithWrappedException(g, r.ex);
3215 +        r.assertInvoked();
3216 +    }}
3217 +
3218 +    /**
3219 +     * exceptionallyCompose result completes exceptionally if the
3220 +     * result of the action does
3221 +     */
3222 +    public void testExceptionallyCompose_actionReturnsFailingFuture() {
3223 +        for (ExecutionMode m : ExecutionMode.values())
3224 +        for (int order = 0; order < 6; order++)
3225 +    {
3226 +        final CFException ex0 = new CFException();
3227 +        final CFException ex = new CFException();
3228 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
3229 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
3230 +        final CompletableFuture<Integer> h;
3231 +        // Test all permutations of orders
3232 +        switch (order) {
3233 +        case 0:
3234 +            assertTrue(f.completeExceptionally(ex0));
3235 +            assertTrue(g.completeExceptionally(ex));
3236 +            h = m.exceptionallyCompose(f, x -> g);
3237 +            break;
3238 +        case 1:
3239 +            assertTrue(f.completeExceptionally(ex0));
3240 +            h = m.exceptionallyCompose(f, x -> g);
3241 +            assertTrue(g.completeExceptionally(ex));
3242 +            break;
3243 +        case 2:
3244 +            assertTrue(g.completeExceptionally(ex));
3245 +            assertTrue(f.completeExceptionally(ex0));
3246 +            h = m.exceptionallyCompose(f, x -> g);
3247 +            break;
3248 +        case 3:
3249 +            assertTrue(g.completeExceptionally(ex));
3250 +            h = m.exceptionallyCompose(f, x -> g);
3251 +            assertTrue(f.completeExceptionally(ex0));
3252 +            break;
3253 +        case 4:
3254 +            h = m.exceptionallyCompose(f, x -> g);
3255 +            assertTrue(f.completeExceptionally(ex0));
3256 +            assertTrue(g.completeExceptionally(ex));
3257 +            break;
3258 +        case 5:
3259 +            h = m.exceptionallyCompose(f, x -> g);
3260 +            assertTrue(f.completeExceptionally(ex0));
3261 +            assertTrue(g.completeExceptionally(ex));
3262 +            break;
3263 +        default: throw new AssertionError();
3264 +        }
3265 +
3266 +        checkCompletedExceptionally(g, ex);
3267 +        checkCompletedWithWrappedException(h, ex);
3268 +        checkCompletedExceptionally(f, ex0);
3269 +    }}
3270 +
3271      // other static methods
3272  
3273      /**
# Line 3114 | Line 3300 | public class CompletableFutureTest exten
3300          }
3301      }
3302  
3303 <    public void testAllOf_backwards() throws Exception {
3303 >    public void testAllOf_normal_backwards() throws Exception {
3304          for (int k = 1; k < 10; k++) {
3305              CompletableFuture<Integer>[] fs
3306                  = (CompletableFuture<Integer>[]) new CompletableFuture[k];
# Line 3142 | Line 3328 | public class CompletableFutureTest exten
3328              for (int i = 0; i < k; i++) {
3329                  checkIncomplete(f);
3330                  checkIncomplete(CompletableFuture.allOf(fs));
3331 <                if (i != k/2) {
3331 >                if (i != k / 2) {
3332                      fs[i].complete(i);
3333                      checkCompletedNormally(fs[i], i);
3334                  } else {
# Line 3245 | Line 3431 | public class CompletableFutureTest exten
3431      /**
3432       * Completion methods throw NullPointerException with null arguments
3433       */
3434 +    @SuppressWarnings("FutureReturnValueIgnored")
3435      public void testNPE() {
3436          CompletableFuture<Integer> f = new CompletableFuture<>();
3437          CompletableFuture<Integer> g = new CompletableFuture<>();
3438          CompletableFuture<Integer> nullFuture = (CompletableFuture<Integer>)null;
3439          ThreadExecutor exec = new ThreadExecutor();
3440  
3441 <        Runnable[] throwingActions = {
3441 >        assertThrows(
3442 >            NullPointerException.class,
3443 >
3444              () -> CompletableFuture.supplyAsync(null),
3445              () -> CompletableFuture.supplyAsync(null, exec),
3446              () -> CompletableFuture.supplyAsync(new IntegerSupplier(ExecutionMode.SYNC, 42), null),
# Line 3264 | Line 3453 | public class CompletableFutureTest exten
3453  
3454              () -> f.thenApply(null),
3455              () -> f.thenApplyAsync(null),
3456 <            () -> f.thenApplyAsync((x) -> x, null),
3456 >            () -> f.thenApplyAsync(x -> x, null),
3457              () -> f.thenApplyAsync(null, exec),
3458  
3459              () -> f.thenAccept(null),
3460              () -> f.thenAcceptAsync(null),
3461 <            () -> f.thenAcceptAsync((x) -> {} , null),
3461 >            () -> f.thenAcceptAsync(x -> {} , null),
3462              () -> f.thenAcceptAsync(null, exec),
3463  
3464              () -> f.thenRun(null),
# Line 3304 | Line 3493 | public class CompletableFutureTest exten
3493              () -> f.applyToEither(g, null),
3494              () -> f.applyToEitherAsync(g, null),
3495              () -> f.applyToEitherAsync(g, null, exec),
3496 <            () -> f.applyToEither(nullFuture, (x) -> x),
3497 <            () -> f.applyToEitherAsync(nullFuture, (x) -> x),
3498 <            () -> f.applyToEitherAsync(nullFuture, (x) -> x, exec),
3499 <            () -> f.applyToEitherAsync(g, (x) -> x, null),
3496 >            () -> f.applyToEither(nullFuture, x -> x),
3497 >            () -> f.applyToEitherAsync(nullFuture, x -> x),
3498 >            () -> f.applyToEitherAsync(nullFuture, x -> x, exec),
3499 >            () -> f.applyToEitherAsync(g, x -> x, null),
3500  
3501              () -> f.acceptEither(g, null),
3502              () -> f.acceptEitherAsync(g, null),
3503              () -> f.acceptEitherAsync(g, null, exec),
3504 <            () -> f.acceptEither(nullFuture, (x) -> {}),
3505 <            () -> f.acceptEitherAsync(nullFuture, (x) -> {}),
3506 <            () -> f.acceptEitherAsync(nullFuture, (x) -> {}, exec),
3507 <            () -> f.acceptEitherAsync(g, (x) -> {}, null),
3504 >            () -> f.acceptEither(nullFuture, x -> {}),
3505 >            () -> f.acceptEitherAsync(nullFuture, x -> {}),
3506 >            () -> f.acceptEitherAsync(nullFuture, x -> {}, exec),
3507 >            () -> f.acceptEitherAsync(g, x -> {}, null),
3508  
3509              () -> f.runAfterEither(g, null),
3510              () -> f.runAfterEitherAsync(g, null),
# Line 3345 | Line 3534 | public class CompletableFutureTest exten
3534              () -> CompletableFuture.anyOf(null, f),
3535  
3536              () -> f.obtrudeException(null),
3348        };
3537  
3538 <        assertThrows(NullPointerException.class, throwingActions);
3538 >            () -> CompletableFuture.delayedExecutor(1L, SECONDS, null),
3539 >            () -> CompletableFuture.delayedExecutor(1L, null, exec),
3540 >            () -> CompletableFuture.delayedExecutor(1L, null),
3541 >
3542 >            () -> f.orTimeout(1L, null),
3543 >            () -> f.completeOnTimeout(42, 1L, null),
3544 >
3545 >            () -> CompletableFuture.failedFuture(null),
3546 >            () -> CompletableFuture.failedStage(null));
3547 >
3548          assertEquals(0, exec.count.get());
3549      }
3550  
3551      /**
3552 +     * Test submissions to an executor that rejects all tasks.
3553 +     */
3554 +    public void testRejectingExecutor() {
3555 +        for (Integer v : new Integer[] { 1, null })
3556 +    {
3557 +        final CountingRejectingExecutor e = new CountingRejectingExecutor();
3558 +
3559 +        final CompletableFuture<Integer> complete = CompletableFuture.completedFuture(v);
3560 +        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
3561 +
3562 +        List<CompletableFuture<?>> futures = new ArrayList<>();
3563 +
3564 +        List<CompletableFuture<Integer>> srcs = new ArrayList<>();
3565 +        srcs.add(complete);
3566 +        srcs.add(incomplete);
3567 +
3568 +        for (CompletableFuture<Integer> src : srcs) {
3569 +            List<CompletableFuture<?>> fs = new ArrayList<>();
3570 +            fs.add(src.thenRunAsync(() -> {}, e));
3571 +            fs.add(src.thenAcceptAsync(z -> {}, e));
3572 +            fs.add(src.thenApplyAsync(z -> z, e));
3573 +
3574 +            fs.add(src.thenCombineAsync(src, (x, y) -> x, e));
3575 +            fs.add(src.thenAcceptBothAsync(src, (x, y) -> {}, e));
3576 +            fs.add(src.runAfterBothAsync(src, () -> {}, e));
3577 +
3578 +            fs.add(src.applyToEitherAsync(src, z -> z, e));
3579 +            fs.add(src.acceptEitherAsync(src, z -> {}, e));
3580 +            fs.add(src.runAfterEitherAsync(src, () -> {}, e));
3581 +
3582 +            fs.add(src.thenComposeAsync(z -> null, e));
3583 +            fs.add(src.whenCompleteAsync((z, t) -> {}, e));
3584 +            fs.add(src.handleAsync((z, t) -> null, e));
3585 +
3586 +            for (CompletableFuture<?> future : fs) {
3587 +                if (src.isDone())
3588 +                    checkCompletedWithWrappedException(future, e.ex);
3589 +                else
3590 +                    checkIncomplete(future);
3591 +            }
3592 +            futures.addAll(fs);
3593 +        }
3594 +
3595 +        {
3596 +            List<CompletableFuture<?>> fs = new ArrayList<>();
3597 +
3598 +            fs.add(complete.thenCombineAsync(incomplete, (x, y) -> x, e));
3599 +            fs.add(incomplete.thenCombineAsync(complete, (x, y) -> x, e));
3600 +
3601 +            fs.add(complete.thenAcceptBothAsync(incomplete, (x, y) -> {}, e));
3602 +            fs.add(incomplete.thenAcceptBothAsync(complete, (x, y) -> {}, e));
3603 +
3604 +            fs.add(complete.runAfterBothAsync(incomplete, () -> {}, e));
3605 +            fs.add(incomplete.runAfterBothAsync(complete, () -> {}, e));
3606 +
3607 +            for (CompletableFuture<?> future : fs)
3608 +                checkIncomplete(future);
3609 +            futures.addAll(fs);
3610 +        }
3611 +
3612 +        {
3613 +            List<CompletableFuture<?>> fs = new ArrayList<>();
3614 +
3615 +            fs.add(complete.applyToEitherAsync(incomplete, z -> z, e));
3616 +            fs.add(incomplete.applyToEitherAsync(complete, z -> z, e));
3617 +
3618 +            fs.add(complete.acceptEitherAsync(incomplete, z -> {}, e));
3619 +            fs.add(incomplete.acceptEitherAsync(complete, z -> {}, e));
3620 +
3621 +            fs.add(complete.runAfterEitherAsync(incomplete, () -> {}, e));
3622 +            fs.add(incomplete.runAfterEitherAsync(complete, () -> {}, e));
3623 +
3624 +            for (CompletableFuture<?> future : fs)
3625 +                checkCompletedWithWrappedException(future, e.ex);
3626 +            futures.addAll(fs);
3627 +        }
3628 +
3629 +        incomplete.complete(v);
3630 +
3631 +        for (CompletableFuture<?> future : futures)
3632 +            checkCompletedWithWrappedException(future, e.ex);
3633 +
3634 +        assertEquals(futures.size(), e.count.get());
3635 +    }}
3636 +
3637 +    /**
3638 +     * Test submissions to an executor that rejects all tasks, but
3639 +     * should never be invoked because the dependent future is
3640 +     * explicitly completed.
3641 +     */
3642 +    public void testRejectingExecutorNeverInvoked() {
3643 +        for (Integer v : new Integer[] { 1, null })
3644 +    {
3645 +        final CountingRejectingExecutor e = new CountingRejectingExecutor();
3646 +
3647 +        final CompletableFuture<Integer> complete = CompletableFuture.completedFuture(v);
3648 +        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
3649 +
3650 +        List<CompletableFuture<?>> fs = new ArrayList<>();
3651 +        fs.add(incomplete.thenRunAsync(() -> {}, e));
3652 +        fs.add(incomplete.thenAcceptAsync(z -> {}, e));
3653 +        fs.add(incomplete.thenApplyAsync(z -> z, e));
3654 +
3655 +        fs.add(incomplete.thenCombineAsync(incomplete, (x, y) -> x, e));
3656 +        fs.add(incomplete.thenAcceptBothAsync(incomplete, (x, y) -> {}, e));
3657 +        fs.add(incomplete.runAfterBothAsync(incomplete, () -> {}, e));
3658 +
3659 +        fs.add(incomplete.applyToEitherAsync(incomplete, z -> z, e));
3660 +        fs.add(incomplete.acceptEitherAsync(incomplete, z -> {}, e));
3661 +        fs.add(incomplete.runAfterEitherAsync(incomplete, () -> {}, e));
3662 +
3663 +        fs.add(incomplete.thenComposeAsync(z -> null, e));
3664 +        fs.add(incomplete.whenCompleteAsync((z, t) -> {}, e));
3665 +        fs.add(incomplete.handleAsync((z, t) -> null, e));
3666 +
3667 +        fs.add(complete.thenCombineAsync(incomplete, (x, y) -> x, e));
3668 +        fs.add(incomplete.thenCombineAsync(complete, (x, y) -> x, e));
3669 +
3670 +        fs.add(complete.thenAcceptBothAsync(incomplete, (x, y) -> {}, e));
3671 +        fs.add(incomplete.thenAcceptBothAsync(complete, (x, y) -> {}, e));
3672 +
3673 +        fs.add(complete.runAfterBothAsync(incomplete, () -> {}, e));
3674 +        fs.add(incomplete.runAfterBothAsync(complete, () -> {}, e));
3675 +
3676 +        for (CompletableFuture<?> future : fs)
3677 +            checkIncomplete(future);
3678 +
3679 +        for (CompletableFuture<?> future : fs)
3680 +            future.complete(null);
3681 +
3682 +        incomplete.complete(v);
3683 +
3684 +        for (CompletableFuture<?> future : fs)
3685 +            checkCompletedNormally(future, null);
3686 +
3687 +        assertEquals(0, e.count.get());
3688 +    }}
3689 +
3690 +    /**
3691       * toCompletableFuture returns this CompletableFuture.
3692       */
3693      public void testToCompletableFuture() {
# Line 3365 | Line 3701 | public class CompletableFutureTest exten
3701       * newIncompleteFuture returns an incomplete CompletableFuture
3702       */
3703      public void testNewIncompleteFuture() {
3704 +        for (Integer v1 : new Integer[] { 1, null })
3705 +    {
3706          CompletableFuture<Integer> f = new CompletableFuture<>();
3707          CompletableFuture<Integer> g = f.newIncompleteFuture();
3708          checkIncomplete(f);
3709          checkIncomplete(g);
3710 <    }
3710 >        f.complete(v1);
3711 >        checkCompletedNormally(f, v1);
3712 >        checkIncomplete(g);
3713 >        g.complete(v1);
3714 >        checkCompletedNormally(g, v1);
3715 >        assertSame(g.getClass(), CompletableFuture.class);
3716 >    }}
3717  
3718      /**
3719       * completedStage returns a completed CompletionStage
3720       */
3721      public void testCompletedStage() {
3722 <        AtomicInteger x = new AtomicInteger();
3723 <        AtomicReference<Throwable> r = new AtomicReference<Throwable>();
3722 >        AtomicInteger x = new AtomicInteger(0);
3723 >        AtomicReference<Throwable> r = new AtomicReference<>();
3724          CompletionStage<Integer> f = CompletableFuture.completedStage(1);
3725          f.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3726          assertEquals(x.get(), 1);
# Line 3385 | Line 3729 | public class CompletableFutureTest exten
3729  
3730      /**
3731       * defaultExecutor by default returns the commonPool if
3732 <     * it supports at least one thread.
3732 >     * it supports more than one thread.
3733       */
3734      public void testDefaultExecutor() {
3735          CompletableFuture<Integer> f = new CompletableFuture<>();
# Line 3393 | Line 3737 | public class CompletableFutureTest exten
3737          Executor c = ForkJoinPool.commonPool();
3738          if (ForkJoinPool.getCommonPoolParallelism() > 1)
3739              assertSame(e, c);
3740 +        else
3741 +            assertNotSame(e, c);
3742      }
3743  
3744      /**
# Line 3402 | Line 3748 | public class CompletableFutureTest exten
3748      public void testFailedFuture() {
3749          CFException ex = new CFException();
3750          CompletableFuture<Integer> f = CompletableFuture.failedFuture(ex);
3751 <        checkCompletedExceptionallyWithRootCause(f, ex);
3751 >        checkCompletedExceptionally(f, ex);
3752      }
3753  
3754      /**
3755       * failedFuture(null) throws NPE
3756       */
3757 <    public void testFailedFuture2() {
3757 >    public void testFailedFuture_null() {
3758          try {
3759              CompletableFuture<Integer> f = CompletableFuture.failedFuture(null);
3760              shouldThrow();
# Line 3419 | Line 3765 | public class CompletableFutureTest exten
3765       * copy returns a CompletableFuture that is completed normally,
3766       * with the same value, when source is.
3767       */
3768 <    public void testCopy() {
3768 >    public void testCopy_normalCompletion() {
3769 >        for (boolean createIncomplete : new boolean[] { true, false })
3770 >        for (Integer v1 : new Integer[] { 1, null })
3771 >    {
3772          CompletableFuture<Integer> f = new CompletableFuture<>();
3773 +        if (!createIncomplete) assertTrue(f.complete(v1));
3774          CompletableFuture<Integer> g = f.copy();
3775 <        checkIncomplete(f);
3776 <        checkIncomplete(g);
3777 <        f.complete(1);
3778 <        checkCompletedNormally(f, 1);
3779 <        checkCompletedNormally(g, 1);
3780 <    }
3775 >        if (createIncomplete) {
3776 >            checkIncomplete(f);
3777 >            checkIncomplete(g);
3778 >            assertTrue(f.complete(v1));
3779 >        }
3780 >        checkCompletedNormally(f, v1);
3781 >        checkCompletedNormally(g, v1);
3782 >    }}
3783  
3784      /**
3785       * copy returns a CompletableFuture that is completed exceptionally
3786       * when source is.
3787       */
3788 <    public void testCopy2() {
3788 >    public void testCopy_exceptionalCompletion() {
3789 >        for (boolean createIncomplete : new boolean[] { true, false })
3790 >    {
3791 >        CFException ex = new CFException();
3792          CompletableFuture<Integer> f = new CompletableFuture<>();
3793 +        if (!createIncomplete) f.completeExceptionally(ex);
3794          CompletableFuture<Integer> g = f.copy();
3795 <        checkIncomplete(f);
3796 <        checkIncomplete(g);
3797 <        CFException ex = new CFException();
3798 <        f.completeExceptionally(ex);
3795 >        if (createIncomplete) {
3796 >            checkIncomplete(f);
3797 >            checkIncomplete(g);
3798 >            f.completeExceptionally(ex);
3799 >        }
3800          checkCompletedExceptionally(f, ex);
3801 <        checkCompletedWithWrappedCFException(g);
3801 >        checkCompletedWithWrappedException(g, ex);
3802 >    }}
3803 >
3804 >    /**
3805 >     * Completion of a copy does not complete its source.
3806 >     */
3807 >    public void testCopy_oneWayPropagation() {
3808 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3809 >        assertTrue(f.copy().complete(1));
3810 >        assertTrue(f.copy().complete(null));
3811 >        assertTrue(f.copy().cancel(true));
3812 >        assertTrue(f.copy().cancel(false));
3813 >        assertTrue(f.copy().completeExceptionally(new CFException()));
3814 >        checkIncomplete(f);
3815      }
3816  
3817      /**
# Line 3451 | Line 3821 | public class CompletableFutureTest exten
3821      public void testMinimalCompletionStage() {
3822          CompletableFuture<Integer> f = new CompletableFuture<>();
3823          CompletionStage<Integer> g = f.minimalCompletionStage();
3824 <        AtomicInteger x = new AtomicInteger();
3825 <        AtomicReference<Throwable> r = new AtomicReference<Throwable>();
3824 >        AtomicInteger x = new AtomicInteger(0);
3825 >        AtomicReference<Throwable> r = new AtomicReference<>();
3826          checkIncomplete(f);
3827          g.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3828          f.complete(1);
# Line 3468 | Line 3838 | public class CompletableFutureTest exten
3838      public void testMinimalCompletionStage2() {
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          g.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3844          checkIncomplete(f);
3845          CFException ex = new CFException();
# Line 3480 | Line 3850 | public class CompletableFutureTest exten
3850      }
3851  
3852      /**
3853 <     * failedStage returns a Completionstage completed
3853 >     * failedStage returns a CompletionStage completed
3854       * exceptionally with the given Exception
3855       */
3856      public void testFailedStage() {
3857          CFException ex = new CFException();
3858          CompletionStage<Integer> f = CompletableFuture.failedStage(ex);
3859 <        AtomicInteger x = new AtomicInteger();
3860 <        AtomicReference<Throwable> r = new AtomicReference<Throwable>();
3859 >        AtomicInteger x = new AtomicInteger(0);
3860 >        AtomicReference<Throwable> r = new AtomicReference<>();
3861          f.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3862          assertEquals(x.get(), 0);
3863 <        assertEquals(r.get().getCause(), ex);
3863 >        assertEquals(r.get(), ex);
3864      }
3865  
3866      /**
3867       * completeAsync completes with value of given supplier
3868       */
3869      public void testCompleteAsync() {
3870 +        for (Integer v1 : new Integer[] { 1, null })
3871 +    {
3872          CompletableFuture<Integer> f = new CompletableFuture<>();
3873 <        f.completeAsync(() -> 1);
3873 >        f.completeAsync(() -> v1);
3874          f.join();
3875 <        checkCompletedNormally(f, 1);
3876 <    }
3875 >        checkCompletedNormally(f, v1);
3876 >    }}
3877  
3878      /**
3879       * completeAsync completes exceptionally if given supplier throws
# Line 3509 | Line 3881 | public class CompletableFutureTest exten
3881      public void testCompleteAsync2() {
3882          CompletableFuture<Integer> f = new CompletableFuture<>();
3883          CFException ex = new CFException();
3884 <        f.completeAsync(() -> {if (true) throw ex; return 1;});
3884 >        f.completeAsync(() -> { throw ex; });
3885          try {
3886              f.join();
3887              shouldThrow();
3888 <        } catch (Exception success) {}
3889 <        checkCompletedWithWrappedCFException(f);
3888 >        } catch (CompletionException success) {}
3889 >        checkCompletedWithWrappedException(f, ex);
3890      }
3891  
3892      /**
3893       * completeAsync with given executor completes with value of given supplier
3894       */
3895      public void testCompleteAsync3() {
3896 +        for (Integer v1 : new Integer[] { 1, null })
3897 +    {
3898          CompletableFuture<Integer> f = new CompletableFuture<>();
3899 <        f.completeAsync(() -> 1, new ThreadExecutor());
3900 <        f.join();
3901 <        checkCompletedNormally(f, 1);
3902 <    }
3899 >        ThreadExecutor executor = new ThreadExecutor();
3900 >        f.completeAsync(() -> v1, executor);
3901 >        assertSame(v1, f.join());
3902 >        checkCompletedNormally(f, v1);
3903 >        assertEquals(1, executor.count.get());
3904 >    }}
3905  
3906      /**
3907       * completeAsync with given executor completes exceptionally if
# Line 3534 | Line 3910 | public class CompletableFutureTest exten
3910      public void testCompleteAsync4() {
3911          CompletableFuture<Integer> f = new CompletableFuture<>();
3912          CFException ex = new CFException();
3913 <        f.completeAsync(() -> {if (true) throw ex; return 1;}, new ThreadExecutor());
3913 >        ThreadExecutor executor = new ThreadExecutor();
3914 >        f.completeAsync(() -> { throw ex; }, executor);
3915          try {
3916              f.join();
3917              shouldThrow();
3918 <        } catch (Exception success) {}
3919 <        checkCompletedWithWrappedCFException(f);
3918 >        } catch (CompletionException success) {}
3919 >        checkCompletedWithWrappedException(f, ex);
3920 >        assertEquals(1, executor.count.get());
3921      }
3922  
3923      /**
3924       * orTimeout completes with TimeoutException if not complete
3925       */
3926 <    public void testOrTimeout() {
3926 >    public void testOrTimeout_timesOut() {
3927 >        long timeoutMillis = timeoutMillis();
3928          CompletableFuture<Integer> f = new CompletableFuture<>();
3929 <        f.orTimeout(SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
3930 <        checkCompletedExceptionallyWithTimeout(f);
3929 >        long startTime = System.nanoTime();
3930 >        assertSame(f, f.orTimeout(timeoutMillis, MILLISECONDS));
3931 >        checkCompletedWithTimeoutException(f);
3932 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
3933      }
3934  
3935      /**
3936       * orTimeout completes normally if completed before timeout
3937       */
3938 <    public void testOrTimeout2() {
3938 >    public void testOrTimeout_completed() {
3939 >        for (Integer v1 : new Integer[] { 1, null })
3940 >    {
3941          CompletableFuture<Integer> f = new CompletableFuture<>();
3942 <        f.complete(1);
3943 <        f.orTimeout(SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
3944 <        checkCompletedNormally(f, 1);
3942 >        CompletableFuture<Integer> g = new CompletableFuture<>();
3943 >        long startTime = System.nanoTime();
3944 >        f.complete(v1);
3945 >        assertSame(f, f.orTimeout(LONG_DELAY_MS, MILLISECONDS));
3946 >        assertSame(g, g.orTimeout(LONG_DELAY_MS, MILLISECONDS));
3947 >        g.complete(v1);
3948 >        checkCompletedNormally(f, v1);
3949 >        checkCompletedNormally(g, v1);
3950 >        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS / 2);
3951 >    }}
3952 >
3953 >    /**
3954 >     * completeOnTimeout completes with given value if not complete
3955 >     */
3956 >    public void testCompleteOnTimeout_timesOut() {
3957 >        testInParallel(() -> testCompleteOnTimeout_timesOut(42),
3958 >                       () -> testCompleteOnTimeout_timesOut(null));
3959      }
3960  
3961      /**
3962       * completeOnTimeout completes with given value if not complete
3963       */
3964 <    public void testCompleteOnTimeout() {
3964 >    public void testCompleteOnTimeout_timesOut(Integer v) {
3965 >        long timeoutMillis = timeoutMillis();
3966          CompletableFuture<Integer> f = new CompletableFuture<>();
3967 <        f.completeOnTimeout(-1, SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
3968 <        f.join();
3969 <        checkCompletedNormally(f, -1);
3967 >        long startTime = System.nanoTime();
3968 >        assertSame(f, f.completeOnTimeout(v, timeoutMillis, MILLISECONDS));
3969 >        assertSame(v, f.join());
3970 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
3971 >        f.complete(99);         // should have no effect
3972 >        checkCompletedNormally(f, v);
3973      }
3974  
3975      /**
3976       * completeOnTimeout has no effect if completed within timeout
3977       */
3978 <    public void testCompleteOnTimeout2() {
3978 >    public void testCompleteOnTimeout_completed() {
3979 >        for (Integer v1 : new Integer[] { 1, null })
3980 >    {
3981          CompletableFuture<Integer> f = new CompletableFuture<>();
3982 <        f.complete(1);
3983 <        f.completeOnTimeout(-1, SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
3984 <        checkCompletedNormally(f, 1);
3985 <    }
3982 >        CompletableFuture<Integer> g = new CompletableFuture<>();
3983 >        long startTime = System.nanoTime();
3984 >        f.complete(v1);
3985 >        assertSame(f, f.completeOnTimeout(-1, LONG_DELAY_MS, MILLISECONDS));
3986 >        assertSame(g, g.completeOnTimeout(-1, LONG_DELAY_MS, MILLISECONDS));
3987 >        g.complete(v1);
3988 >        checkCompletedNormally(f, v1);
3989 >        checkCompletedNormally(g, v1);
3990 >        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS / 2);
3991 >    }}
3992  
3993      /**
3994       * delayedExecutor returns an executor that delays submission
3995       */
3996      public void testDelayedExecutor() {
3997 <        long timeoutMillis = SMALL_DELAY_MS;
3998 <        Executor d = CompletableFuture.delayedExecutor(timeoutMillis,
3999 <                                                       MILLISECONDS);
3997 >        testInParallel(() -> testDelayedExecutor(null, null),
3998 >                       () -> testDelayedExecutor(null, 1),
3999 >                       () -> testDelayedExecutor(new ThreadExecutor(), 1),
4000 >                       () -> testDelayedExecutor(new ThreadExecutor(), 1));
4001 >    }
4002 >
4003 >    public void testDelayedExecutor(Executor executor, Integer v) throws Exception {
4004 >        long timeoutMillis = timeoutMillis();
4005 >        // Use an "unreasonably long" long timeout to catch lingering threads
4006 >        long longTimeoutMillis = 1000 * 60 * 60 * 24;
4007 >        final Executor delayer, longDelayer;
4008 >        if (executor == null) {
4009 >            delayer = CompletableFuture.delayedExecutor(timeoutMillis, MILLISECONDS);
4010 >            longDelayer = CompletableFuture.delayedExecutor(longTimeoutMillis, MILLISECONDS);
4011 >        } else {
4012 >            delayer = CompletableFuture.delayedExecutor(timeoutMillis, MILLISECONDS, executor);
4013 >            longDelayer = CompletableFuture.delayedExecutor(longTimeoutMillis, MILLISECONDS, executor);
4014 >        }
4015          long startTime = System.nanoTime();
4016 <        CompletableFuture<Integer> f = CompletableFuture.supplyAsync(() -> 1, d);
4017 <        assertNull(f.getNow(null));
4018 <        try {
4019 <            f.get(LONG_DELAY_MS, MILLISECONDS);
4020 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
4021 <        assertTrue(millisElapsedSince(startTime) > timeoutMillis/2);
4022 <        checkCompletedNormally(f, 1);
4023 <    }
4016 >        CompletableFuture<Integer> f =
4017 >            CompletableFuture.supplyAsync(() -> v, delayer);
4018 >        CompletableFuture<Integer> g =
4019 >            CompletableFuture.supplyAsync(() -> v, longDelayer);
4020 >
4021 >        assertNull(g.getNow(null));
4022 >
4023 >        assertSame(v, f.get(LONG_DELAY_MS, MILLISECONDS));
4024 >        long millisElapsed = millisElapsedSince(startTime);
4025 >        assertTrue(millisElapsed >= timeoutMillis);
4026 >        assertTrue(millisElapsed < LONG_DELAY_MS / 2);
4027  
4028 <    /**
4029 <     * delayedExecutor for a given executor returns an executor that
4030 <     * delays submission
4031 <     */
3605 <    public void testDelayedExecutor2() {
3606 <        long timeoutMillis = SMALL_DELAY_MS;
3607 <        Executor d = CompletableFuture.delayedExecutor(timeoutMillis,
3608 <                                                       MILLISECONDS,
3609 <                                                       new ThreadExecutor());
3610 <        long startTime = System.nanoTime();
3611 <        CompletableFuture<Integer> f = CompletableFuture.supplyAsync(() -> 1, d);
3612 <        assertNull(f.getNow(null));
3613 <        try {
3614 <            f.get(LONG_DELAY_MS, MILLISECONDS);
3615 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
3616 <        assertTrue(millisElapsedSince(startTime) > timeoutMillis/2);
3617 <        checkCompletedNormally(f, 1);
4028 >        checkCompletedNormally(f, v);
4029 >
4030 >        checkIncomplete(g);
4031 >        assertTrue(g.cancel(true));
4032      }
4033  
4034      //--- tests of implementation details; not part of official tck ---
4035  
4036      Object resultOf(CompletableFuture<?> f) {
4037 +        SecurityManager sm = System.getSecurityManager();
4038 +        if (sm != null) {
4039 +            try {
4040 +                System.setSecurityManager(null);
4041 +            } catch (SecurityException giveUp) {
4042 +                return "Reflection not available";
4043 +            }
4044 +        }
4045 +
4046          try {
4047              java.lang.reflect.Field resultField
4048                  = CompletableFuture.class.getDeclaredField("result");
4049              resultField.setAccessible(true);
4050              return resultField.get(f);
4051 <        } catch (Throwable t) { throw new AssertionError(t); }
4051 >        } catch (Throwable t) {
4052 >            throw new AssertionError(t);
4053 >        } finally {
4054 >            if (sm != null) System.setSecurityManager(sm);
4055 >        }
4056      }
4057  
4058      public void testExceptionPropagationReusesResultObject() {
# Line 3636 | Line 4063 | public class CompletableFutureTest exten
4063          final CompletableFuture<Integer> v42 = CompletableFuture.completedFuture(42);
4064          final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
4065  
4066 +        final Runnable noopRunnable = new Noop(m);
4067 +        final Consumer<Integer> noopConsumer = new NoopConsumer(m);
4068 +        final Function<Integer, Integer> incFunction = new IncFunction(m);
4069 +
4070          List<Function<CompletableFuture<Integer>, CompletableFuture<?>>> funs
4071              = new ArrayList<>();
4072  
4073 <        funs.add((y) -> m.thenRun(y, new Noop(m)));
4074 <        funs.add((y) -> m.thenAccept(y, new NoopConsumer(m)));
4075 <        funs.add((y) -> m.thenApply(y, new IncFunction(m)));
4076 <
4077 <        funs.add((y) -> m.runAfterEither(y, incomplete, new Noop(m)));
4078 <        funs.add((y) -> m.acceptEither(y, incomplete, new NoopConsumer(m)));
4079 <        funs.add((y) -> m.applyToEither(y, incomplete, new IncFunction(m)));
4080 <
4081 <        funs.add((y) -> m.runAfterBoth(y, v42, new Noop(m)));
4082 <        funs.add((y) -> m.thenAcceptBoth(y, v42, new SubtractAction(m)));
4083 <        funs.add((y) -> m.thenCombine(y, v42, new SubtractFunction(m)));
4084 <
4085 <        funs.add((y) -> m.whenComplete(y, (Integer x, Throwable t) -> {}));
4086 <
4087 <        funs.add((y) -> m.thenCompose(y, new CompletableFutureInc(m)));
4088 <
4089 <        funs.add((y) -> CompletableFuture.allOf(new CompletableFuture<?>[] {y, v42}));
4090 <        funs.add((y) -> CompletableFuture.anyOf(new CompletableFuture<?>[] {y, incomplete}));
4073 >        funs.add(y -> m.thenRun(y, noopRunnable));
4074 >        funs.add(y -> m.thenAccept(y, noopConsumer));
4075 >        funs.add(y -> m.thenApply(y, incFunction));
4076 >
4077 >        funs.add(y -> m.runAfterEither(y, incomplete, noopRunnable));
4078 >        funs.add(y -> m.acceptEither(y, incomplete, noopConsumer));
4079 >        funs.add(y -> m.applyToEither(y, incomplete, incFunction));
4080 >
4081 >        funs.add(y -> m.runAfterBoth(y, v42, noopRunnable));
4082 >        funs.add(y -> m.runAfterBoth(v42, y, noopRunnable));
4083 >        funs.add(y -> m.thenAcceptBoth(y, v42, new SubtractAction(m)));
4084 >        funs.add(y -> m.thenAcceptBoth(v42, y, new SubtractAction(m)));
4085 >        funs.add(y -> m.thenCombine(y, v42, new SubtractFunction(m)));
4086 >        funs.add(y -> m.thenCombine(v42, y, new SubtractFunction(m)));
4087 >
4088 >        funs.add(y -> m.whenComplete(y, (Integer r, Throwable t) -> {}));
4089 >
4090 >        funs.add(y -> m.thenCompose(y, new CompletableFutureInc(m)));
4091 >
4092 >        funs.add(y -> CompletableFuture.allOf(y));
4093 >        funs.add(y -> CompletableFuture.allOf(y, v42));
4094 >        funs.add(y -> CompletableFuture.allOf(v42, y));
4095 >        funs.add(y -> CompletableFuture.anyOf(y));
4096 >        funs.add(y -> CompletableFuture.anyOf(y, incomplete));
4097 >        funs.add(y -> CompletableFuture.anyOf(incomplete, y));
4098  
4099          for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
4100                   fun : funs) {
4101              CompletableFuture<Integer> f = new CompletableFuture<>();
4102              f.completeExceptionally(ex);
4103 <            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
4103 >            CompletableFuture<Integer> src = m.thenApply(f, incFunction);
4104              checkCompletedWithWrappedException(src, ex);
4105              CompletableFuture<?> dep = fun.apply(src);
4106              checkCompletedWithWrappedException(dep, ex);
# Line 3672 | Line 4110 | public class CompletableFutureTest exten
4110          for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
4111                   fun : funs) {
4112              CompletableFuture<Integer> f = new CompletableFuture<>();
4113 <            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
4113 >            CompletableFuture<Integer> src = m.thenApply(f, incFunction);
4114              CompletableFuture<?> dep = fun.apply(src);
4115              f.completeExceptionally(ex);
4116              checkCompletedWithWrappedException(src, ex);
# Line 3686 | Line 4124 | public class CompletableFutureTest exten
4124              CompletableFuture<Integer> f = new CompletableFuture<>();
4125              f.cancel(mayInterruptIfRunning);
4126              checkCancelled(f);
4127 <            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
4127 >            CompletableFuture<Integer> src = m.thenApply(f, incFunction);
4128              checkCompletedWithWrappedCancellationException(src);
4129              CompletableFuture<?> dep = fun.apply(src);
4130              checkCompletedWithWrappedCancellationException(dep);
# Line 3697 | Line 4135 | public class CompletableFutureTest exten
4135          for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
4136                   fun : funs) {
4137              CompletableFuture<Integer> f = new CompletableFuture<>();
4138 <            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
4138 >            CompletableFuture<Integer> src = m.thenApply(f, incFunction);
4139              CompletableFuture<?> dep = fun.apply(src);
4140              f.cancel(mayInterruptIfRunning);
4141              checkCancelled(f);
# Line 3707 | Line 4145 | public class CompletableFutureTest exten
4145          }
4146      }}
4147  
4148 +    /**
4149 +     * Minimal completion stages throw UOE for most non-CompletionStage methods
4150 +     */
4151 +    public void testMinimalCompletionStage_minimality() {
4152 +        if (!testImplementationDetails) return;
4153 +        Function<Method, String> toSignature =
4154 +            method -> method.getName() + Arrays.toString(method.getParameterTypes());
4155 +        Predicate<Method> isNotStatic =
4156 +            method -> (method.getModifiers() & Modifier.STATIC) == 0;
4157 +        List<Method> minimalMethods =
4158 +            Stream.of(Object.class, CompletionStage.class)
4159 +            .flatMap(klazz -> Stream.of(klazz.getMethods()))
4160 +            .filter(isNotStatic)
4161 +            .collect(Collectors.toList());
4162 +        // Methods from CompletableFuture permitted NOT to throw UOE
4163 +        String[] signatureWhitelist = {
4164 +            "newIncompleteFuture[]",
4165 +            "defaultExecutor[]",
4166 +            "minimalCompletionStage[]",
4167 +            "copy[]",
4168 +        };
4169 +        Set<String> permittedMethodSignatures =
4170 +            Stream.concat(minimalMethods.stream().map(toSignature),
4171 +                          Stream.of(signatureWhitelist))
4172 +            .collect(Collectors.toSet());
4173 +        List<Method> allMethods = Stream.of(CompletableFuture.class.getMethods())
4174 +            .filter(isNotStatic)
4175 +            .filter(method -> !permittedMethodSignatures.contains(toSignature.apply(method)))
4176 +            .collect(Collectors.toList());
4177 +
4178 +        List<CompletionStage<Integer>> stages = new ArrayList<>();
4179 +        CompletionStage<Integer> min =
4180 +            new CompletableFuture<Integer>().minimalCompletionStage();
4181 +        stages.add(min);
4182 +        stages.add(min.thenApply(x -> x));
4183 +        stages.add(CompletableFuture.completedStage(1));
4184 +        stages.add(CompletableFuture.failedStage(new CFException()));
4185 +
4186 +        List<Method> bugs = new ArrayList<>();
4187 +        for (Method method : allMethods) {
4188 +            Class<?>[] parameterTypes = method.getParameterTypes();
4189 +            Object[] args = new Object[parameterTypes.length];
4190 +            // Manufacture boxed primitives for primitive params
4191 +            for (int i = 0; i < args.length; i++) {
4192 +                Class<?> type = parameterTypes[i];
4193 +                if      (type == boolean.class) args[i] = false;
4194 +                else if (type == int.class)     args[i] = 0;
4195 +                else if (type == long.class)    args[i] = 0L;
4196 +            }
4197 +            for (CompletionStage<Integer> stage : stages) {
4198 +                try {
4199 +                    method.invoke(stage, args);
4200 +                    bugs.add(method);
4201 +                }
4202 +                catch (java.lang.reflect.InvocationTargetException expected) {
4203 +                    if (! (expected.getCause() instanceof UnsupportedOperationException)) {
4204 +                        bugs.add(method);
4205 +                        // expected.getCause().printStackTrace();
4206 +                    }
4207 +                }
4208 +                catch (ReflectiveOperationException bad) { throw new Error(bad); }
4209 +            }
4210 +        }
4211 +        if (!bugs.isEmpty())
4212 +            throw new Error("Methods did not throw UOE: " + bugs);
4213 +    }
4214 +
4215 +    /**
4216 +     * minimalStage.toCompletableFuture() returns a CompletableFuture that
4217 +     * is completed normally, with the same value, when source is.
4218 +     */
4219 +    public void testMinimalCompletionStage_toCompletableFuture_normalCompletion() {
4220 +        for (boolean createIncomplete : new boolean[] { true, false })
4221 +        for (Integer v1 : new Integer[] { 1, null })
4222 +    {
4223 +        CompletableFuture<Integer> f = new CompletableFuture<>();
4224 +        CompletionStage<Integer> minimal = f.minimalCompletionStage();
4225 +        if (!createIncomplete) assertTrue(f.complete(v1));
4226 +        CompletableFuture<Integer> g = minimal.toCompletableFuture();
4227 +        if (createIncomplete) {
4228 +            checkIncomplete(f);
4229 +            checkIncomplete(g);
4230 +            assertTrue(f.complete(v1));
4231 +        }
4232 +        checkCompletedNormally(f, v1);
4233 +        checkCompletedNormally(g, v1);
4234 +    }}
4235 +
4236 +    /**
4237 +     * minimalStage.toCompletableFuture() returns a CompletableFuture that
4238 +     * is completed exceptionally when source is.
4239 +     */
4240 +    public void testMinimalCompletionStage_toCompletableFuture_exceptionalCompletion() {
4241 +        for (boolean createIncomplete : new boolean[] { true, false })
4242 +    {
4243 +        CFException ex = new CFException();
4244 +        CompletableFuture<Integer> f = new CompletableFuture<>();
4245 +        CompletionStage<Integer> minimal = f.minimalCompletionStage();
4246 +        if (!createIncomplete) f.completeExceptionally(ex);
4247 +        CompletableFuture<Integer> g = minimal.toCompletableFuture();
4248 +        if (createIncomplete) {
4249 +            checkIncomplete(f);
4250 +            checkIncomplete(g);
4251 +            f.completeExceptionally(ex);
4252 +        }
4253 +        checkCompletedExceptionally(f, ex);
4254 +        checkCompletedWithWrappedException(g, ex);
4255 +    }}
4256 +
4257 +    /**
4258 +     * minimalStage.toCompletableFuture() gives mutable CompletableFuture
4259 +     */
4260 +    public void testMinimalCompletionStage_toCompletableFuture_mutable() {
4261 +        for (Integer v1 : new Integer[] { 1, null })
4262 +    {
4263 +        CompletableFuture<Integer> f = new CompletableFuture<>();
4264 +        CompletionStage minimal = f.minimalCompletionStage();
4265 +        CompletableFuture<Integer> g = minimal.toCompletableFuture();
4266 +        assertTrue(g.complete(v1));
4267 +        checkCompletedNormally(g, v1);
4268 +        checkIncomplete(f);
4269 +        checkIncomplete(minimal.toCompletableFuture());
4270 +    }}
4271 +
4272 +    /**
4273 +     * minimalStage.toCompletableFuture().join() awaits completion
4274 +     */
4275 +    public void testMinimalCompletionStage_toCompletableFuture_join() throws Exception {
4276 +        for (boolean createIncomplete : new boolean[] { true, false })
4277 +        for (Integer v1 : new Integer[] { 1, null })
4278 +    {
4279 +        CompletableFuture<Integer> f = new CompletableFuture<>();
4280 +        if (!createIncomplete) assertTrue(f.complete(v1));
4281 +        CompletionStage<Integer> minimal = f.minimalCompletionStage();
4282 +        if (createIncomplete) assertTrue(f.complete(v1));
4283 +        assertEquals(v1, minimal.toCompletableFuture().join());
4284 +        assertEquals(v1, minimal.toCompletableFuture().get());
4285 +        checkCompletedNormally(minimal.toCompletableFuture(), v1);
4286 +    }}
4287 +
4288 +    /**
4289 +     * Completion of a toCompletableFuture copy of a minimal stage
4290 +     * does not complete its source.
4291 +     */
4292 +    public void testMinimalCompletionStage_toCompletableFuture_oneWayPropagation() {
4293 +        CompletableFuture<Integer> f = new CompletableFuture<>();
4294 +        CompletionStage<Integer> g = f.minimalCompletionStage();
4295 +        assertTrue(g.toCompletableFuture().complete(1));
4296 +        assertTrue(g.toCompletableFuture().complete(null));
4297 +        assertTrue(g.toCompletableFuture().cancel(true));
4298 +        assertTrue(g.toCompletableFuture().cancel(false));
4299 +        assertTrue(g.toCompletableFuture().completeExceptionally(new CFException()));
4300 +        checkIncomplete(g.toCompletableFuture());
4301 +        f.complete(1);
4302 +        checkCompletedNormally(g.toCompletableFuture(), 1);
4303 +    }
4304 +
4305 +    /** Demo utility method for external reliable toCompletableFuture */
4306 +    static <T> CompletableFuture<T> toCompletableFuture(CompletionStage<T> stage) {
4307 +        CompletableFuture<T> f = new CompletableFuture<>();
4308 +        stage.handle((T t, Throwable ex) -> {
4309 +                         if (ex != null) f.completeExceptionally(ex);
4310 +                         else f.complete(t);
4311 +                         return null;
4312 +                     });
4313 +        return f;
4314 +    }
4315 +
4316 +    /** Demo utility method to join a CompletionStage */
4317 +    static <T> T join(CompletionStage<T> stage) {
4318 +        return toCompletableFuture(stage).join();
4319 +    }
4320 +
4321 +    /**
4322 +     * Joining a minimal stage "by hand" works
4323 +     */
4324 +    public void testMinimalCompletionStage_join_by_hand() {
4325 +        for (boolean createIncomplete : new boolean[] { true, false })
4326 +        for (Integer v1 : new Integer[] { 1, null })
4327 +    {
4328 +        CompletableFuture<Integer> f = new CompletableFuture<>();
4329 +        CompletionStage<Integer> minimal = f.minimalCompletionStage();
4330 +        CompletableFuture<Integer> g = new CompletableFuture<>();
4331 +        if (!createIncomplete) assertTrue(f.complete(v1));
4332 +        minimal.thenAccept(x -> g.complete(x));
4333 +        if (createIncomplete) assertTrue(f.complete(v1));
4334 +        g.join();
4335 +        checkCompletedNormally(g, v1);
4336 +        checkCompletedNormally(f, v1);
4337 +        assertEquals(v1, join(minimal));
4338 +    }}
4339 +
4340 +    static class Monad {
4341 +        static class ZeroException extends RuntimeException {
4342 +            public ZeroException() { super("monadic zero"); }
4343 +        }
4344 +        // "return", "unit"
4345 +        static <T> CompletableFuture<T> unit(T value) {
4346 +            return completedFuture(value);
4347 +        }
4348 +        // monadic zero ?
4349 +        static <T> CompletableFuture<T> zero() {
4350 +            return failedFuture(new ZeroException());
4351 +        }
4352 +        // >=>
4353 +        static <T,U,V> Function<T, CompletableFuture<V>> compose
4354 +            (Function<T, CompletableFuture<U>> f,
4355 +             Function<U, CompletableFuture<V>> g) {
4356 +            return x -> f.apply(x).thenCompose(g);
4357 +        }
4358 +
4359 +        static void assertZero(CompletableFuture<?> f) {
4360 +            try {
4361 +                f.getNow(null);
4362 +                throw new AssertionError("should throw");
4363 +            } catch (CompletionException success) {
4364 +                assertTrue(success.getCause() instanceof ZeroException);
4365 +            }
4366 +        }
4367 +
4368 +        static <T> void assertFutureEquals(CompletableFuture<T> f,
4369 +                                           CompletableFuture<T> g) {
4370 +            T fval = null, gval = null;
4371 +            Throwable fex = null, gex = null;
4372 +
4373 +            try { fval = f.get(); }
4374 +            catch (ExecutionException ex) { fex = ex.getCause(); }
4375 +            catch (Throwable ex) { fex = ex; }
4376 +
4377 +            try { gval = g.get(); }
4378 +            catch (ExecutionException ex) { gex = ex.getCause(); }
4379 +            catch (Throwable ex) { gex = ex; }
4380 +
4381 +            if (fex != null || gex != null)
4382 +                assertSame(fex.getClass(), gex.getClass());
4383 +            else
4384 +                assertEquals(fval, gval);
4385 +        }
4386 +
4387 +        static class PlusFuture<T> extends CompletableFuture<T> {
4388 +            AtomicReference<Throwable> firstFailure = new AtomicReference<>(null);
4389 +        }
4390 +
4391 +        /** Implements "monadic plus". */
4392 +        static <T> CompletableFuture<T> plus(CompletableFuture<? extends T> f,
4393 +                                             CompletableFuture<? extends T> g) {
4394 +            PlusFuture<T> plus = new PlusFuture<T>();
4395 +            BiConsumer<T, Throwable> action = (T result, Throwable ex) -> {
4396 +                try {
4397 +                    if (ex == null) {
4398 +                        if (plus.complete(result))
4399 +                            if (plus.firstFailure.get() != null)
4400 +                                plus.firstFailure.set(null);
4401 +                    }
4402 +                    else if (plus.firstFailure.compareAndSet(null, ex)) {
4403 +                        if (plus.isDone())
4404 +                            plus.firstFailure.set(null);
4405 +                    }
4406 +                    else {
4407 +                        // first failure has precedence
4408 +                        Throwable first = plus.firstFailure.getAndSet(null);
4409 +
4410 +                        // may fail with "Self-suppression not permitted"
4411 +                        try { first.addSuppressed(ex); }
4412 +                        catch (Exception ignored) {}
4413 +
4414 +                        plus.completeExceptionally(first);
4415 +                    }
4416 +                } catch (Throwable unexpected) {
4417 +                    plus.completeExceptionally(unexpected);
4418 +                }
4419 +            };
4420 +            f.whenComplete(action);
4421 +            g.whenComplete(action);
4422 +            return plus;
4423 +        }
4424 +    }
4425 +
4426 +    /**
4427 +     * CompletableFuture is an additive monad - sort of.
4428 +     * https://en.wikipedia.org/wiki/Monad_(functional_programming)#Additive_monads
4429 +     */
4430 +    public void testAdditiveMonad() throws Throwable {
4431 +        Function<Long, CompletableFuture<Long>> unit = Monad::unit;
4432 +        CompletableFuture<Long> zero = Monad.zero();
4433 +
4434 +        // Some mutually non-commutative functions
4435 +        Function<Long, CompletableFuture<Long>> triple
4436 +            = x -> Monad.unit(3 * x);
4437 +        Function<Long, CompletableFuture<Long>> inc
4438 +            = x -> Monad.unit(x + 1);
4439 +
4440 +        // unit is a right identity: m >>= unit === m
4441 +        Monad.assertFutureEquals(inc.apply(5L).thenCompose(unit),
4442 +                                 inc.apply(5L));
4443 +        // unit is a left identity: (unit x) >>= f === f x
4444 +        Monad.assertFutureEquals(unit.apply(5L).thenCompose(inc),
4445 +                                 inc.apply(5L));
4446 +
4447 +        // associativity: (m >>= f) >>= g === m >>= ( \x -> (f x >>= g) )
4448 +        Monad.assertFutureEquals(
4449 +            unit.apply(5L).thenCompose(inc).thenCompose(triple),
4450 +            unit.apply(5L).thenCompose(x -> inc.apply(x).thenCompose(triple)));
4451 +
4452 +        // The case for CompletableFuture as an additive monad is weaker...
4453 +
4454 +        // zero is a monadic zero
4455 +        Monad.assertZero(zero);
4456 +
4457 +        // left zero: zero >>= f === zero
4458 +        Monad.assertZero(zero.thenCompose(inc));
4459 +        // right zero: f >>= (\x -> zero) === zero
4460 +        Monad.assertZero(inc.apply(5L).thenCompose(x -> zero));
4461 +
4462 +        // f plus zero === f
4463 +        Monad.assertFutureEquals(Monad.unit(5L),
4464 +                                 Monad.plus(Monad.unit(5L), zero));
4465 +        // zero plus f === f
4466 +        Monad.assertFutureEquals(Monad.unit(5L),
4467 +                                 Monad.plus(zero, Monad.unit(5L)));
4468 +        // zero plus zero === zero
4469 +        Monad.assertZero(Monad.plus(zero, zero));
4470 +        {
4471 +            CompletableFuture<Long> f = Monad.plus(Monad.unit(5L),
4472 +                                                   Monad.unit(8L));
4473 +            // non-determinism
4474 +            assertTrue(f.get() == 5L || f.get() == 8L);
4475 +        }
4476 +
4477 +        CompletableFuture<Long> godot = new CompletableFuture<>();
4478 +        // f plus godot === f (doesn't wait for godot)
4479 +        Monad.assertFutureEquals(Monad.unit(5L),
4480 +                                 Monad.plus(Monad.unit(5L), godot));
4481 +        // godot plus f === f (doesn't wait for godot)
4482 +        Monad.assertFutureEquals(Monad.unit(5L),
4483 +                                 Monad.plus(godot, Monad.unit(5L)));
4484 +    }
4485 +
4486 +    /** Test long recursive chains of CompletableFutures with cascading completions */
4487 +    @SuppressWarnings("FutureReturnValueIgnored")
4488 +    public void testRecursiveChains() throws Throwable {
4489 +        for (ExecutionMode m : ExecutionMode.values())
4490 +        for (boolean addDeadEnds : new boolean[] { true, false })
4491 +    {
4492 +        final int val = 42;
4493 +        final int n = expensiveTests ? 1_000 : 2;
4494 +        CompletableFuture<Integer> head = new CompletableFuture<>();
4495 +        CompletableFuture<Integer> tail = head;
4496 +        for (int i = 0; i < n; i++) {
4497 +            if (addDeadEnds) m.thenApply(tail, v -> v + 1);
4498 +            tail = m.thenApply(tail, v -> v + 1);
4499 +            if (addDeadEnds) m.applyToEither(tail, tail, v -> v + 1);
4500 +            tail = m.applyToEither(tail, tail, v -> v + 1);
4501 +            if (addDeadEnds) m.thenCombine(tail, tail, (v, w) -> v + 1);
4502 +            tail = m.thenCombine(tail, tail, (v, w) -> v + 1);
4503 +        }
4504 +        head.complete(val);
4505 +        assertEquals(val + 3 * n, (int) tail.join());
4506 +    }}
4507 +
4508 +    /**
4509 +     * A single CompletableFuture with many dependents.
4510 +     * A demo of scalability - runtime is O(n).
4511 +     */
4512 +    @SuppressWarnings("FutureReturnValueIgnored")
4513 +    public void testManyDependents() throws Throwable {
4514 +        final int n = expensiveTests ? 1_000_000 : 10;
4515 +        final CompletableFuture<Void> head = new CompletableFuture<>();
4516 +        final CompletableFuture<Void> complete = CompletableFuture.completedFuture((Void)null);
4517 +        final AtomicInteger count = new AtomicInteger(0);
4518 +        for (int i = 0; i < n; i++) {
4519 +            head.thenRun(() -> count.getAndIncrement());
4520 +            head.thenAccept(x -> count.getAndIncrement());
4521 +            head.thenApply(x -> count.getAndIncrement());
4522 +
4523 +            head.runAfterBoth(complete, () -> count.getAndIncrement());
4524 +            head.thenAcceptBoth(complete, (x, y) -> count.getAndIncrement());
4525 +            head.thenCombine(complete, (x, y) -> count.getAndIncrement());
4526 +            complete.runAfterBoth(head, () -> count.getAndIncrement());
4527 +            complete.thenAcceptBoth(head, (x, y) -> count.getAndIncrement());
4528 +            complete.thenCombine(head, (x, y) -> count.getAndIncrement());
4529 +
4530 +            head.runAfterEither(new CompletableFuture<Void>(), () -> count.getAndIncrement());
4531 +            head.acceptEither(new CompletableFuture<Void>(), x -> count.getAndIncrement());
4532 +            head.applyToEither(new CompletableFuture<Void>(), x -> count.getAndIncrement());
4533 +            new CompletableFuture<Void>().runAfterEither(head, () -> count.getAndIncrement());
4534 +            new CompletableFuture<Void>().acceptEither(head, x -> count.getAndIncrement());
4535 +            new CompletableFuture<Void>().applyToEither(head, x -> count.getAndIncrement());
4536 +        }
4537 +        head.complete(null);
4538 +        assertEquals(5 * 3 * n, count.get());
4539 +    }
4540 +
4541 +    /** ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest tck */
4542 +    @SuppressWarnings("FutureReturnValueIgnored")
4543 +    public void testCoCompletionGarbageRetention() throws Throwable {
4544 +        final int n = expensiveTests ? 1_000_000 : 10;
4545 +        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
4546 +        CompletableFuture<Integer> f;
4547 +        for (int i = 0; i < n; i++) {
4548 +            f = new CompletableFuture<>();
4549 +            f.runAfterEither(incomplete, () -> {});
4550 +            f.complete(null);
4551 +
4552 +            f = new CompletableFuture<>();
4553 +            f.acceptEither(incomplete, x -> {});
4554 +            f.complete(null);
4555 +
4556 +            f = new CompletableFuture<>();
4557 +            f.applyToEither(incomplete, x -> x);
4558 +            f.complete(null);
4559 +
4560 +            f = new CompletableFuture<>();
4561 +            CompletableFuture.anyOf(f, incomplete);
4562 +            f.complete(null);
4563 +        }
4564 +
4565 +        for (int i = 0; i < n; i++) {
4566 +            f = new CompletableFuture<>();
4567 +            incomplete.runAfterEither(f, () -> {});
4568 +            f.complete(null);
4569 +
4570 +            f = new CompletableFuture<>();
4571 +            incomplete.acceptEither(f, x -> {});
4572 +            f.complete(null);
4573 +
4574 +            f = new CompletableFuture<>();
4575 +            incomplete.applyToEither(f, x -> x);
4576 +            f.complete(null);
4577 +
4578 +            f = new CompletableFuture<>();
4579 +            CompletableFuture.anyOf(incomplete, f);
4580 +            f.complete(null);
4581 +        }
4582 +    }
4583 +
4584 +    /**
4585 +     * Reproduction recipe for:
4586 +     * 8160402: Garbage retention with CompletableFuture.anyOf
4587 +     * 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
4588 +     */
4589 +    public void testAnyOfGarbageRetention() throws Throwable {
4590 +        for (Integer v : new Integer[] { 1, null })
4591 +    {
4592 +        final int n = expensiveTests ? 100_000 : 10;
4593 +        CompletableFuture<Integer>[] fs
4594 +            = (CompletableFuture<Integer>[]) new CompletableFuture<?>[100];
4595 +        for (int i = 0; i < fs.length; i++)
4596 +            fs[i] = new CompletableFuture<>();
4597 +        fs[fs.length - 1].complete(v);
4598 +        for (int i = 0; i < n; i++)
4599 +            checkCompletedNormally(CompletableFuture.anyOf(fs), v);
4600 +    }}
4601 +
4602 +    /**
4603 +     * Checks for garbage retention with allOf.
4604 +     *
4605 +     * As of 2016-07, fails with OOME:
4606 +     * ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest -Djsr166.methodFilter=testCancelledAllOfGarbageRetention tck
4607 +     */
4608 +    public void testCancelledAllOfGarbageRetention() throws Throwable {
4609 +        final int n = expensiveTests ? 100_000 : 10;
4610 +        CompletableFuture<Integer>[] fs
4611 +            = (CompletableFuture<Integer>[]) new CompletableFuture<?>[100];
4612 +        for (int i = 0; i < fs.length; i++)
4613 +            fs[i] = new CompletableFuture<>();
4614 +        for (int i = 0; i < n; i++)
4615 +            assertTrue(CompletableFuture.allOf(fs).cancel(false));
4616 +    }
4617 +
4618 +    /**
4619 +     * Checks for garbage retention when a dependent future is
4620 +     * cancelled and garbage-collected.
4621 +     * 8161600: Garbage retention when source CompletableFutures are never completed
4622 +     *
4623 +     * As of 2016-07, fails with OOME:
4624 +     * ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest -Djsr166.methodFilter=testCancelledGarbageRetention tck
4625 +     */
4626 +    public void testCancelledGarbageRetention() throws Throwable {
4627 +        final int n = expensiveTests ? 100_000 : 10;
4628 +        CompletableFuture<Integer> neverCompleted = new CompletableFuture<>();
4629 +        for (int i = 0; i < n; i++)
4630 +            assertTrue(neverCompleted.thenRun(() -> {}).cancel(true));
4631 +    }
4632 +
4633 +    /**
4634 +     * Checks for garbage retention when MinimalStage.toCompletableFuture()
4635 +     * is invoked many times.
4636 +     * 8161600: Garbage retention when source CompletableFutures are never completed
4637 +     *
4638 +     * As of 2016-07, fails with OOME:
4639 +     * ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest -Djsr166.methodFilter=testToCompletableFutureGarbageRetention tck
4640 +     */
4641 +    public void testToCompletableFutureGarbageRetention() throws Throwable {
4642 +        final int n = expensiveTests ? 900_000 : 10;
4643 +        CompletableFuture<Integer> neverCompleted = new CompletableFuture<>();
4644 +        CompletionStage minimal = neverCompleted.minimalCompletionStage();
4645 +        for (int i = 0; i < n; i++)
4646 +            assertTrue(minimal.toCompletableFuture().cancel(true));
4647 +    }
4648 +
4649 + //     static <U> U join(CompletionStage<U> stage) {
4650 + //         CompletableFuture<U> f = new CompletableFuture<>();
4651 + //         stage.whenComplete((v, ex) -> {
4652 + //             if (ex != null) f.completeExceptionally(ex); else f.complete(v);
4653 + //         });
4654 + //         return f.join();
4655 + //     }
4656 +
4657 + //     static <U> boolean isDone(CompletionStage<U> stage) {
4658 + //         CompletableFuture<U> f = new CompletableFuture<>();
4659 + //         stage.whenComplete((v, ex) -> {
4660 + //             if (ex != null) f.completeExceptionally(ex); else f.complete(v);
4661 + //         });
4662 + //         return f.isDone();
4663 + //     }
4664 +
4665 + //     static <U> U join2(CompletionStage<U> stage) {
4666 + //         return stage.toCompletableFuture().copy().join();
4667 + //     }
4668 +
4669 + //     static <U> boolean isDone2(CompletionStage<U> stage) {
4670 + //         return stage.toCompletableFuture().copy().isDone();
4671 + //     }
4672 +
4673 +    // For testing default implementations
4674 +    // Only non-default interface methods defined.
4675 +    static final class DelegatedCompletionStage<T> implements CompletionStage<T> {
4676 +        final CompletableFuture<T> cf;
4677 +        DelegatedCompletionStage(CompletableFuture<T> cf) { this.cf = cf; }
4678 +        public CompletableFuture<T> toCompletableFuture() {
4679 +            return cf; }
4680 +        public CompletionStage<Void> thenRun
4681 +            (Runnable action) {
4682 +            return cf.thenRun(action); }
4683 +        public CompletionStage<Void> thenRunAsync
4684 +            (Runnable action) {
4685 +            return cf.thenRunAsync(action); }
4686 +        public CompletionStage<Void> thenRunAsync
4687 +            (Runnable action,
4688 +             Executor executor) {
4689 +            return cf.thenRunAsync(action, executor); }
4690 +        public CompletionStage<Void> thenAccept
4691 +            (Consumer<? super T> action) {
4692 +            return cf.thenAccept(action); }
4693 +        public CompletionStage<Void> thenAcceptAsync
4694 +            (Consumer<? super T> action) {
4695 +            return cf.thenAcceptAsync(action); }
4696 +        public CompletionStage<Void> thenAcceptAsync
4697 +            (Consumer<? super T> action,
4698 +             Executor executor) {
4699 +            return cf.thenAcceptAsync(action, executor); }
4700 +        public <U> CompletionStage<U> thenApply
4701 +            (Function<? super T,? extends U> a) {
4702 +            return cf.thenApply(a); }
4703 +        public <U> CompletionStage<U> thenApplyAsync
4704 +            (Function<? super T,? extends U> fn) {
4705 +            return cf.thenApplyAsync(fn); }
4706 +        public <U> CompletionStage<U> thenApplyAsync
4707 +            (Function<? super T,? extends U> fn,
4708 +             Executor executor) {
4709 +            return cf.thenApplyAsync(fn, executor); }
4710 +        public <U,V> CompletionStage<V> thenCombine
4711 +            (CompletionStage<? extends U> other,
4712 +             BiFunction<? super T,? super U,? extends V> fn) {
4713 +            return cf.thenCombine(other, fn); }
4714 +        public <U,V> CompletionStage<V> thenCombineAsync
4715 +            (CompletionStage<? extends U> other,
4716 +             BiFunction<? super T,? super U,? extends V> fn) {
4717 +            return cf.thenCombineAsync(other, fn); }
4718 +        public <U,V> CompletionStage<V> thenCombineAsync
4719 +            (CompletionStage<? extends U> other,
4720 +             BiFunction<? super T,? super U,? extends V> fn,
4721 +             Executor executor) {
4722 +            return cf.thenCombineAsync(other, fn, executor); }
4723 +        public <U> CompletionStage<Void> thenAcceptBoth
4724 +            (CompletionStage<? extends U> other,
4725 +             BiConsumer<? super T, ? super U> action) {
4726 +            return cf.thenAcceptBoth(other, action); }
4727 +        public <U> CompletionStage<Void> thenAcceptBothAsync
4728 +            (CompletionStage<? extends U> other,
4729 +             BiConsumer<? super T, ? super U> action) {
4730 +            return cf.thenAcceptBothAsync(other, action); }
4731 +        public <U> CompletionStage<Void> thenAcceptBothAsync
4732 +            (CompletionStage<? extends U> other,
4733 +             BiConsumer<? super T, ? super U> action,
4734 +             Executor executor) {
4735 +            return cf.thenAcceptBothAsync(other, action, executor); }
4736 +        public CompletionStage<Void> runAfterBoth
4737 +            (CompletionStage<?> other,
4738 +             Runnable action) {
4739 +            return cf.runAfterBoth(other, action); }
4740 +        public CompletionStage<Void> runAfterBothAsync
4741 +            (CompletionStage<?> other,
4742 +             Runnable action) {
4743 +            return cf.runAfterBothAsync(other, action); }
4744 +        public CompletionStage<Void> runAfterBothAsync
4745 +            (CompletionStage<?> other,
4746 +             Runnable action,
4747 +             Executor executor) {
4748 +            return cf.runAfterBothAsync(other, action, executor); }
4749 +        public <U> CompletionStage<U> applyToEither
4750 +            (CompletionStage<? extends T> other,
4751 +             Function<? super T, U> fn) {
4752 +            return cf.applyToEither(other, fn); }
4753 +        public <U> CompletionStage<U> applyToEitherAsync
4754 +            (CompletionStage<? extends T> other,
4755 +             Function<? super T, U> fn) {
4756 +            return cf.applyToEitherAsync(other, fn); }
4757 +        public <U> CompletionStage<U> applyToEitherAsync
4758 +            (CompletionStage<? extends T> other,
4759 +             Function<? super T, U> fn,
4760 +             Executor executor) {
4761 +            return cf.applyToEitherAsync(other, fn, executor); }
4762 +        public CompletionStage<Void> acceptEither
4763 +            (CompletionStage<? extends T> other,
4764 +             Consumer<? super T> action) {
4765 +            return cf.acceptEither(other, action); }
4766 +        public CompletionStage<Void> acceptEitherAsync
4767 +            (CompletionStage<? extends T> other,
4768 +             Consumer<? super T> action) {
4769 +            return cf.acceptEitherAsync(other, action); }
4770 +        public CompletionStage<Void> acceptEitherAsync
4771 +            (CompletionStage<? extends T> other,
4772 +             Consumer<? super T> action,
4773 +             Executor executor) {
4774 +            return cf.acceptEitherAsync(other, action, executor); }
4775 +        public CompletionStage<Void> runAfterEither
4776 +            (CompletionStage<?> other,
4777 +             Runnable action) {
4778 +            return cf.runAfterEither(other, action); }
4779 +        public CompletionStage<Void> runAfterEitherAsync
4780 +            (CompletionStage<?> other,
4781 +             Runnable action) {
4782 +            return cf.runAfterEitherAsync(other, action); }
4783 +        public CompletionStage<Void> runAfterEitherAsync
4784 +            (CompletionStage<?> other,
4785 +             Runnable action,
4786 +             Executor executor) {
4787 +            return cf.runAfterEitherAsync(other, action, executor); }
4788 +        public <U> CompletionStage<U> thenCompose
4789 +            (Function<? super T, ? extends CompletionStage<U>> fn) {
4790 +            return cf.thenCompose(fn); }
4791 +        public <U> CompletionStage<U> thenComposeAsync
4792 +            (Function<? super T, ? extends CompletionStage<U>> fn) {
4793 +            return cf.thenComposeAsync(fn); }
4794 +        public <U> CompletionStage<U> thenComposeAsync
4795 +            (Function<? super T, ? extends CompletionStage<U>> fn,
4796 +             Executor executor) {
4797 +            return cf.thenComposeAsync(fn, executor); }
4798 +        public <U> CompletionStage<U> handle
4799 +            (BiFunction<? super T, Throwable, ? extends U> fn) {
4800 +            return cf.handle(fn); }
4801 +        public <U> CompletionStage<U> handleAsync
4802 +            (BiFunction<? super T, Throwable, ? extends U> fn) {
4803 +            return cf.handleAsync(fn); }
4804 +        public <U> CompletionStage<U> handleAsync
4805 +            (BiFunction<? super T, Throwable, ? extends U> fn,
4806 +             Executor executor) {
4807 +            return cf.handleAsync(fn, executor); }
4808 +        public CompletionStage<T> whenComplete
4809 +            (BiConsumer<? super T, ? super Throwable> action) {
4810 +            return cf.whenComplete(action); }
4811 +        public CompletionStage<T> whenCompleteAsync
4812 +            (BiConsumer<? super T, ? super Throwable> action) {
4813 +            return cf.whenCompleteAsync(action); }
4814 +        public CompletionStage<T> whenCompleteAsync
4815 +            (BiConsumer<? super T, ? super Throwable> action,
4816 +             Executor executor) {
4817 +            return cf.whenCompleteAsync(action, executor); }
4818 +        public CompletionStage<T> exceptionally
4819 +            (Function<Throwable, ? extends T> fn) {
4820 +            return cf.exceptionally(fn); }
4821 +    }
4822 +
4823 +    /**
4824 +     * default-implemented exceptionallyAsync action is not invoked when
4825 +     * source completes normally, and source result is propagated
4826 +     */
4827 +    public void testDefaultExceptionallyAsync_normalCompletion() {
4828 +        for (boolean createIncomplete : new boolean[] { true, false })
4829 +        for (Integer v1 : new Integer[] { 1, null })
4830 +    {
4831 +        final AtomicInteger ran = new AtomicInteger(0);
4832 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
4833 +        final DelegatedCompletionStage<Integer> d =
4834 +            new DelegatedCompletionStage<Integer>(f);
4835 +        if (!createIncomplete) assertTrue(f.complete(v1));
4836 +        final CompletionStage<Integer> g = d.exceptionallyAsync
4837 +            ((Throwable t) -> {
4838 +                ran.getAndIncrement();
4839 +                throw new AssertionError("should not be called");
4840 +            });
4841 +        if (createIncomplete) assertTrue(f.complete(v1));
4842 +
4843 +        checkCompletedNormally(g.toCompletableFuture(), v1);
4844 +        checkCompletedNormally(f, v1);
4845 +        assertEquals(0, ran.get());
4846 +    }}
4847 +
4848 +    /**
4849 +     * default-implemented exceptionallyAsync action completes with
4850 +     * function value on source exception
4851 +     */
4852 +    public void testDefaultExceptionallyAsync_exceptionalCompletion() {
4853 +        for (boolean createIncomplete : new boolean[] { true, false })
4854 +        for (Integer v1 : new Integer[] { 1, null })
4855 +    {
4856 +        final AtomicInteger ran = new AtomicInteger(0);
4857 +        final CFException ex = new CFException();
4858 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
4859 +        final DelegatedCompletionStage<Integer> d =
4860 +            new DelegatedCompletionStage<Integer>(f);
4861 +        if (!createIncomplete) f.completeExceptionally(ex);
4862 +        final CompletionStage<Integer> g = d.exceptionallyAsync
4863 +            ((Throwable t) -> {
4864 +                assertSame(t, ex);
4865 +                ran.getAndIncrement();
4866 +                return v1;
4867 +            });
4868 +        if (createIncomplete) f.completeExceptionally(ex);
4869 +
4870 +        checkCompletedNormally(g.toCompletableFuture(), v1);
4871 +        checkCompletedExceptionally(f, ex);
4872 +        assertEquals(1, ran.get());
4873 +    }}
4874 +
4875 +    /**
4876 +     * Under default implementation, if an "exceptionally action"
4877 +     * throws an exception, it completes exceptionally with that
4878 +     * exception
4879 +     */
4880 +    public void testDefaultExceptionallyAsync_exceptionalCompletionActionFailed() {
4881 +        for (boolean createIncomplete : new boolean[] { true, false })
4882 +    {
4883 +        final AtomicInteger ran = new AtomicInteger(0);
4884 +        final CFException ex1 = new CFException();
4885 +        final CFException ex2 = new CFException();
4886 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
4887 +        final DelegatedCompletionStage<Integer> d =
4888 +            new DelegatedCompletionStage<Integer>(f);
4889 +        if (!createIncomplete) f.completeExceptionally(ex1);
4890 +        final CompletionStage<Integer> g = d.exceptionallyAsync
4891 +            ((Throwable t) -> {
4892 +                assertSame(t, ex1);
4893 +                ran.getAndIncrement();
4894 +                throw ex2;
4895 +            });
4896 +        if (createIncomplete) f.completeExceptionally(ex1);
4897 +
4898 +        checkCompletedWithWrappedException(g.toCompletableFuture(), ex2);
4899 +        checkCompletedExceptionally(f, ex1);
4900 +        checkCompletedExceptionally(d.toCompletableFuture(), ex1);
4901 +        assertEquals(1, ran.get());
4902 +    }}
4903 +
4904 +    /**
4905 +     * default-implemented exceptionallyCompose result completes
4906 +     * normally after normal completion of source
4907 +     */
4908 +    public void testDefaultExceptionallyCompose_normalCompletion() {
4909 +        for (boolean createIncomplete : new boolean[] { true, false })
4910 +        for (Integer v1 : new Integer[] { 1, null })
4911 +    {
4912 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
4913 +        final ExceptionalCompletableFutureFunction r =
4914 +            new ExceptionalCompletableFutureFunction(ExecutionMode.SYNC);
4915 +        final DelegatedCompletionStage<Integer> d =
4916 +            new DelegatedCompletionStage<Integer>(f);
4917 +        if (!createIncomplete) assertTrue(f.complete(v1));
4918 +        final CompletionStage<Integer> g = d.exceptionallyCompose(r);
4919 +        if (createIncomplete) assertTrue(f.complete(v1));
4920 +
4921 +        checkCompletedNormally(f, v1);
4922 +        checkCompletedNormally(g.toCompletableFuture(), v1);
4923 +        r.assertNotInvoked();
4924 +    }}
4925 +
4926 +    /**
4927 +     * default-implemented exceptionallyCompose result completes
4928 +     * normally after exceptional completion of source
4929 +     */
4930 +    public void testDefaultExceptionallyCompose_exceptionalCompletion() {
4931 +        for (boolean createIncomplete : new boolean[] { true, false })
4932 +    {
4933 +        final CFException ex = new CFException();
4934 +        final ExceptionalCompletableFutureFunction r =
4935 +            new ExceptionalCompletableFutureFunction(ExecutionMode.SYNC);
4936 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
4937 +        final DelegatedCompletionStage<Integer> d =
4938 +            new DelegatedCompletionStage<Integer>(f);
4939 +        if (!createIncomplete) f.completeExceptionally(ex);
4940 +        final CompletionStage<Integer> g = d.exceptionallyCompose(r);
4941 +        if (createIncomplete) f.completeExceptionally(ex);
4942 +
4943 +        checkCompletedExceptionally(f, ex);
4944 +        checkCompletedNormally(g.toCompletableFuture(), r.value);
4945 +        r.assertInvoked();
4946 +    }}
4947 +
4948 +    /**
4949 +     * default-implemented exceptionallyCompose completes
4950 +     * exceptionally on exception if action does
4951 +     */
4952 +    public void testDefaultExceptionallyCompose_actionFailed() {
4953 +        for (boolean createIncomplete : new boolean[] { true, false })
4954 +    {
4955 +        final CFException ex = new CFException();
4956 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
4957 +        final FailingExceptionalCompletableFutureFunction r
4958 +            = new FailingExceptionalCompletableFutureFunction(ExecutionMode.SYNC);
4959 +        final DelegatedCompletionStage<Integer> d =
4960 +            new DelegatedCompletionStage<Integer>(f);
4961 +        if (!createIncomplete) f.completeExceptionally(ex);
4962 +        final CompletionStage<Integer> g = d.exceptionallyCompose(r);
4963 +        if (createIncomplete) f.completeExceptionally(ex);
4964 +
4965 +        checkCompletedExceptionally(f, ex);
4966 +        checkCompletedWithWrappedException(g.toCompletableFuture(), r.ex);
4967 +        r.assertInvoked();
4968 +    }}
4969 +
4970 +    /**
4971 +     * default-implemented exceptionallyComposeAsync result completes
4972 +     * normally after normal completion of source
4973 +     */
4974 +    public void testDefaultExceptionallyComposeAsync_normalCompletion() {
4975 +        for (boolean createIncomplete : new boolean[] { true, false })
4976 +        for (Integer v1 : new Integer[] { 1, null })
4977 +    {
4978 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
4979 +        final ExceptionalCompletableFutureFunction r =
4980 +            new ExceptionalCompletableFutureFunction(ExecutionMode.ASYNC);
4981 +        final DelegatedCompletionStage<Integer> d =
4982 +            new DelegatedCompletionStage<Integer>(f);
4983 +        if (!createIncomplete) assertTrue(f.complete(v1));
4984 +        final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r);
4985 +        if (createIncomplete) assertTrue(f.complete(v1));
4986 +
4987 +        checkCompletedNormally(f, v1);
4988 +        checkCompletedNormally(g.toCompletableFuture(), v1);
4989 +        r.assertNotInvoked();
4990 +    }}
4991 +
4992 +    /**
4993 +     * default-implemented exceptionallyComposeAsync result completes
4994 +     * normally after exceptional completion of source
4995 +     */
4996 +    public void testDefaultExceptionallyComposeAsync_exceptionalCompletion() {
4997 +        for (boolean createIncomplete : new boolean[] { true, false })
4998 +    {
4999 +        final CFException ex = new CFException();
5000 +        final ExceptionalCompletableFutureFunction r =
5001 +            new ExceptionalCompletableFutureFunction(ExecutionMode.ASYNC);
5002 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
5003 +        final DelegatedCompletionStage<Integer> d =
5004 +            new DelegatedCompletionStage<Integer>(f);
5005 +        if (!createIncomplete) f.completeExceptionally(ex);
5006 +        final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r);
5007 +        if (createIncomplete) f.completeExceptionally(ex);
5008 +
5009 +        checkCompletedExceptionally(f, ex);
5010 +        checkCompletedNormally(g.toCompletableFuture(), r.value);
5011 +        r.assertInvoked();
5012 +    }}
5013 +
5014 +    /**
5015 +     * default-implemented exceptionallyComposeAsync completes
5016 +     * exceptionally on exception if action does
5017 +     */
5018 +    public void testDefaultExceptionallyComposeAsync_actionFailed() {
5019 +        for (boolean createIncomplete : new boolean[] { true, false })
5020 +    {
5021 +        final CFException ex = new CFException();
5022 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
5023 +        final FailingExceptionalCompletableFutureFunction r
5024 +            = new FailingExceptionalCompletableFutureFunction(ExecutionMode.ASYNC);
5025 +        final DelegatedCompletionStage<Integer> d =
5026 +            new DelegatedCompletionStage<Integer>(f);
5027 +        if (!createIncomplete) f.completeExceptionally(ex);
5028 +        final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r);
5029 +        if (createIncomplete) f.completeExceptionally(ex);
5030 +
5031 +        checkCompletedExceptionally(f, ex);
5032 +        checkCompletedWithWrappedException(g.toCompletableFuture(), r.ex);
5033 +        r.assertInvoked();
5034 +    }}
5035 +
5036 +    /**
5037 +     * default-implemented exceptionallyComposeAsync result completes
5038 +     * normally after normal completion of source
5039 +     */
5040 +    public void testDefaultExceptionallyComposeAsyncExecutor_normalCompletion() {
5041 +        for (boolean createIncomplete : new boolean[] { true, false })
5042 +        for (Integer v1 : new Integer[] { 1, null })
5043 +    {
5044 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
5045 +        final ExceptionalCompletableFutureFunction r =
5046 +            new ExceptionalCompletableFutureFunction(ExecutionMode.EXECUTOR);
5047 +        final DelegatedCompletionStage<Integer> d =
5048 +            new DelegatedCompletionStage<Integer>(f);
5049 +        if (!createIncomplete) assertTrue(f.complete(v1));
5050 +        final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r, new ThreadExecutor());
5051 +        if (createIncomplete) assertTrue(f.complete(v1));
5052 +
5053 +        checkCompletedNormally(f, v1);
5054 +        checkCompletedNormally(g.toCompletableFuture(), v1);
5055 +        r.assertNotInvoked();
5056 +    }}
5057 +
5058 +    /**
5059 +     * default-implemented exceptionallyComposeAsync result completes
5060 +     * normally after exceptional completion of source
5061 +     */
5062 +    public void testDefaultExceptionallyComposeAsyncExecutor_exceptionalCompletion() {
5063 +        for (boolean createIncomplete : new boolean[] { true, false })
5064 +    {
5065 +        final CFException ex = new CFException();
5066 +        final ExceptionalCompletableFutureFunction r =
5067 +            new ExceptionalCompletableFutureFunction(ExecutionMode.EXECUTOR);
5068 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
5069 +        final DelegatedCompletionStage<Integer> d =
5070 +            new DelegatedCompletionStage<Integer>(f);
5071 +        if (!createIncomplete) f.completeExceptionally(ex);
5072 +        final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r, new ThreadExecutor());
5073 +        if (createIncomplete) f.completeExceptionally(ex);
5074 +
5075 +        checkCompletedExceptionally(f, ex);
5076 +        checkCompletedNormally(g.toCompletableFuture(), r.value);
5077 +        r.assertInvoked();
5078 +    }}
5079 +
5080 +    /**
5081 +     * default-implemented exceptionallyComposeAsync completes
5082 +     * exceptionally on exception if action does
5083 +     */
5084 +    public void testDefaultExceptionallyComposeAsyncExecutor_actionFailed() {
5085 +        for (boolean createIncomplete : new boolean[] { true, false })
5086 +    {
5087 +        final CFException ex = new CFException();
5088 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
5089 +        final FailingExceptionalCompletableFutureFunction r
5090 +            = new FailingExceptionalCompletableFutureFunction(ExecutionMode.EXECUTOR);
5091 +        final DelegatedCompletionStage<Integer> d =
5092 +            new DelegatedCompletionStage<Integer>(f);
5093 +        if (!createIncomplete) f.completeExceptionally(ex);
5094 +        final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r, new ThreadExecutor());
5095 +        if (createIncomplete) f.completeExceptionally(ex);
5096 +
5097 +        checkCompletedExceptionally(f, ex);
5098 +        checkCompletedWithWrappedException(g.toCompletableFuture(), r.ex);
5099 +        r.assertInvoked();
5100 +    }}
5101 +
5102   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines