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.93 by jsr166, Tue Jun 17 21:09:56 2014 UTC vs.
Revision 1.217 by jsr166, Sat Nov 24 18:13:28 2018 UTC

# Line 5 | Line 5
5   * http://creativecommons.org/publicdomain/zero/1.0/
6   */
7  
8 < import junit.framework.*;
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;
10 import java.util.concurrent.Executor;
11 import java.util.concurrent.ExecutorService;
12 import java.util.concurrent.Executors;
25   import java.util.concurrent.CancellationException;
14 import java.util.concurrent.CountDownLatch;
15 import java.util.concurrent.ExecutionException;
16 import java.util.concurrent.Future;
26   import java.util.concurrent.CompletableFuture;
27   import java.util.concurrent.CompletionException;
28   import java.util.concurrent.CompletionStage;
29 + import java.util.concurrent.ExecutionException;
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;
35   import java.util.concurrent.atomic.AtomicInteger;
36 < import static java.util.concurrent.TimeUnit.MILLISECONDS;
25 < import static java.util.concurrent.TimeUnit.SECONDS;
26 < import java.util.*;
27 < import java.util.function.Supplier;
28 < import java.util.function.Consumer;
36 > import java.util.concurrent.atomic.AtomicReference;
37   import java.util.function.BiConsumer;
30 import java.util.function.Function;
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;
45 + import junit.framework.TestSuite;
46  
47   public class CompletableFutureTest extends JSR166TestCase {
48  
49      public static void main(String[] args) {
50 <        junit.textui.TestRunner.run(suite());
50 >        main(suite(), args);
51      }
52      public static Test suite() {
53          return new TestSuite(CompletableFutureTest.class);
# Line 44 | 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 <        try {
79 <            assertEquals(value, f.get(LONG_DELAY_MS, MILLISECONDS));
80 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
81 <        try {
82 <            assertEquals(value, f.join());
83 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
66 <        try {
67 <            assertEquals(value, f.getNow(null));
68 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
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.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 <        try {
97 <            f.get(LONG_DELAY_MS, MILLISECONDS);
98 <            shouldThrow();
99 <        } catch (ExecutionException success) {
100 <            assertTrue(success.getCause() instanceof CFException);
101 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
102 <        try {
86 <            f.join();
87 <            shouldThrow();
88 <        } catch (CompletionException success) {
89 <            assertTrue(success.getCause() instanceof CFException);
90 <        }
91 <        try {
92 <            f.getNow(null);
93 <            shouldThrow();
94 <        } catch (CompletionException success) {
95 <            assertTrue(success.getCause() instanceof CFException);
96 <        }
97 <        try {
98 <            f.get();
99 <            shouldThrow();
100 <        } catch (ExecutionException success) {
101 <            assertTrue(success.getCause() instanceof CFException);
102 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
103 <        assertTrue(f.isDone());
104 <        assertFalse(f.isCancelled());
105 <        assertTrue(f.toString().contains("[Completed exceptionally]"));
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 <    <U> void checkCompletedExceptionallyWithRootCause(CompletableFuture<U> f,
106 <                                                      Throwable ex) {
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 >        checker.accept(cause);
114 >
115 >        long startTime = System.nanoTime();
116          try {
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) < 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  
135        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 checkCompletedWithWrappedException(CompletableFuture<U> f,
152 <                                                Throwable ex) {
153 <        checkCompletedExceptionallyWithRootCause(f, ex);
143 <        try {
144 <            CompletableFuture<Throwable> spy = f.handle
145 <                ((U u, Throwable t) -> t);
146 <            assertTrue(spy.join() instanceof CompletionException);
147 <            assertSame(ex, spy.join().getCause());
148 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
151 >    void checkCompletedWithWrappedCFException(CompletableFuture<?> f) {
152 >        checkCompletedExceptionally(f, true,
153 >            t -> assertTrue(t instanceof CFException));
154      }
155  
156 <    <U> void checkCompletedExceptionally(CompletableFuture<U> f, Throwable ex) {
157 <        checkCompletedExceptionallyWithRootCause(f, ex);
158 <        try {
159 <            CompletableFuture<Throwable> spy = f.handle
160 <                ((U u, Throwable t) -> t);
161 <            assertSame(ex, spy.join());
162 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
156 >    void checkCompletedWithWrappedCancellationException(CompletableFuture<?> f) {
157 >        checkCompletedExceptionally(f, true,
158 >            t -> assertTrue(t instanceof CancellationException));
159 >    }
160 >
161 >    void checkCompletedWithTimeoutException(CompletableFuture<?> f) {
162 >        checkCompletedExceptionally(f, false,
163 >            t -> assertTrue(t instanceof TimeoutException));
164 >    }
165 >
166 >    void checkCompletedWithWrappedException(CompletableFuture<?> f,
167 >                                            Throwable ex) {
168 >        checkCompletedExceptionally(f, true, t -> assertSame(t, ex));
169 >    }
170 >
171 >    void checkCompletedExceptionally(CompletableFuture<?> f, Throwable ex) {
172 >        checkCompletedExceptionally(f, false, t -> assertSame(t, ex));
173      }
174  
175      void checkCancelled(CompletableFuture<?> f) {
176 +        long startTime = System.nanoTime();
177          try {
178              f.get(LONG_DELAY_MS, MILLISECONDS);
179              shouldThrow();
180          } catch (CancellationException success) {
181          } catch (Throwable fail) { threadUnexpectedException(fail); }
182 +        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS / 2);
183 +
184          try {
185              f.join();
186              shouldThrow();
# Line 176 | Line 194 | public class CompletableFutureTest exten
194              shouldThrow();
195          } catch (CancellationException success) {
196          } catch (Throwable fail) { threadUnexpectedException(fail); }
179        assertTrue(f.isDone());
180        assertTrue(f.isCompletedExceptionally());
181        assertTrue(f.isCancelled());
182        assertTrue(f.toString().contains("[Completed exceptionally]"));
183    }
197  
198 <    void checkCompletedWithWrappedCancellationException(CompletableFuture<?> f) {
199 <        try {
187 <            f.get(LONG_DELAY_MS, MILLISECONDS);
188 <            shouldThrow();
189 <        } catch (ExecutionException success) {
190 <            assertTrue(success.getCause() instanceof CancellationException);
191 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
192 <        try {
193 <            f.join();
194 <            shouldThrow();
195 <        } catch (CompletionException success) {
196 <            assertTrue(success.getCause() instanceof CancellationException);
197 <        }
198 <        try {
199 <            f.getNow(null);
200 <            shouldThrow();
201 <        } catch (CompletionException success) {
202 <            assertTrue(success.getCause() instanceof CancellationException);
203 <        }
204 <        try {
205 <            f.get();
206 <            shouldThrow();
207 <        } catch (ExecutionException success) {
208 <            assertTrue(success.getCause() instanceof CancellationException);
209 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
198 >        assertTrue(exceptionalCompletion(f) instanceof CancellationException);
199 >
200          assertTrue(f.isDone());
211        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 257 | Line 247 | public class CompletableFutureTest exten
247      {
248          CompletableFuture<Integer> f = new CompletableFuture<>();
249          checkIncomplete(f);
250 <        assertTrue(f.cancel(true));
251 <        assertTrue(f.cancel(true));
250 >        assertTrue(f.cancel(mayInterruptIfRunning));
251 >        assertTrue(f.cancel(mayInterruptIfRunning));
252 >        assertTrue(f.cancel(!mayInterruptIfRunning));
253          checkCancelled(f);
254      }}
255  
# Line 308 | 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 345 | 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 373 | 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 385 | 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 394 | 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 413 | 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 423 | 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 441 | 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 451 | 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 461 | 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 <
534 <    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 <    class FailingCompletableFutureFunction extends CheckedIntegerAction
569 >    static class ExceptionalCompletableFutureFunction extends CheckedAction
570 >        implements Function<Throwable, CompletionStage<Integer>> {
571 >        final Integer value = 3;
572 >        ExceptionalCompletableFutureFunction(ExecutionMode m) { super(m); }
573 >        public CompletionStage<Integer> apply(Throwable x) {
574 >            invoked();
575 >            return CompletableFuture.completedFuture(value);
576 >        }
577 >    }
578 >
579 >    static class FailingCompletableFutureFunction extends CheckedIntegerAction
580          implements Function<Integer, CompletableFuture<Integer>>
581      {
582 <        FailingCompletableFutureFunction(ExecutionMode m) { super(m); }
582 >        final CFException ex;
583 >        FailingCompletableFutureFunction(ExecutionMode m) { super(m); ex = new CFException(); }
584          public CompletableFuture<Integer> apply(Integer x) {
585              invoked();
586              value = x;
587 <            throw new CFException();
587 >            throw ex;
588 >        }
589 >    }
590 >
591 >    static class CountingRejectingExecutor implements Executor {
592 >        final RejectedExecutionException ex = new RejectedExecutionException();
593 >        final AtomicInteger count = new AtomicInteger(0);
594 >        public void execute(Runnable r) {
595 >            count.getAndIncrement();
596 >            throw ex;
597          }
598      }
599  
# Line 569 | Line 611 | public class CompletableFutureTest exten
611          }
612      }
613  
614 +    static final boolean defaultExecutorIsCommonPool
615 +        = ForkJoinPool.getCommonPoolParallelism() > 1;
616 +
617      /**
618       * Permits the testing of parallel code for the 3 different
619       * execution modes without copy/pasting all the test methods.
620       */
621      enum ExecutionMode {
622 <        DEFAULT {
622 >        SYNC {
623              public void checkExecutionMode() {
624                  assertFalse(ThreadExecutor.startedCurrentThread());
625                  assertNull(ForkJoinTask.getPool());
# Line 646 | 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          },
650
704          ASYNC {
705              public void checkExecutionMode() {
706 <                assertSame(ForkJoinPool.commonPool(),
707 <                           ForkJoinTask.getPool());
706 >                assertEquals(defaultExecutorIsCommonPool,
707 >                             (ForkJoinPool.commonPool() == ForkJoinTask.getPool()));
708              }
709              public CompletableFuture<Void> runAsync(Runnable a) {
710                  return CompletableFuture.runAsync(a);
# Line 720 | 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 793 | 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 835 | 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 842 | 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      {
848        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();
855 <                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);
861        assertEquals(0, a.get());
940      }}
941  
942      /**
# Line 866 | 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 873 | 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.DEFAULT.checkExecutionMode();
958 <                threadAssertSame(t, ex);
955 >        final CompletableFuture<Integer> g = m.exceptionally
956 >            (f, (Throwable t) -> {
957 >                m.checkExecutionMode();
958 >                assertSame(t, ex);
959                  a.getAndIncrement();
960                  return v1;
961              });
# Line 886 | 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 })
891        for (Integer v1 : new Integer[] { 1, null })
975      {
976          final AtomicInteger a = new AtomicInteger(0);
977          final CFException ex1 = new CFException();
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.DEFAULT.checkExecutionMode();
984 <                threadAssertSame(t, ex1);
981 >        final CompletableFuture<Integer> g = m.exceptionally
982 >            (f, (Throwable t) -> {
983 >                m.checkExecutionMode();
984 >                assertSame(t, ex1);
985                  a.getAndIncrement();
986                  throw ex2;
987              });
988          if (createIncomplete) f.completeExceptionally(ex1);
989  
990          checkCompletedWithWrappedException(g, ex2);
991 +        checkCompletedExceptionally(f, ex1);
992          assertEquals(1, a.get());
993      }}
994  
# Line 912 | 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 922 | 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);
1012 <                threadAssertNull(t);
1011 >                assertSame(result, v1);
1012 >                assertNull(t);
1013                  a.getAndIncrement();
1014              });
1015          if (createIncomplete) assertTrue(f.complete(v1));
# Line 942 | Line 1026 | public class CompletableFutureTest exten
1026      public void testWhenComplete_exceptionalCompletion() {
1027          for (ExecutionMode m : ExecutionMode.values())
1028          for (boolean createIncomplete : new boolean[] { true, false })
945        for (Integer v1 : new Integer[] { 1, null })
1029      {
1030          final AtomicInteger a = new AtomicInteger(0);
1031          final CFException ex = new CFException();
# Line 950 | 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);
1039 <                threadAssertSame(t, ex);
1038 >                assertNull(result);
1039 >                assertSame(t, ex);
1040                  a.getAndIncrement();
1041              });
1042          if (createIncomplete) f.completeExceptionally(ex);
# Line 977 | 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);
1066 <                threadAssertTrue(t instanceof CancellationException);
1065 >                assertNull(result);
1066 >                assertTrue(t instanceof CancellationException);
1067                  a.getAndIncrement();
1068              });
1069          if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
# Line 994 | 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 1005 | 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);
1094 <                threadAssertNull(t);
1093 >                assertSame(result, v1);
1094 >                assertNull(t);
1095                  a.getAndIncrement();
1096                  throw ex;
1097              });
# Line 1022 | 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())
1030        for (Integer v1 : new Integer[] { 1, null })
1113      {
1114          final AtomicInteger a = new AtomicInteger(0);
1115          final CFException ex1 = new CFException();
# Line 1037 | 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);
1124 >                assertSame(t, ex1);
1125 >                assertNull(result);
1126                  a.getAndIncrement();
1127                  throw ex2;
1128              });
# Line 1048 | 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 1065 | 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);
1157 <                threadAssertNull(t);
1156 >                assertSame(result, v1);
1157 >                assertNull(t);
1158                  a.getAndIncrement();
1159                  return inc(v1);
1160              });
# Line 1094 | 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);
1186 <                threadAssertSame(t, ex);
1185 >                assertNull(result);
1186 >                assertSame(t, ex);
1187                  a.getAndIncrement();
1188                  return v1;
1189              });
# Line 1123 | 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);
1215 <                threadAssertTrue(t instanceof CancellationException);
1214 >                assertNull(result);
1215 >                assertTrue(t instanceof CancellationException);
1216                  a.getAndIncrement();
1217                  return v1;
1218              });
# Line 1138 | 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();
1151 <        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 >                assertSame(result, v1);
1244 >                assertNull(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      {
1173        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 >                assertNull(result);
1275 >                assertSame(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 1219 | 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 1253 | 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 1375 | 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 1479 | 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 1581 | 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 1628 | Line 1747 | public class CompletableFutureTest exten
1747          rs[0].assertValue(subtract(v1, v2));
1748          rs[2].assertValue(subtract(v1, v2));
1749          rs[4].assertValue(subtract(v1, v2));
1750 <      
1750 >
1751          checkCompletedNormally(f, v1);
1752          checkCompletedNormally(g, v2);
1753      }}
# Line 1746 | 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 1910 | 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 2074 | 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 2366 | 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 2378 | 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 2519 | 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 2625 | 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 2637 | 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 2656 | 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 2668 | 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 2774 | 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 2880 | 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 2950 | 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 2975 | Line 3099 | public class CompletableFutureTest exten
3099          checkCancelled(f);
3100      }}
3101  
3102 +    /**
3103 +     * thenCompose result completes exceptionally if the result of the action does
3104 +     */
3105 +    public void testThenCompose_actionReturnsFailingFuture() {
3106 +        for (ExecutionMode m : ExecutionMode.values())
3107 +        for (int order = 0; order < 6; order++)
3108 +        for (Integer v1 : new Integer[] { 1, null })
3109 +    {
3110 +        final CFException ex = new CFException();
3111 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
3112 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
3113 +        final CompletableFuture<Integer> h;
3114 +        // Test all permutations of orders
3115 +        switch (order) {
3116 +        case 0:
3117 +            assertTrue(f.complete(v1));
3118 +            assertTrue(g.completeExceptionally(ex));
3119 +            h = m.thenCompose(f, x -> g);
3120 +            break;
3121 +        case 1:
3122 +            assertTrue(f.complete(v1));
3123 +            h = m.thenCompose(f, x -> g);
3124 +            assertTrue(g.completeExceptionally(ex));
3125 +            break;
3126 +        case 2:
3127 +            assertTrue(g.completeExceptionally(ex));
3128 +            assertTrue(f.complete(v1));
3129 +            h = m.thenCompose(f, x -> g);
3130 +            break;
3131 +        case 3:
3132 +            assertTrue(g.completeExceptionally(ex));
3133 +            h = m.thenCompose(f, x -> g);
3134 +            assertTrue(f.complete(v1));
3135 +            break;
3136 +        case 4:
3137 +            h = m.thenCompose(f, x -> g);
3138 +            assertTrue(f.complete(v1));
3139 +            assertTrue(g.completeExceptionally(ex));
3140 +            break;
3141 +        case 5:
3142 +            h = m.thenCompose(f, x -> g);
3143 +            assertTrue(f.complete(v1));
3144 +            assertTrue(g.completeExceptionally(ex));
3145 +            break;
3146 +        default: throw new AssertionError();
3147 +        }
3148 +
3149 +        checkCompletedExceptionally(g, ex);
3150 +        checkCompletedWithWrappedException(h, ex);
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 +    {
3203 +        final CFException ex = new CFException();
3204 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
3205 +        final FailingExceptionalCompletableFutureFunction r
3206 +            = new FailingExceptionalCompletableFutureFunction(m);
3207 +        if (!createIncomplete) f.completeExceptionally(ex);
3208 +        final CompletableFuture<Integer> g = m.exceptionallyCompose(f, r);
3209 +        if (createIncomplete) f.completeExceptionally(ex);
3210 +
3211 +        checkCompletedExceptionally(f, ex);
3212 +        checkCompletedWithWrappedException(g, r.ex);
3213 +        r.assertInvoked();
3214 +    }}
3215 +
3216 +    /**
3217 +     * exceptionallyCompose result completes exceptionally if the
3218 +     * result of the action does
3219 +     */
3220 +    public void testExceptionallyCompose_actionReturnsFailingFuture() {
3221 +        for (ExecutionMode m : ExecutionMode.values())
3222 +        for (int order = 0; order < 6; order++)
3223 +    {
3224 +        final CFException ex0 = new CFException();
3225 +        final CFException ex = new CFException();
3226 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
3227 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
3228 +        final CompletableFuture<Integer> h;
3229 +        // Test all permutations of orders
3230 +        switch (order) {
3231 +        case 0:
3232 +            assertTrue(f.completeExceptionally(ex0));
3233 +            assertTrue(g.completeExceptionally(ex));
3234 +            h = m.exceptionallyCompose(f, x -> g);
3235 +            break;
3236 +        case 1:
3237 +            assertTrue(f.completeExceptionally(ex0));
3238 +            h = m.exceptionallyCompose(f, x -> g);
3239 +            assertTrue(g.completeExceptionally(ex));
3240 +            break;
3241 +        case 2:
3242 +            assertTrue(g.completeExceptionally(ex));
3243 +            assertTrue(f.completeExceptionally(ex0));
3244 +            h = m.exceptionallyCompose(f, x -> g);
3245 +            break;
3246 +        case 3:
3247 +            assertTrue(g.completeExceptionally(ex));
3248 +            h = m.exceptionallyCompose(f, x -> g);
3249 +            assertTrue(f.completeExceptionally(ex0));
3250 +            break;
3251 +        case 4:
3252 +            h = m.exceptionallyCompose(f, x -> g);
3253 +            assertTrue(f.completeExceptionally(ex0));
3254 +            assertTrue(g.completeExceptionally(ex));
3255 +            break;
3256 +        case 5:
3257 +            h = m.exceptionallyCompose(f, x -> g);
3258 +            assertTrue(f.completeExceptionally(ex0));
3259 +            assertTrue(g.completeExceptionally(ex));
3260 +            break;
3261 +        default: throw new AssertionError();
3262 +        }
3263 +
3264 +        checkCompletedExceptionally(g, ex);
3265 +        checkCompletedWithWrappedException(h, ex);
3266 +        checkCompletedExceptionally(f, ex0);
3267 +    }}
3268 +
3269      // other static methods
3270  
3271      /**
# Line 3007 | Line 3298 | public class CompletableFutureTest exten
3298          }
3299      }
3300  
3301 <    public void testAllOf_backwards() throws Exception {
3301 >    public void testAllOf_normal_backwards() throws Exception {
3302          for (int k = 1; k < 10; k++) {
3303              CompletableFuture<Integer>[] fs
3304                  = (CompletableFuture<Integer>[]) new CompletableFuture[k];
# Line 3035 | Line 3326 | public class CompletableFutureTest exten
3326              for (int i = 0; i < k; i++) {
3327                  checkIncomplete(f);
3328                  checkIncomplete(CompletableFuture.allOf(fs));
3329 <                if (i != k/2) {
3329 >                if (i != k / 2) {
3330                      fs[i].complete(i);
3331                      checkCompletedNormally(fs[i], i);
3332                  } else {
# Line 3138 | Line 3429 | public class CompletableFutureTest exten
3429      /**
3430       * Completion methods throw NullPointerException with null arguments
3431       */
3432 +    @SuppressWarnings("FutureReturnValueIgnored")
3433      public void testNPE() {
3434          CompletableFuture<Integer> f = new CompletableFuture<>();
3435          CompletableFuture<Integer> g = new CompletableFuture<>();
3436          CompletableFuture<Integer> nullFuture = (CompletableFuture<Integer>)null;
3145        CompletableFuture<?> h;
3437          ThreadExecutor exec = new ThreadExecutor();
3438  
3439          Runnable[] throwingActions = {
3440              () -> CompletableFuture.supplyAsync(null),
3441              () -> CompletableFuture.supplyAsync(null, exec),
3442 <            () -> CompletableFuture.supplyAsync(new IntegerSupplier(ExecutionMode.DEFAULT, 42), null),
3442 >            () -> CompletableFuture.supplyAsync(new IntegerSupplier(ExecutionMode.SYNC, 42), null),
3443  
3444              () -> CompletableFuture.runAsync(null),
3445              () -> CompletableFuture.runAsync(null, exec),
# Line 3158 | Line 3449 | public class CompletableFutureTest exten
3449  
3450              () -> f.thenApply(null),
3451              () -> f.thenApplyAsync(null),
3452 <            () -> f.thenApplyAsync((x) -> x, null),
3452 >            () -> f.thenApplyAsync(x -> x, null),
3453              () -> f.thenApplyAsync(null, exec),
3454  
3455              () -> f.thenAccept(null),
3456              () -> f.thenAcceptAsync(null),
3457 <            () -> f.thenAcceptAsync((x) -> {} , null),
3457 >            () -> f.thenAcceptAsync(x -> {} , null),
3458              () -> f.thenAcceptAsync(null, exec),
3459  
3460              () -> f.thenRun(null),
# Line 3198 | Line 3489 | public class CompletableFutureTest exten
3489              () -> f.applyToEither(g, null),
3490              () -> f.applyToEitherAsync(g, null),
3491              () -> f.applyToEitherAsync(g, null, exec),
3492 <            () -> f.applyToEither(nullFuture, (x) -> x),
3493 <            () -> f.applyToEitherAsync(nullFuture, (x) -> x),
3494 <            () -> f.applyToEitherAsync(nullFuture, (x) -> x, exec),
3495 <            () -> f.applyToEitherAsync(g, (x) -> x, null),
3492 >            () -> f.applyToEither(nullFuture, x -> x),
3493 >            () -> f.applyToEitherAsync(nullFuture, x -> x),
3494 >            () -> f.applyToEitherAsync(nullFuture, x -> x, exec),
3495 >            () -> f.applyToEitherAsync(g, x -> x, null),
3496  
3497              () -> f.acceptEither(g, null),
3498              () -> f.acceptEitherAsync(g, null),
3499              () -> f.acceptEitherAsync(g, null, exec),
3500 <            () -> f.acceptEither(nullFuture, (x) -> {}),
3501 <            () -> f.acceptEitherAsync(nullFuture, (x) -> {}),
3502 <            () -> f.acceptEitherAsync(nullFuture, (x) -> {}, exec),
3503 <            () -> f.acceptEitherAsync(g, (x) -> {}, null),
3500 >            () -> f.acceptEither(nullFuture, x -> {}),
3501 >            () -> f.acceptEitherAsync(nullFuture, x -> {}),
3502 >            () -> f.acceptEitherAsync(nullFuture, x -> {}, exec),
3503 >            () -> f.acceptEitherAsync(g, x -> {}, null),
3504  
3505              () -> f.runAfterEither(g, null),
3506              () -> f.runAfterEitherAsync(g, null),
# Line 3239 | Line 3530 | public class CompletableFutureTest exten
3530              () -> CompletableFuture.anyOf(null, f),
3531  
3532              () -> f.obtrudeException(null),
3533 +
3534 +            () -> CompletableFuture.delayedExecutor(1L, SECONDS, null),
3535 +            () -> CompletableFuture.delayedExecutor(1L, null, exec),
3536 +            () -> CompletableFuture.delayedExecutor(1L, null),
3537 +
3538 +            () -> f.orTimeout(1L, null),
3539 +            () -> f.completeOnTimeout(42, 1L, null),
3540 +
3541 +            () -> CompletableFuture.failedFuture(null),
3542 +            () -> CompletableFuture.failedStage(null),
3543          };
3544  
3545          assertThrows(NullPointerException.class, throwingActions);
# Line 3246 | Line 3547 | public class CompletableFutureTest exten
3547      }
3548  
3549      /**
3550 +     * Test submissions to an executor that rejects all tasks.
3551 +     */
3552 +    public void testRejectingExecutor() {
3553 +        for (Integer v : new Integer[] { 1, null })
3554 +    {
3555 +        final CountingRejectingExecutor e = new CountingRejectingExecutor();
3556 +
3557 +        final CompletableFuture<Integer> complete = CompletableFuture.completedFuture(v);
3558 +        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
3559 +
3560 +        List<CompletableFuture<?>> futures = new ArrayList<>();
3561 +
3562 +        List<CompletableFuture<Integer>> srcs = new ArrayList<>();
3563 +        srcs.add(complete);
3564 +        srcs.add(incomplete);
3565 +
3566 +        for (CompletableFuture<Integer> src : srcs) {
3567 +            List<CompletableFuture<?>> fs = new ArrayList<>();
3568 +            fs.add(src.thenRunAsync(() -> {}, e));
3569 +            fs.add(src.thenAcceptAsync(z -> {}, e));
3570 +            fs.add(src.thenApplyAsync(z -> z, e));
3571 +
3572 +            fs.add(src.thenCombineAsync(src, (x, y) -> x, e));
3573 +            fs.add(src.thenAcceptBothAsync(src, (x, y) -> {}, e));
3574 +            fs.add(src.runAfterBothAsync(src, () -> {}, e));
3575 +
3576 +            fs.add(src.applyToEitherAsync(src, z -> z, e));
3577 +            fs.add(src.acceptEitherAsync(src, z -> {}, e));
3578 +            fs.add(src.runAfterEitherAsync(src, () -> {}, e));
3579 +
3580 +            fs.add(src.thenComposeAsync(z -> null, e));
3581 +            fs.add(src.whenCompleteAsync((z, t) -> {}, e));
3582 +            fs.add(src.handleAsync((z, t) -> null, e));
3583 +
3584 +            for (CompletableFuture<?> future : fs) {
3585 +                if (src.isDone())
3586 +                    checkCompletedWithWrappedException(future, e.ex);
3587 +                else
3588 +                    checkIncomplete(future);
3589 +            }
3590 +            futures.addAll(fs);
3591 +        }
3592 +
3593 +        {
3594 +            List<CompletableFuture<?>> fs = new ArrayList<>();
3595 +
3596 +            fs.add(complete.thenCombineAsync(incomplete, (x, y) -> x, e));
3597 +            fs.add(incomplete.thenCombineAsync(complete, (x, y) -> x, e));
3598 +
3599 +            fs.add(complete.thenAcceptBothAsync(incomplete, (x, y) -> {}, e));
3600 +            fs.add(incomplete.thenAcceptBothAsync(complete, (x, y) -> {}, e));
3601 +
3602 +            fs.add(complete.runAfterBothAsync(incomplete, () -> {}, e));
3603 +            fs.add(incomplete.runAfterBothAsync(complete, () -> {}, e));
3604 +
3605 +            for (CompletableFuture<?> future : fs)
3606 +                checkIncomplete(future);
3607 +            futures.addAll(fs);
3608 +        }
3609 +
3610 +        {
3611 +            List<CompletableFuture<?>> fs = new ArrayList<>();
3612 +
3613 +            fs.add(complete.applyToEitherAsync(incomplete, z -> z, e));
3614 +            fs.add(incomplete.applyToEitherAsync(complete, z -> z, e));
3615 +
3616 +            fs.add(complete.acceptEitherAsync(incomplete, z -> {}, e));
3617 +            fs.add(incomplete.acceptEitherAsync(complete, z -> {}, e));
3618 +
3619 +            fs.add(complete.runAfterEitherAsync(incomplete, () -> {}, e));
3620 +            fs.add(incomplete.runAfterEitherAsync(complete, () -> {}, e));
3621 +
3622 +            for (CompletableFuture<?> future : fs)
3623 +                checkCompletedWithWrappedException(future, e.ex);
3624 +            futures.addAll(fs);
3625 +        }
3626 +
3627 +        incomplete.complete(v);
3628 +
3629 +        for (CompletableFuture<?> future : futures)
3630 +            checkCompletedWithWrappedException(future, e.ex);
3631 +
3632 +        assertEquals(futures.size(), e.count.get());
3633 +    }}
3634 +
3635 +    /**
3636 +     * Test submissions to an executor that rejects all tasks, but
3637 +     * should never be invoked because the dependent future is
3638 +     * explicitly completed.
3639 +     */
3640 +    public void testRejectingExecutorNeverInvoked() {
3641 +        for (Integer v : new Integer[] { 1, null })
3642 +    {
3643 +        final CountingRejectingExecutor e = new CountingRejectingExecutor();
3644 +
3645 +        final CompletableFuture<Integer> complete = CompletableFuture.completedFuture(v);
3646 +        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
3647 +
3648 +        List<CompletableFuture<?>> fs = new ArrayList<>();
3649 +        fs.add(incomplete.thenRunAsync(() -> {}, e));
3650 +        fs.add(incomplete.thenAcceptAsync(z -> {}, e));
3651 +        fs.add(incomplete.thenApplyAsync(z -> z, e));
3652 +
3653 +        fs.add(incomplete.thenCombineAsync(incomplete, (x, y) -> x, e));
3654 +        fs.add(incomplete.thenAcceptBothAsync(incomplete, (x, y) -> {}, e));
3655 +        fs.add(incomplete.runAfterBothAsync(incomplete, () -> {}, e));
3656 +
3657 +        fs.add(incomplete.applyToEitherAsync(incomplete, z -> z, e));
3658 +        fs.add(incomplete.acceptEitherAsync(incomplete, z -> {}, e));
3659 +        fs.add(incomplete.runAfterEitherAsync(incomplete, () -> {}, e));
3660 +
3661 +        fs.add(incomplete.thenComposeAsync(z -> null, e));
3662 +        fs.add(incomplete.whenCompleteAsync((z, t) -> {}, e));
3663 +        fs.add(incomplete.handleAsync((z, t) -> null, e));
3664 +
3665 +        fs.add(complete.thenCombineAsync(incomplete, (x, y) -> x, e));
3666 +        fs.add(incomplete.thenCombineAsync(complete, (x, y) -> x, e));
3667 +
3668 +        fs.add(complete.thenAcceptBothAsync(incomplete, (x, y) -> {}, e));
3669 +        fs.add(incomplete.thenAcceptBothAsync(complete, (x, y) -> {}, e));
3670 +
3671 +        fs.add(complete.runAfterBothAsync(incomplete, () -> {}, e));
3672 +        fs.add(incomplete.runAfterBothAsync(complete, () -> {}, e));
3673 +
3674 +        for (CompletableFuture<?> future : fs)
3675 +            checkIncomplete(future);
3676 +
3677 +        for (CompletableFuture<?> future : fs)
3678 +            future.complete(null);
3679 +
3680 +        incomplete.complete(v);
3681 +
3682 +        for (CompletableFuture<?> future : fs)
3683 +            checkCompletedNormally(future, null);
3684 +
3685 +        assertEquals(0, e.count.get());
3686 +    }}
3687 +
3688 +    /**
3689       * toCompletableFuture returns this CompletableFuture.
3690       */
3691      public void testToCompletableFuture() {
# Line 3253 | Line 3693 | public class CompletableFutureTest exten
3693          assertSame(f, f.toCompletableFuture());
3694      }
3695  
3696 +    // jdk9
3697 +
3698 +    /**
3699 +     * newIncompleteFuture returns an incomplete CompletableFuture
3700 +     */
3701 +    public void testNewIncompleteFuture() {
3702 +        for (Integer v1 : new Integer[] { 1, null })
3703 +    {
3704 +        CompletableFuture<Integer> f = new CompletableFuture<>();
3705 +        CompletableFuture<Integer> g = f.newIncompleteFuture();
3706 +        checkIncomplete(f);
3707 +        checkIncomplete(g);
3708 +        f.complete(v1);
3709 +        checkCompletedNormally(f, v1);
3710 +        checkIncomplete(g);
3711 +        g.complete(v1);
3712 +        checkCompletedNormally(g, v1);
3713 +        assertSame(g.getClass(), CompletableFuture.class);
3714 +    }}
3715 +
3716 +    /**
3717 +     * completedStage returns a completed CompletionStage
3718 +     */
3719 +    public void testCompletedStage() {
3720 +        AtomicInteger x = new AtomicInteger(0);
3721 +        AtomicReference<Throwable> r = new AtomicReference<>();
3722 +        CompletionStage<Integer> f = CompletableFuture.completedStage(1);
3723 +        f.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3724 +        assertEquals(x.get(), 1);
3725 +        assertNull(r.get());
3726 +    }
3727 +
3728 +    /**
3729 +     * defaultExecutor by default returns the commonPool if
3730 +     * it supports more than one thread.
3731 +     */
3732 +    public void testDefaultExecutor() {
3733 +        CompletableFuture<Integer> f = new CompletableFuture<>();
3734 +        Executor e = f.defaultExecutor();
3735 +        Executor c = ForkJoinPool.commonPool();
3736 +        if (ForkJoinPool.getCommonPoolParallelism() > 1)
3737 +            assertSame(e, c);
3738 +        else
3739 +            assertNotSame(e, c);
3740 +    }
3741 +
3742 +    /**
3743 +     * failedFuture returns a CompletableFuture completed
3744 +     * exceptionally with the given Exception
3745 +     */
3746 +    public void testFailedFuture() {
3747 +        CFException ex = new CFException();
3748 +        CompletableFuture<Integer> f = CompletableFuture.failedFuture(ex);
3749 +        checkCompletedExceptionally(f, ex);
3750 +    }
3751 +
3752 +    /**
3753 +     * failedFuture(null) throws NPE
3754 +     */
3755 +    public void testFailedFuture_null() {
3756 +        try {
3757 +            CompletableFuture<Integer> f = CompletableFuture.failedFuture(null);
3758 +            shouldThrow();
3759 +        } catch (NullPointerException success) {}
3760 +    }
3761 +
3762 +    /**
3763 +     * copy returns a CompletableFuture that is completed normally,
3764 +     * with the same value, when source is.
3765 +     */
3766 +    public void testCopy_normalCompletion() {
3767 +        for (boolean createIncomplete : new boolean[] { true, false })
3768 +        for (Integer v1 : new Integer[] { 1, null })
3769 +    {
3770 +        CompletableFuture<Integer> f = new CompletableFuture<>();
3771 +        if (!createIncomplete) assertTrue(f.complete(v1));
3772 +        CompletableFuture<Integer> g = f.copy();
3773 +        if (createIncomplete) {
3774 +            checkIncomplete(f);
3775 +            checkIncomplete(g);
3776 +            assertTrue(f.complete(v1));
3777 +        }
3778 +        checkCompletedNormally(f, v1);
3779 +        checkCompletedNormally(g, v1);
3780 +    }}
3781 +
3782 +    /**
3783 +     * copy returns a CompletableFuture that is completed exceptionally
3784 +     * when source is.
3785 +     */
3786 +    public void testCopy_exceptionalCompletion() {
3787 +        for (boolean createIncomplete : new boolean[] { true, false })
3788 +    {
3789 +        CFException ex = new CFException();
3790 +        CompletableFuture<Integer> f = new CompletableFuture<>();
3791 +        if (!createIncomplete) f.completeExceptionally(ex);
3792 +        CompletableFuture<Integer> g = f.copy();
3793 +        if (createIncomplete) {
3794 +            checkIncomplete(f);
3795 +            checkIncomplete(g);
3796 +            f.completeExceptionally(ex);
3797 +        }
3798 +        checkCompletedExceptionally(f, ex);
3799 +        checkCompletedWithWrappedException(g, ex);
3800 +    }}
3801 +
3802 +    /**
3803 +     * Completion of a copy does not complete its source.
3804 +     */
3805 +    public void testCopy_oneWayPropagation() {
3806 +        CompletableFuture<Integer> f = new CompletableFuture<>();
3807 +        assertTrue(f.copy().complete(1));
3808 +        assertTrue(f.copy().complete(null));
3809 +        assertTrue(f.copy().cancel(true));
3810 +        assertTrue(f.copy().cancel(false));
3811 +        assertTrue(f.copy().completeExceptionally(new CFException()));
3812 +        checkIncomplete(f);
3813 +    }
3814 +
3815 +    /**
3816 +     * minimalCompletionStage returns a CompletableFuture that is
3817 +     * completed normally, with the same value, when source is.
3818 +     */
3819 +    public void testMinimalCompletionStage() {
3820 +        CompletableFuture<Integer> f = new CompletableFuture<>();
3821 +        CompletionStage<Integer> g = f.minimalCompletionStage();
3822 +        AtomicInteger x = new AtomicInteger(0);
3823 +        AtomicReference<Throwable> r = new AtomicReference<>();
3824 +        checkIncomplete(f);
3825 +        g.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3826 +        f.complete(1);
3827 +        checkCompletedNormally(f, 1);
3828 +        assertEquals(x.get(), 1);
3829 +        assertNull(r.get());
3830 +    }
3831 +
3832 +    /**
3833 +     * minimalCompletionStage returns a CompletableFuture that is
3834 +     * completed exceptionally when source is.
3835 +     */
3836 +    public void testMinimalCompletionStage2() {
3837 +        CompletableFuture<Integer> f = new CompletableFuture<>();
3838 +        CompletionStage<Integer> g = f.minimalCompletionStage();
3839 +        AtomicInteger x = new AtomicInteger(0);
3840 +        AtomicReference<Throwable> r = new AtomicReference<>();
3841 +        g.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3842 +        checkIncomplete(f);
3843 +        CFException ex = new CFException();
3844 +        f.completeExceptionally(ex);
3845 +        checkCompletedExceptionally(f, ex);
3846 +        assertEquals(x.get(), 0);
3847 +        assertEquals(r.get().getCause(), ex);
3848 +    }
3849 +
3850 +    /**
3851 +     * failedStage returns a CompletionStage completed
3852 +     * exceptionally with the given Exception
3853 +     */
3854 +    public void testFailedStage() {
3855 +        CFException ex = new CFException();
3856 +        CompletionStage<Integer> f = CompletableFuture.failedStage(ex);
3857 +        AtomicInteger x = new AtomicInteger(0);
3858 +        AtomicReference<Throwable> r = new AtomicReference<>();
3859 +        f.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3860 +        assertEquals(x.get(), 0);
3861 +        assertEquals(r.get(), ex);
3862 +    }
3863 +
3864 +    /**
3865 +     * completeAsync completes with value of given supplier
3866 +     */
3867 +    public void testCompleteAsync() {
3868 +        for (Integer v1 : new Integer[] { 1, null })
3869 +    {
3870 +        CompletableFuture<Integer> f = new CompletableFuture<>();
3871 +        f.completeAsync(() -> v1);
3872 +        f.join();
3873 +        checkCompletedNormally(f, v1);
3874 +    }}
3875 +
3876 +    /**
3877 +     * completeAsync completes exceptionally if given supplier throws
3878 +     */
3879 +    public void testCompleteAsync2() {
3880 +        CompletableFuture<Integer> f = new CompletableFuture<>();
3881 +        CFException ex = new CFException();
3882 +        f.completeAsync(() -> { throw ex; });
3883 +        try {
3884 +            f.join();
3885 +            shouldThrow();
3886 +        } catch (CompletionException success) {}
3887 +        checkCompletedWithWrappedException(f, ex);
3888 +    }
3889 +
3890 +    /**
3891 +     * completeAsync with given executor completes with value of given supplier
3892 +     */
3893 +    public void testCompleteAsync3() {
3894 +        for (Integer v1 : new Integer[] { 1, null })
3895 +    {
3896 +        CompletableFuture<Integer> f = new CompletableFuture<>();
3897 +        ThreadExecutor executor = new ThreadExecutor();
3898 +        f.completeAsync(() -> v1, executor);
3899 +        assertSame(v1, f.join());
3900 +        checkCompletedNormally(f, v1);
3901 +        assertEquals(1, executor.count.get());
3902 +    }}
3903 +
3904 +    /**
3905 +     * completeAsync with given executor completes exceptionally if
3906 +     * given supplier throws
3907 +     */
3908 +    public void testCompleteAsync4() {
3909 +        CompletableFuture<Integer> f = new CompletableFuture<>();
3910 +        CFException ex = new CFException();
3911 +        ThreadExecutor executor = new ThreadExecutor();
3912 +        f.completeAsync(() -> { throw ex; }, executor);
3913 +        try {
3914 +            f.join();
3915 +            shouldThrow();
3916 +        } catch (CompletionException success) {}
3917 +        checkCompletedWithWrappedException(f, ex);
3918 +        assertEquals(1, executor.count.get());
3919 +    }
3920 +
3921 +    /**
3922 +     * orTimeout completes with TimeoutException if not complete
3923 +     */
3924 +    public void testOrTimeout_timesOut() {
3925 +        long timeoutMillis = timeoutMillis();
3926 +        CompletableFuture<Integer> f = new CompletableFuture<>();
3927 +        long startTime = System.nanoTime();
3928 +        assertSame(f, f.orTimeout(timeoutMillis, MILLISECONDS));
3929 +        checkCompletedWithTimeoutException(f);
3930 +        assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
3931 +    }
3932 +
3933 +    /**
3934 +     * orTimeout completes normally if completed before timeout
3935 +     */
3936 +    public void testOrTimeout_completed() {
3937 +        for (Integer v1 : new Integer[] { 1, null })
3938 +    {
3939 +        CompletableFuture<Integer> f = new CompletableFuture<>();
3940 +        CompletableFuture<Integer> g = new CompletableFuture<>();
3941 +        long startTime = System.nanoTime();
3942 +        f.complete(v1);
3943 +        assertSame(f, f.orTimeout(LONG_DELAY_MS, MILLISECONDS));
3944 +        assertSame(g, g.orTimeout(LONG_DELAY_MS, MILLISECONDS));
3945 +        g.complete(v1);
3946 +        checkCompletedNormally(f, v1);
3947 +        checkCompletedNormally(g, v1);
3948 +        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS / 2);
3949 +    }}
3950 +
3951 +    /**
3952 +     * completeOnTimeout completes with given value if not complete
3953 +     */
3954 +    public void testCompleteOnTimeout_timesOut() {
3955 +        testInParallel(() -> testCompleteOnTimeout_timesOut(42),
3956 +                       () -> testCompleteOnTimeout_timesOut(null));
3957 +    }
3958 +
3959 +    /**
3960 +     * completeOnTimeout completes with given value if not complete
3961 +     */
3962 +    public void testCompleteOnTimeout_timesOut(Integer v) {
3963 +        long timeoutMillis = timeoutMillis();
3964 +        CompletableFuture<Integer> f = new CompletableFuture<>();
3965 +        long startTime = System.nanoTime();
3966 +        assertSame(f, f.completeOnTimeout(v, timeoutMillis, MILLISECONDS));
3967 +        assertSame(v, f.join());
3968 +        assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
3969 +        f.complete(99);         // should have no effect
3970 +        checkCompletedNormally(f, v);
3971 +    }
3972 +
3973 +    /**
3974 +     * completeOnTimeout has no effect if completed within timeout
3975 +     */
3976 +    public void testCompleteOnTimeout_completed() {
3977 +        for (Integer v1 : new Integer[] { 1, null })
3978 +    {
3979 +        CompletableFuture<Integer> f = new CompletableFuture<>();
3980 +        CompletableFuture<Integer> g = new CompletableFuture<>();
3981 +        long startTime = System.nanoTime();
3982 +        f.complete(v1);
3983 +        assertSame(f, f.completeOnTimeout(-1, LONG_DELAY_MS, MILLISECONDS));
3984 +        assertSame(g, g.completeOnTimeout(-1, LONG_DELAY_MS, MILLISECONDS));
3985 +        g.complete(v1);
3986 +        checkCompletedNormally(f, v1);
3987 +        checkCompletedNormally(g, v1);
3988 +        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS / 2);
3989 +    }}
3990 +
3991 +    /**
3992 +     * delayedExecutor returns an executor that delays submission
3993 +     */
3994 +    public void testDelayedExecutor() {
3995 +        testInParallel(() -> testDelayedExecutor(null, null),
3996 +                       () -> testDelayedExecutor(null, 1),
3997 +                       () -> testDelayedExecutor(new ThreadExecutor(), 1),
3998 +                       () -> testDelayedExecutor(new ThreadExecutor(), 1));
3999 +    }
4000 +
4001 +    public void testDelayedExecutor(Executor executor, Integer v) throws Exception {
4002 +        long timeoutMillis = timeoutMillis();
4003 +        // Use an "unreasonably long" long timeout to catch lingering threads
4004 +        long longTimeoutMillis = 1000 * 60 * 60 * 24;
4005 +        final Executor delayer, longDelayer;
4006 +        if (executor == null) {
4007 +            delayer = CompletableFuture.delayedExecutor(timeoutMillis, MILLISECONDS);
4008 +            longDelayer = CompletableFuture.delayedExecutor(longTimeoutMillis, MILLISECONDS);
4009 +        } else {
4010 +            delayer = CompletableFuture.delayedExecutor(timeoutMillis, MILLISECONDS, executor);
4011 +            longDelayer = CompletableFuture.delayedExecutor(longTimeoutMillis, MILLISECONDS, executor);
4012 +        }
4013 +        long startTime = System.nanoTime();
4014 +        CompletableFuture<Integer> f =
4015 +            CompletableFuture.supplyAsync(() -> v, delayer);
4016 +        CompletableFuture<Integer> g =
4017 +            CompletableFuture.supplyAsync(() -> v, longDelayer);
4018 +
4019 +        assertNull(g.getNow(null));
4020 +
4021 +        assertSame(v, f.get(LONG_DELAY_MS, MILLISECONDS));
4022 +        long millisElapsed = millisElapsedSince(startTime);
4023 +        assertTrue(millisElapsed >= timeoutMillis);
4024 +        assertTrue(millisElapsed < LONG_DELAY_MS / 2);
4025 +
4026 +        checkCompletedNormally(f, v);
4027 +
4028 +        checkIncomplete(g);
4029 +        assertTrue(g.cancel(true));
4030 +    }
4031 +
4032      //--- tests of implementation details; not part of official tck ---
4033  
4034      Object resultOf(CompletableFuture<?> f) {
4035 +        SecurityManager sm = System.getSecurityManager();
4036 +        if (sm != null) {
4037 +            try {
4038 +                System.setSecurityManager(null);
4039 +            } catch (SecurityException giveUp) {
4040 +                return "Reflection not available";
4041 +            }
4042 +        }
4043 +
4044          try {
4045              java.lang.reflect.Field resultField
4046                  = CompletableFuture.class.getDeclaredField("result");
4047              resultField.setAccessible(true);
4048              return resultField.get(f);
4049 <        } catch (Throwable t) { throw new AssertionError(t); }
4049 >        } catch (Throwable t) {
4050 >            throw new AssertionError(t);
4051 >        } finally {
4052 >            if (sm != null) System.setSecurityManager(sm);
4053 >        }
4054      }
4055  
4056      public void testExceptionPropagationReusesResultObject() {
# Line 3272 | Line 4061 | public class CompletableFutureTest exten
4061          final CompletableFuture<Integer> v42 = CompletableFuture.completedFuture(42);
4062          final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
4063  
4064 +        final Runnable noopRunnable = new Noop(m);
4065 +        final Consumer<Integer> noopConsumer = new NoopConsumer(m);
4066 +        final Function<Integer, Integer> incFunction = new IncFunction(m);
4067 +
4068          List<Function<CompletableFuture<Integer>, CompletableFuture<?>>> funs
4069              = new ArrayList<>();
4070  
4071 <        funs.add((y) -> m.thenRun(y, new Noop(m)));
4072 <        funs.add((y) -> m.thenAccept(y, new NoopConsumer(m)));
4073 <        funs.add((y) -> m.thenApply(y, new IncFunction(m)));
4074 <
4075 <        funs.add((y) -> m.runAfterEither(y, incomplete, new Noop(m)));
4076 <        funs.add((y) -> m.acceptEither(y, incomplete, new NoopConsumer(m)));
4077 <        funs.add((y) -> m.applyToEither(y, incomplete, new IncFunction(m)));
4078 <
4079 <        funs.add((y) -> m.runAfterBoth(y, v42, new Noop(m)));
4080 <        funs.add((y) -> m.thenAcceptBoth(y, v42, new SubtractAction(m)));
4081 <        funs.add((y) -> m.thenCombine(y, v42, new SubtractFunction(m)));
4082 <
4083 <        funs.add((y) -> m.whenComplete(y, (Integer x, Throwable t) -> {}));
4084 <
4085 <        funs.add((y) -> m.thenCompose(y, new CompletableFutureInc(m)));
4086 <
4087 <        funs.add((y) -> CompletableFuture.allOf(new CompletableFuture<?>[] {y, v42}));
4088 <        funs.add((y) -> CompletableFuture.anyOf(new CompletableFuture<?>[] {y, incomplete}));
4071 >        funs.add(y -> m.thenRun(y, noopRunnable));
4072 >        funs.add(y -> m.thenAccept(y, noopConsumer));
4073 >        funs.add(y -> m.thenApply(y, incFunction));
4074 >
4075 >        funs.add(y -> m.runAfterEither(y, incomplete, noopRunnable));
4076 >        funs.add(y -> m.acceptEither(y, incomplete, noopConsumer));
4077 >        funs.add(y -> m.applyToEither(y, incomplete, incFunction));
4078 >
4079 >        funs.add(y -> m.runAfterBoth(y, v42, noopRunnable));
4080 >        funs.add(y -> m.runAfterBoth(v42, y, noopRunnable));
4081 >        funs.add(y -> m.thenAcceptBoth(y, v42, new SubtractAction(m)));
4082 >        funs.add(y -> m.thenAcceptBoth(v42, y, new SubtractAction(m)));
4083 >        funs.add(y -> m.thenCombine(y, v42, new SubtractFunction(m)));
4084 >        funs.add(y -> m.thenCombine(v42, y, new SubtractFunction(m)));
4085 >
4086 >        funs.add(y -> m.whenComplete(y, (Integer r, Throwable t) -> {}));
4087 >
4088 >        funs.add(y -> m.thenCompose(y, new CompletableFutureInc(m)));
4089 >
4090 >        funs.add(y -> CompletableFuture.allOf(y));
4091 >        funs.add(y -> CompletableFuture.allOf(y, v42));
4092 >        funs.add(y -> CompletableFuture.allOf(v42, y));
4093 >        funs.add(y -> CompletableFuture.anyOf(y));
4094 >        funs.add(y -> CompletableFuture.anyOf(y, incomplete));
4095 >        funs.add(y -> CompletableFuture.anyOf(incomplete, y));
4096  
4097          for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
4098                   fun : funs) {
4099              CompletableFuture<Integer> f = new CompletableFuture<>();
4100              f.completeExceptionally(ex);
4101 <            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
4101 >            CompletableFuture<Integer> src = m.thenApply(f, incFunction);
4102              checkCompletedWithWrappedException(src, ex);
4103              CompletableFuture<?> dep = fun.apply(src);
4104              checkCompletedWithWrappedException(dep, ex);
# Line 3308 | Line 4108 | public class CompletableFutureTest exten
4108          for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
4109                   fun : funs) {
4110              CompletableFuture<Integer> f = new CompletableFuture<>();
4111 <            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
4111 >            CompletableFuture<Integer> src = m.thenApply(f, incFunction);
4112              CompletableFuture<?> dep = fun.apply(src);
4113              f.completeExceptionally(ex);
4114              checkCompletedWithWrappedException(src, ex);
# Line 3322 | Line 4122 | public class CompletableFutureTest exten
4122              CompletableFuture<Integer> f = new CompletableFuture<>();
4123              f.cancel(mayInterruptIfRunning);
4124              checkCancelled(f);
4125 <            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
4125 >            CompletableFuture<Integer> src = m.thenApply(f, incFunction);
4126              checkCompletedWithWrappedCancellationException(src);
4127              CompletableFuture<?> dep = fun.apply(src);
4128              checkCompletedWithWrappedCancellationException(dep);
# Line 3333 | Line 4133 | public class CompletableFutureTest exten
4133          for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
4134                   fun : funs) {
4135              CompletableFuture<Integer> f = new CompletableFuture<>();
4136 <            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
4136 >            CompletableFuture<Integer> src = m.thenApply(f, incFunction);
4137              CompletableFuture<?> dep = fun.apply(src);
4138              f.cancel(mayInterruptIfRunning);
4139              checkCancelled(f);
# Line 3343 | Line 4143 | public class CompletableFutureTest exten
4143          }
4144      }}
4145  
4146 +    /**
4147 +     * Minimal completion stages throw UOE for most non-CompletionStage methods
4148 +     */
4149 +    public void testMinimalCompletionStage_minimality() {
4150 +        if (!testImplementationDetails) return;
4151 +        Function<Method, String> toSignature =
4152 +            method -> method.getName() + Arrays.toString(method.getParameterTypes());
4153 +        Predicate<Method> isNotStatic =
4154 +            method -> (method.getModifiers() & Modifier.STATIC) == 0;
4155 +        List<Method> minimalMethods =
4156 +            Stream.of(Object.class, CompletionStage.class)
4157 +            .flatMap(klazz -> Stream.of(klazz.getMethods()))
4158 +            .filter(isNotStatic)
4159 +            .collect(Collectors.toList());
4160 +        // Methods from CompletableFuture permitted NOT to throw UOE
4161 +        String[] signatureWhitelist = {
4162 +            "newIncompleteFuture[]",
4163 +            "defaultExecutor[]",
4164 +            "minimalCompletionStage[]",
4165 +            "copy[]",
4166 +        };
4167 +        Set<String> permittedMethodSignatures =
4168 +            Stream.concat(minimalMethods.stream().map(toSignature),
4169 +                          Stream.of(signatureWhitelist))
4170 +            .collect(Collectors.toSet());
4171 +        List<Method> allMethods = Stream.of(CompletableFuture.class.getMethods())
4172 +            .filter(isNotStatic)
4173 +            .filter(method -> !permittedMethodSignatures.contains(toSignature.apply(method)))
4174 +            .collect(Collectors.toList());
4175 +
4176 +        List<CompletionStage<Integer>> stages = new ArrayList<>();
4177 +        CompletionStage<Integer> min =
4178 +            new CompletableFuture<Integer>().minimalCompletionStage();
4179 +        stages.add(min);
4180 +        stages.add(min.thenApply(x -> x));
4181 +        stages.add(CompletableFuture.completedStage(1));
4182 +        stages.add(CompletableFuture.failedStage(new CFException()));
4183 +
4184 +        List<Method> bugs = new ArrayList<>();
4185 +        for (Method method : allMethods) {
4186 +            Class<?>[] parameterTypes = method.getParameterTypes();
4187 +            Object[] args = new Object[parameterTypes.length];
4188 +            // Manufacture boxed primitives for primitive params
4189 +            for (int i = 0; i < args.length; i++) {
4190 +                Class<?> type = parameterTypes[i];
4191 +                if (parameterTypes[i] == boolean.class)
4192 +                    args[i] = false;
4193 +                else if (parameterTypes[i] == int.class)
4194 +                    args[i] = 0;
4195 +                else if (parameterTypes[i] == long.class)
4196 +                    args[i] = 0L;
4197 +            }
4198 +            for (CompletionStage<Integer> stage : stages) {
4199 +                try {
4200 +                    method.invoke(stage, args);
4201 +                    bugs.add(method);
4202 +                }
4203 +                catch (java.lang.reflect.InvocationTargetException expected) {
4204 +                    if (! (expected.getCause() instanceof UnsupportedOperationException)) {
4205 +                        bugs.add(method);
4206 +                        // expected.getCause().printStackTrace();
4207 +                    }
4208 +                }
4209 +                catch (ReflectiveOperationException bad) { throw new Error(bad); }
4210 +            }
4211 +        }
4212 +        if (!bugs.isEmpty())
4213 +            throw new Error("Methods did not throw UOE: " + bugs);
4214 +    }
4215 +
4216 +    /**
4217 +     * minimalStage.toCompletableFuture() returns a CompletableFuture that
4218 +     * is completed normally, with the same value, when source is.
4219 +     */
4220 +    public void testMinimalCompletionStage_toCompletableFuture_normalCompletion() {
4221 +        for (boolean createIncomplete : new boolean[] { true, false })
4222 +        for (Integer v1 : new Integer[] { 1, null })
4223 +    {
4224 +        CompletableFuture<Integer> f = new CompletableFuture<>();
4225 +        CompletionStage<Integer> minimal = f.minimalCompletionStage();
4226 +        if (!createIncomplete) assertTrue(f.complete(v1));
4227 +        CompletableFuture<Integer> g = minimal.toCompletableFuture();
4228 +        if (createIncomplete) {
4229 +            checkIncomplete(f);
4230 +            checkIncomplete(g);
4231 +            assertTrue(f.complete(v1));
4232 +        }
4233 +        checkCompletedNormally(f, v1);
4234 +        checkCompletedNormally(g, v1);
4235 +    }}
4236 +
4237 +    /**
4238 +     * minimalStage.toCompletableFuture() returns a CompletableFuture that
4239 +     * is completed exceptionally when source is.
4240 +     */
4241 +    public void testMinimalCompletionStage_toCompletableFuture_exceptionalCompletion() {
4242 +        for (boolean createIncomplete : new boolean[] { true, false })
4243 +    {
4244 +        CFException ex = new CFException();
4245 +        CompletableFuture<Integer> f = new CompletableFuture<>();
4246 +        CompletionStage<Integer> minimal = f.minimalCompletionStage();
4247 +        if (!createIncomplete) f.completeExceptionally(ex);
4248 +        CompletableFuture<Integer> g = minimal.toCompletableFuture();
4249 +        if (createIncomplete) {
4250 +            checkIncomplete(f);
4251 +            checkIncomplete(g);
4252 +            f.completeExceptionally(ex);
4253 +        }
4254 +        checkCompletedExceptionally(f, ex);
4255 +        checkCompletedWithWrappedException(g, ex);
4256 +    }}
4257 +
4258 +    /**
4259 +     * minimalStage.toCompletableFuture() gives mutable CompletableFuture
4260 +     */
4261 +    public void testMinimalCompletionStage_toCompletableFuture_mutable() {
4262 +        for (Integer v1 : new Integer[] { 1, null })
4263 +    {
4264 +        CompletableFuture<Integer> f = new CompletableFuture<>();
4265 +        CompletionStage minimal = f.minimalCompletionStage();
4266 +        CompletableFuture<Integer> g = minimal.toCompletableFuture();
4267 +        assertTrue(g.complete(v1));
4268 +        checkCompletedNormally(g, v1);
4269 +        checkIncomplete(f);
4270 +        checkIncomplete(minimal.toCompletableFuture());
4271 +    }}
4272 +
4273 +    /**
4274 +     * minimalStage.toCompletableFuture().join() awaits completion
4275 +     */
4276 +    public void testMinimalCompletionStage_toCompletableFuture_join() throws Exception {
4277 +        for (boolean createIncomplete : new boolean[] { true, false })
4278 +        for (Integer v1 : new Integer[] { 1, null })
4279 +    {
4280 +        CompletableFuture<Integer> f = new CompletableFuture<>();
4281 +        if (!createIncomplete) assertTrue(f.complete(v1));
4282 +        CompletionStage<Integer> minimal = f.minimalCompletionStage();
4283 +        if (createIncomplete) assertTrue(f.complete(v1));
4284 +        assertEquals(v1, minimal.toCompletableFuture().join());
4285 +        assertEquals(v1, minimal.toCompletableFuture().get());
4286 +        checkCompletedNormally(minimal.toCompletableFuture(), v1);
4287 +    }}
4288 +
4289 +    /**
4290 +     * Completion of a toCompletableFuture copy of a minimal stage
4291 +     * does not complete its source.
4292 +     */
4293 +    public void testMinimalCompletionStage_toCompletableFuture_oneWayPropagation() {
4294 +        CompletableFuture<Integer> f = new CompletableFuture<>();
4295 +        CompletionStage<Integer> g = f.minimalCompletionStage();
4296 +        assertTrue(g.toCompletableFuture().complete(1));
4297 +        assertTrue(g.toCompletableFuture().complete(null));
4298 +        assertTrue(g.toCompletableFuture().cancel(true));
4299 +        assertTrue(g.toCompletableFuture().cancel(false));
4300 +        assertTrue(g.toCompletableFuture().completeExceptionally(new CFException()));
4301 +        checkIncomplete(g.toCompletableFuture());
4302 +        f.complete(1);
4303 +        checkCompletedNormally(g.toCompletableFuture(), 1);
4304 +    }
4305 +
4306 +    /** Demo utility method for external reliable toCompletableFuture */
4307 +    static <T> CompletableFuture<T> toCompletableFuture(CompletionStage<T> stage) {
4308 +        CompletableFuture<T> f = new CompletableFuture<>();
4309 +        stage.handle((T t, Throwable ex) -> {
4310 +                         if (ex != null) f.completeExceptionally(ex);
4311 +                         else f.complete(t);
4312 +                         return null;
4313 +                     });
4314 +        return f;
4315 +    }
4316 +
4317 +    /** Demo utility method to join a CompletionStage */
4318 +    static <T> T join(CompletionStage<T> stage) {
4319 +        return toCompletableFuture(stage).join();
4320 +    }
4321 +
4322 +    /**
4323 +     * Joining a minimal stage "by hand" works
4324 +     */
4325 +    public void testMinimalCompletionStage_join_by_hand() {
4326 +        for (boolean createIncomplete : new boolean[] { true, false })
4327 +        for (Integer v1 : new Integer[] { 1, null })
4328 +    {
4329 +        CompletableFuture<Integer> f = new CompletableFuture<>();
4330 +        CompletionStage<Integer> minimal = f.minimalCompletionStage();
4331 +        CompletableFuture<Integer> g = new CompletableFuture<>();
4332 +        if (!createIncomplete) assertTrue(f.complete(v1));
4333 +        minimal.thenAccept(x -> g.complete(x));
4334 +        if (createIncomplete) assertTrue(f.complete(v1));
4335 +        g.join();
4336 +        checkCompletedNormally(g, v1);
4337 +        checkCompletedNormally(f, v1);
4338 +        assertEquals(v1, join(minimal));
4339 +    }}
4340 +
4341 +    static class Monad {
4342 +        static class ZeroException extends RuntimeException {
4343 +            public ZeroException() { super("monadic zero"); }
4344 +        }
4345 +        // "return", "unit"
4346 +        static <T> CompletableFuture<T> unit(T value) {
4347 +            return completedFuture(value);
4348 +        }
4349 +        // monadic zero ?
4350 +        static <T> CompletableFuture<T> zero() {
4351 +            return failedFuture(new ZeroException());
4352 +        }
4353 +        // >=>
4354 +        static <T,U,V> Function<T, CompletableFuture<V>> compose
4355 +            (Function<T, CompletableFuture<U>> f,
4356 +             Function<U, CompletableFuture<V>> g) {
4357 +            return x -> f.apply(x).thenCompose(g);
4358 +        }
4359 +
4360 +        static void assertZero(CompletableFuture<?> f) {
4361 +            try {
4362 +                f.getNow(null);
4363 +                throw new AssertionError("should throw");
4364 +            } catch (CompletionException success) {
4365 +                assertTrue(success.getCause() instanceof ZeroException);
4366 +            }
4367 +        }
4368 +
4369 +        static <T> void assertFutureEquals(CompletableFuture<T> f,
4370 +                                           CompletableFuture<T> g) {
4371 +            T fval = null, gval = null;
4372 +            Throwable fex = null, gex = null;
4373 +
4374 +            try { fval = f.get(); }
4375 +            catch (ExecutionException ex) { fex = ex.getCause(); }
4376 +            catch (Throwable ex) { fex = ex; }
4377 +
4378 +            try { gval = g.get(); }
4379 +            catch (ExecutionException ex) { gex = ex.getCause(); }
4380 +            catch (Throwable ex) { gex = ex; }
4381 +
4382 +            if (fex != null || gex != null)
4383 +                assertSame(fex.getClass(), gex.getClass());
4384 +            else
4385 +                assertEquals(fval, gval);
4386 +        }
4387 +
4388 +        static class PlusFuture<T> extends CompletableFuture<T> {
4389 +            AtomicReference<Throwable> firstFailure = new AtomicReference<>(null);
4390 +        }
4391 +
4392 +        /** Implements "monadic plus". */
4393 +        static <T> CompletableFuture<T> plus(CompletableFuture<? extends T> f,
4394 +                                             CompletableFuture<? extends T> g) {
4395 +            PlusFuture<T> plus = new PlusFuture<T>();
4396 +            BiConsumer<T, Throwable> action = (T result, Throwable ex) -> {
4397 +                try {
4398 +                    if (ex == null) {
4399 +                        if (plus.complete(result))
4400 +                            if (plus.firstFailure.get() != null)
4401 +                                plus.firstFailure.set(null);
4402 +                    }
4403 +                    else if (plus.firstFailure.compareAndSet(null, ex)) {
4404 +                        if (plus.isDone())
4405 +                            plus.firstFailure.set(null);
4406 +                    }
4407 +                    else {
4408 +                        // first failure has precedence
4409 +                        Throwable first = plus.firstFailure.getAndSet(null);
4410 +
4411 +                        // may fail with "Self-suppression not permitted"
4412 +                        try { first.addSuppressed(ex); }
4413 +                        catch (Exception ignored) {}
4414 +
4415 +                        plus.completeExceptionally(first);
4416 +                    }
4417 +                } catch (Throwable unexpected) {
4418 +                    plus.completeExceptionally(unexpected);
4419 +                }
4420 +            };
4421 +            f.whenComplete(action);
4422 +            g.whenComplete(action);
4423 +            return plus;
4424 +        }
4425 +    }
4426 +
4427 +    /**
4428 +     * CompletableFuture is an additive monad - sort of.
4429 +     * https://en.wikipedia.org/wiki/Monad_(functional_programming)#Additive_monads
4430 +     */
4431 +    public void testAdditiveMonad() throws Throwable {
4432 +        Function<Long, CompletableFuture<Long>> unit = Monad::unit;
4433 +        CompletableFuture<Long> zero = Monad.zero();
4434 +
4435 +        // Some mutually non-commutative functions
4436 +        Function<Long, CompletableFuture<Long>> triple
4437 +            = x -> Monad.unit(3 * x);
4438 +        Function<Long, CompletableFuture<Long>> inc
4439 +            = x -> Monad.unit(x + 1);
4440 +
4441 +        // unit is a right identity: m >>= unit === m
4442 +        Monad.assertFutureEquals(inc.apply(5L).thenCompose(unit),
4443 +                                 inc.apply(5L));
4444 +        // unit is a left identity: (unit x) >>= f === f x
4445 +        Monad.assertFutureEquals(unit.apply(5L).thenCompose(inc),
4446 +                                 inc.apply(5L));
4447 +
4448 +        // associativity: (m >>= f) >>= g === m >>= ( \x -> (f x >>= g) )
4449 +        Monad.assertFutureEquals(
4450 +            unit.apply(5L).thenCompose(inc).thenCompose(triple),
4451 +            unit.apply(5L).thenCompose(x -> inc.apply(x).thenCompose(triple)));
4452 +
4453 +        // The case for CompletableFuture as an additive monad is weaker...
4454 +
4455 +        // zero is a monadic zero
4456 +        Monad.assertZero(zero);
4457 +
4458 +        // left zero: zero >>= f === zero
4459 +        Monad.assertZero(zero.thenCompose(inc));
4460 +        // right zero: f >>= (\x -> zero) === zero
4461 +        Monad.assertZero(inc.apply(5L).thenCompose(x -> zero));
4462 +
4463 +        // f plus zero === f
4464 +        Monad.assertFutureEquals(Monad.unit(5L),
4465 +                                 Monad.plus(Monad.unit(5L), zero));
4466 +        // zero plus f === f
4467 +        Monad.assertFutureEquals(Monad.unit(5L),
4468 +                                 Monad.plus(zero, Monad.unit(5L)));
4469 +        // zero plus zero === zero
4470 +        Monad.assertZero(Monad.plus(zero, zero));
4471 +        {
4472 +            CompletableFuture<Long> f = Monad.plus(Monad.unit(5L),
4473 +                                                   Monad.unit(8L));
4474 +            // non-determinism
4475 +            assertTrue(f.get() == 5L || f.get() == 8L);
4476 +        }
4477 +
4478 +        CompletableFuture<Long> godot = new CompletableFuture<>();
4479 +        // f plus godot === f (doesn't wait for godot)
4480 +        Monad.assertFutureEquals(Monad.unit(5L),
4481 +                                 Monad.plus(Monad.unit(5L), godot));
4482 +        // godot plus f === f (doesn't wait for godot)
4483 +        Monad.assertFutureEquals(Monad.unit(5L),
4484 +                                 Monad.plus(godot, Monad.unit(5L)));
4485 +    }
4486 +
4487 +    /** Test long recursive chains of CompletableFutures with cascading completions */
4488 +    @SuppressWarnings("FutureReturnValueIgnored")
4489 +    public void testRecursiveChains() throws Throwable {
4490 +        for (ExecutionMode m : ExecutionMode.values())
4491 +        for (boolean addDeadEnds : new boolean[] { true, false })
4492 +    {
4493 +        final int val = 42;
4494 +        final int n = expensiveTests ? 1_000 : 2;
4495 +        CompletableFuture<Integer> head = new CompletableFuture<>();
4496 +        CompletableFuture<Integer> tail = head;
4497 +        for (int i = 0; i < n; i++) {
4498 +            if (addDeadEnds) m.thenApply(tail, v -> v + 1);
4499 +            tail = m.thenApply(tail, v -> v + 1);
4500 +            if (addDeadEnds) m.applyToEither(tail, tail, v -> v + 1);
4501 +            tail = m.applyToEither(tail, tail, v -> v + 1);
4502 +            if (addDeadEnds) m.thenCombine(tail, tail, (v, w) -> v + 1);
4503 +            tail = m.thenCombine(tail, tail, (v, w) -> v + 1);
4504 +        }
4505 +        head.complete(val);
4506 +        assertEquals(val + 3 * n, (int) tail.join());
4507 +    }}
4508 +
4509 +    /**
4510 +     * A single CompletableFuture with many dependents.
4511 +     * A demo of scalability - runtime is O(n).
4512 +     */
4513 +    @SuppressWarnings("FutureReturnValueIgnored")
4514 +    public void testManyDependents() throws Throwable {
4515 +        final int n = expensiveTests ? 1_000_000 : 10;
4516 +        final CompletableFuture<Void> head = new CompletableFuture<>();
4517 +        final CompletableFuture<Void> complete = CompletableFuture.completedFuture((Void)null);
4518 +        final AtomicInteger count = new AtomicInteger(0);
4519 +        for (int i = 0; i < n; i++) {
4520 +            head.thenRun(() -> count.getAndIncrement());
4521 +            head.thenAccept(x -> count.getAndIncrement());
4522 +            head.thenApply(x -> count.getAndIncrement());
4523 +
4524 +            head.runAfterBoth(complete, () -> count.getAndIncrement());
4525 +            head.thenAcceptBoth(complete, (x, y) -> count.getAndIncrement());
4526 +            head.thenCombine(complete, (x, y) -> count.getAndIncrement());
4527 +            complete.runAfterBoth(head, () -> count.getAndIncrement());
4528 +            complete.thenAcceptBoth(head, (x, y) -> count.getAndIncrement());
4529 +            complete.thenCombine(head, (x, y) -> count.getAndIncrement());
4530 +
4531 +            head.runAfterEither(new CompletableFuture<Void>(), () -> count.getAndIncrement());
4532 +            head.acceptEither(new CompletableFuture<Void>(), x -> count.getAndIncrement());
4533 +            head.applyToEither(new CompletableFuture<Void>(), x -> count.getAndIncrement());
4534 +            new CompletableFuture<Void>().runAfterEither(head, () -> count.getAndIncrement());
4535 +            new CompletableFuture<Void>().acceptEither(head, x -> count.getAndIncrement());
4536 +            new CompletableFuture<Void>().applyToEither(head, x -> count.getAndIncrement());
4537 +        }
4538 +        head.complete(null);
4539 +        assertEquals(5 * 3 * n, count.get());
4540 +    }
4541 +
4542 +    /** ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest tck */
4543 +    @SuppressWarnings("FutureReturnValueIgnored")
4544 +    public void testCoCompletionGarbageRetention() throws Throwable {
4545 +        final int n = expensiveTests ? 1_000_000 : 10;
4546 +        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
4547 +        CompletableFuture<Integer> f;
4548 +        for (int i = 0; i < n; i++) {
4549 +            f = new CompletableFuture<>();
4550 +            f.runAfterEither(incomplete, () -> {});
4551 +            f.complete(null);
4552 +
4553 +            f = new CompletableFuture<>();
4554 +            f.acceptEither(incomplete, x -> {});
4555 +            f.complete(null);
4556 +
4557 +            f = new CompletableFuture<>();
4558 +            f.applyToEither(incomplete, x -> x);
4559 +            f.complete(null);
4560 +
4561 +            f = new CompletableFuture<>();
4562 +            CompletableFuture.anyOf(f, incomplete);
4563 +            f.complete(null);
4564 +        }
4565 +
4566 +        for (int i = 0; i < n; i++) {
4567 +            f = new CompletableFuture<>();
4568 +            incomplete.runAfterEither(f, () -> {});
4569 +            f.complete(null);
4570 +
4571 +            f = new CompletableFuture<>();
4572 +            incomplete.acceptEither(f, x -> {});
4573 +            f.complete(null);
4574 +
4575 +            f = new CompletableFuture<>();
4576 +            incomplete.applyToEither(f, x -> x);
4577 +            f.complete(null);
4578 +
4579 +            f = new CompletableFuture<>();
4580 +            CompletableFuture.anyOf(incomplete, f);
4581 +            f.complete(null);
4582 +        }
4583 +    }
4584 +
4585 +    /**
4586 +     * Reproduction recipe for:
4587 +     * 8160402: Garbage retention with CompletableFuture.anyOf
4588 +     * 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
4589 +     */
4590 +    public void testAnyOfGarbageRetention() throws Throwable {
4591 +        for (Integer v : new Integer[] { 1, null })
4592 +    {
4593 +        final int n = expensiveTests ? 100_000 : 10;
4594 +        CompletableFuture<Integer>[] fs
4595 +            = (CompletableFuture<Integer>[]) new CompletableFuture<?>[100];
4596 +        for (int i = 0; i < fs.length; i++)
4597 +            fs[i] = new CompletableFuture<>();
4598 +        fs[fs.length - 1].complete(v);
4599 +        for (int i = 0; i < n; i++)
4600 +            checkCompletedNormally(CompletableFuture.anyOf(fs), v);
4601 +    }}
4602 +
4603 +    /**
4604 +     * Checks for garbage retention with allOf.
4605 +     *
4606 +     * As of 2016-07, fails with OOME:
4607 +     * ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest -Djsr166.methodFilter=testCancelledAllOfGarbageRetention tck
4608 +     */
4609 +    public void testCancelledAllOfGarbageRetention() throws Throwable {
4610 +        final int n = expensiveTests ? 100_000 : 10;
4611 +        CompletableFuture<Integer>[] fs
4612 +            = (CompletableFuture<Integer>[]) new CompletableFuture<?>[100];
4613 +        for (int i = 0; i < fs.length; i++)
4614 +            fs[i] = new CompletableFuture<>();
4615 +        for (int i = 0; i < n; i++)
4616 +            assertTrue(CompletableFuture.allOf(fs).cancel(false));
4617 +    }
4618 +
4619 +    /**
4620 +     * Checks for garbage retention when a dependent future is
4621 +     * cancelled and garbage-collected.
4622 +     * 8161600: Garbage retention when source CompletableFutures are never completed
4623 +     *
4624 +     * As of 2016-07, fails with OOME:
4625 +     * ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest -Djsr166.methodFilter=testCancelledGarbageRetention tck
4626 +     */
4627 +    public void testCancelledGarbageRetention() throws Throwable {
4628 +        final int n = expensiveTests ? 100_000 : 10;
4629 +        CompletableFuture<Integer> neverCompleted = new CompletableFuture<>();
4630 +        for (int i = 0; i < n; i++)
4631 +            assertTrue(neverCompleted.thenRun(() -> {}).cancel(true));
4632 +    }
4633 +
4634 +    /**
4635 +     * Checks for garbage retention when MinimalStage.toCompletableFuture()
4636 +     * is invoked many times.
4637 +     * 8161600: Garbage retention when source CompletableFutures are never completed
4638 +     *
4639 +     * As of 2016-07, fails with OOME:
4640 +     * ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest -Djsr166.methodFilter=testToCompletableFutureGarbageRetention tck
4641 +     */
4642 +    public void testToCompletableFutureGarbageRetention() throws Throwable {
4643 +        final int n = expensiveTests ? 900_000 : 10;
4644 +        CompletableFuture<Integer> neverCompleted = new CompletableFuture<>();
4645 +        CompletionStage minimal = neverCompleted.minimalCompletionStage();
4646 +        for (int i = 0; i < n; i++)
4647 +            assertTrue(minimal.toCompletableFuture().cancel(true));
4648 +    }
4649 +
4650 + //     static <U> U join(CompletionStage<U> stage) {
4651 + //         CompletableFuture<U> f = new CompletableFuture<>();
4652 + //         stage.whenComplete((v, ex) -> {
4653 + //             if (ex != null) f.completeExceptionally(ex); else f.complete(v);
4654 + //         });
4655 + //         return f.join();
4656 + //     }
4657 +
4658 + //     static <U> boolean isDone(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.isDone();
4664 + //     }
4665 +
4666 + //     static <U> U join2(CompletionStage<U> stage) {
4667 + //         return stage.toCompletableFuture().copy().join();
4668 + //     }
4669 +
4670 + //     static <U> boolean isDone2(CompletionStage<U> stage) {
4671 + //         return stage.toCompletableFuture().copy().isDone();
4672 + //     }
4673 +
4674 +    // For testing default implementations
4675 +    // Only non-default interface methods defined.
4676 +    static final class DelegatedCompletionStage<T> implements CompletionStage<T> {
4677 +        final CompletableFuture<T> cf;
4678 +        DelegatedCompletionStage(CompletableFuture<T> cf) { this.cf = cf; }
4679 +        public CompletableFuture<T> toCompletableFuture() {
4680 +            return cf; }
4681 +        public CompletionStage<Void> thenRun
4682 +            (Runnable action) {
4683 +            return cf.thenRun(action); }
4684 +        public CompletionStage<Void> thenRunAsync
4685 +            (Runnable action) {
4686 +            return cf.thenRunAsync(action); }
4687 +        public CompletionStage<Void> thenRunAsync
4688 +            (Runnable action,
4689 +             Executor executor) {
4690 +            return cf.thenRunAsync(action, executor); }
4691 +        public CompletionStage<Void> thenAccept
4692 +            (Consumer<? super T> action) {
4693 +            return cf.thenAccept(action); }
4694 +        public CompletionStage<Void> thenAcceptAsync
4695 +            (Consumer<? super T> action) {
4696 +            return cf.thenAcceptAsync(action); }
4697 +        public CompletionStage<Void> thenAcceptAsync
4698 +            (Consumer<? super T> action,
4699 +             Executor executor) {
4700 +            return cf.thenAcceptAsync(action, executor); }
4701 +        public <U> CompletionStage<U> thenApply
4702 +            (Function<? super T,? extends U> a) {
4703 +            return cf.thenApply(a); }
4704 +        public <U> CompletionStage<U> thenApplyAsync
4705 +            (Function<? super T,? extends U> fn) {
4706 +            return cf.thenApplyAsync(fn); }
4707 +        public <U> CompletionStage<U> thenApplyAsync
4708 +            (Function<? super T,? extends U> fn,
4709 +             Executor executor) {
4710 +            return cf.thenApplyAsync(fn, executor); }
4711 +        public <U,V> CompletionStage<V> thenCombine
4712 +            (CompletionStage<? extends U> other,
4713 +             BiFunction<? super T,? super U,? extends V> fn) {
4714 +            return cf.thenCombine(other, fn); }
4715 +        public <U,V> CompletionStage<V> thenCombineAsync
4716 +            (CompletionStage<? extends U> other,
4717 +             BiFunction<? super T,? super U,? extends V> fn) {
4718 +            return cf.thenCombineAsync(other, fn); }
4719 +        public <U,V> CompletionStage<V> thenCombineAsync
4720 +            (CompletionStage<? extends U> other,
4721 +             BiFunction<? super T,? super U,? extends V> fn,
4722 +             Executor executor) {
4723 +            return cf.thenCombineAsync(other, fn, executor); }
4724 +        public <U> CompletionStage<Void> thenAcceptBoth
4725 +            (CompletionStage<? extends U> other,
4726 +             BiConsumer<? super T, ? super U> action) {
4727 +            return cf.thenAcceptBoth(other, action); }
4728 +        public <U> CompletionStage<Void> thenAcceptBothAsync
4729 +            (CompletionStage<? extends U> other,
4730 +             BiConsumer<? super T, ? super U> action) {
4731 +            return cf.thenAcceptBothAsync(other, action); }
4732 +        public <U> CompletionStage<Void> thenAcceptBothAsync
4733 +            (CompletionStage<? extends U> other,
4734 +             BiConsumer<? super T, ? super U> action,
4735 +             Executor executor) {
4736 +            return cf.thenAcceptBothAsync(other, action, executor); }
4737 +        public CompletionStage<Void> runAfterBoth
4738 +            (CompletionStage<?> other,
4739 +             Runnable action) {
4740 +            return cf.runAfterBoth(other, action); }
4741 +        public CompletionStage<Void> runAfterBothAsync
4742 +            (CompletionStage<?> other,
4743 +             Runnable action) {
4744 +            return cf.runAfterBothAsync(other, action); }
4745 +        public CompletionStage<Void> runAfterBothAsync
4746 +            (CompletionStage<?> other,
4747 +             Runnable action,
4748 +             Executor executor) {
4749 +            return cf.runAfterBothAsync(other, action, executor); }
4750 +        public <U> CompletionStage<U> applyToEither
4751 +            (CompletionStage<? extends T> other,
4752 +             Function<? super T, U> fn) {
4753 +            return cf.applyToEither(other, fn); }
4754 +        public <U> CompletionStage<U> applyToEitherAsync
4755 +            (CompletionStage<? extends T> other,
4756 +             Function<? super T, U> fn) {
4757 +            return cf.applyToEitherAsync(other, fn); }
4758 +        public <U> CompletionStage<U> applyToEitherAsync
4759 +            (CompletionStage<? extends T> other,
4760 +             Function<? super T, U> fn,
4761 +             Executor executor) {
4762 +            return cf.applyToEitherAsync(other, fn, executor); }
4763 +        public CompletionStage<Void> acceptEither
4764 +            (CompletionStage<? extends T> other,
4765 +             Consumer<? super T> action) {
4766 +            return cf.acceptEither(other, action); }
4767 +        public CompletionStage<Void> acceptEitherAsync
4768 +            (CompletionStage<? extends T> other,
4769 +             Consumer<? super T> action) {
4770 +            return cf.acceptEitherAsync(other, action); }
4771 +        public CompletionStage<Void> acceptEitherAsync
4772 +            (CompletionStage<? extends T> other,
4773 +             Consumer<? super T> action,
4774 +             Executor executor) {
4775 +            return cf.acceptEitherAsync(other, action, executor); }
4776 +        public CompletionStage<Void> runAfterEither
4777 +            (CompletionStage<?> other,
4778 +             Runnable action) {
4779 +            return cf.runAfterEither(other, action); }
4780 +        public CompletionStage<Void> runAfterEitherAsync
4781 +            (CompletionStage<?> other,
4782 +             Runnable action) {
4783 +            return cf.runAfterEitherAsync(other, action); }
4784 +        public CompletionStage<Void> runAfterEitherAsync
4785 +            (CompletionStage<?> other,
4786 +             Runnable action,
4787 +             Executor executor) {
4788 +            return cf.runAfterEitherAsync(other, action, executor); }
4789 +        public <U> CompletionStage<U> thenCompose
4790 +            (Function<? super T, ? extends CompletionStage<U>> fn) {
4791 +            return cf.thenCompose(fn); }
4792 +        public <U> CompletionStage<U> thenComposeAsync
4793 +            (Function<? super T, ? extends CompletionStage<U>> fn) {
4794 +            return cf.thenComposeAsync(fn); }
4795 +        public <U> CompletionStage<U> thenComposeAsync
4796 +            (Function<? super T, ? extends CompletionStage<U>> fn,
4797 +             Executor executor) {
4798 +            return cf.thenComposeAsync(fn, executor); }
4799 +        public <U> CompletionStage<U> handle
4800 +            (BiFunction<? super T, Throwable, ? extends U> fn) {
4801 +            return cf.handle(fn); }
4802 +        public <U> CompletionStage<U> handleAsync
4803 +            (BiFunction<? super T, Throwable, ? extends U> fn) {
4804 +            return cf.handleAsync(fn); }
4805 +        public <U> CompletionStage<U> handleAsync
4806 +            (BiFunction<? super T, Throwable, ? extends U> fn,
4807 +             Executor executor) {
4808 +            return cf.handleAsync(fn, executor); }
4809 +        public CompletionStage<T> whenComplete
4810 +            (BiConsumer<? super T, ? super Throwable> action) {
4811 +            return cf.whenComplete(action); }
4812 +        public CompletionStage<T> whenCompleteAsync
4813 +            (BiConsumer<? super T, ? super Throwable> action) {
4814 +            return cf.whenCompleteAsync(action); }
4815 +        public CompletionStage<T> whenCompleteAsync
4816 +            (BiConsumer<? super T, ? super Throwable> action,
4817 +             Executor executor) {
4818 +            return cf.whenCompleteAsync(action, executor); }
4819 +        public CompletionStage<T> exceptionally
4820 +            (Function<Throwable, ? extends T> fn) {
4821 +            return cf.exceptionally(fn); }
4822 +    }
4823 +
4824 +    /**
4825 +     * default-implemented exceptionallyAsync action is not invoked when
4826 +     * source completes normally, and source result is propagated
4827 +     */
4828 +    public void testDefaultExceptionallyAsync_normalCompletion() {
4829 +        for (boolean createIncomplete : new boolean[] { true, false })
4830 +        for (Integer v1 : new Integer[] { 1, null })
4831 +    {
4832 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
4833 +        final DelegatedCompletionStage<Integer> d =
4834 +            new DelegatedCompletionStage<Integer>(f);
4835 +        if (!createIncomplete) assertTrue(f.complete(v1));
4836 +        final CompletionStage<Integer> g = d.exceptionallyAsync
4837 +            ((Throwable t) -> {
4838 +                threadFail("should not be called");
4839 +                return null;            // unreached
4840 +            });
4841 +        if (createIncomplete) assertTrue(f.complete(v1));
4842 +
4843 +        checkCompletedNormally(g.toCompletableFuture(), v1);
4844 +    }}
4845 +
4846 +    /**
4847 +     * default-implemented exceptionallyAsync action completes with
4848 +     * function value on source exception
4849 +     */
4850 +    public void testDefaultExceptionallyAsync_exceptionalCompletion() {
4851 +        for (boolean createIncomplete : new boolean[] { true, false })
4852 +        for (Integer v1 : new Integer[] { 1, null })
4853 +    {
4854 +        final AtomicInteger a = new AtomicInteger(0);
4855 +        final CFException ex = new CFException();
4856 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
4857 +        final DelegatedCompletionStage<Integer> d =
4858 +            new DelegatedCompletionStage<Integer>(f);
4859 +        if (!createIncomplete) f.completeExceptionally(ex);
4860 +        final CompletionStage<Integer> g = d.exceptionallyAsync
4861 +            ((Throwable t) -> {
4862 +                assertSame(t, ex);
4863 +                a.getAndIncrement();
4864 +                return v1;
4865 +            });
4866 +        if (createIncomplete) f.completeExceptionally(ex);
4867 +
4868 +        checkCompletedNormally(g.toCompletableFuture(), v1);
4869 +        assertEquals(1, a.get());
4870 +    }}
4871 +
4872 +    /**
4873 +     * Under default implementation, if an "exceptionally action"
4874 +     * throws an exception, it completes exceptionally with that
4875 +     * exception
4876 +     */
4877 +    public void testDefaultExceptionallyAsync_exceptionalCompletionActionFailed() {
4878 +        for (boolean createIncomplete : new boolean[] { true, false })
4879 +    {
4880 +        final AtomicInteger a = new AtomicInteger(0);
4881 +        final CFException ex1 = new CFException();
4882 +        final CFException ex2 = new CFException();
4883 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
4884 +        final DelegatedCompletionStage<Integer> d =
4885 +            new DelegatedCompletionStage<Integer>(f);
4886 +        if (!createIncomplete) f.completeExceptionally(ex1);
4887 +        final CompletionStage<Integer> g = d.exceptionallyAsync
4888 +            ((Throwable t) -> {
4889 +                assertSame(t, ex1);
4890 +                a.getAndIncrement();
4891 +                throw ex2;
4892 +            });
4893 +        if (createIncomplete) f.completeExceptionally(ex1);
4894 +
4895 +        checkCompletedWithWrappedException(g.toCompletableFuture(), ex2);
4896 +        checkCompletedExceptionally(f, ex1);
4897 +        checkCompletedExceptionally(d.toCompletableFuture(), ex1);
4898 +        assertEquals(1, a.get());
4899 +    }}
4900 +
4901 +    /**
4902 +     * default-implemented exceptionallyCompose result completes
4903 +     * normally after normal completion of source
4904 +     */
4905 +    public void testDefaultExceptionallyCompose_normalCompletion() {
4906 +        for (boolean createIncomplete : new boolean[] { true, false })
4907 +        for (Integer v1 : new Integer[] { 1, null })
4908 +    {
4909 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
4910 +        final ExceptionalCompletableFutureFunction r =
4911 +            new ExceptionalCompletableFutureFunction(ExecutionMode.SYNC);
4912 +        final DelegatedCompletionStage<Integer> d =
4913 +            new DelegatedCompletionStage<Integer>(f);
4914 +        if (!createIncomplete) assertTrue(f.complete(v1));
4915 +        final CompletionStage<Integer> g = d.exceptionallyCompose(r);
4916 +        if (createIncomplete) assertTrue(f.complete(v1));
4917 +
4918 +        checkCompletedNormally(f, v1);
4919 +        checkCompletedNormally(g.toCompletableFuture(), v1);
4920 +        r.assertNotInvoked();
4921 +    }}
4922 +
4923 +    /**
4924 +     * default-implemented exceptionallyCompose result completes
4925 +     * normally after exceptional completion of source
4926 +     */
4927 +    public void testDefaultExceptionallyCompose_exceptionalCompletion() {
4928 +        for (boolean createIncomplete : new boolean[] { true, false })
4929 +    {
4930 +        final CFException ex = new CFException();
4931 +        final ExceptionalCompletableFutureFunction r =
4932 +            new ExceptionalCompletableFutureFunction(ExecutionMode.SYNC);
4933 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
4934 +        final DelegatedCompletionStage<Integer> d =
4935 +            new DelegatedCompletionStage<Integer>(f);
4936 +        if (!createIncomplete) f.completeExceptionally(ex);
4937 +        final CompletionStage<Integer> g = d.exceptionallyCompose(r);
4938 +        if (createIncomplete) f.completeExceptionally(ex);
4939 +
4940 +        checkCompletedExceptionally(f, ex);
4941 +        checkCompletedNormally(g.toCompletableFuture(), r.value);
4942 +        r.assertInvoked();
4943 +    }}
4944 +
4945 +    /**
4946 +     * default-implemented exceptionallyCompose completes
4947 +     * exceptionally on exception if action does
4948 +     */
4949 +    public void testDefaultExceptionallyCompose_actionFailed() {
4950 +        for (boolean createIncomplete : new boolean[] { true, false })
4951 +    {
4952 +        final CFException ex = new CFException();
4953 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
4954 +        final FailingExceptionalCompletableFutureFunction r
4955 +            = new FailingExceptionalCompletableFutureFunction(ExecutionMode.SYNC);
4956 +        final DelegatedCompletionStage<Integer> d =
4957 +            new DelegatedCompletionStage<Integer>(f);
4958 +        if (!createIncomplete) f.completeExceptionally(ex);
4959 +        final CompletionStage<Integer> g = d.exceptionallyCompose(r);
4960 +        if (createIncomplete) f.completeExceptionally(ex);
4961 +
4962 +        checkCompletedExceptionally(f, ex);
4963 +        checkCompletedWithWrappedException(g.toCompletableFuture(), r.ex);
4964 +        r.assertInvoked();
4965 +    }}
4966 +
4967 +    /**
4968 +     * default-implemented exceptionallyComposeAsync result completes
4969 +     * normally after normal completion of source
4970 +     */
4971 +    public void testDefaultExceptionallyComposeAsync_normalCompletion() {
4972 +        for (boolean createIncomplete : new boolean[] { true, false })
4973 +        for (Integer v1 : new Integer[] { 1, null })
4974 +    {
4975 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
4976 +        final ExceptionalCompletableFutureFunction r =
4977 +            new ExceptionalCompletableFutureFunction(ExecutionMode.ASYNC);
4978 +        final DelegatedCompletionStage<Integer> d =
4979 +            new DelegatedCompletionStage<Integer>(f);
4980 +        if (!createIncomplete) assertTrue(f.complete(v1));
4981 +        final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r);
4982 +        if (createIncomplete) assertTrue(f.complete(v1));
4983 +
4984 +        checkCompletedNormally(f, v1);
4985 +        checkCompletedNormally(g.toCompletableFuture(), v1);
4986 +        r.assertNotInvoked();
4987 +    }}
4988 +
4989 +    /**
4990 +     * default-implemented exceptionallyComposeAsync result completes
4991 +     * normally after exceptional completion of source
4992 +     */
4993 +    public void testDefaultExceptionallyComposeAsync_exceptionalCompletion() {
4994 +        for (boolean createIncomplete : new boolean[] { true, false })
4995 +    {
4996 +        final CFException ex = new CFException();
4997 +        final ExceptionalCompletableFutureFunction r =
4998 +            new ExceptionalCompletableFutureFunction(ExecutionMode.ASYNC);
4999 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
5000 +        final DelegatedCompletionStage<Integer> d =
5001 +            new DelegatedCompletionStage<Integer>(f);
5002 +        if (!createIncomplete) f.completeExceptionally(ex);
5003 +        final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r);
5004 +        if (createIncomplete) f.completeExceptionally(ex);
5005 +
5006 +        checkCompletedExceptionally(f, ex);
5007 +        checkCompletedNormally(g.toCompletableFuture(), r.value);
5008 +        r.assertInvoked();
5009 +    }}
5010 +
5011 +    /**
5012 +     * default-implemented exceptionallyComposeAsync completes
5013 +     * exceptionally on exception if action does
5014 +     */
5015 +    public void testDefaultExceptionallyComposeAsync_actionFailed() {
5016 +        for (boolean createIncomplete : new boolean[] { true, false })
5017 +    {
5018 +        final CFException ex = new CFException();
5019 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
5020 +        final FailingExceptionalCompletableFutureFunction r
5021 +            = new FailingExceptionalCompletableFutureFunction(ExecutionMode.ASYNC);
5022 +        final DelegatedCompletionStage<Integer> d =
5023 +            new DelegatedCompletionStage<Integer>(f);
5024 +        if (!createIncomplete) f.completeExceptionally(ex);
5025 +        final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r);
5026 +        if (createIncomplete) f.completeExceptionally(ex);
5027 +
5028 +        checkCompletedExceptionally(f, ex);
5029 +        checkCompletedWithWrappedException(g.toCompletableFuture(), r.ex);
5030 +        r.assertInvoked();
5031 +    }}
5032 +
5033 +    /**
5034 +     * default-implemented exceptionallyComposeAsync result completes
5035 +     * normally after normal completion of source
5036 +     */
5037 +    public void testDefaultExceptionallyComposeAsyncExecutor_normalCompletion() {
5038 +        for (boolean createIncomplete : new boolean[] { true, false })
5039 +        for (Integer v1 : new Integer[] { 1, null })
5040 +    {
5041 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
5042 +        final ExceptionalCompletableFutureFunction r =
5043 +            new ExceptionalCompletableFutureFunction(ExecutionMode.EXECUTOR);
5044 +        final DelegatedCompletionStage<Integer> d =
5045 +            new DelegatedCompletionStage<Integer>(f);
5046 +        if (!createIncomplete) assertTrue(f.complete(v1));
5047 +        final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r, new ThreadExecutor());
5048 +        if (createIncomplete) assertTrue(f.complete(v1));
5049 +
5050 +        checkCompletedNormally(f, v1);
5051 +        checkCompletedNormally(g.toCompletableFuture(), v1);
5052 +        r.assertNotInvoked();
5053 +    }}
5054 +
5055 +    /**
5056 +     * default-implemented exceptionallyComposeAsync result completes
5057 +     * normally after exceptional completion of source
5058 +     */
5059 +    public void testDefaultExceptionallyComposeAsyncExecutor_exceptionalCompletion() {
5060 +        for (boolean createIncomplete : new boolean[] { true, false })
5061 +    {
5062 +        final CFException ex = new CFException();
5063 +        final ExceptionalCompletableFutureFunction r =
5064 +            new ExceptionalCompletableFutureFunction(ExecutionMode.EXECUTOR);
5065 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
5066 +        final DelegatedCompletionStage<Integer> d =
5067 +            new DelegatedCompletionStage<Integer>(f);
5068 +        if (!createIncomplete) f.completeExceptionally(ex);
5069 +        final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r, new ThreadExecutor());
5070 +        if (createIncomplete) f.completeExceptionally(ex);
5071 +
5072 +        checkCompletedExceptionally(f, ex);
5073 +        checkCompletedNormally(g.toCompletableFuture(), r.value);
5074 +        r.assertInvoked();
5075 +    }}
5076 +
5077 +    /**
5078 +     * default-implemented exceptionallyComposeAsync completes
5079 +     * exceptionally on exception if action does
5080 +     */
5081 +    public void testDefaultExceptionallyComposeAsyncExecutor_actionFailed() {
5082 +        for (boolean createIncomplete : new boolean[] { true, false })
5083 +    {
5084 +        final CFException ex = new CFException();
5085 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
5086 +        final FailingExceptionalCompletableFutureFunction r
5087 +            = new FailingExceptionalCompletableFutureFunction(ExecutionMode.EXECUTOR);
5088 +        final DelegatedCompletionStage<Integer> d =
5089 +            new DelegatedCompletionStage<Integer>(f);
5090 +        if (!createIncomplete) f.completeExceptionally(ex);
5091 +        final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r, new ThreadExecutor());
5092 +        if (createIncomplete) f.completeExceptionally(ex);
5093 +
5094 +        checkCompletedExceptionally(f, ex);
5095 +        checkCompletedWithWrappedException(g.toCompletableFuture(), r.ex);
5096 +        r.assertInvoked();
5097 +    }}
5098 +
5099   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines