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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines