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.109 by jsr166, Fri Sep 4 02:50:00 2015 UTC vs.
Revision 1.213 by jsr166, Mon Sep 24 17:13:37 2018 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines