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.83 by jsr166, Mon Jun 16 20:16:32 2014 UTC vs.
Revision 1.215 by jsr166, Wed Nov 21 23:19:03 2018 UTC

# Line 5 | Line 5
5   * http://creativecommons.org/publicdomain/zero/1.0/
6   */
7  
8 < import junit.framework.*;
8 > import static java.util.concurrent.TimeUnit.MILLISECONDS;
9 > import static java.util.concurrent.TimeUnit.SECONDS;
10 > import static java.util.concurrent.CompletableFuture.completedFuture;
11 > import static java.util.concurrent.CompletableFuture.failedFuture;
12 >
13 > import java.lang.reflect.Method;
14 > import java.lang.reflect.Modifier;
15 >
16 > import java.util.stream.Collectors;
17 > import java.util.stream.Stream;
18 >
19 > import java.util.ArrayList;
20 > import java.util.Arrays;
21 > import java.util.List;
22 > import java.util.Objects;
23 > import java.util.Set;
24   import java.util.concurrent.Callable;
10 import java.util.concurrent.Executor;
11 import java.util.concurrent.ExecutorService;
12 import java.util.concurrent.Executors;
25   import java.util.concurrent.CancellationException;
14 import java.util.concurrent.CountDownLatch;
15 import java.util.concurrent.ExecutionException;
16 import java.util.concurrent.Future;
26   import java.util.concurrent.CompletableFuture;
27   import java.util.concurrent.CompletionException;
28   import java.util.concurrent.CompletionStage;
29 + import java.util.concurrent.ExecutionException;
30 + import java.util.concurrent.Executor;
31   import java.util.concurrent.ForkJoinPool;
32   import java.util.concurrent.ForkJoinTask;
33 + import java.util.concurrent.RejectedExecutionException;
34   import java.util.concurrent.TimeoutException;
35   import java.util.concurrent.atomic.AtomicInteger;
36 < import static java.util.concurrent.TimeUnit.MILLISECONDS;
25 < import static java.util.concurrent.TimeUnit.SECONDS;
26 < import java.util.*;
27 < import java.util.function.Supplier;
28 < import java.util.function.Consumer;
36 > import java.util.concurrent.atomic.AtomicReference;
37   import java.util.function.BiConsumer;
30 import java.util.function.Function;
38   import java.util.function.BiFunction;
39 + import java.util.function.Consumer;
40 + import java.util.function.Function;
41 + import java.util.function.Predicate;
42 + import java.util.function.Supplier;
43 +
44 + import junit.framework.Test;
45 + import junit.framework.TestSuite;
46  
47   public class CompletableFutureTest extends JSR166TestCase {
48  
49      public static void main(String[] args) {
50 <        junit.textui.TestRunner.run(suite());
50 >        main(suite(), args);
51      }
52      public static Test suite() {
53          return new TestSuite(CompletableFutureTest.class);
# Line 44 | Line 58 | public class CompletableFutureTest exten
58      void checkIncomplete(CompletableFuture<?> f) {
59          assertFalse(f.isDone());
60          assertFalse(f.isCancelled());
61 <        assertTrue(f.toString().contains("[Not completed]"));
61 >        assertTrue(f.toString().matches(".*\\[.*Not completed.*\\]"));
62 >
63 >        Object result = null;
64          try {
65 <            assertNull(f.getNow(null));
65 >            result = f.getNow(null);
66          } catch (Throwable fail) { threadUnexpectedException(fail); }
67 +        assertNull(result);
68 +
69          try {
70 <            f.get(0L, SECONDS);
70 >            f.get(randomExpiredTimeout(), randomTimeUnit());
71              shouldThrow();
72          }
73          catch (TimeoutException success) {}
74          catch (Throwable fail) { threadUnexpectedException(fail); }
75      }
76  
77 <    <T> void checkCompletedNormally(CompletableFuture<T> f, T value) {
78 <        try {
79 <            assertEquals(value, f.get(LONG_DELAY_MS, MILLISECONDS));
80 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
81 <        try {
82 <            assertEquals(value, f.join());
83 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
66 <        try {
67 <            assertEquals(value, f.getNow(null));
68 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
77 >    <T> void checkCompletedNormally(CompletableFuture<T> f, T expectedValue) {
78 >        checkTimedGet(f, expectedValue);
79 >
80 >        assertEquals(expectedValue, f.join());
81 >        assertEquals(expectedValue, f.getNow(null));
82 >
83 >        T result = null;
84          try {
85 <            assertEquals(value, f.get());
85 >            result = f.get();
86          } catch (Throwable fail) { threadUnexpectedException(fail); }
87 +        assertEquals(expectedValue, result);
88 +
89          assertTrue(f.isDone());
90          assertFalse(f.isCancelled());
91          assertFalse(f.isCompletedExceptionally());
92 <        assertTrue(f.toString().contains("[Completed normally]"));
92 >        assertTrue(f.toString().matches(".*\\[.*Completed normally.*\\]"));
93      }
94  
95 <    void checkCompletedWithWrappedCFException(CompletableFuture<?> f) {
96 <        try {
97 <            f.get(LONG_DELAY_MS, MILLISECONDS);
98 <            shouldThrow();
99 <        } catch (ExecutionException success) {
100 <            assertTrue(success.getCause() instanceof CFException);
101 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
102 <        try {
86 <            f.join();
87 <            shouldThrow();
88 <        } catch (CompletionException success) {
89 <            assertTrue(success.getCause() instanceof CFException);
90 <        }
91 <        try {
92 <            f.getNow(null);
93 <            shouldThrow();
94 <        } catch (CompletionException success) {
95 <            assertTrue(success.getCause() instanceof CFException);
96 <        }
97 <        try {
98 <            f.get();
99 <            shouldThrow();
100 <        } catch (ExecutionException success) {
101 <            assertTrue(success.getCause() instanceof CFException);
102 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
103 <        assertTrue(f.isDone());
104 <        assertFalse(f.isCancelled());
105 <        assertTrue(f.toString().contains("[Completed exceptionally]"));
95 >    /**
96 >     * Returns the "raw" internal exceptional completion of f,
97 >     * without any additional wrapping with CompletionException.
98 >     */
99 >    Throwable exceptionalCompletion(CompletableFuture<?> f) {
100 >        // handle (and whenComplete and exceptionally) can distinguish
101 >        // between "direct" and "wrapped" exceptional completion
102 >        return f.handle((u, t) -> t).join();
103      }
104  
105 <    <U> void checkCompletedExceptionallyWithRootCause(CompletableFuture<U> f,
106 <                                                      Throwable ex) {
105 >    void checkCompletedExceptionally(CompletableFuture<?> f,
106 >                                     boolean wrapped,
107 >                                     Consumer<Throwable> checker) {
108 >        Throwable cause = exceptionalCompletion(f);
109 >        if (wrapped) {
110 >            assertTrue(cause instanceof CompletionException);
111 >            cause = cause.getCause();
112 >        }
113 >        checker.accept(cause);
114 >
115 >        long startTime = System.nanoTime();
116          try {
117              f.get(LONG_DELAY_MS, MILLISECONDS);
118              shouldThrow();
119          } catch (ExecutionException success) {
120 <            assertSame(ex, success.getCause());
120 >            assertSame(cause, success.getCause());
121          } catch (Throwable fail) { threadUnexpectedException(fail); }
122 +        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS / 2);
123 +
124          try {
125              f.join();
126              shouldThrow();
127          } catch (CompletionException success) {
128 <            assertSame(ex, success.getCause());
129 <        }
128 >            assertSame(cause, success.getCause());
129 >        } catch (Throwable fail) { threadUnexpectedException(fail); }
130 >
131          try {
132              f.getNow(null);
133              shouldThrow();
134          } catch (CompletionException success) {
135 <            assertSame(ex, success.getCause());
136 <        }
135 >            assertSame(cause, success.getCause());
136 >        } catch (Throwable fail) { threadUnexpectedException(fail); }
137 >
138          try {
139              f.get();
140              shouldThrow();
141          } catch (ExecutionException success) {
142 <            assertSame(ex, success.getCause());
142 >            assertSame(cause, success.getCause());
143          } catch (Throwable fail) { threadUnexpectedException(fail); }
144  
135        assertTrue(f.isDone());
145          assertFalse(f.isCancelled());
146 <        assertTrue(f.toString().contains("[Completed exceptionally]"));
146 >        assertTrue(f.isDone());
147 >        assertTrue(f.isCompletedExceptionally());
148 >        assertTrue(f.toString().matches(".*\\[.*Completed exceptionally.*\\]"));
149      }
150  
151 <    <U> void checkCompletedWithWrappedException(CompletableFuture<U> f,
152 <                                                Throwable ex) {
153 <        checkCompletedExceptionallyWithRootCause(f, ex);
143 <        try {
144 <            CompletableFuture<Throwable> spy = f.handle
145 <                ((U u, Throwable t) -> t);
146 <            assertTrue(spy.join() instanceof CompletionException);
147 <            assertSame(ex, spy.join().getCause());
148 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
151 >    void checkCompletedWithWrappedCFException(CompletableFuture<?> f) {
152 >        checkCompletedExceptionally(f, true,
153 >            t -> assertTrue(t instanceof CFException));
154      }
155  
156 <    <U> void checkCompletedExceptionally(CompletableFuture<U> f, Throwable ex) {
157 <        checkCompletedExceptionallyWithRootCause(f, ex);
158 <        try {
159 <            CompletableFuture<Throwable> spy = f.handle
160 <                ((U u, Throwable t) -> t);
161 <            assertSame(ex, spy.join());
162 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
156 >    void checkCompletedWithWrappedCancellationException(CompletableFuture<?> f) {
157 >        checkCompletedExceptionally(f, true,
158 >            t -> assertTrue(t instanceof CancellationException));
159 >    }
160 >
161 >    void checkCompletedWithTimeoutException(CompletableFuture<?> f) {
162 >        checkCompletedExceptionally(f, false,
163 >            t -> assertTrue(t instanceof TimeoutException));
164 >    }
165 >
166 >    void checkCompletedWithWrappedException(CompletableFuture<?> f,
167 >                                            Throwable ex) {
168 >        checkCompletedExceptionally(f, true, t -> assertSame(t, ex));
169 >    }
170 >
171 >    void checkCompletedExceptionally(CompletableFuture<?> f, Throwable ex) {
172 >        checkCompletedExceptionally(f, false, t -> assertSame(t, ex));
173      }
174  
175      void checkCancelled(CompletableFuture<?> f) {
176 +        long startTime = System.nanoTime();
177          try {
178              f.get(LONG_DELAY_MS, MILLISECONDS);
179              shouldThrow();
180          } catch (CancellationException success) {
181          } catch (Throwable fail) { threadUnexpectedException(fail); }
182 +        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS / 2);
183 +
184          try {
185              f.join();
186              shouldThrow();
# Line 176 | Line 194 | public class CompletableFutureTest exten
194              shouldThrow();
195          } catch (CancellationException success) {
196          } catch (Throwable fail) { threadUnexpectedException(fail); }
179        assertTrue(f.isDone());
180        assertTrue(f.isCompletedExceptionally());
181        assertTrue(f.isCancelled());
182        assertTrue(f.toString().contains("[Completed exceptionally]"));
183    }
197  
198 <    void checkCompletedWithWrappedCancellationException(CompletableFuture<?> f) {
199 <        try {
187 <            f.get(LONG_DELAY_MS, MILLISECONDS);
188 <            shouldThrow();
189 <        } catch (ExecutionException success) {
190 <            assertTrue(success.getCause() instanceof CancellationException);
191 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
192 <        try {
193 <            f.join();
194 <            shouldThrow();
195 <        } catch (CompletionException success) {
196 <            assertTrue(success.getCause() instanceof CancellationException);
197 <        }
198 <        try {
199 <            f.getNow(null);
200 <            shouldThrow();
201 <        } catch (CompletionException success) {
202 <            assertTrue(success.getCause() instanceof CancellationException);
203 <        }
204 <        try {
205 <            f.get();
206 <            shouldThrow();
207 <        } catch (ExecutionException success) {
208 <            assertTrue(success.getCause() instanceof CancellationException);
209 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
198 >        assertTrue(exceptionalCompletion(f) instanceof CancellationException);
199 >
200          assertTrue(f.isDone());
211        assertFalse(f.isCancelled());
201          assertTrue(f.isCompletedExceptionally());
202 <        assertTrue(f.toString().contains("[Completed exceptionally]"));
202 >        assertTrue(f.isCancelled());
203 >        assertTrue(f.toString().matches(".*\\[.*Completed exceptionally.*\\]"));
204      }
205  
206      /**
# Line 257 | Line 247 | public class CompletableFutureTest exten
247      {
248          CompletableFuture<Integer> f = new CompletableFuture<>();
249          checkIncomplete(f);
250 <        assertTrue(f.cancel(true));
251 <        assertTrue(f.cancel(true));
250 >        assertTrue(f.cancel(mayInterruptIfRunning));
251 >        assertTrue(f.cancel(mayInterruptIfRunning));
252 >        assertTrue(f.cancel(!mayInterruptIfRunning));
253          checkCancelled(f);
254      }}
255  
# Line 308 | Line 299 | public class CompletableFutureTest exten
299          }
300  
301          f = new CompletableFuture<>();
302 <        f.completeExceptionally(ex = new CFException());
302 >        f.completeExceptionally(new CFException());
303          f.obtrudeValue(v1);
304          checkCompletedNormally(f, v1);
305          f.obtrudeException(ex = new CFException());
# Line 345 | Line 336 | public class CompletableFutureTest exten
336      /**
337       * toString indicates current completion state
338       */
339 <    public void testToString() {
340 <        CompletableFuture<String> f;
341 <
342 <        f = new CompletableFuture<String>();
343 <        assertTrue(f.toString().contains("[Not completed]"));
339 >    public void testToString_incomplete() {
340 >        CompletableFuture<String> f = new CompletableFuture<>();
341 >        assertTrue(f.toString().matches(".*\\[.*Not completed.*\\]"));
342 >        if (testImplementationDetails)
343 >            assertEquals(identityString(f) + "[Not completed]",
344 >                         f.toString());
345 >    }
346  
347 +    public void testToString_normal() {
348 +        CompletableFuture<String> f = new CompletableFuture<>();
349          assertTrue(f.complete("foo"));
350 <        assertTrue(f.toString().contains("[Completed normally]"));
350 >        assertTrue(f.toString().matches(".*\\[.*Completed normally.*\\]"));
351 >        if (testImplementationDetails)
352 >            assertEquals(identityString(f) + "[Completed normally]",
353 >                         f.toString());
354 >    }
355  
356 <        f = new CompletableFuture<String>();
356 >    public void testToString_exception() {
357 >        CompletableFuture<String> f = new CompletableFuture<>();
358          assertTrue(f.completeExceptionally(new IndexOutOfBoundsException()));
359 <        assertTrue(f.toString().contains("[Completed exceptionally]"));
359 >        assertTrue(f.toString().matches(".*\\[.*Completed exceptionally.*\\]"));
360 >        if (testImplementationDetails)
361 >            assertTrue(f.toString().startsWith(
362 >                               identityString(f) + "[Completed exceptionally: "));
363 >    }
364  
365 +    public void testToString_cancelled() {
366          for (boolean mayInterruptIfRunning : new boolean[] { true, false }) {
367 <            f = new CompletableFuture<String>();
367 >            CompletableFuture<String> f = new CompletableFuture<>();
368              assertTrue(f.cancel(mayInterruptIfRunning));
369 <            assertTrue(f.toString().contains("[Completed exceptionally]"));
369 >            assertTrue(f.toString().matches(".*\\[.*Completed exceptionally.*\\]"));
370 >            if (testImplementationDetails)
371 >                assertTrue(f.toString().startsWith(
372 >                                   identityString(f) + "[Completed exceptionally: "));
373          }
374      }
375  
# Line 373 | Line 381 | public class CompletableFutureTest exten
381          checkCompletedNormally(f, "test");
382      }
383  
384 <    abstract class CheckedAction {
384 >    abstract static class CheckedAction {
385          int invocationCount = 0;
386          final ExecutionMode m;
387          CheckedAction(ExecutionMode m) { this.m = m; }
# Line 385 | Line 393 | public class CompletableFutureTest exten
393          void assertInvoked() { assertEquals(1, invocationCount); }
394      }
395  
396 <    abstract class CheckedIntegerAction extends CheckedAction {
396 >    abstract static class CheckedIntegerAction extends CheckedAction {
397          Integer value;
398          CheckedIntegerAction(ExecutionMode m) { super(m); }
399          void assertValue(Integer expected) {
# Line 394 | Line 402 | public class CompletableFutureTest exten
402          }
403      }
404  
405 <    class IntegerSupplier extends CheckedAction
405 >    static class IntegerSupplier extends CheckedAction
406          implements Supplier<Integer>
407      {
408          final Integer value;
# Line 413 | Line 421 | public class CompletableFutureTest exten
421          return (x == null) ? null : x + 1;
422      }
423  
424 <    class NoopConsumer extends CheckedIntegerAction
424 >    static class NoopConsumer extends CheckedIntegerAction
425          implements Consumer<Integer>
426      {
427          NoopConsumer(ExecutionMode m) { super(m); }
# Line 423 | Line 431 | public class CompletableFutureTest exten
431          }
432      }
433  
434 <    class IncFunction extends CheckedIntegerAction
434 >    static class IncFunction extends CheckedIntegerAction
435          implements Function<Integer,Integer>
436      {
437          IncFunction(ExecutionMode m) { super(m); }
# Line 441 | Line 449 | public class CompletableFutureTest exten
449              - ((y == null) ? 99 : y.intValue());
450      }
451  
452 <    class SubtractAction extends CheckedIntegerAction
452 >    static class SubtractAction extends CheckedIntegerAction
453          implements BiConsumer<Integer, Integer>
454      {
455          SubtractAction(ExecutionMode m) { super(m); }
# Line 451 | Line 459 | public class CompletableFutureTest exten
459          }
460      }
461  
462 <    class SubtractFunction extends CheckedIntegerAction
462 >    static class SubtractFunction extends CheckedIntegerAction
463          implements BiFunction<Integer, Integer, Integer>
464      {
465          SubtractFunction(ExecutionMode m) { super(m); }
# Line 461 | Line 469 | public class CompletableFutureTest exten
469          }
470      }
471  
472 <    class Noop extends CheckedAction implements Runnable {
472 >    static class Noop extends CheckedAction implements Runnable {
473          Noop(ExecutionMode m) { super(m); }
474          public void run() {
475              invoked();
476          }
477      }
478  
479 <    class FailingSupplier extends CheckedAction
479 >    static class FailingSupplier extends CheckedAction
480          implements Supplier<Integer>
481      {
482 <        FailingSupplier(ExecutionMode m) { super(m); }
482 >        final CFException ex;
483 >        FailingSupplier(ExecutionMode m) { super(m); ex = new CFException(); }
484          public Integer get() {
485              invoked();
486 <            throw new CFException();
486 >            throw ex;
487          }
488      }
489  
490 <    class FailingConsumer extends CheckedIntegerAction
490 >    static class FailingConsumer extends CheckedIntegerAction
491          implements Consumer<Integer>
492      {
493 <        FailingConsumer(ExecutionMode m) { super(m); }
493 >        final CFException ex;
494 >        FailingConsumer(ExecutionMode m) { super(m); ex = new CFException(); }
495          public void accept(Integer x) {
496              invoked();
497              value = x;
498 <            throw new CFException();
498 >            throw ex;
499          }
500      }
501  
502 <    class FailingBiConsumer extends CheckedIntegerAction
502 >    static class FailingBiConsumer extends CheckedIntegerAction
503          implements BiConsumer<Integer, Integer>
504      {
505 <        FailingBiConsumer(ExecutionMode m) { super(m); }
505 >        final CFException ex;
506 >        FailingBiConsumer(ExecutionMode m) { super(m); ex = new CFException(); }
507          public void accept(Integer x, Integer y) {
508              invoked();
509              value = subtract(x, y);
510 <            throw new CFException();
510 >            throw ex;
511          }
512      }
513  
514 <    class FailingFunction extends CheckedIntegerAction
514 >    static class FailingFunction extends CheckedIntegerAction
515          implements Function<Integer, Integer>
516      {
517 <        FailingFunction(ExecutionMode m) { super(m); }
517 >        final CFException ex;
518 >        FailingFunction(ExecutionMode m) { super(m); ex = new CFException(); }
519          public Integer apply(Integer x) {
520              invoked();
521              value = x;
522 <            throw new CFException();
522 >            throw ex;
523          }
524      }
525  
526 <    class FailingBiFunction extends CheckedIntegerAction
526 >    static class FailingBiFunction extends CheckedIntegerAction
527          implements BiFunction<Integer, Integer, Integer>
528      {
529 <        FailingBiFunction(ExecutionMode m) { super(m); }
529 >        final CFException ex;
530 >        FailingBiFunction(ExecutionMode m) { super(m); ex = new CFException(); }
531          public Integer apply(Integer x, Integer y) {
532              invoked();
533              value = subtract(x, y);
534 <            throw new CFException();
534 >            throw ex;
535          }
536      }
537  
538 <    class FailingRunnable extends CheckedAction implements Runnable {
539 <        FailingRunnable(ExecutionMode m) { super(m); }
538 >    static class FailingRunnable extends CheckedAction implements Runnable {
539 >        final CFException ex;
540 >        FailingRunnable(ExecutionMode m) { super(m); ex = new CFException(); }
541          public void run() {
542              invoked();
543 <            throw new CFException();
543 >            throw ex;
544          }
545      }
546  
547 <
534 <    class CompletableFutureInc extends CheckedIntegerAction
547 >    static class CompletableFutureInc extends CheckedIntegerAction
548          implements Function<Integer, CompletableFuture<Integer>>
549      {
550          CompletableFutureInc(ExecutionMode m) { super(m); }
551          public CompletableFuture<Integer> apply(Integer x) {
552              invoked();
553              value = x;
554 <            CompletableFuture<Integer> f = new CompletableFuture<>();
555 <            assertTrue(f.complete(inc(x)));
556 <            return f;
554 >            return CompletableFuture.completedFuture(inc(x));
555 >        }
556 >    }
557 >
558 >    static class FailingExceptionalCompletableFutureFunction extends CheckedAction
559 >        implements Function<Throwable, CompletableFuture<Integer>>
560 >    {
561 >        final CFException ex;
562 >        FailingExceptionalCompletableFutureFunction(ExecutionMode m) { super(m); ex = new CFException(); }
563 >        public CompletableFuture<Integer> apply(Throwable x) {
564 >            invoked();
565 >            throw ex;
566 >        }
567 >    }
568 >
569 >    static class ExceptionalCompletableFutureFunction extends CheckedAction
570 >        implements Function<Throwable, CompletionStage<Integer>> {
571 >        final Integer value = 3;
572 >        ExceptionalCompletableFutureFunction(ExecutionMode m) { super(m); }
573 >        public CompletionStage<Integer> apply(Throwable x) {
574 >            invoked();
575 >            return CompletableFuture.completedFuture(value);
576          }
577      }
578  
579 <    class FailingCompletableFutureFunction extends CheckedIntegerAction
579 >    static class FailingCompletableFutureFunction extends CheckedIntegerAction
580          implements Function<Integer, CompletableFuture<Integer>>
581      {
582 <        FailingCompletableFutureFunction(ExecutionMode m) { super(m); }
582 >        final CFException ex;
583 >        FailingCompletableFutureFunction(ExecutionMode m) { super(m); ex = new CFException(); }
584          public CompletableFuture<Integer> apply(Integer x) {
585              invoked();
586              value = x;
587 <            throw new CFException();
587 >            throw ex;
588 >        }
589 >    }
590 >
591 >    static class CountingRejectingExecutor implements Executor {
592 >        final RejectedExecutionException ex = new RejectedExecutionException();
593 >        final AtomicInteger count = new AtomicInteger(0);
594 >        public void execute(Runnable r) {
595 >            count.getAndIncrement();
596 >            throw ex;
597          }
598      }
599  
# Line 569 | Line 611 | public class CompletableFutureTest exten
611          }
612      }
613  
614 +    static final boolean defaultExecutorIsCommonPool
615 +        = ForkJoinPool.getCommonPoolParallelism() > 1;
616 +
617      /**
618       * Permits the testing of parallel code for the 3 different
619       * execution modes without copy/pasting all the test methods.
620       */
621      enum ExecutionMode {
622 <        DEFAULT {
622 >        SYNC {
623              public void checkExecutionMode() {
624                  assertFalse(ThreadExecutor.startedCurrentThread());
625                  assertNull(ForkJoinTask.getPool());
# Line 646 | Line 691 | public class CompletableFutureTest exten
691                   Function<? super T,U> a) {
692                  return f.applyToEither(g, a);
693              }
694 +            public <T> CompletableFuture<T> exceptionally
695 +                (CompletableFuture<T> f,
696 +                 Function<Throwable, ? extends T> fn) {
697 +                return f.exceptionally(fn);
698 +            }
699 +            public <T> CompletableFuture<T> exceptionallyCompose
700 +                (CompletableFuture<T> f, Function<Throwable, ? extends CompletionStage<T>> fn) {
701 +                return f.exceptionallyCompose(fn);
702 +            }
703          },
650
704          ASYNC {
705              public void checkExecutionMode() {
706 <                assertSame(ForkJoinPool.commonPool(),
707 <                           ForkJoinTask.getPool());
706 >                assertEquals(defaultExecutorIsCommonPool,
707 >                             (ForkJoinPool.commonPool() == ForkJoinTask.getPool()));
708              }
709              public CompletableFuture<Void> runAsync(Runnable a) {
710                  return CompletableFuture.runAsync(a);
# Line 720 | Line 773 | public class CompletableFutureTest exten
773                   Function<? super T,U> a) {
774                  return f.applyToEitherAsync(g, a);
775              }
776 +            public <T> CompletableFuture<T> exceptionally
777 +                (CompletableFuture<T> f,
778 +                 Function<Throwable, ? extends T> fn) {
779 +                return f.exceptionallyAsync(fn);
780 +            }
781 +
782 +            public <T> CompletableFuture<T> exceptionallyCompose
783 +                (CompletableFuture<T> f, Function<Throwable, ? extends CompletionStage<T>> fn) {
784 +                return f.exceptionallyComposeAsync(fn);
785 +            }
786 +
787          },
788  
789          EXECUTOR {
# Line 793 | Line 857 | public class CompletableFutureTest exten
857                   Function<? super T,U> a) {
858                  return f.applyToEitherAsync(g, a, new ThreadExecutor());
859              }
860 +            public <T> CompletableFuture<T> exceptionally
861 +                (CompletableFuture<T> f,
862 +                 Function<Throwable, ? extends T> fn) {
863 +                return f.exceptionallyAsync(fn, new ThreadExecutor());
864 +            }
865 +            public <T> CompletableFuture<T> exceptionallyCompose
866 +                (CompletableFuture<T> f, Function<Throwable, ? extends CompletionStage<T>> fn) {
867 +                return f.exceptionallyComposeAsync(fn, new ThreadExecutor());
868 +            }
869 +
870          };
871  
872          public abstract void checkExecutionMode();
# Line 835 | Line 909 | public class CompletableFutureTest exten
909              (CompletableFuture<T> f,
910               CompletionStage<? extends T> g,
911               Function<? super T,U> a);
912 +        public abstract <T> CompletableFuture<T> exceptionally
913 +            (CompletableFuture<T> f,
914 +             Function<Throwable, ? extends T> fn);
915 +        public abstract <T> CompletableFuture<T> exceptionallyCompose
916 +            (CompletableFuture<T> f,
917 +             Function<Throwable, ? extends CompletionStage<T>> fn);
918      }
919  
920      /**
# Line 842 | Line 922 | public class CompletableFutureTest exten
922       * normally, and source result is propagated
923       */
924      public void testExceptionally_normalCompletion() {
925 +        for (ExecutionMode m : ExecutionMode.values())
926          for (boolean createIncomplete : new boolean[] { true, false })
927          for (Integer v1 : new Integer[] { 1, null })
928      {
848        final AtomicInteger a = new AtomicInteger(0);
929          final CompletableFuture<Integer> f = new CompletableFuture<>();
930          if (!createIncomplete) assertTrue(f.complete(v1));
931 <        final CompletableFuture<Integer> g = f.exceptionally
932 <            ((Throwable t) -> {
933 <                // Should not be called
934 <                a.getAndIncrement();
855 <                throw new AssertionError();
931 >        final CompletableFuture<Integer> g = m.exceptionally
932 >            (f, (Throwable t) -> {
933 >                threadFail("should not be called");
934 >                return null;            // unreached
935              });
936          if (createIncomplete) assertTrue(f.complete(v1));
937  
938          checkCompletedNormally(g, v1);
939          checkCompletedNormally(f, v1);
861        assertEquals(0, a.get());
940      }}
941  
942      /**
# Line 866 | Line 944 | public class CompletableFutureTest exten
944       * exception
945       */
946      public void testExceptionally_exceptionalCompletion() {
947 +        for (ExecutionMode m : ExecutionMode.values())
948          for (boolean createIncomplete : new boolean[] { true, false })
949          for (Integer v1 : new Integer[] { 1, null })
950      {
# Line 873 | Line 952 | public class CompletableFutureTest exten
952          final CFException ex = new CFException();
953          final CompletableFuture<Integer> f = new CompletableFuture<>();
954          if (!createIncomplete) f.completeExceptionally(ex);
955 <        final CompletableFuture<Integer> g = f.exceptionally
956 <            ((Throwable t) -> {
957 <                ExecutionMode.DEFAULT.checkExecutionMode();
955 >        final CompletableFuture<Integer> g = m.exceptionally
956 >            (f, (Throwable t) -> {
957 >                m.checkExecutionMode();
958                  threadAssertSame(t, ex);
959                  a.getAndIncrement();
960                  return v1;
# Line 886 | Line 965 | public class CompletableFutureTest exten
965          assertEquals(1, a.get());
966      }}
967  
968 +    /**
969 +     * If an "exceptionally action" throws an exception, it completes
970 +     * exceptionally with that exception
971 +     */
972      public void testExceptionally_exceptionalCompletionActionFailed() {
973 +        for (ExecutionMode m : ExecutionMode.values())
974          for (boolean createIncomplete : new boolean[] { true, false })
891        for (Integer v1 : new Integer[] { 1, null })
975      {
976          final AtomicInteger a = new AtomicInteger(0);
977          final CFException ex1 = new CFException();
978          final CFException ex2 = new CFException();
979          final CompletableFuture<Integer> f = new CompletableFuture<>();
980          if (!createIncomplete) f.completeExceptionally(ex1);
981 <        final CompletableFuture<Integer> g = f.exceptionally
982 <            ((Throwable t) -> {
983 <                ExecutionMode.DEFAULT.checkExecutionMode();
981 >        final CompletableFuture<Integer> g = m.exceptionally
982 >            (f, (Throwable t) -> {
983 >                m.checkExecutionMode();
984                  threadAssertSame(t, ex1);
985                  a.getAndIncrement();
986                  throw ex2;
# Line 905 | Line 988 | public class CompletableFutureTest exten
988          if (createIncomplete) f.completeExceptionally(ex1);
989  
990          checkCompletedWithWrappedException(g, ex2);
991 +        checkCompletedExceptionally(f, ex1);
992          assertEquals(1, a.get());
993      }}
994  
# Line 912 | Line 996 | public class CompletableFutureTest exten
996       * whenComplete action executes on normal completion, propagating
997       * source result.
998       */
999 <    public void testWhenComplete_normalCompletion1() {
999 >    public void testWhenComplete_normalCompletion() {
1000          for (ExecutionMode m : ExecutionMode.values())
1001          for (boolean createIncomplete : new boolean[] { true, false })
1002          for (Integer v1 : new Integer[] { 1, null })
# Line 922 | Line 1006 | public class CompletableFutureTest exten
1006          if (!createIncomplete) assertTrue(f.complete(v1));
1007          final CompletableFuture<Integer> g = m.whenComplete
1008              (f,
1009 <             (Integer x, Throwable t) -> {
1009 >             (Integer result, Throwable t) -> {
1010                  m.checkExecutionMode();
1011 <                threadAssertSame(x, v1);
1011 >                threadAssertSame(result, v1);
1012                  threadAssertNull(t);
1013                  a.getAndIncrement();
1014              });
# Line 942 | Line 1026 | public class CompletableFutureTest exten
1026      public void testWhenComplete_exceptionalCompletion() {
1027          for (ExecutionMode m : ExecutionMode.values())
1028          for (boolean createIncomplete : new boolean[] { true, false })
945        for (Integer v1 : new Integer[] { 1, null })
1029      {
1030          final AtomicInteger a = new AtomicInteger(0);
1031          final CFException ex = new CFException();
# Line 950 | Line 1033 | public class CompletableFutureTest exten
1033          if (!createIncomplete) f.completeExceptionally(ex);
1034          final CompletableFuture<Integer> g = m.whenComplete
1035              (f,
1036 <             (Integer x, Throwable t) -> {
1036 >             (Integer result, Throwable t) -> {
1037                  m.checkExecutionMode();
1038 <                threadAssertNull(x);
1038 >                threadAssertNull(result);
1039                  threadAssertSame(t, ex);
1040                  a.getAndIncrement();
1041              });
# Line 977 | Line 1060 | public class CompletableFutureTest exten
1060          if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1061          final CompletableFuture<Integer> g = m.whenComplete
1062              (f,
1063 <             (Integer x, Throwable t) -> {
1063 >             (Integer result, Throwable t) -> {
1064                  m.checkExecutionMode();
1065 <                threadAssertNull(x);
1065 >                threadAssertNull(result);
1066                  threadAssertTrue(t instanceof CancellationException);
1067                  a.getAndIncrement();
1068              });
# Line 994 | Line 1077 | public class CompletableFutureTest exten
1077       * If a whenComplete action throws an exception when triggered by
1078       * a normal completion, it completes exceptionally
1079       */
1080 <    public void testWhenComplete_actionFailed() {
1080 >    public void testWhenComplete_sourceCompletedNormallyActionFailed() {
1081          for (boolean createIncomplete : new boolean[] { true, false })
1082          for (ExecutionMode m : ExecutionMode.values())
1083          for (Integer v1 : new Integer[] { 1, null })
# Line 1005 | Line 1088 | public class CompletableFutureTest exten
1088          if (!createIncomplete) assertTrue(f.complete(v1));
1089          final CompletableFuture<Integer> g = m.whenComplete
1090              (f,
1091 <             (Integer x, Throwable t) -> {
1091 >             (Integer result, Throwable t) -> {
1092                  m.checkExecutionMode();
1093 <                threadAssertSame(x, v1);
1093 >                threadAssertSame(result, v1);
1094                  threadAssertNull(t);
1095                  a.getAndIncrement();
1096                  throw ex;
# Line 1022 | Line 1105 | public class CompletableFutureTest exten
1105      /**
1106       * If a whenComplete action throws an exception when triggered by
1107       * a source completion that also throws an exception, the source
1108 <     * exception takes precedence.
1108 >     * exception takes precedence (unlike handle)
1109       */
1110 <    public void testWhenComplete_actionFailedSourceFailed() {
1110 >    public void testWhenComplete_sourceFailedActionFailed() {
1111          for (boolean createIncomplete : new boolean[] { true, false })
1112          for (ExecutionMode m : ExecutionMode.values())
1030        for (Integer v1 : new Integer[] { 1, null })
1113      {
1114          final AtomicInteger a = new AtomicInteger(0);
1115          final CFException ex1 = new CFException();
# Line 1037 | Line 1119 | public class CompletableFutureTest exten
1119          if (!createIncomplete) f.completeExceptionally(ex1);
1120          final CompletableFuture<Integer> g = m.whenComplete
1121              (f,
1122 <             (Integer x, Throwable t) -> {
1122 >             (Integer result, Throwable t) -> {
1123                  m.checkExecutionMode();
1124                  threadAssertSame(t, ex1);
1125 <                threadAssertNull(x);
1125 >                threadAssertNull(result);
1126                  a.getAndIncrement();
1127                  throw ex2;
1128              });
# Line 1048 | Line 1130 | public class CompletableFutureTest exten
1130  
1131          checkCompletedWithWrappedException(g, ex1);
1132          checkCompletedExceptionally(f, ex1);
1133 +        if (testImplementationDetails) {
1134 +            assertEquals(1, ex1.getSuppressed().length);
1135 +            assertSame(ex2, ex1.getSuppressed()[0]);
1136 +        }
1137          assertEquals(1, a.get());
1138      }}
1139  
# Line 1065 | Line 1151 | public class CompletableFutureTest exten
1151          if (!createIncomplete) assertTrue(f.complete(v1));
1152          final CompletableFuture<Integer> g = m.handle
1153              (f,
1154 <             (Integer x, Throwable t) -> {
1154 >             (Integer result, Throwable t) -> {
1155                  m.checkExecutionMode();
1156 <                threadAssertSame(x, v1);
1156 >                threadAssertSame(result, v1);
1157                  threadAssertNull(t);
1158                  a.getAndIncrement();
1159                  return inc(v1);
# Line 1094 | Line 1180 | public class CompletableFutureTest exten
1180          if (!createIncomplete) f.completeExceptionally(ex);
1181          final CompletableFuture<Integer> g = m.handle
1182              (f,
1183 <             (Integer x, Throwable t) -> {
1183 >             (Integer result, Throwable t) -> {
1184                  m.checkExecutionMode();
1185 <                threadAssertNull(x);
1185 >                threadAssertNull(result);
1186                  threadAssertSame(t, ex);
1187                  a.getAndIncrement();
1188                  return v1;
# Line 1123 | Line 1209 | public class CompletableFutureTest exten
1209          if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1210          final CompletableFuture<Integer> g = m.handle
1211              (f,
1212 <             (Integer x, Throwable t) -> {
1212 >             (Integer result, Throwable t) -> {
1213                  m.checkExecutionMode();
1214 <                threadAssertNull(x);
1214 >                threadAssertNull(result);
1215                  threadAssertTrue(t instanceof CancellationException);
1216                  a.getAndIncrement();
1217                  return v1;
# Line 1138 | Line 1224 | public class CompletableFutureTest exten
1224      }}
1225  
1226      /**
1227 <     * handle result completes exceptionally if action does
1227 >     * If a "handle action" throws an exception when triggered by
1228 >     * a normal completion, it completes exceptionally
1229       */
1230 <    public void testHandle_sourceFailedActionFailed() {
1230 >    public void testHandle_sourceCompletedNormallyActionFailed() {
1231          for (ExecutionMode m : ExecutionMode.values())
1232          for (boolean createIncomplete : new boolean[] { true, false })
1233 +        for (Integer v1 : new Integer[] { 1, null })
1234      {
1235          final CompletableFuture<Integer> f = new CompletableFuture<>();
1236          final AtomicInteger a = new AtomicInteger(0);
1237 <        final CFException ex1 = new CFException();
1238 <        final CFException ex2 = new CFException();
1151 <        if (!createIncomplete) f.completeExceptionally(ex1);
1237 >        final CFException ex = new CFException();
1238 >        if (!createIncomplete) assertTrue(f.complete(v1));
1239          final CompletableFuture<Integer> g = m.handle
1240              (f,
1241 <             (Integer x, Throwable t) -> {
1241 >             (Integer result, Throwable t) -> {
1242                  m.checkExecutionMode();
1243 <                threadAssertNull(x);
1244 <                threadAssertSame(ex1, t);
1243 >                threadAssertSame(result, v1);
1244 >                threadAssertNull(t);
1245                  a.getAndIncrement();
1246 <                throw ex2;
1246 >                throw ex;
1247              });
1248 <        if (createIncomplete) f.completeExceptionally(ex1);
1248 >        if (createIncomplete) assertTrue(f.complete(v1));
1249  
1250 <        checkCompletedWithWrappedException(g, ex2);
1251 <        checkCompletedExceptionally(f, ex1);
1250 >        checkCompletedWithWrappedException(g, ex);
1251 >        checkCompletedNormally(f, v1);
1252          assertEquals(1, a.get());
1253      }}
1254  
1255 <    public void testHandle_sourceCompletedNormallyActionFailed() {
1256 <        for (ExecutionMode m : ExecutionMode.values())
1255 >    /**
1256 >     * If a "handle action" throws an exception when triggered by
1257 >     * a source completion that also throws an exception, the action
1258 >     * exception takes precedence (unlike whenComplete)
1259 >     */
1260 >    public void testHandle_sourceFailedActionFailed() {
1261          for (boolean createIncomplete : new boolean[] { true, false })
1262 <        for (Integer v1 : new Integer[] { 1, null })
1262 >        for (ExecutionMode m : ExecutionMode.values())
1263      {
1173        final CompletableFuture<Integer> f = new CompletableFuture<>();
1264          final AtomicInteger a = new AtomicInteger(0);
1265 <        final CFException ex = new CFException();
1266 <        if (!createIncomplete) assertTrue(f.complete(v1));
1265 >        final CFException ex1 = new CFException();
1266 >        final CFException ex2 = new CFException();
1267 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1268 >
1269 >        if (!createIncomplete) f.completeExceptionally(ex1);
1270          final CompletableFuture<Integer> g = m.handle
1271              (f,
1272 <             (Integer x, Throwable t) -> {
1272 >             (Integer result, Throwable t) -> {
1273                  m.checkExecutionMode();
1274 <                threadAssertSame(x, v1);
1275 <                threadAssertNull(t);
1274 >                threadAssertNull(result);
1275 >                threadAssertSame(ex1, t);
1276                  a.getAndIncrement();
1277 <                throw ex;
1277 >                throw ex2;
1278              });
1279 <        if (createIncomplete) assertTrue(f.complete(v1));
1279 >        if (createIncomplete) f.completeExceptionally(ex1);
1280  
1281 <        checkCompletedWithWrappedException(g, ex);
1282 <        checkCompletedNormally(f, v1);
1281 >        checkCompletedWithWrappedException(g, ex2);
1282 >        checkCompletedExceptionally(f, ex1);
1283          assertEquals(1, a.get());
1284      }}
1285  
# Line 1219 | Line 1312 | public class CompletableFutureTest exten
1312      {
1313          final FailingRunnable r = new FailingRunnable(m);
1314          final CompletableFuture<Void> f = m.runAsync(r);
1315 <        checkCompletedWithWrappedCFException(f);
1315 >        checkCompletedWithWrappedException(f, r.ex);
1316          r.assertInvoked();
1317      }}
1318  
1319 +    @SuppressWarnings("FutureReturnValueIgnored")
1320 +    public void testRunAsync_rejectingExecutor() {
1321 +        CountingRejectingExecutor e = new CountingRejectingExecutor();
1322 +        try {
1323 +            CompletableFuture.runAsync(() -> {}, e);
1324 +            shouldThrow();
1325 +        } catch (Throwable t) {
1326 +            assertSame(e.ex, t);
1327 +        }
1328 +
1329 +        assertEquals(1, e.count.get());
1330 +    }
1331 +
1332      /**
1333       * supplyAsync completes with result of supplier
1334       */
# Line 1253 | Line 1359 | public class CompletableFutureTest exten
1359      {
1360          FailingSupplier r = new FailingSupplier(m);
1361          CompletableFuture<Integer> f = m.supplyAsync(r);
1362 <        checkCompletedWithWrappedCFException(f);
1362 >        checkCompletedWithWrappedException(f, r.ex);
1363          r.assertInvoked();
1364      }}
1365  
1366 +    @SuppressWarnings("FutureReturnValueIgnored")
1367 +    public void testSupplyAsync_rejectingExecutor() {
1368 +        CountingRejectingExecutor e = new CountingRejectingExecutor();
1369 +        try {
1370 +            CompletableFuture.supplyAsync(() -> null, e);
1371 +            shouldThrow();
1372 +        } catch (Throwable t) {
1373 +            assertSame(e.ex, t);
1374 +        }
1375 +
1376 +        assertEquals(1, e.count.get());
1377 +    }
1378 +
1379      // seq completion methods
1380  
1381      /**
# Line 1264 | Line 1383 | public class CompletableFutureTest exten
1383       */
1384      public void testThenRun_normalCompletion() {
1385          for (ExecutionMode m : ExecutionMode.values())
1267        for (boolean createIncomplete : new boolean[] { true, false })
1386          for (Integer v1 : new Integer[] { 1, null })
1387      {
1388          final CompletableFuture<Integer> f = new CompletableFuture<>();
1389 <        final Noop r = new Noop(m);
1390 <        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 <        }
1389 >        final Noop[] rs = new Noop[6];
1390 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1391  
1392 <        checkCompletedNormally(g, null);
1392 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1393 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1394 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1395 >        checkIncomplete(h0);
1396 >        checkIncomplete(h1);
1397 >        checkIncomplete(h2);
1398 >        assertTrue(f.complete(v1));
1399 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1400 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1401 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1402 >
1403 >        checkCompletedNormally(h0, null);
1404 >        checkCompletedNormally(h1, null);
1405 >        checkCompletedNormally(h2, null);
1406 >        checkCompletedNormally(h3, null);
1407 >        checkCompletedNormally(h4, null);
1408 >        checkCompletedNormally(h5, null);
1409          checkCompletedNormally(f, v1);
1410 <        r.assertInvoked();
1410 >        for (Noop r : rs) r.assertInvoked();
1411      }}
1412  
1413      /**
# Line 1287 | Line 1416 | public class CompletableFutureTest exten
1416       */
1417      public void testThenRun_exceptionalCompletion() {
1418          for (ExecutionMode m : ExecutionMode.values())
1290        for (boolean createIncomplete : new boolean[] { true, false })
1419      {
1420          final CFException ex = new CFException();
1421          final CompletableFuture<Integer> f = new CompletableFuture<>();
1422 <        final Noop r = new Noop(m);
1423 <        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 <        }
1422 >        final Noop[] rs = new Noop[6];
1423 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1424  
1425 <        checkCompletedWithWrappedException(g, ex);
1425 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1426 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1427 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1428 >        checkIncomplete(h0);
1429 >        checkIncomplete(h1);
1430 >        checkIncomplete(h2);
1431 >        assertTrue(f.completeExceptionally(ex));
1432 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1433 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1434 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1435 >
1436 >        checkCompletedWithWrappedException(h0, ex);
1437 >        checkCompletedWithWrappedException(h1, ex);
1438 >        checkCompletedWithWrappedException(h2, ex);
1439 >        checkCompletedWithWrappedException(h3, ex);
1440 >        checkCompletedWithWrappedException(h4, ex);
1441 >        checkCompletedWithWrappedException(h5, ex);
1442          checkCompletedExceptionally(f, ex);
1443 <        r.assertNotInvoked();
1443 >        for (Noop r : rs) r.assertNotInvoked();
1444      }}
1445  
1446      /**
# Line 1309 | Line 1448 | public class CompletableFutureTest exten
1448       */
1449      public void testThenRun_sourceCancelled() {
1450          for (ExecutionMode m : ExecutionMode.values())
1312        for (boolean createIncomplete : new boolean[] { true, false })
1451          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1452      {
1453          final CompletableFuture<Integer> f = new CompletableFuture<>();
1454 <        final Noop r = new Noop(m);
1455 <        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 <        }
1454 >        final Noop[] rs = new Noop[6];
1455 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1456  
1457 <        checkCompletedWithWrappedCancellationException(g);
1457 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1458 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1459 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1460 >        checkIncomplete(h0);
1461 >        checkIncomplete(h1);
1462 >        checkIncomplete(h2);
1463 >        assertTrue(f.cancel(mayInterruptIfRunning));
1464 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1465 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1466 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1467 >
1468 >        checkCompletedWithWrappedCancellationException(h0);
1469 >        checkCompletedWithWrappedCancellationException(h1);
1470 >        checkCompletedWithWrappedCancellationException(h2);
1471 >        checkCompletedWithWrappedCancellationException(h3);
1472 >        checkCompletedWithWrappedCancellationException(h4);
1473 >        checkCompletedWithWrappedCancellationException(h5);
1474          checkCancelled(f);
1475 <        r.assertNotInvoked();
1475 >        for (Noop r : rs) r.assertNotInvoked();
1476      }}
1477  
1478      /**
# Line 1331 | Line 1480 | public class CompletableFutureTest exten
1480       */
1481      public void testThenRun_actionFailed() {
1482          for (ExecutionMode m : ExecutionMode.values())
1334        for (boolean createIncomplete : new boolean[] { true, false })
1483          for (Integer v1 : new Integer[] { 1, null })
1484      {
1485          final CompletableFuture<Integer> f = new CompletableFuture<>();
1486 <        final FailingRunnable r = new FailingRunnable(m);
1487 <        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 <        }
1486 >        final FailingRunnable[] rs = new FailingRunnable[6];
1487 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingRunnable(m);
1488  
1489 <        checkCompletedWithWrappedCFException(g);
1489 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1490 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1491 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1492 >        assertTrue(f.complete(v1));
1493 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1494 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1495 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1496 >
1497 >        checkCompletedWithWrappedException(h0, rs[0].ex);
1498 >        checkCompletedWithWrappedException(h1, rs[1].ex);
1499 >        checkCompletedWithWrappedException(h2, rs[2].ex);
1500 >        checkCompletedWithWrappedException(h3, rs[3].ex);
1501 >        checkCompletedWithWrappedException(h4, rs[4].ex);
1502 >        checkCompletedWithWrappedException(h5, rs[5].ex);
1503          checkCompletedNormally(f, v1);
1504      }}
1505  
# Line 1352 | Line 1508 | public class CompletableFutureTest exten
1508       */
1509      public void testThenApply_normalCompletion() {
1510          for (ExecutionMode m : ExecutionMode.values())
1355        for (boolean createIncomplete : new boolean[] { true, false })
1511          for (Integer v1 : new Integer[] { 1, null })
1512      {
1513          final CompletableFuture<Integer> f = new CompletableFuture<>();
1514 <        final IncFunction r = new IncFunction(m);
1515 <        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 <        }
1514 >        final IncFunction[] rs = new IncFunction[4];
1515 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1516  
1517 <        checkCompletedNormally(g, inc(v1));
1517 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1518 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1519 >        checkIncomplete(h0);
1520 >        checkIncomplete(h1);
1521 >        assertTrue(f.complete(v1));
1522 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1523 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1524 >
1525 >        checkCompletedNormally(h0, inc(v1));
1526 >        checkCompletedNormally(h1, inc(v1));
1527 >        checkCompletedNormally(h2, inc(v1));
1528 >        checkCompletedNormally(h3, inc(v1));
1529          checkCompletedNormally(f, v1);
1530 <        r.assertValue(inc(v1));
1530 >        for (IncFunction r : rs) r.assertValue(inc(v1));
1531      }}
1532  
1533      /**
# Line 1375 | Line 1536 | public class CompletableFutureTest exten
1536       */
1537      public void testThenApply_exceptionalCompletion() {
1538          for (ExecutionMode m : ExecutionMode.values())
1378        for (boolean createIncomplete : new boolean[] { true, false })
1539      {
1540          final CFException ex = new CFException();
1541          final CompletableFuture<Integer> f = new CompletableFuture<>();
1542 <        final IncFunction r = new IncFunction(m);
1543 <        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 <        }
1542 >        final IncFunction[] rs = new IncFunction[4];
1543 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1544  
1545 <        checkCompletedWithWrappedException(g, ex);
1545 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1546 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1547 >        assertTrue(f.completeExceptionally(ex));
1548 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1549 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1550 >
1551 >        checkCompletedWithWrappedException(h0, ex);
1552 >        checkCompletedWithWrappedException(h1, ex);
1553 >        checkCompletedWithWrappedException(h2, ex);
1554 >        checkCompletedWithWrappedException(h3, ex);
1555          checkCompletedExceptionally(f, ex);
1556 <        r.assertNotInvoked();
1556 >        for (IncFunction r : rs) r.assertNotInvoked();
1557      }}
1558  
1559      /**
# Line 1397 | Line 1561 | public class CompletableFutureTest exten
1561       */
1562      public void testThenApply_sourceCancelled() {
1563          for (ExecutionMode m : ExecutionMode.values())
1400        for (boolean createIncomplete : new boolean[] { true, false })
1564          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1565      {
1566          final CompletableFuture<Integer> f = new CompletableFuture<>();
1567 <        final IncFunction r = new IncFunction(m);
1568 <        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 <        }
1567 >        final IncFunction[] rs = new IncFunction[4];
1568 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1569  
1570 <        checkCompletedWithWrappedCancellationException(g);
1570 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1571 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1572 >        assertTrue(f.cancel(mayInterruptIfRunning));
1573 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1574 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1575 >
1576 >        checkCompletedWithWrappedCancellationException(h0);
1577 >        checkCompletedWithWrappedCancellationException(h1);
1578 >        checkCompletedWithWrappedCancellationException(h2);
1579 >        checkCompletedWithWrappedCancellationException(h3);
1580          checkCancelled(f);
1581 <        r.assertNotInvoked();
1581 >        for (IncFunction r : rs) r.assertNotInvoked();
1582      }}
1583  
1584      /**
# Line 1419 | Line 1586 | public class CompletableFutureTest exten
1586       */
1587      public void testThenApply_actionFailed() {
1588          for (ExecutionMode m : ExecutionMode.values())
1422        for (boolean createIncomplete : new boolean[] { true, false })
1589          for (Integer v1 : new Integer[] { 1, null })
1590      {
1591          final CompletableFuture<Integer> f = new CompletableFuture<>();
1592 <        final FailingFunction r = new FailingFunction(m);
1593 <        if (!createIncomplete) assertTrue(f.complete(v1));
1594 <        final CompletableFuture<Integer> g = m.thenApply(f, r);
1595 <        if (createIncomplete) {
1596 <            checkIncomplete(g);
1597 <            assertTrue(f.complete(v1));
1598 <        }
1592 >        final FailingFunction[] rs = new FailingFunction[4];
1593 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingFunction(m);
1594 >
1595 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1596 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1597 >        assertTrue(f.complete(v1));
1598 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1599 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1600  
1601 <        checkCompletedWithWrappedCFException(g);
1601 >        checkCompletedWithWrappedException(h0, rs[0].ex);
1602 >        checkCompletedWithWrappedException(h1, rs[1].ex);
1603 >        checkCompletedWithWrappedException(h2, rs[2].ex);
1604 >        checkCompletedWithWrappedException(h3, rs[3].ex);
1605          checkCompletedNormally(f, v1);
1606      }}
1607  
# Line 1440 | Line 1610 | public class CompletableFutureTest exten
1610       */
1611      public void testThenAccept_normalCompletion() {
1612          for (ExecutionMode m : ExecutionMode.values())
1443        for (boolean createIncomplete : new boolean[] { true, false })
1613          for (Integer v1 : new Integer[] { 1, null })
1614      {
1615          final CompletableFuture<Integer> f = new CompletableFuture<>();
1616 <        final NoopConsumer r = new NoopConsumer(m);
1617 <        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 <        }
1616 >        final NoopConsumer[] rs = new NoopConsumer[4];
1617 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1618  
1619 <        checkCompletedNormally(g, null);
1620 <        r.assertValue(v1);
1619 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1620 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1621 >        checkIncomplete(h0);
1622 >        checkIncomplete(h1);
1623 >        assertTrue(f.complete(v1));
1624 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1625 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1626 >
1627 >        checkCompletedNormally(h0, null);
1628 >        checkCompletedNormally(h1, null);
1629 >        checkCompletedNormally(h2, null);
1630 >        checkCompletedNormally(h3, null);
1631          checkCompletedNormally(f, v1);
1632 +        for (NoopConsumer r : rs) r.assertValue(v1);
1633      }}
1634  
1635      /**
# Line 1463 | Line 1638 | public class CompletableFutureTest exten
1638       */
1639      public void testThenAccept_exceptionalCompletion() {
1640          for (ExecutionMode m : ExecutionMode.values())
1466        for (boolean createIncomplete : new boolean[] { true, false })
1641      {
1642          final CFException ex = new CFException();
1643          final CompletableFuture<Integer> f = new CompletableFuture<>();
1644 <        final NoopConsumer r = new NoopConsumer(m);
1645 <        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 <        }
1644 >        final NoopConsumer[] rs = new NoopConsumer[4];
1645 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1646  
1647 <        checkCompletedWithWrappedException(g, ex);
1647 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1648 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1649 >        assertTrue(f.completeExceptionally(ex));
1650 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1651 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1652 >
1653 >        checkCompletedWithWrappedException(h0, ex);
1654 >        checkCompletedWithWrappedException(h1, ex);
1655 >        checkCompletedWithWrappedException(h2, ex);
1656 >        checkCompletedWithWrappedException(h3, ex);
1657          checkCompletedExceptionally(f, ex);
1658 <        r.assertNotInvoked();
1658 >        for (NoopConsumer r : rs) r.assertNotInvoked();
1659      }}
1660  
1661      /**
# Line 1485 | Line 1663 | public class CompletableFutureTest exten
1663       */
1664      public void testThenAccept_sourceCancelled() {
1665          for (ExecutionMode m : ExecutionMode.values())
1488        for (boolean createIncomplete : new boolean[] { true, false })
1666          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1667      {
1668          final CompletableFuture<Integer> f = new CompletableFuture<>();
1669 <        final NoopConsumer r = new NoopConsumer(m);
1670 <        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 <        }
1669 >        final NoopConsumer[] rs = new NoopConsumer[4];
1670 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1671  
1672 <        checkCompletedWithWrappedCancellationException(g);
1672 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1673 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1674 >        assertTrue(f.cancel(mayInterruptIfRunning));
1675 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1676 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1677 >
1678 >        checkCompletedWithWrappedCancellationException(h0);
1679 >        checkCompletedWithWrappedCancellationException(h1);
1680 >        checkCompletedWithWrappedCancellationException(h2);
1681 >        checkCompletedWithWrappedCancellationException(h3);
1682          checkCancelled(f);
1683 <        r.assertNotInvoked();
1683 >        for (NoopConsumer r : rs) r.assertNotInvoked();
1684      }}
1685  
1686      /**
# Line 1507 | Line 1688 | public class CompletableFutureTest exten
1688       */
1689      public void testThenAccept_actionFailed() {
1690          for (ExecutionMode m : ExecutionMode.values())
1510        for (boolean createIncomplete : new boolean[] { true, false })
1691          for (Integer v1 : new Integer[] { 1, null })
1692      {
1693          final CompletableFuture<Integer> f = new CompletableFuture<>();
1694 <        final FailingConsumer r = new FailingConsumer(m);
1695 <        if (!createIncomplete) f.complete(v1);
1696 <        final CompletableFuture<Void> g = m.thenAccept(f, r);
1697 <        if (createIncomplete) {
1698 <            checkIncomplete(g);
1699 <            f.complete(v1);
1700 <        }
1694 >        final FailingConsumer[] rs = new FailingConsumer[4];
1695 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingConsumer(m);
1696 >
1697 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1698 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1699 >        assertTrue(f.complete(v1));
1700 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1701 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1702  
1703 <        checkCompletedWithWrappedCFException(g);
1703 >        checkCompletedWithWrappedException(h0, rs[0].ex);
1704 >        checkCompletedWithWrappedException(h1, rs[1].ex);
1705 >        checkCompletedWithWrappedException(h2, rs[2].ex);
1706 >        checkCompletedWithWrappedException(h3, rs[3].ex);
1707          checkCompletedNormally(f, v1);
1708      }}
1709  
# Line 1535 | Line 1719 | public class CompletableFutureTest exten
1719      {
1720          final CompletableFuture<Integer> f = new CompletableFuture<>();
1721          final CompletableFuture<Integer> g = new CompletableFuture<>();
1722 <        final SubtractFunction r1 = new SubtractFunction(m);
1723 <        final SubtractFunction r2 = new SubtractFunction(m);
1540 <        final SubtractFunction r3 = new SubtractFunction(m);
1722 >        final SubtractFunction[] rs = new SubtractFunction[6];
1723 >        for (int i = 0; i < rs.length; i++) rs[i] = new SubtractFunction(m);
1724  
1725          final CompletableFuture<Integer> fst =  fFirst ? f : g;
1726          final CompletableFuture<Integer> snd = !fFirst ? f : g;
1727          final Integer w1 =  fFirst ? v1 : v2;
1728          final Integer w2 = !fFirst ? v1 : v2;
1729  
1730 <        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1730 >        final CompletableFuture<Integer> h0 = m.thenCombine(f, g, rs[0]);
1731 >        final CompletableFuture<Integer> h1 = m.thenCombine(fst, fst, rs[1]);
1732          assertTrue(fst.complete(w1));
1733 <        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1734 <        checkIncomplete(h1);
1735 <        checkIncomplete(h2);
1736 <        r1.assertNotInvoked();
1737 <        r2.assertNotInvoked();
1733 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, rs[2]);
1734 >        final CompletableFuture<Integer> h3 = m.thenCombine(fst, fst, rs[3]);
1735 >        checkIncomplete(h0); rs[0].assertNotInvoked();
1736 >        checkIncomplete(h2); rs[2].assertNotInvoked();
1737 >        checkCompletedNormally(h1, subtract(w1, w1));
1738 >        checkCompletedNormally(h3, subtract(w1, w1));
1739 >        rs[1].assertValue(subtract(w1, w1));
1740 >        rs[3].assertValue(subtract(w1, w1));
1741          assertTrue(snd.complete(w2));
1742 <        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1742 >        final CompletableFuture<Integer> h4 = m.thenCombine(f, g, rs[4]);
1743  
1744 <        checkCompletedNormally(h1, subtract(v1, v2));
1744 >        checkCompletedNormally(h0, subtract(v1, v2));
1745          checkCompletedNormally(h2, subtract(v1, v2));
1746 <        checkCompletedNormally(h3, subtract(v1, v2));
1747 <        r1.assertValue(subtract(v1, v2));
1748 <        r2.assertValue(subtract(v1, v2));
1749 <        r3.assertValue(subtract(v1, v2));
1746 >        checkCompletedNormally(h4, subtract(v1, v2));
1747 >        rs[0].assertValue(subtract(v1, v2));
1748 >        rs[2].assertValue(subtract(v1, v2));
1749 >        rs[4].assertValue(subtract(v1, v2));
1750 >
1751          checkCompletedNormally(f, v1);
1752          checkCompletedNormally(g, v2);
1753      }}
# Line 1677 | Line 1865 | public class CompletableFutureTest exten
1865          assertTrue(snd.complete(w2));
1866          final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1867  
1868 <        checkCompletedWithWrappedCFException(h1);
1869 <        checkCompletedWithWrappedCFException(h2);
1870 <        checkCompletedWithWrappedCFException(h3);
1868 >        checkCompletedWithWrappedException(h1, r1.ex);
1869 >        checkCompletedWithWrappedException(h2, r2.ex);
1870 >        checkCompletedWithWrappedException(h3, r3.ex);
1871          r1.assertInvoked();
1872          r2.assertInvoked();
1873          r3.assertInvoked();
# Line 1841 | Line 2029 | public class CompletableFutureTest exten
2029          assertTrue(snd.complete(w2));
2030          final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
2031  
2032 <        checkCompletedWithWrappedCFException(h1);
2033 <        checkCompletedWithWrappedCFException(h2);
2034 <        checkCompletedWithWrappedCFException(h3);
2032 >        checkCompletedWithWrappedException(h1, r1.ex);
2033 >        checkCompletedWithWrappedException(h2, r2.ex);
2034 >        checkCompletedWithWrappedException(h3, r3.ex);
2035          r1.assertInvoked();
2036          r2.assertInvoked();
2037          r3.assertInvoked();
# Line 2005 | Line 2193 | public class CompletableFutureTest exten
2193          assertTrue(snd.complete(w2));
2194          final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2195  
2196 <        checkCompletedWithWrappedCFException(h1);
2197 <        checkCompletedWithWrappedCFException(h2);
2198 <        checkCompletedWithWrappedCFException(h3);
2196 >        checkCompletedWithWrappedException(h1, r1.ex);
2197 >        checkCompletedWithWrappedException(h2, r2.ex);
2198 >        checkCompletedWithWrappedException(h3, r3.ex);
2199          r1.assertInvoked();
2200          r2.assertInvoked();
2201          r3.assertInvoked();
# Line 2297 | Line 2485 | public class CompletableFutureTest exten
2485          f.complete(v1);
2486          final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2487          final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2488 <        checkCompletedWithWrappedCFException(h0);
2489 <        checkCompletedWithWrappedCFException(h1);
2490 <        checkCompletedWithWrappedCFException(h2);
2491 <        checkCompletedWithWrappedCFException(h3);
2488 >        checkCompletedWithWrappedException(h0, rs[0].ex);
2489 >        checkCompletedWithWrappedException(h1, rs[1].ex);
2490 >        checkCompletedWithWrappedException(h2, rs[2].ex);
2491 >        checkCompletedWithWrappedException(h3, rs[3].ex);
2492          for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2493  
2494          g.complete(v2);
# Line 2309 | Line 2497 | public class CompletableFutureTest exten
2497          final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2498          final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2499  
2500 <        checkCompletedWithWrappedCFException(h4);
2500 >        checkCompletedWithWrappedException(h4, rs[4].ex);
2501          assertTrue(Objects.equals(v1, rs[4].value) ||
2502                     Objects.equals(v2, rs[4].value));
2503 <        checkCompletedWithWrappedCFException(h5);
2503 >        checkCompletedWithWrappedException(h5, rs[5].ex);
2504          assertTrue(Objects.equals(v1, rs[5].value) ||
2505                     Objects.equals(v2, rs[5].value));
2506  
# Line 2450 | Line 2638 | public class CompletableFutureTest exten
2638  
2639          // unspecified behavior - both source completions available
2640          try {
2641 <            assertEquals(null, h0.join());
2641 >            assertNull(h0.join());
2642              rs[0].assertValue(v1);
2643          } catch (CompletionException ok) {
2644              checkCompletedWithWrappedException(h0, ex);
2645              rs[0].assertNotInvoked();
2646          }
2647          try {
2648 <            assertEquals(null, h1.join());
2648 >            assertNull(h1.join());
2649              rs[1].assertValue(v1);
2650          } catch (CompletionException ok) {
2651              checkCompletedWithWrappedException(h1, ex);
2652              rs[1].assertNotInvoked();
2653          }
2654          try {
2655 <            assertEquals(null, h2.join());
2655 >            assertNull(h2.join());
2656              rs[2].assertValue(v1);
2657          } catch (CompletionException ok) {
2658              checkCompletedWithWrappedException(h2, ex);
2659              rs[2].assertNotInvoked();
2660          }
2661          try {
2662 <            assertEquals(null, h3.join());
2662 >            assertNull(h3.join());
2663              rs[3].assertValue(v1);
2664          } catch (CompletionException ok) {
2665              checkCompletedWithWrappedException(h3, ex);
# Line 2556 | Line 2744 | public class CompletableFutureTest exten
2744          f.complete(v1);
2745          final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2746          final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2747 <        checkCompletedWithWrappedCFException(h0);
2748 <        checkCompletedWithWrappedCFException(h1);
2749 <        checkCompletedWithWrappedCFException(h2);
2750 <        checkCompletedWithWrappedCFException(h3);
2747 >        checkCompletedWithWrappedException(h0, rs[0].ex);
2748 >        checkCompletedWithWrappedException(h1, rs[1].ex);
2749 >        checkCompletedWithWrappedException(h2, rs[2].ex);
2750 >        checkCompletedWithWrappedException(h3, rs[3].ex);
2751          for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2752  
2753          g.complete(v2);
# Line 2568 | Line 2756 | public class CompletableFutureTest exten
2756          final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2757          final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2758  
2759 <        checkCompletedWithWrappedCFException(h4);
2759 >        checkCompletedWithWrappedException(h4, rs[4].ex);
2760          assertTrue(Objects.equals(v1, rs[4].value) ||
2761                     Objects.equals(v2, rs[4].value));
2762 <        checkCompletedWithWrappedCFException(h5);
2762 >        checkCompletedWithWrappedException(h5, rs[5].ex);
2763          assertTrue(Objects.equals(v1, rs[5].value) ||
2764                     Objects.equals(v2, rs[5].value));
2765  
# Line 2587 | Line 2775 | public class CompletableFutureTest exten
2775          for (ExecutionMode m : ExecutionMode.values())
2776          for (Integer v1 : new Integer[] { 1, null })
2777          for (Integer v2 : new Integer[] { 2, null })
2778 +        for (boolean pushNop : new boolean[] { true, false })
2779      {
2780          final CompletableFuture<Integer> f = new CompletableFuture<>();
2781          final CompletableFuture<Integer> g = new CompletableFuture<>();
# Line 2599 | Line 2788 | public class CompletableFutureTest exten
2788          checkIncomplete(h1);
2789          rs[0].assertNotInvoked();
2790          rs[1].assertNotInvoked();
2791 +        if (pushNop) {          // ad hoc test of intra-completion interference
2792 +            m.thenRun(f, () -> {});
2793 +            m.thenRun(g, () -> {});
2794 +        }
2795          f.complete(v1);
2796          checkCompletedNormally(h0, null);
2797          checkCompletedNormally(h1, null);
# Line 2705 | Line 2898 | public class CompletableFutureTest exten
2898  
2899          // unspecified behavior - both source completions available
2900          try {
2901 <            assertEquals(null, h0.join());
2901 >            assertNull(h0.join());
2902              rs[0].assertInvoked();
2903          } catch (CompletionException ok) {
2904              checkCompletedWithWrappedException(h0, ex);
2905              rs[0].assertNotInvoked();
2906          }
2907          try {
2908 <            assertEquals(null, h1.join());
2908 >            assertNull(h1.join());
2909              rs[1].assertInvoked();
2910          } catch (CompletionException ok) {
2911              checkCompletedWithWrappedException(h1, ex);
2912              rs[1].assertNotInvoked();
2913          }
2914          try {
2915 <            assertEquals(null, h2.join());
2915 >            assertNull(h2.join());
2916              rs[2].assertInvoked();
2917          } catch (CompletionException ok) {
2918              checkCompletedWithWrappedException(h2, ex);
2919              rs[2].assertNotInvoked();
2920          }
2921          try {
2922 <            assertEquals(null, h3.join());
2922 >            assertNull(h3.join());
2923              rs[3].assertInvoked();
2924          } catch (CompletionException ok) {
2925              checkCompletedWithWrappedException(h3, ex);
# Line 2811 | Line 3004 | public class CompletableFutureTest exten
3004          assertTrue(f.complete(v1));
3005          final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
3006          final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
3007 <        checkCompletedWithWrappedCFException(h0);
3008 <        checkCompletedWithWrappedCFException(h1);
3009 <        checkCompletedWithWrappedCFException(h2);
3010 <        checkCompletedWithWrappedCFException(h3);
3007 >        checkCompletedWithWrappedException(h0, rs[0].ex);
3008 >        checkCompletedWithWrappedException(h1, rs[1].ex);
3009 >        checkCompletedWithWrappedException(h2, rs[2].ex);
3010 >        checkCompletedWithWrappedException(h3, rs[3].ex);
3011          for (int i = 0; i < 4; i++) rs[i].assertInvoked();
3012          assertTrue(g.complete(v2));
3013          final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
3014          final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
3015 <        checkCompletedWithWrappedCFException(h4);
3016 <        checkCompletedWithWrappedCFException(h5);
3015 >        checkCompletedWithWrappedException(h4, rs[4].ex);
3016 >        checkCompletedWithWrappedException(h5, rs[5].ex);
3017  
3018          checkCompletedNormally(f, v1);
3019          checkCompletedNormally(g, v2);
# Line 2881 | Line 3074 | public class CompletableFutureTest exten
3074          final CompletableFuture<Integer> g = m.thenCompose(f, r);
3075          if (createIncomplete) assertTrue(f.complete(v1));
3076  
3077 <        checkCompletedWithWrappedCFException(g);
3077 >        checkCompletedWithWrappedException(g, r.ex);
3078          checkCompletedNormally(f, v1);
3079      }}
3080  
# Line 2906 | Line 3099 | public class CompletableFutureTest exten
3099          checkCancelled(f);
3100      }}
3101  
3102 +    /**
3103 +     * thenCompose result completes exceptionally if the result of the action does
3104 +     */
3105 +    public void testThenCompose_actionReturnsFailingFuture() {
3106 +        for (ExecutionMode m : ExecutionMode.values())
3107 +        for (int order = 0; order < 6; order++)
3108 +        for (Integer v1 : new Integer[] { 1, null })
3109 +    {
3110 +        final CFException ex = new CFException();
3111 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
3112 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
3113 +        final CompletableFuture<Integer> h;
3114 +        // Test all permutations of orders
3115 +        switch (order) {
3116 +        case 0:
3117 +            assertTrue(f.complete(v1));
3118 +            assertTrue(g.completeExceptionally(ex));
3119 +            h = m.thenCompose(f, x -> g);
3120 +            break;
3121 +        case 1:
3122 +            assertTrue(f.complete(v1));
3123 +            h = m.thenCompose(f, x -> g);
3124 +            assertTrue(g.completeExceptionally(ex));
3125 +            break;
3126 +        case 2:
3127 +            assertTrue(g.completeExceptionally(ex));
3128 +            assertTrue(f.complete(v1));
3129 +            h = m.thenCompose(f, x -> g);
3130 +            break;
3131 +        case 3:
3132 +            assertTrue(g.completeExceptionally(ex));
3133 +            h = m.thenCompose(f, x -> g);
3134 +            assertTrue(f.complete(v1));
3135 +            break;
3136 +        case 4:
3137 +            h = m.thenCompose(f, x -> g);
3138 +            assertTrue(f.complete(v1));
3139 +            assertTrue(g.completeExceptionally(ex));
3140 +            break;
3141 +        case 5:
3142 +            h = m.thenCompose(f, x -> g);
3143 +            assertTrue(f.complete(v1));
3144 +            assertTrue(g.completeExceptionally(ex));
3145 +            break;
3146 +        default: throw new AssertionError();
3147 +        }
3148 +
3149 +        checkCompletedExceptionally(g, ex);
3150 +        checkCompletedWithWrappedException(h, ex);
3151 +        checkCompletedNormally(f, v1);
3152 +    }}
3153 +
3154 +    /**
3155 +     * exceptionallyCompose result completes normally after normal
3156 +     * completion of source
3157 +     */
3158 +    public void testExceptionallyCompose_normalCompletion() {
3159 +        for (ExecutionMode m : ExecutionMode.values())
3160 +        for (boolean createIncomplete : new boolean[] { true, false })
3161 +        for (Integer v1 : new Integer[] { 1, null })
3162 +    {
3163 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
3164 +        final ExceptionalCompletableFutureFunction r =
3165 +            new ExceptionalCompletableFutureFunction(m);
3166 +        if (!createIncomplete) assertTrue(f.complete(v1));
3167 +        final CompletableFuture<Integer> g = m.exceptionallyCompose(f, r);
3168 +        if (createIncomplete) assertTrue(f.complete(v1));
3169 +
3170 +        checkCompletedNormally(f, v1);
3171 +        checkCompletedNormally(g, v1);
3172 +        r.assertNotInvoked();
3173 +    }}
3174 +
3175 +    /**
3176 +     * exceptionallyCompose result completes normally after exceptional
3177 +     * completion of source
3178 +     */
3179 +    public void testExceptionallyCompose_exceptionalCompletion() {
3180 +        for (ExecutionMode m : ExecutionMode.values())
3181 +        for (boolean createIncomplete : new boolean[] { true, false })
3182 +    {
3183 +        final CFException ex = new CFException();
3184 +        final ExceptionalCompletableFutureFunction r =
3185 +            new ExceptionalCompletableFutureFunction(m);
3186 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
3187 +        if (!createIncomplete) f.completeExceptionally(ex);
3188 +        final CompletableFuture<Integer> g = m.exceptionallyCompose(f, r);
3189 +        if (createIncomplete) f.completeExceptionally(ex);
3190 +
3191 +        checkCompletedExceptionally(f, ex);
3192 +        checkCompletedNormally(g, r.value);
3193 +        r.assertInvoked();
3194 +    }}
3195 +
3196 +    /**
3197 +     * exceptionallyCompose completes exceptionally on exception if action does
3198 +     */
3199 +    public void testExceptionallyCompose_actionFailed() {
3200 +        for (ExecutionMode m : ExecutionMode.values())
3201 +        for (boolean createIncomplete : new boolean[] { true, false })
3202 +    {
3203 +        final CFException ex = new CFException();
3204 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
3205 +        final FailingExceptionalCompletableFutureFunction r
3206 +            = new FailingExceptionalCompletableFutureFunction(m);
3207 +        if (!createIncomplete) f.completeExceptionally(ex);
3208 +        final CompletableFuture<Integer> g = m.exceptionallyCompose(f, r);
3209 +        if (createIncomplete) f.completeExceptionally(ex);
3210 +
3211 +        checkCompletedExceptionally(f, ex);
3212 +        checkCompletedWithWrappedException(g, r.ex);
3213 +        r.assertInvoked();
3214 +    }}
3215 +
3216 +    /**
3217 +     * exceptionallyCompose result completes exceptionally if the
3218 +     * result of the action does
3219 +     */
3220 +    public void testExceptionallyCompose_actionReturnsFailingFuture() {
3221 +        for (ExecutionMode m : ExecutionMode.values())
3222 +        for (int order = 0; order < 6; order++)
3223 +    {
3224 +        final CFException ex0 = new CFException();
3225 +        final CFException ex = new CFException();
3226 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
3227 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
3228 +        final CompletableFuture<Integer> h;
3229 +        // Test all permutations of orders
3230 +        switch (order) {
3231 +        case 0:
3232 +            assertTrue(f.completeExceptionally(ex0));
3233 +            assertTrue(g.completeExceptionally(ex));
3234 +            h = m.exceptionallyCompose(f, x -> g);
3235 +            break;
3236 +        case 1:
3237 +            assertTrue(f.completeExceptionally(ex0));
3238 +            h = m.exceptionallyCompose(f, x -> g);
3239 +            assertTrue(g.completeExceptionally(ex));
3240 +            break;
3241 +        case 2:
3242 +            assertTrue(g.completeExceptionally(ex));
3243 +            assertTrue(f.completeExceptionally(ex0));
3244 +            h = m.exceptionallyCompose(f, x -> g);
3245 +            break;
3246 +        case 3:
3247 +            assertTrue(g.completeExceptionally(ex));
3248 +            h = m.exceptionallyCompose(f, x -> g);
3249 +            assertTrue(f.completeExceptionally(ex0));
3250 +            break;
3251 +        case 4:
3252 +            h = m.exceptionallyCompose(f, x -> g);
3253 +            assertTrue(f.completeExceptionally(ex0));
3254 +            assertTrue(g.completeExceptionally(ex));
3255 +            break;
3256 +        case 5:
3257 +            h = m.exceptionallyCompose(f, x -> g);
3258 +            assertTrue(f.completeExceptionally(ex0));
3259 +            assertTrue(g.completeExceptionally(ex));
3260 +            break;
3261 +        default: throw new AssertionError();
3262 +        }
3263 +
3264 +        checkCompletedExceptionally(g, ex);
3265 +        checkCompletedWithWrappedException(h, ex);
3266 +        checkCompletedExceptionally(f, ex0);
3267 +    }}
3268 +
3269      // other static methods
3270  
3271      /**
# Line 2922 | Line 3282 | public class CompletableFutureTest exten
3282       * when all components complete normally
3283       */
3284      public void testAllOf_normal() throws Exception {
3285 <        for (int k = 1; k < 20; ++k) {
3285 >        for (int k = 1; k < 10; k++) {
3286              CompletableFuture<Integer>[] fs
3287                  = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3288 <            for (int i = 0; i < k; ++i)
3288 >            for (int i = 0; i < k; i++)
3289                  fs[i] = new CompletableFuture<>();
3290              CompletableFuture<Void> f = CompletableFuture.allOf(fs);
3291 <            for (int i = 0; i < k; ++i) {
3291 >            for (int i = 0; i < k; i++) {
3292                  checkIncomplete(f);
3293                  checkIncomplete(CompletableFuture.allOf(fs));
3294                  fs[i].complete(one);
# Line 2938 | Line 3298 | public class CompletableFutureTest exten
3298          }
3299      }
3300  
3301 <    public void testAllOf_backwards() throws Exception {
3302 <        for (int k = 1; k < 20; ++k) {
3301 >    public void testAllOf_normal_backwards() throws Exception {
3302 >        for (int k = 1; k < 10; k++) {
3303              CompletableFuture<Integer>[] fs
3304                  = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3305 <            for (int i = 0; i < k; ++i)
3305 >            for (int i = 0; i < k; i++)
3306                  fs[i] = new CompletableFuture<>();
3307              CompletableFuture<Void> f = CompletableFuture.allOf(fs);
3308              for (int i = k - 1; i >= 0; i--) {
# Line 2955 | Line 3315 | public class CompletableFutureTest exten
3315          }
3316      }
3317  
3318 +    public void testAllOf_exceptional() throws Exception {
3319 +        for (int k = 1; k < 10; k++) {
3320 +            CompletableFuture<Integer>[] fs
3321 +                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3322 +            CFException ex = new CFException();
3323 +            for (int i = 0; i < k; i++)
3324 +                fs[i] = new CompletableFuture<>();
3325 +            CompletableFuture<Void> f = CompletableFuture.allOf(fs);
3326 +            for (int i = 0; i < k; i++) {
3327 +                checkIncomplete(f);
3328 +                checkIncomplete(CompletableFuture.allOf(fs));
3329 +                if (i != k / 2) {
3330 +                    fs[i].complete(i);
3331 +                    checkCompletedNormally(fs[i], i);
3332 +                } else {
3333 +                    fs[i].completeExceptionally(ex);
3334 +                    checkCompletedExceptionally(fs[i], ex);
3335 +                }
3336 +            }
3337 +            checkCompletedWithWrappedException(f, ex);
3338 +            checkCompletedWithWrappedException(CompletableFuture.allOf(fs), ex);
3339 +        }
3340 +    }
3341 +
3342      /**
3343       * anyOf(no component futures) returns an incomplete future
3344       */
3345      public void testAnyOf_empty() throws Exception {
3346 +        for (Integer v1 : new Integer[] { 1, null })
3347 +    {
3348          CompletableFuture<Object> f = CompletableFuture.anyOf();
3349          checkIncomplete(f);
3350 <    }
3350 >
3351 >        f.complete(v1);
3352 >        checkCompletedNormally(f, v1);
3353 >    }}
3354  
3355      /**
3356       * anyOf returns a future completed normally with a value when
3357       * a component future does
3358       */
3359      public void testAnyOf_normal() throws Exception {
3360 <        for (int k = 0; k < 10; ++k) {
3360 >        for (int k = 0; k < 10; k++) {
3361              CompletableFuture[] fs = new CompletableFuture[k];
3362 <            for (int i = 0; i < k; ++i)
3362 >            for (int i = 0; i < k; i++)
3363                  fs[i] = new CompletableFuture<>();
3364              CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3365              checkIncomplete(f);
3366 <            for (int i = 0; i < k; ++i) {
3367 <                fs[i].complete(one);
3368 <                checkCompletedNormally(f, one);
3369 <                checkCompletedNormally(CompletableFuture.anyOf(fs), one);
3366 >            for (int i = 0; i < k; i++) {
3367 >                fs[i].complete(i);
3368 >                checkCompletedNormally(f, 0);
3369 >                int x = (int) CompletableFuture.anyOf(fs).join();
3370 >                assertTrue(0 <= x && x <= i);
3371 >            }
3372 >        }
3373 >    }
3374 >    public void testAnyOf_normal_backwards() throws Exception {
3375 >        for (int k = 0; k < 10; k++) {
3376 >            CompletableFuture[] fs = new CompletableFuture[k];
3377 >            for (int i = 0; i < k; i++)
3378 >                fs[i] = new CompletableFuture<>();
3379 >            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3380 >            checkIncomplete(f);
3381 >            for (int i = k - 1; i >= 0; i--) {
3382 >                fs[i].complete(i);
3383 >                checkCompletedNormally(f, k - 1);
3384 >                int x = (int) CompletableFuture.anyOf(fs).join();
3385 >                assertTrue(i <= x && x <= k - 1);
3386              }
3387          }
3388      }
# Line 2986 | Line 3391 | public class CompletableFutureTest exten
3391       * anyOf result completes exceptionally when any component does.
3392       */
3393      public void testAnyOf_exceptional() throws Exception {
3394 <        for (int k = 0; k < 10; ++k) {
3394 >        for (int k = 0; k < 10; k++) {
3395 >            CompletableFuture[] fs = new CompletableFuture[k];
3396 >            CFException[] exs = new CFException[k];
3397 >            for (int i = 0; i < k; i++) {
3398 >                fs[i] = new CompletableFuture<>();
3399 >                exs[i] = new CFException();
3400 >            }
3401 >            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3402 >            checkIncomplete(f);
3403 >            for (int i = 0; i < k; i++) {
3404 >                fs[i].completeExceptionally(exs[i]);
3405 >                checkCompletedWithWrappedException(f, exs[0]);
3406 >                checkCompletedWithWrappedCFException(CompletableFuture.anyOf(fs));
3407 >            }
3408 >        }
3409 >    }
3410 >
3411 >    public void testAnyOf_exceptional_backwards() throws Exception {
3412 >        for (int k = 0; k < 10; k++) {
3413              CompletableFuture[] fs = new CompletableFuture[k];
3414 <            for (int i = 0; i < k; ++i)
3414 >            CFException[] exs = new CFException[k];
3415 >            for (int i = 0; i < k; i++) {
3416                  fs[i] = new CompletableFuture<>();
3417 +                exs[i] = new CFException();
3418 +            }
3419              CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3420              checkIncomplete(f);
3421 <            for (int i = 0; i < k; ++i) {
3422 <                fs[i].completeExceptionally(new CFException());
3423 <                checkCompletedWithWrappedCFException(f);
3421 >            for (int i = k - 1; i >= 0; i--) {
3422 >                fs[i].completeExceptionally(exs[i]);
3423 >                checkCompletedWithWrappedException(f, exs[k - 1]);
3424                  checkCompletedWithWrappedCFException(CompletableFuture.anyOf(fs));
3425              }
3426          }
# Line 3003 | Line 3429 | public class CompletableFutureTest exten
3429      /**
3430       * Completion methods throw NullPointerException with null arguments
3431       */
3432 +    @SuppressWarnings("FutureReturnValueIgnored")
3433      public void testNPE() {
3434          CompletableFuture<Integer> f = new CompletableFuture<>();
3435          CompletableFuture<Integer> g = new CompletableFuture<>();
3436          CompletableFuture<Integer> nullFuture = (CompletableFuture<Integer>)null;
3010        CompletableFuture<?> h;
3437          ThreadExecutor exec = new ThreadExecutor();
3438  
3439          Runnable[] throwingActions = {
3440              () -> CompletableFuture.supplyAsync(null),
3441              () -> CompletableFuture.supplyAsync(null, exec),
3442 <            () -> CompletableFuture.supplyAsync(new IntegerSupplier(ExecutionMode.DEFAULT, 42), null),
3442 >            () -> CompletableFuture.supplyAsync(new IntegerSupplier(ExecutionMode.SYNC, 42), null),
3443  
3444              () -> CompletableFuture.runAsync(null),
3445              () -> CompletableFuture.runAsync(null, exec),
# Line 3023 | Line 3449 | public class CompletableFutureTest exten
3449  
3450              () -> f.thenApply(null),
3451              () -> f.thenApplyAsync(null),
3452 <            () -> f.thenApplyAsync((x) -> x, null),
3452 >            () -> f.thenApplyAsync(x -> x, null),
3453              () -> f.thenApplyAsync(null, exec),
3454  
3455              () -> f.thenAccept(null),
3456              () -> f.thenAcceptAsync(null),
3457 <            () -> f.thenAcceptAsync((x) -> {} , null),
3457 >            () -> f.thenAcceptAsync(x -> {} , null),
3458              () -> f.thenAcceptAsync(null, exec),
3459  
3460              () -> f.thenRun(null),
# Line 3063 | Line 3489 | public class CompletableFutureTest exten
3489              () -> f.applyToEither(g, null),
3490              () -> f.applyToEitherAsync(g, null),
3491              () -> f.applyToEitherAsync(g, null, exec),
3492 <            () -> f.applyToEither(nullFuture, (x) -> x),
3493 <            () -> f.applyToEitherAsync(nullFuture, (x) -> x),
3494 <            () -> f.applyToEitherAsync(nullFuture, (x) -> x, exec),
3495 <            () -> f.applyToEitherAsync(g, (x) -> x, null),
3492 >            () -> f.applyToEither(nullFuture, x -> x),
3493 >            () -> f.applyToEitherAsync(nullFuture, x -> x),
3494 >            () -> f.applyToEitherAsync(nullFuture, x -> x, exec),
3495 >            () -> f.applyToEitherAsync(g, x -> x, null),
3496  
3497              () -> f.acceptEither(g, null),
3498              () -> f.acceptEitherAsync(g, null),
3499              () -> f.acceptEitherAsync(g, null, exec),
3500 <            () -> f.acceptEither(nullFuture, (x) -> {}),
3501 <            () -> f.acceptEitherAsync(nullFuture, (x) -> {}),
3502 <            () -> f.acceptEitherAsync(nullFuture, (x) -> {}, exec),
3503 <            () -> f.acceptEitherAsync(g, (x) -> {}, null),
3500 >            () -> f.acceptEither(nullFuture, x -> {}),
3501 >            () -> f.acceptEitherAsync(nullFuture, x -> {}),
3502 >            () -> f.acceptEitherAsync(nullFuture, x -> {}, exec),
3503 >            () -> f.acceptEitherAsync(g, x -> {}, null),
3504  
3505              () -> f.runAfterEither(g, null),
3506              () -> f.runAfterEitherAsync(g, null),
# Line 3104 | Line 3530 | public class CompletableFutureTest exten
3530              () -> CompletableFuture.anyOf(null, f),
3531  
3532              () -> f.obtrudeException(null),
3533 +
3534 +            () -> CompletableFuture.delayedExecutor(1L, SECONDS, null),
3535 +            () -> CompletableFuture.delayedExecutor(1L, null, exec),
3536 +            () -> CompletableFuture.delayedExecutor(1L, null),
3537 +
3538 +            () -> f.orTimeout(1L, null),
3539 +            () -> f.completeOnTimeout(42, 1L, null),
3540 +
3541 +            () -> CompletableFuture.failedFuture(null),
3542 +            () -> CompletableFuture.failedStage(null),
3543          };
3544  
3545          assertThrows(NullPointerException.class, throwingActions);
# Line 3111 | Line 3547 | public class CompletableFutureTest exten
3547      }
3548  
3549      /**
3550 +     * Test submissions to an executor that rejects all tasks.
3551 +     */
3552 +    public void testRejectingExecutor() {
3553 +        for (Integer v : new Integer[] { 1, null })
3554 +    {
3555 +        final CountingRejectingExecutor e = new CountingRejectingExecutor();
3556 +
3557 +        final CompletableFuture<Integer> complete = CompletableFuture.completedFuture(v);
3558 +        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
3559 +
3560 +        List<CompletableFuture<?>> futures = new ArrayList<>();
3561 +
3562 +        List<CompletableFuture<Integer>> srcs = new ArrayList<>();
3563 +        srcs.add(complete);
3564 +        srcs.add(incomplete);
3565 +
3566 +        for (CompletableFuture<Integer> src : srcs) {
3567 +            List<CompletableFuture<?>> fs = new ArrayList<>();
3568 +            fs.add(src.thenRunAsync(() -> {}, e));
3569 +            fs.add(src.thenAcceptAsync(z -> {}, e));
3570 +            fs.add(src.thenApplyAsync(z -> z, e));
3571 +
3572 +            fs.add(src.thenCombineAsync(src, (x, y) -> x, e));
3573 +            fs.add(src.thenAcceptBothAsync(src, (x, y) -> {}, e));
3574 +            fs.add(src.runAfterBothAsync(src, () -> {}, e));
3575 +
3576 +            fs.add(src.applyToEitherAsync(src, z -> z, e));
3577 +            fs.add(src.acceptEitherAsync(src, z -> {}, e));
3578 +            fs.add(src.runAfterEitherAsync(src, () -> {}, e));
3579 +
3580 +            fs.add(src.thenComposeAsync(z -> null, e));
3581 +            fs.add(src.whenCompleteAsync((z, t) -> {}, e));
3582 +            fs.add(src.handleAsync((z, t) -> null, e));
3583 +
3584 +            for (CompletableFuture<?> future : fs) {
3585 +                if (src.isDone())
3586 +                    checkCompletedWithWrappedException(future, e.ex);
3587 +                else
3588 +                    checkIncomplete(future);
3589 +            }
3590 +            futures.addAll(fs);
3591 +        }
3592 +
3593 +        {
3594 +            List<CompletableFuture<?>> fs = new ArrayList<>();
3595 +
3596 +            fs.add(complete.thenCombineAsync(incomplete, (x, y) -> x, e));
3597 +            fs.add(incomplete.thenCombineAsync(complete, (x, y) -> x, e));
3598 +
3599 +            fs.add(complete.thenAcceptBothAsync(incomplete, (x, y) -> {}, e));
3600 +            fs.add(incomplete.thenAcceptBothAsync(complete, (x, y) -> {}, e));
3601 +
3602 +            fs.add(complete.runAfterBothAsync(incomplete, () -> {}, e));
3603 +            fs.add(incomplete.runAfterBothAsync(complete, () -> {}, e));
3604 +
3605 +            for (CompletableFuture<?> future : fs)
3606 +                checkIncomplete(future);
3607 +            futures.addAll(fs);
3608 +        }
3609 +
3610 +        {
3611 +            List<CompletableFuture<?>> fs = new ArrayList<>();
3612 +
3613 +            fs.add(complete.applyToEitherAsync(incomplete, z -> z, e));
3614 +            fs.add(incomplete.applyToEitherAsync(complete, z -> z, e));
3615 +
3616 +            fs.add(complete.acceptEitherAsync(incomplete, z -> {}, e));
3617 +            fs.add(incomplete.acceptEitherAsync(complete, z -> {}, e));
3618 +
3619 +            fs.add(complete.runAfterEitherAsync(incomplete, () -> {}, e));
3620 +            fs.add(incomplete.runAfterEitherAsync(complete, () -> {}, e));
3621 +
3622 +            for (CompletableFuture<?> future : fs)
3623 +                checkCompletedWithWrappedException(future, e.ex);
3624 +            futures.addAll(fs);
3625 +        }
3626 +
3627 +        incomplete.complete(v);
3628 +
3629 +        for (CompletableFuture<?> future : futures)
3630 +            checkCompletedWithWrappedException(future, e.ex);
3631 +
3632 +        assertEquals(futures.size(), e.count.get());
3633 +    }}
3634 +
3635 +    /**
3636 +     * Test submissions to an executor that rejects all tasks, but
3637 +     * should never be invoked because the dependent future is
3638 +     * explicitly completed.
3639 +     */
3640 +    public void testRejectingExecutorNeverInvoked() {
3641 +        for (Integer v : new Integer[] { 1, null })
3642 +    {
3643 +        final CountingRejectingExecutor e = new CountingRejectingExecutor();
3644 +
3645 +        final CompletableFuture<Integer> complete = CompletableFuture.completedFuture(v);
3646 +        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
3647 +
3648 +        List<CompletableFuture<?>> futures = new ArrayList<>();
3649 +
3650 +        List<CompletableFuture<Integer>> srcs = new ArrayList<>();
3651 +        srcs.add(complete);
3652 +        srcs.add(incomplete);
3653 +
3654 +        List<CompletableFuture<?>> fs = new ArrayList<>();
3655 +        fs.add(incomplete.thenRunAsync(() -> {}, e));
3656 +        fs.add(incomplete.thenAcceptAsync(z -> {}, e));
3657 +        fs.add(incomplete.thenApplyAsync(z -> z, e));
3658 +
3659 +        fs.add(incomplete.thenCombineAsync(incomplete, (x, y) -> x, e));
3660 +        fs.add(incomplete.thenAcceptBothAsync(incomplete, (x, y) -> {}, e));
3661 +        fs.add(incomplete.runAfterBothAsync(incomplete, () -> {}, e));
3662 +
3663 +        fs.add(incomplete.applyToEitherAsync(incomplete, z -> z, e));
3664 +        fs.add(incomplete.acceptEitherAsync(incomplete, z -> {}, e));
3665 +        fs.add(incomplete.runAfterEitherAsync(incomplete, () -> {}, e));
3666 +
3667 +        fs.add(incomplete.thenComposeAsync(z -> null, e));
3668 +        fs.add(incomplete.whenCompleteAsync((z, t) -> {}, e));
3669 +        fs.add(incomplete.handleAsync((z, t) -> null, e));
3670 +
3671 +        fs.add(complete.thenCombineAsync(incomplete, (x, y) -> x, e));
3672 +        fs.add(incomplete.thenCombineAsync(complete, (x, y) -> x, e));
3673 +
3674 +        fs.add(complete.thenAcceptBothAsync(incomplete, (x, y) -> {}, e));
3675 +        fs.add(incomplete.thenAcceptBothAsync(complete, (x, y) -> {}, e));
3676 +
3677 +        fs.add(complete.runAfterBothAsync(incomplete, () -> {}, e));
3678 +        fs.add(incomplete.runAfterBothAsync(complete, () -> {}, e));
3679 +
3680 +        for (CompletableFuture<?> future : fs)
3681 +            checkIncomplete(future);
3682 +
3683 +        for (CompletableFuture<?> future : fs)
3684 +            future.complete(null);
3685 +
3686 +        incomplete.complete(v);
3687 +
3688 +        for (CompletableFuture<?> future : fs)
3689 +            checkCompletedNormally(future, null);
3690 +
3691 +        assertEquals(0, e.count.get());
3692 +    }}
3693 +
3694 +    /**
3695       * toCompletableFuture returns this CompletableFuture.
3696       */
3697      public void testToCompletableFuture() {
# Line 3118 | Line 3699 | public class CompletableFutureTest exten
3699          assertSame(f, f.toCompletableFuture());
3700      }
3701  
3702 +    // jdk9
3703 +
3704 +    /**
3705 +     * newIncompleteFuture returns an incomplete CompletableFuture
3706 +     */
3707 +    public void testNewIncompleteFuture() {
3708 +        for (Integer v1 : new Integer[] { 1, null })
3709 +    {
3710 +        CompletableFuture<Integer> f = new CompletableFuture<>();
3711 +        CompletableFuture<Integer> g = f.newIncompleteFuture();
3712 +        checkIncomplete(f);
3713 +        checkIncomplete(g);
3714 +        f.complete(v1);
3715 +        checkCompletedNormally(f, v1);
3716 +        checkIncomplete(g);
3717 +        g.complete(v1);
3718 +        checkCompletedNormally(g, v1);
3719 +        assertSame(g.getClass(), CompletableFuture.class);
3720 +    }}
3721 +
3722 +    /**
3723 +     * completedStage returns a completed CompletionStage
3724 +     */
3725 +    public void testCompletedStage() {
3726 +        AtomicInteger x = new AtomicInteger(0);
3727 +        AtomicReference<Throwable> r = new AtomicReference<>();
3728 +        CompletionStage<Integer> f = CompletableFuture.completedStage(1);
3729 +        f.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3730 +        assertEquals(x.get(), 1);
3731 +        assertNull(r.get());
3732 +    }
3733 +
3734 +    /**
3735 +     * defaultExecutor by default returns the commonPool if
3736 +     * it supports more than one thread.
3737 +     */
3738 +    public void testDefaultExecutor() {
3739 +        CompletableFuture<Integer> f = new CompletableFuture<>();
3740 +        Executor e = f.defaultExecutor();
3741 +        Executor c = ForkJoinPool.commonPool();
3742 +        if (ForkJoinPool.getCommonPoolParallelism() > 1)
3743 +            assertSame(e, c);
3744 +        else
3745 +            assertNotSame(e, c);
3746 +    }
3747 +
3748 +    /**
3749 +     * failedFuture returns a CompletableFuture completed
3750 +     * exceptionally with the given Exception
3751 +     */
3752 +    public void testFailedFuture() {
3753 +        CFException ex = new CFException();
3754 +        CompletableFuture<Integer> f = CompletableFuture.failedFuture(ex);
3755 +        checkCompletedExceptionally(f, ex);
3756 +    }
3757 +
3758 +    /**
3759 +     * failedFuture(null) throws NPE
3760 +     */
3761 +    public void testFailedFuture_null() {
3762 +        try {
3763 +            CompletableFuture<Integer> f = CompletableFuture.failedFuture(null);
3764 +            shouldThrow();
3765 +        } catch (NullPointerException success) {}
3766 +    }
3767 +
3768 +    /**
3769 +     * copy returns a CompletableFuture that is completed normally,
3770 +     * with the same value, when source is.
3771 +     */
3772 +    public void testCopy_normalCompletion() {
3773 +        for (boolean createIncomplete : new boolean[] { true, false })
3774 +        for (Integer v1 : new Integer[] { 1, null })
3775 +    {
3776 +        CompletableFuture<Integer> f = new CompletableFuture<>();
3777 +        if (!createIncomplete) assertTrue(f.complete(v1));
3778 +        CompletableFuture<Integer> g = f.copy();
3779 +        if (createIncomplete) {
3780 +            checkIncomplete(f);
3781 +            checkIncomplete(g);
3782 +            assertTrue(f.complete(v1));
3783 +        }
3784 +        checkCompletedNormally(f, v1);
3785 +        checkCompletedNormally(g, v1);
3786 +    }}
3787 +
3788 +    /**
3789 +     * copy returns a CompletableFuture that is completed exceptionally
3790 +     * when source is.
3791 +     */
3792 +    public void testCopy_exceptionalCompletion() {
3793 +        for (boolean createIncomplete : new boolean[] { true, false })
3794 +    {
3795 +        CFException ex = new CFException();
3796 +        CompletableFuture<Integer> f = new CompletableFuture<>();
3797 +        if (!createIncomplete) f.completeExceptionally(ex);
3798 +        CompletableFuture<Integer> g = f.copy();
3799 +        if (createIncomplete) {
3800 +            checkIncomplete(f);
3801 +            checkIncomplete(g);
3802 +            f.completeExceptionally(ex);
3803 +        }
3804 +        checkCompletedExceptionally(f, ex);
3805 +        checkCompletedWithWrappedException(g, ex);
3806 +    }}
3807 +
3808 +    /**
3809 +     * Completion of a copy does not complete its source.
3810 +     */
3811 +    public void testCopy_oneWayPropagation() {
3812 +        CompletableFuture<Integer> f = new CompletableFuture<>();
3813 +        assertTrue(f.copy().complete(1));
3814 +        assertTrue(f.copy().complete(null));
3815 +        assertTrue(f.copy().cancel(true));
3816 +        assertTrue(f.copy().cancel(false));
3817 +        assertTrue(f.copy().completeExceptionally(new CFException()));
3818 +        checkIncomplete(f);
3819 +    }
3820 +
3821 +    /**
3822 +     * minimalCompletionStage returns a CompletableFuture that is
3823 +     * completed normally, with the same value, when source is.
3824 +     */
3825 +    public void testMinimalCompletionStage() {
3826 +        CompletableFuture<Integer> f = new CompletableFuture<>();
3827 +        CompletionStage<Integer> g = f.minimalCompletionStage();
3828 +        AtomicInteger x = new AtomicInteger(0);
3829 +        AtomicReference<Throwable> r = new AtomicReference<>();
3830 +        checkIncomplete(f);
3831 +        g.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3832 +        f.complete(1);
3833 +        checkCompletedNormally(f, 1);
3834 +        assertEquals(x.get(), 1);
3835 +        assertNull(r.get());
3836 +    }
3837 +
3838 +    /**
3839 +     * minimalCompletionStage returns a CompletableFuture that is
3840 +     * completed exceptionally when source is.
3841 +     */
3842 +    public void testMinimalCompletionStage2() {
3843 +        CompletableFuture<Integer> f = new CompletableFuture<>();
3844 +        CompletionStage<Integer> g = f.minimalCompletionStage();
3845 +        AtomicInteger x = new AtomicInteger(0);
3846 +        AtomicReference<Throwable> r = new AtomicReference<>();
3847 +        g.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3848 +        checkIncomplete(f);
3849 +        CFException ex = new CFException();
3850 +        f.completeExceptionally(ex);
3851 +        checkCompletedExceptionally(f, ex);
3852 +        assertEquals(x.get(), 0);
3853 +        assertEquals(r.get().getCause(), ex);
3854 +    }
3855 +
3856 +    /**
3857 +     * failedStage returns a CompletionStage completed
3858 +     * exceptionally with the given Exception
3859 +     */
3860 +    public void testFailedStage() {
3861 +        CFException ex = new CFException();
3862 +        CompletionStage<Integer> f = CompletableFuture.failedStage(ex);
3863 +        AtomicInteger x = new AtomicInteger(0);
3864 +        AtomicReference<Throwable> r = new AtomicReference<>();
3865 +        f.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3866 +        assertEquals(x.get(), 0);
3867 +        assertEquals(r.get(), ex);
3868 +    }
3869 +
3870 +    /**
3871 +     * completeAsync completes with value of given supplier
3872 +     */
3873 +    public void testCompleteAsync() {
3874 +        for (Integer v1 : new Integer[] { 1, null })
3875 +    {
3876 +        CompletableFuture<Integer> f = new CompletableFuture<>();
3877 +        f.completeAsync(() -> v1);
3878 +        f.join();
3879 +        checkCompletedNormally(f, v1);
3880 +    }}
3881 +
3882 +    /**
3883 +     * completeAsync completes exceptionally if given supplier throws
3884 +     */
3885 +    public void testCompleteAsync2() {
3886 +        CompletableFuture<Integer> f = new CompletableFuture<>();
3887 +        CFException ex = new CFException();
3888 +        f.completeAsync(() -> { throw ex; });
3889 +        try {
3890 +            f.join();
3891 +            shouldThrow();
3892 +        } catch (CompletionException success) {}
3893 +        checkCompletedWithWrappedException(f, ex);
3894 +    }
3895 +
3896 +    /**
3897 +     * completeAsync with given executor completes with value of given supplier
3898 +     */
3899 +    public void testCompleteAsync3() {
3900 +        for (Integer v1 : new Integer[] { 1, null })
3901 +    {
3902 +        CompletableFuture<Integer> f = new CompletableFuture<>();
3903 +        ThreadExecutor executor = new ThreadExecutor();
3904 +        f.completeAsync(() -> v1, executor);
3905 +        assertSame(v1, f.join());
3906 +        checkCompletedNormally(f, v1);
3907 +        assertEquals(1, executor.count.get());
3908 +    }}
3909 +
3910 +    /**
3911 +     * completeAsync with given executor completes exceptionally if
3912 +     * given supplier throws
3913 +     */
3914 +    public void testCompleteAsync4() {
3915 +        CompletableFuture<Integer> f = new CompletableFuture<>();
3916 +        CFException ex = new CFException();
3917 +        ThreadExecutor executor = new ThreadExecutor();
3918 +        f.completeAsync(() -> { throw ex; }, executor);
3919 +        try {
3920 +            f.join();
3921 +            shouldThrow();
3922 +        } catch (CompletionException success) {}
3923 +        checkCompletedWithWrappedException(f, ex);
3924 +        assertEquals(1, executor.count.get());
3925 +    }
3926 +
3927 +    /**
3928 +     * orTimeout completes with TimeoutException if not complete
3929 +     */
3930 +    public void testOrTimeout_timesOut() {
3931 +        long timeoutMillis = timeoutMillis();
3932 +        CompletableFuture<Integer> f = new CompletableFuture<>();
3933 +        long startTime = System.nanoTime();
3934 +        assertSame(f, f.orTimeout(timeoutMillis, MILLISECONDS));
3935 +        checkCompletedWithTimeoutException(f);
3936 +        assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
3937 +    }
3938 +
3939 +    /**
3940 +     * orTimeout completes normally if completed before timeout
3941 +     */
3942 +    public void testOrTimeout_completed() {
3943 +        for (Integer v1 : new Integer[] { 1, null })
3944 +    {
3945 +        CompletableFuture<Integer> f = new CompletableFuture<>();
3946 +        CompletableFuture<Integer> g = new CompletableFuture<>();
3947 +        long startTime = System.nanoTime();
3948 +        f.complete(v1);
3949 +        assertSame(f, f.orTimeout(LONG_DELAY_MS, MILLISECONDS));
3950 +        assertSame(g, g.orTimeout(LONG_DELAY_MS, MILLISECONDS));
3951 +        g.complete(v1);
3952 +        checkCompletedNormally(f, v1);
3953 +        checkCompletedNormally(g, v1);
3954 +        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS / 2);
3955 +    }}
3956 +
3957 +    /**
3958 +     * completeOnTimeout completes with given value if not complete
3959 +     */
3960 +    public void testCompleteOnTimeout_timesOut() {
3961 +        testInParallel(() -> testCompleteOnTimeout_timesOut(42),
3962 +                       () -> testCompleteOnTimeout_timesOut(null));
3963 +    }
3964 +
3965 +    /**
3966 +     * completeOnTimeout completes with given value if not complete
3967 +     */
3968 +    public void testCompleteOnTimeout_timesOut(Integer v) {
3969 +        long timeoutMillis = timeoutMillis();
3970 +        CompletableFuture<Integer> f = new CompletableFuture<>();
3971 +        long startTime = System.nanoTime();
3972 +        assertSame(f, f.completeOnTimeout(v, timeoutMillis, MILLISECONDS));
3973 +        assertSame(v, f.join());
3974 +        assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
3975 +        f.complete(99);         // should have no effect
3976 +        checkCompletedNormally(f, v);
3977 +    }
3978 +
3979 +    /**
3980 +     * completeOnTimeout has no effect if completed within timeout
3981 +     */
3982 +    public void testCompleteOnTimeout_completed() {
3983 +        for (Integer v1 : new Integer[] { 1, null })
3984 +    {
3985 +        CompletableFuture<Integer> f = new CompletableFuture<>();
3986 +        CompletableFuture<Integer> g = new CompletableFuture<>();
3987 +        long startTime = System.nanoTime();
3988 +        f.complete(v1);
3989 +        assertSame(f, f.completeOnTimeout(-1, LONG_DELAY_MS, MILLISECONDS));
3990 +        assertSame(g, g.completeOnTimeout(-1, LONG_DELAY_MS, MILLISECONDS));
3991 +        g.complete(v1);
3992 +        checkCompletedNormally(f, v1);
3993 +        checkCompletedNormally(g, v1);
3994 +        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS / 2);
3995 +    }}
3996 +
3997 +    /**
3998 +     * delayedExecutor returns an executor that delays submission
3999 +     */
4000 +    public void testDelayedExecutor() {
4001 +        testInParallel(() -> testDelayedExecutor(null, null),
4002 +                       () -> testDelayedExecutor(null, 1),
4003 +                       () -> testDelayedExecutor(new ThreadExecutor(), 1),
4004 +                       () -> testDelayedExecutor(new ThreadExecutor(), 1));
4005 +    }
4006 +
4007 +    public void testDelayedExecutor(Executor executor, Integer v) throws Exception {
4008 +        long timeoutMillis = timeoutMillis();
4009 +        // Use an "unreasonably long" long timeout to catch lingering threads
4010 +        long longTimeoutMillis = 1000 * 60 * 60 * 24;
4011 +        final Executor delayer, longDelayer;
4012 +        if (executor == null) {
4013 +            delayer = CompletableFuture.delayedExecutor(timeoutMillis, MILLISECONDS);
4014 +            longDelayer = CompletableFuture.delayedExecutor(longTimeoutMillis, MILLISECONDS);
4015 +        } else {
4016 +            delayer = CompletableFuture.delayedExecutor(timeoutMillis, MILLISECONDS, executor);
4017 +            longDelayer = CompletableFuture.delayedExecutor(longTimeoutMillis, MILLISECONDS, executor);
4018 +        }
4019 +        long startTime = System.nanoTime();
4020 +        CompletableFuture<Integer> f =
4021 +            CompletableFuture.supplyAsync(() -> v, delayer);
4022 +        CompletableFuture<Integer> g =
4023 +            CompletableFuture.supplyAsync(() -> v, longDelayer);
4024 +
4025 +        assertNull(g.getNow(null));
4026 +
4027 +        assertSame(v, f.get(LONG_DELAY_MS, MILLISECONDS));
4028 +        long millisElapsed = millisElapsedSince(startTime);
4029 +        assertTrue(millisElapsed >= timeoutMillis);
4030 +        assertTrue(millisElapsed < LONG_DELAY_MS / 2);
4031 +
4032 +        checkCompletedNormally(f, v);
4033 +
4034 +        checkIncomplete(g);
4035 +        assertTrue(g.cancel(true));
4036 +    }
4037 +
4038      //--- tests of implementation details; not part of official tck ---
4039  
4040      Object resultOf(CompletableFuture<?> f) {
4041 +        SecurityManager sm = System.getSecurityManager();
4042 +        if (sm != null) {
4043 +            try {
4044 +                System.setSecurityManager(null);
4045 +            } catch (SecurityException giveUp) {
4046 +                return "Reflection not available";
4047 +            }
4048 +        }
4049 +
4050          try {
4051              java.lang.reflect.Field resultField
4052                  = CompletableFuture.class.getDeclaredField("result");
4053              resultField.setAccessible(true);
4054              return resultField.get(f);
4055 <        } catch (Throwable t) { throw new AssertionError(t); }
4055 >        } catch (Throwable t) {
4056 >            throw new AssertionError(t);
4057 >        } finally {
4058 >            if (sm != null) System.setSecurityManager(sm);
4059 >        }
4060      }
4061  
4062      public void testExceptionPropagationReusesResultObject() {
# Line 3137 | Line 4067 | public class CompletableFutureTest exten
4067          final CompletableFuture<Integer> v42 = CompletableFuture.completedFuture(42);
4068          final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
4069  
4070 <        List<Function<CompletableFuture<Integer>, CompletableFuture<?>>> dependentFactories
4071 <            = new ArrayList<>();
4072 <
3143 <        dependentFactories.add((y) -> m.thenRun(y, new Noop(m)));
3144 <        dependentFactories.add((y) -> m.thenAccept(y, new NoopConsumer(m)));
3145 <        dependentFactories.add((y) -> m.thenApply(y, new IncFunction(m)));
3146 <
3147 <        dependentFactories.add((y) -> m.runAfterEither(y, incomplete, new Noop(m)));
3148 <        dependentFactories.add((y) -> m.acceptEither(y, incomplete, new NoopConsumer(m)));
3149 <        dependentFactories.add((y) -> m.applyToEither(y, incomplete, new IncFunction(m)));
3150 <
3151 <        dependentFactories.add((y) -> m.runAfterBoth(y, v42, new Noop(m)));
3152 <        dependentFactories.add((y) -> m.thenAcceptBoth(y, v42, new SubtractAction(m)));
3153 <        dependentFactories.add((y) -> m.thenCombine(y, v42, new SubtractFunction(m)));
4070 >        final Runnable noopRunnable = new Noop(m);
4071 >        final Consumer<Integer> noopConsumer = new NoopConsumer(m);
4072 >        final Function<Integer, Integer> incFunction = new IncFunction(m);
4073  
4074 <        dependentFactories.add((y) -> m.whenComplete(y, (Integer x, Throwable t) -> {}));
4074 >        List<Function<CompletableFuture<Integer>, CompletableFuture<?>>> funs
4075 >            = new ArrayList<>();
4076  
4077 <        dependentFactories.add((y) -> m.thenCompose(y, new CompletableFutureInc(m)));
4077 >        funs.add(y -> m.thenRun(y, noopRunnable));
4078 >        funs.add(y -> m.thenAccept(y, noopConsumer));
4079 >        funs.add(y -> m.thenApply(y, incFunction));
4080 >
4081 >        funs.add(y -> m.runAfterEither(y, incomplete, noopRunnable));
4082 >        funs.add(y -> m.acceptEither(y, incomplete, noopConsumer));
4083 >        funs.add(y -> m.applyToEither(y, incomplete, incFunction));
4084 >
4085 >        funs.add(y -> m.runAfterBoth(y, v42, noopRunnable));
4086 >        funs.add(y -> m.runAfterBoth(v42, y, noopRunnable));
4087 >        funs.add(y -> m.thenAcceptBoth(y, v42, new SubtractAction(m)));
4088 >        funs.add(y -> m.thenAcceptBoth(v42, y, new SubtractAction(m)));
4089 >        funs.add(y -> m.thenCombine(y, v42, new SubtractFunction(m)));
4090 >        funs.add(y -> m.thenCombine(v42, y, new SubtractFunction(m)));
4091 >
4092 >        funs.add(y -> m.whenComplete(y, (Integer r, Throwable t) -> {}));
4093 >
4094 >        funs.add(y -> m.thenCompose(y, new CompletableFutureInc(m)));
4095 >
4096 >        funs.add(y -> CompletableFuture.allOf(y));
4097 >        funs.add(y -> CompletableFuture.allOf(y, v42));
4098 >        funs.add(y -> CompletableFuture.allOf(v42, y));
4099 >        funs.add(y -> CompletableFuture.anyOf(y));
4100 >        funs.add(y -> CompletableFuture.anyOf(y, incomplete));
4101 >        funs.add(y -> CompletableFuture.anyOf(incomplete, y));
4102  
4103          for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
4104 <                 dependentFactory : dependentFactories) {
4104 >                 fun : funs) {
4105              CompletableFuture<Integer> f = new CompletableFuture<>();
4106              f.completeExceptionally(ex);
4107 <            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
4107 >            CompletableFuture<Integer> src = m.thenApply(f, incFunction);
4108              checkCompletedWithWrappedException(src, ex);
4109 <            CompletableFuture<?> dep = dependentFactory.apply(src);
4109 >            CompletableFuture<?> dep = fun.apply(src);
4110              checkCompletedWithWrappedException(dep, ex);
4111              assertSame(resultOf(src), resultOf(dep));
4112          }
4113  
4114          for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
4115 <                 dependentFactory : dependentFactories) {
4115 >                 fun : funs) {
4116              CompletableFuture<Integer> f = new CompletableFuture<>();
4117 <            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
4118 <            CompletableFuture<?> dep = dependentFactory.apply(src);
4117 >            CompletableFuture<Integer> src = m.thenApply(f, incFunction);
4118 >            CompletableFuture<?> dep = fun.apply(src);
4119              f.completeExceptionally(ex);
4120              checkCompletedWithWrappedException(src, ex);
4121              checkCompletedWithWrappedException(dep, ex);
# Line 3180 | Line 4124 | public class CompletableFutureTest exten
4124  
4125          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
4126          for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
4127 <                 dependentFactory : dependentFactories) {
4127 >                 fun : funs) {
4128              CompletableFuture<Integer> f = new CompletableFuture<>();
4129              f.cancel(mayInterruptIfRunning);
4130              checkCancelled(f);
4131 <            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
4131 >            CompletableFuture<Integer> src = m.thenApply(f, incFunction);
4132              checkCompletedWithWrappedCancellationException(src);
4133 <            CompletableFuture<?> dep = dependentFactory.apply(src);
4133 >            CompletableFuture<?> dep = fun.apply(src);
4134              checkCompletedWithWrappedCancellationException(dep);
4135              assertSame(resultOf(src), resultOf(dep));
4136          }
4137  
4138          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
4139          for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
4140 <                 dependentFactory : dependentFactories) {
4140 >                 fun : funs) {
4141              CompletableFuture<Integer> f = new CompletableFuture<>();
4142 <            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
4143 <            CompletableFuture<?> dep = dependentFactory.apply(src);
4142 >            CompletableFuture<Integer> src = m.thenApply(f, incFunction);
4143 >            CompletableFuture<?> dep = fun.apply(src);
4144              f.cancel(mayInterruptIfRunning);
4145              checkCancelled(f);
4146              checkCompletedWithWrappedCancellationException(src);
# Line 3205 | Line 4149 | public class CompletableFutureTest exten
4149          }
4150      }}
4151  
4152 < //     public void testRunAfterEither_resultDeterminedAtTimeOfCreation() {
4153 < //         for (ExecutionMode m : ExecutionMode.values())
4154 < //         for (boolean mayInterruptIfRunning : new boolean[] { true, false })
4155 < //         for (Integer v1 : new Integer[] { 1, null })
4156 < //     {
4157 < //         final CompletableFuture<Integer> f = new CompletableFuture<>();
4158 < //         final CompletableFuture<Integer> g = new CompletableFuture<>();
4159 < //         final Noop[] rs = new Noop[2];
4160 < //         for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
4161 < //         f.complete(v1);
4162 < //         final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
4163 < //         final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
4164 < //         assertTrue(g.cancel(mayInterruptIfRunning));
4165 < //         checkCompletedNormally(h0, null);
4166 < //         checkCompletedNormally(h1, null);
4167 < //         for (Noop r : rs) r.assertInvoked();
4168 < //     }}
4152 >    /**
4153 >     * Minimal completion stages throw UOE for most non-CompletionStage methods
4154 >     */
4155 >    public void testMinimalCompletionStage_minimality() {
4156 >        if (!testImplementationDetails) return;
4157 >        Function<Method, String> toSignature =
4158 >            method -> method.getName() + Arrays.toString(method.getParameterTypes());
4159 >        Predicate<Method> isNotStatic =
4160 >            method -> (method.getModifiers() & Modifier.STATIC) == 0;
4161 >        List<Method> minimalMethods =
4162 >            Stream.of(Object.class, CompletionStage.class)
4163 >            .flatMap(klazz -> Stream.of(klazz.getMethods()))
4164 >            .filter(isNotStatic)
4165 >            .collect(Collectors.toList());
4166 >        // Methods from CompletableFuture permitted NOT to throw UOE
4167 >        String[] signatureWhitelist = {
4168 >            "newIncompleteFuture[]",
4169 >            "defaultExecutor[]",
4170 >            "minimalCompletionStage[]",
4171 >            "copy[]",
4172 >        };
4173 >        Set<String> permittedMethodSignatures =
4174 >            Stream.concat(minimalMethods.stream().map(toSignature),
4175 >                          Stream.of(signatureWhitelist))
4176 >            .collect(Collectors.toSet());
4177 >        List<Method> allMethods = Stream.of(CompletableFuture.class.getMethods())
4178 >            .filter(isNotStatic)
4179 >            .filter(method -> !permittedMethodSignatures.contains(toSignature.apply(method)))
4180 >            .collect(Collectors.toList());
4181 >
4182 >        List<CompletionStage<Integer>> stages = new ArrayList<>();
4183 >        CompletionStage<Integer> min =
4184 >            new CompletableFuture<Integer>().minimalCompletionStage();
4185 >        stages.add(min);
4186 >        stages.add(min.thenApply(x -> x));
4187 >        stages.add(CompletableFuture.completedStage(1));
4188 >        stages.add(CompletableFuture.failedStage(new CFException()));
4189 >
4190 >        List<Method> bugs = new ArrayList<>();
4191 >        for (Method method : allMethods) {
4192 >            Class<?>[] parameterTypes = method.getParameterTypes();
4193 >            Object[] args = new Object[parameterTypes.length];
4194 >            // Manufacture boxed primitives for primitive params
4195 >            for (int i = 0; i < args.length; i++) {
4196 >                Class<?> type = parameterTypes[i];
4197 >                if (parameterTypes[i] == boolean.class)
4198 >                    args[i] = false;
4199 >                else if (parameterTypes[i] == int.class)
4200 >                    args[i] = 0;
4201 >                else if (parameterTypes[i] == long.class)
4202 >                    args[i] = 0L;
4203 >            }
4204 >            for (CompletionStage<Integer> stage : stages) {
4205 >                try {
4206 >                    method.invoke(stage, args);
4207 >                    bugs.add(method);
4208 >                }
4209 >                catch (java.lang.reflect.InvocationTargetException expected) {
4210 >                    if (! (expected.getCause() instanceof UnsupportedOperationException)) {
4211 >                        bugs.add(method);
4212 >                        // expected.getCause().printStackTrace();
4213 >                    }
4214 >                }
4215 >                catch (ReflectiveOperationException bad) { throw new Error(bad); }
4216 >            }
4217 >        }
4218 >        if (!bugs.isEmpty())
4219 >            throw new Error("Methods did not throw UOE: " + bugs);
4220 >    }
4221 >
4222 >    /**
4223 >     * minimalStage.toCompletableFuture() returns a CompletableFuture that
4224 >     * is completed normally, with the same value, when source is.
4225 >     */
4226 >    public void testMinimalCompletionStage_toCompletableFuture_normalCompletion() {
4227 >        for (boolean createIncomplete : new boolean[] { true, false })
4228 >        for (Integer v1 : new Integer[] { 1, null })
4229 >    {
4230 >        CompletableFuture<Integer> f = new CompletableFuture<>();
4231 >        CompletionStage<Integer> minimal = f.minimalCompletionStage();
4232 >        if (!createIncomplete) assertTrue(f.complete(v1));
4233 >        CompletableFuture<Integer> g = minimal.toCompletableFuture();
4234 >        if (createIncomplete) {
4235 >            checkIncomplete(f);
4236 >            checkIncomplete(g);
4237 >            assertTrue(f.complete(v1));
4238 >        }
4239 >        checkCompletedNormally(f, v1);
4240 >        checkCompletedNormally(g, v1);
4241 >    }}
4242 >
4243 >    /**
4244 >     * minimalStage.toCompletableFuture() returns a CompletableFuture that
4245 >     * is completed exceptionally when source is.
4246 >     */
4247 >    public void testMinimalCompletionStage_toCompletableFuture_exceptionalCompletion() {
4248 >        for (boolean createIncomplete : new boolean[] { true, false })
4249 >    {
4250 >        CFException ex = new CFException();
4251 >        CompletableFuture<Integer> f = new CompletableFuture<>();
4252 >        CompletionStage<Integer> minimal = f.minimalCompletionStage();
4253 >        if (!createIncomplete) f.completeExceptionally(ex);
4254 >        CompletableFuture<Integer> g = minimal.toCompletableFuture();
4255 >        if (createIncomplete) {
4256 >            checkIncomplete(f);
4257 >            checkIncomplete(g);
4258 >            f.completeExceptionally(ex);
4259 >        }
4260 >        checkCompletedExceptionally(f, ex);
4261 >        checkCompletedWithWrappedException(g, ex);
4262 >    }}
4263 >
4264 >    /**
4265 >     * minimalStage.toCompletableFuture() gives mutable CompletableFuture
4266 >     */
4267 >    public void testMinimalCompletionStage_toCompletableFuture_mutable() {
4268 >        for (Integer v1 : new Integer[] { 1, null })
4269 >    {
4270 >        CompletableFuture<Integer> f = new CompletableFuture<>();
4271 >        CompletionStage minimal = f.minimalCompletionStage();
4272 >        CompletableFuture<Integer> g = minimal.toCompletableFuture();
4273 >        assertTrue(g.complete(v1));
4274 >        checkCompletedNormally(g, v1);
4275 >        checkIncomplete(f);
4276 >        checkIncomplete(minimal.toCompletableFuture());
4277 >    }}
4278 >
4279 >    /**
4280 >     * minimalStage.toCompletableFuture().join() awaits completion
4281 >     */
4282 >    public void testMinimalCompletionStage_toCompletableFuture_join() throws Exception {
4283 >        for (boolean createIncomplete : new boolean[] { true, false })
4284 >        for (Integer v1 : new Integer[] { 1, null })
4285 >    {
4286 >        CompletableFuture<Integer> f = new CompletableFuture<>();
4287 >        if (!createIncomplete) assertTrue(f.complete(v1));
4288 >        CompletionStage<Integer> minimal = f.minimalCompletionStage();
4289 >        if (createIncomplete) assertTrue(f.complete(v1));
4290 >        assertEquals(v1, minimal.toCompletableFuture().join());
4291 >        assertEquals(v1, minimal.toCompletableFuture().get());
4292 >        checkCompletedNormally(minimal.toCompletableFuture(), v1);
4293 >    }}
4294 >
4295 >    /**
4296 >     * Completion of a toCompletableFuture copy of a minimal stage
4297 >     * does not complete its source.
4298 >     */
4299 >    public void testMinimalCompletionStage_toCompletableFuture_oneWayPropagation() {
4300 >        CompletableFuture<Integer> f = new CompletableFuture<>();
4301 >        CompletionStage<Integer> g = f.minimalCompletionStage();
4302 >        assertTrue(g.toCompletableFuture().complete(1));
4303 >        assertTrue(g.toCompletableFuture().complete(null));
4304 >        assertTrue(g.toCompletableFuture().cancel(true));
4305 >        assertTrue(g.toCompletableFuture().cancel(false));
4306 >        assertTrue(g.toCompletableFuture().completeExceptionally(new CFException()));
4307 >        checkIncomplete(g.toCompletableFuture());
4308 >        f.complete(1);
4309 >        checkCompletedNormally(g.toCompletableFuture(), 1);
4310 >    }
4311 >
4312 >    /** Demo utility method for external reliable toCompletableFuture */
4313 >    static <T> CompletableFuture<T> toCompletableFuture(CompletionStage<T> stage) {
4314 >        CompletableFuture<T> f = new CompletableFuture<>();
4315 >        stage.handle((T t, Throwable ex) -> {
4316 >                         if (ex != null) f.completeExceptionally(ex);
4317 >                         else f.complete(t);
4318 >                         return null;
4319 >                     });
4320 >        return f;
4321 >    }
4322 >
4323 >    /** Demo utility method to join a CompletionStage */
4324 >    static <T> T join(CompletionStage<T> stage) {
4325 >        return toCompletableFuture(stage).join();
4326 >    }
4327 >
4328 >    /**
4329 >     * Joining a minimal stage "by hand" works
4330 >     */
4331 >    public void testMinimalCompletionStage_join_by_hand() {
4332 >        for (boolean createIncomplete : new boolean[] { true, false })
4333 >        for (Integer v1 : new Integer[] { 1, null })
4334 >    {
4335 >        CompletableFuture<Integer> f = new CompletableFuture<>();
4336 >        CompletionStage<Integer> minimal = f.minimalCompletionStage();
4337 >        CompletableFuture<Integer> g = new CompletableFuture<>();
4338 >        if (!createIncomplete) assertTrue(f.complete(v1));
4339 >        minimal.thenAccept(x -> g.complete(x));
4340 >        if (createIncomplete) assertTrue(f.complete(v1));
4341 >        g.join();
4342 >        checkCompletedNormally(g, v1);
4343 >        checkCompletedNormally(f, v1);
4344 >        assertEquals(v1, join(minimal));
4345 >    }}
4346 >
4347 >    static class Monad {
4348 >        static class ZeroException extends RuntimeException {
4349 >            public ZeroException() { super("monadic zero"); }
4350 >        }
4351 >        // "return", "unit"
4352 >        static <T> CompletableFuture<T> unit(T value) {
4353 >            return completedFuture(value);
4354 >        }
4355 >        // monadic zero ?
4356 >        static <T> CompletableFuture<T> zero() {
4357 >            return failedFuture(new ZeroException());
4358 >        }
4359 >        // >=>
4360 >        static <T,U,V> Function<T, CompletableFuture<V>> compose
4361 >            (Function<T, CompletableFuture<U>> f,
4362 >             Function<U, CompletableFuture<V>> g) {
4363 >            return x -> f.apply(x).thenCompose(g);
4364 >        }
4365 >
4366 >        static void assertZero(CompletableFuture<?> f) {
4367 >            try {
4368 >                f.getNow(null);
4369 >                throw new AssertionError("should throw");
4370 >            } catch (CompletionException success) {
4371 >                assertTrue(success.getCause() instanceof ZeroException);
4372 >            }
4373 >        }
4374 >
4375 >        static <T> void assertFutureEquals(CompletableFuture<T> f,
4376 >                                           CompletableFuture<T> g) {
4377 >            T fval = null, gval = null;
4378 >            Throwable fex = null, gex = null;
4379 >
4380 >            try { fval = f.get(); }
4381 >            catch (ExecutionException ex) { fex = ex.getCause(); }
4382 >            catch (Throwable ex) { fex = ex; }
4383 >
4384 >            try { gval = g.get(); }
4385 >            catch (ExecutionException ex) { gex = ex.getCause(); }
4386 >            catch (Throwable ex) { gex = ex; }
4387 >
4388 >            if (fex != null || gex != null)
4389 >                assertSame(fex.getClass(), gex.getClass());
4390 >            else
4391 >                assertEquals(fval, gval);
4392 >        }
4393 >
4394 >        static class PlusFuture<T> extends CompletableFuture<T> {
4395 >            AtomicReference<Throwable> firstFailure = new AtomicReference<>(null);
4396 >        }
4397 >
4398 >        /** Implements "monadic plus". */
4399 >        static <T> CompletableFuture<T> plus(CompletableFuture<? extends T> f,
4400 >                                             CompletableFuture<? extends T> g) {
4401 >            PlusFuture<T> plus = new PlusFuture<T>();
4402 >            BiConsumer<T, Throwable> action = (T result, Throwable ex) -> {
4403 >                try {
4404 >                    if (ex == null) {
4405 >                        if (plus.complete(result))
4406 >                            if (plus.firstFailure.get() != null)
4407 >                                plus.firstFailure.set(null);
4408 >                    }
4409 >                    else if (plus.firstFailure.compareAndSet(null, ex)) {
4410 >                        if (plus.isDone())
4411 >                            plus.firstFailure.set(null);
4412 >                    }
4413 >                    else {
4414 >                        // first failure has precedence
4415 >                        Throwable first = plus.firstFailure.getAndSet(null);
4416 >
4417 >                        // may fail with "Self-suppression not permitted"
4418 >                        try { first.addSuppressed(ex); }
4419 >                        catch (Exception ignored) {}
4420 >
4421 >                        plus.completeExceptionally(first);
4422 >                    }
4423 >                } catch (Throwable unexpected) {
4424 >                    plus.completeExceptionally(unexpected);
4425 >                }
4426 >            };
4427 >            f.whenComplete(action);
4428 >            g.whenComplete(action);
4429 >            return plus;
4430 >        }
4431 >    }
4432 >
4433 >    /**
4434 >     * CompletableFuture is an additive monad - sort of.
4435 >     * https://en.wikipedia.org/wiki/Monad_(functional_programming)#Additive_monads
4436 >     */
4437 >    public void testAdditiveMonad() throws Throwable {
4438 >        Function<Long, CompletableFuture<Long>> unit = Monad::unit;
4439 >        CompletableFuture<Long> zero = Monad.zero();
4440 >
4441 >        // Some mutually non-commutative functions
4442 >        Function<Long, CompletableFuture<Long>> triple
4443 >            = x -> Monad.unit(3 * x);
4444 >        Function<Long, CompletableFuture<Long>> inc
4445 >            = x -> Monad.unit(x + 1);
4446 >
4447 >        // unit is a right identity: m >>= unit === m
4448 >        Monad.assertFutureEquals(inc.apply(5L).thenCompose(unit),
4449 >                                 inc.apply(5L));
4450 >        // unit is a left identity: (unit x) >>= f === f x
4451 >        Monad.assertFutureEquals(unit.apply(5L).thenCompose(inc),
4452 >                                 inc.apply(5L));
4453 >
4454 >        // associativity: (m >>= f) >>= g === m >>= ( \x -> (f x >>= g) )
4455 >        Monad.assertFutureEquals(
4456 >            unit.apply(5L).thenCompose(inc).thenCompose(triple),
4457 >            unit.apply(5L).thenCompose(x -> inc.apply(x).thenCompose(triple)));
4458 >
4459 >        // The case for CompletableFuture as an additive monad is weaker...
4460 >
4461 >        // zero is a monadic zero
4462 >        Monad.assertZero(zero);
4463 >
4464 >        // left zero: zero >>= f === zero
4465 >        Monad.assertZero(zero.thenCompose(inc));
4466 >        // right zero: f >>= (\x -> zero) === zero
4467 >        Monad.assertZero(inc.apply(5L).thenCompose(x -> zero));
4468 >
4469 >        // f plus zero === f
4470 >        Monad.assertFutureEquals(Monad.unit(5L),
4471 >                                 Monad.plus(Monad.unit(5L), zero));
4472 >        // zero plus f === f
4473 >        Monad.assertFutureEquals(Monad.unit(5L),
4474 >                                 Monad.plus(zero, Monad.unit(5L)));
4475 >        // zero plus zero === zero
4476 >        Monad.assertZero(Monad.plus(zero, zero));
4477 >        {
4478 >            CompletableFuture<Long> f = Monad.plus(Monad.unit(5L),
4479 >                                                   Monad.unit(8L));
4480 >            // non-determinism
4481 >            assertTrue(f.get() == 5L || f.get() == 8L);
4482 >        }
4483 >
4484 >        CompletableFuture<Long> godot = new CompletableFuture<>();
4485 >        // f plus godot === f (doesn't wait for godot)
4486 >        Monad.assertFutureEquals(Monad.unit(5L),
4487 >                                 Monad.plus(Monad.unit(5L), godot));
4488 >        // godot plus f === f (doesn't wait for godot)
4489 >        Monad.assertFutureEquals(Monad.unit(5L),
4490 >                                 Monad.plus(godot, Monad.unit(5L)));
4491 >    }
4492 >
4493 >    /** Test long recursive chains of CompletableFutures with cascading completions */
4494 >    @SuppressWarnings("FutureReturnValueIgnored")
4495 >    public void testRecursiveChains() throws Throwable {
4496 >        for (ExecutionMode m : ExecutionMode.values())
4497 >        for (boolean addDeadEnds : new boolean[] { true, false })
4498 >    {
4499 >        final int val = 42;
4500 >        final int n = expensiveTests ? 1_000 : 2;
4501 >        CompletableFuture<Integer> head = new CompletableFuture<>();
4502 >        CompletableFuture<Integer> tail = head;
4503 >        for (int i = 0; i < n; i++) {
4504 >            if (addDeadEnds) m.thenApply(tail, v -> v + 1);
4505 >            tail = m.thenApply(tail, v -> v + 1);
4506 >            if (addDeadEnds) m.applyToEither(tail, tail, v -> v + 1);
4507 >            tail = m.applyToEither(tail, tail, v -> v + 1);
4508 >            if (addDeadEnds) m.thenCombine(tail, tail, (v, w) -> v + 1);
4509 >            tail = m.thenCombine(tail, tail, (v, w) -> v + 1);
4510 >        }
4511 >        head.complete(val);
4512 >        assertEquals(val + 3 * n, (int) tail.join());
4513 >    }}
4514 >
4515 >    /**
4516 >     * A single CompletableFuture with many dependents.
4517 >     * A demo of scalability - runtime is O(n).
4518 >     */
4519 >    @SuppressWarnings("FutureReturnValueIgnored")
4520 >    public void testManyDependents() throws Throwable {
4521 >        final int n = expensiveTests ? 1_000_000 : 10;
4522 >        final CompletableFuture<Void> head = new CompletableFuture<>();
4523 >        final CompletableFuture<Void> complete = CompletableFuture.completedFuture((Void)null);
4524 >        final AtomicInteger count = new AtomicInteger(0);
4525 >        for (int i = 0; i < n; i++) {
4526 >            head.thenRun(() -> count.getAndIncrement());
4527 >            head.thenAccept(x -> count.getAndIncrement());
4528 >            head.thenApply(x -> count.getAndIncrement());
4529 >
4530 >            head.runAfterBoth(complete, () -> count.getAndIncrement());
4531 >            head.thenAcceptBoth(complete, (x, y) -> count.getAndIncrement());
4532 >            head.thenCombine(complete, (x, y) -> count.getAndIncrement());
4533 >            complete.runAfterBoth(head, () -> count.getAndIncrement());
4534 >            complete.thenAcceptBoth(head, (x, y) -> count.getAndIncrement());
4535 >            complete.thenCombine(head, (x, y) -> count.getAndIncrement());
4536 >
4537 >            head.runAfterEither(new CompletableFuture<Void>(), () -> count.getAndIncrement());
4538 >            head.acceptEither(new CompletableFuture<Void>(), x -> count.getAndIncrement());
4539 >            head.applyToEither(new CompletableFuture<Void>(), x -> count.getAndIncrement());
4540 >            new CompletableFuture<Void>().runAfterEither(head, () -> count.getAndIncrement());
4541 >            new CompletableFuture<Void>().acceptEither(head, x -> count.getAndIncrement());
4542 >            new CompletableFuture<Void>().applyToEither(head, x -> count.getAndIncrement());
4543 >        }
4544 >        head.complete(null);
4545 >        assertEquals(5 * 3 * n, count.get());
4546 >    }
4547 >
4548 >    /** ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest tck */
4549 >    @SuppressWarnings("FutureReturnValueIgnored")
4550 >    public void testCoCompletionGarbageRetention() throws Throwable {
4551 >        final int n = expensiveTests ? 1_000_000 : 10;
4552 >        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
4553 >        CompletableFuture<Integer> f;
4554 >        for (int i = 0; i < n; i++) {
4555 >            f = new CompletableFuture<>();
4556 >            f.runAfterEither(incomplete, () -> {});
4557 >            f.complete(null);
4558 >
4559 >            f = new CompletableFuture<>();
4560 >            f.acceptEither(incomplete, x -> {});
4561 >            f.complete(null);
4562 >
4563 >            f = new CompletableFuture<>();
4564 >            f.applyToEither(incomplete, x -> x);
4565 >            f.complete(null);
4566 >
4567 >            f = new CompletableFuture<>();
4568 >            CompletableFuture.anyOf(f, incomplete);
4569 >            f.complete(null);
4570 >        }
4571 >
4572 >        for (int i = 0; i < n; i++) {
4573 >            f = new CompletableFuture<>();
4574 >            incomplete.runAfterEither(f, () -> {});
4575 >            f.complete(null);
4576 >
4577 >            f = new CompletableFuture<>();
4578 >            incomplete.acceptEither(f, x -> {});
4579 >            f.complete(null);
4580 >
4581 >            f = new CompletableFuture<>();
4582 >            incomplete.applyToEither(f, x -> x);
4583 >            f.complete(null);
4584 >
4585 >            f = new CompletableFuture<>();
4586 >            CompletableFuture.anyOf(incomplete, f);
4587 >            f.complete(null);
4588 >        }
4589 >    }
4590 >
4591 >    /**
4592 >     * Reproduction recipe for:
4593 >     * 8160402: Garbage retention with CompletableFuture.anyOf
4594 >     * 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
4595 >     */
4596 >    public void testAnyOfGarbageRetention() throws Throwable {
4597 >        for (Integer v : new Integer[] { 1, null })
4598 >    {
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 >        fs[fs.length - 1].complete(v);
4605 >        for (int i = 0; i < n; i++)
4606 >            checkCompletedNormally(CompletableFuture.anyOf(fs), v);
4607 >    }}
4608 >
4609 >    /**
4610 >     * Checks for garbage retention with allOf.
4611 >     *
4612 >     * As of 2016-07, fails with OOME:
4613 >     * ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest -Djsr166.methodFilter=testCancelledAllOfGarbageRetention tck
4614 >     */
4615 >    public void testCancelledAllOfGarbageRetention() throws Throwable {
4616 >        final int n = expensiveTests ? 100_000 : 10;
4617 >        CompletableFuture<Integer>[] fs
4618 >            = (CompletableFuture<Integer>[]) new CompletableFuture<?>[100];
4619 >        for (int i = 0; i < fs.length; i++)
4620 >            fs[i] = new CompletableFuture<>();
4621 >        for (int i = 0; i < n; i++)
4622 >            assertTrue(CompletableFuture.allOf(fs).cancel(false));
4623 >    }
4624 >
4625 >    /**
4626 >     * Checks for garbage retention when a dependent future is
4627 >     * cancelled and garbage-collected.
4628 >     * 8161600: Garbage retention when source CompletableFutures are never completed
4629 >     *
4630 >     * As of 2016-07, fails with OOME:
4631 >     * ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest -Djsr166.methodFilter=testCancelledGarbageRetention tck
4632 >     */
4633 >    public void testCancelledGarbageRetention() throws Throwable {
4634 >        final int n = expensiveTests ? 100_000 : 10;
4635 >        CompletableFuture<Integer> neverCompleted = new CompletableFuture<>();
4636 >        for (int i = 0; i < n; i++)
4637 >            assertTrue(neverCompleted.thenRun(() -> {}).cancel(true));
4638 >    }
4639 >
4640 >    /**
4641 >     * Checks for garbage retention when MinimalStage.toCompletableFuture()
4642 >     * is invoked many times.
4643 >     * 8161600: Garbage retention when source CompletableFutures are never completed
4644 >     *
4645 >     * As of 2016-07, fails with OOME:
4646 >     * ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest -Djsr166.methodFilter=testToCompletableFutureGarbageRetention tck
4647 >     */
4648 >    public void testToCompletableFutureGarbageRetention() throws Throwable {
4649 >        final int n = expensiveTests ? 900_000 : 10;
4650 >        CompletableFuture<Integer> neverCompleted = new CompletableFuture<>();
4651 >        CompletionStage minimal = neverCompleted.minimalCompletionStage();
4652 >        for (int i = 0; i < n; i++)
4653 >            assertTrue(minimal.toCompletableFuture().cancel(true));
4654 >    }
4655 >
4656 > //     static <U> U join(CompletionStage<U> stage) {
4657 > //         CompletableFuture<U> f = new CompletableFuture<>();
4658 > //         stage.whenComplete((v, ex) -> {
4659 > //             if (ex != null) f.completeExceptionally(ex); else f.complete(v);
4660 > //         });
4661 > //         return f.join();
4662 > //     }
4663 >
4664 > //     static <U> boolean isDone(CompletionStage<U> stage) {
4665 > //         CompletableFuture<U> f = new CompletableFuture<>();
4666 > //         stage.whenComplete((v, ex) -> {
4667 > //             if (ex != null) f.completeExceptionally(ex); else f.complete(v);
4668 > //         });
4669 > //         return f.isDone();
4670 > //     }
4671 >
4672 > //     static <U> U join2(CompletionStage<U> stage) {
4673 > //         return stage.toCompletableFuture().copy().join();
4674 > //     }
4675 >
4676 > //     static <U> boolean isDone2(CompletionStage<U> stage) {
4677 > //         return stage.toCompletableFuture().copy().isDone();
4678 > //     }
4679 >
4680 >    // For testing default implementations
4681 >    // Only non-default interface methods defined.
4682 >    static final class DelegatedCompletionStage<T> implements CompletionStage<T> {
4683 >        final CompletableFuture<T> cf;
4684 >        DelegatedCompletionStage(CompletableFuture<T> cf) { this.cf = cf; }
4685 >        public CompletableFuture<T> toCompletableFuture() {
4686 >            return cf; }
4687 >        public CompletionStage<Void> thenRun
4688 >            (Runnable action) {
4689 >            return cf.thenRun(action); }
4690 >        public CompletionStage<Void> thenRunAsync
4691 >            (Runnable action) {
4692 >            return cf.thenRunAsync(action); }
4693 >        public CompletionStage<Void> thenRunAsync
4694 >            (Runnable action,
4695 >             Executor executor) {
4696 >            return cf.thenRunAsync(action, executor); }
4697 >        public CompletionStage<Void> thenAccept
4698 >            (Consumer<? super T> action) {
4699 >            return cf.thenAccept(action); }
4700 >        public CompletionStage<Void> thenAcceptAsync
4701 >            (Consumer<? super T> action) {
4702 >            return cf.thenAcceptAsync(action); }
4703 >        public CompletionStage<Void> thenAcceptAsync
4704 >            (Consumer<? super T> action,
4705 >             Executor executor) {
4706 >            return cf.thenAcceptAsync(action, executor); }
4707 >        public <U> CompletionStage<U> thenApply
4708 >            (Function<? super T,? extends U> a) {
4709 >            return cf.thenApply(a); }
4710 >        public <U> CompletionStage<U> thenApplyAsync
4711 >            (Function<? super T,? extends U> fn) {
4712 >            return cf.thenApplyAsync(fn); }
4713 >        public <U> CompletionStage<U> thenApplyAsync
4714 >            (Function<? super T,? extends U> fn,
4715 >             Executor executor) {
4716 >            return cf.thenApplyAsync(fn, executor); }
4717 >        public <U,V> CompletionStage<V> thenCombine
4718 >            (CompletionStage<? extends U> other,
4719 >             BiFunction<? super T,? super U,? extends V> fn) {
4720 >            return cf.thenCombine(other, fn); }
4721 >        public <U,V> CompletionStage<V> thenCombineAsync
4722 >            (CompletionStage<? extends U> other,
4723 >             BiFunction<? super T,? super U,? extends V> fn) {
4724 >            return cf.thenCombineAsync(other, fn); }
4725 >        public <U,V> CompletionStage<V> thenCombineAsync
4726 >            (CompletionStage<? extends U> other,
4727 >             BiFunction<? super T,? super U,? extends V> fn,
4728 >             Executor executor) {
4729 >            return cf.thenCombineAsync(other, fn, executor); }
4730 >        public <U> CompletionStage<Void> thenAcceptBoth
4731 >            (CompletionStage<? extends U> other,
4732 >             BiConsumer<? super T, ? super U> action) {
4733 >            return cf.thenAcceptBoth(other, action); }
4734 >        public <U> CompletionStage<Void> thenAcceptBothAsync
4735 >            (CompletionStage<? extends U> other,
4736 >             BiConsumer<? super T, ? super U> action) {
4737 >            return cf.thenAcceptBothAsync(other, action); }
4738 >        public <U> CompletionStage<Void> thenAcceptBothAsync
4739 >            (CompletionStage<? extends U> other,
4740 >             BiConsumer<? super T, ? super U> action,
4741 >             Executor executor) {
4742 >            return cf.thenAcceptBothAsync(other, action, executor); }
4743 >        public CompletionStage<Void> runAfterBoth
4744 >            (CompletionStage<?> other,
4745 >             Runnable action) {
4746 >            return cf.runAfterBoth(other, action); }
4747 >        public CompletionStage<Void> runAfterBothAsync
4748 >            (CompletionStage<?> other,
4749 >             Runnable action) {
4750 >            return cf.runAfterBothAsync(other, action); }
4751 >        public CompletionStage<Void> runAfterBothAsync
4752 >            (CompletionStage<?> other,
4753 >             Runnable action,
4754 >             Executor executor) {
4755 >            return cf.runAfterBothAsync(other, action, executor); }
4756 >        public <U> CompletionStage<U> applyToEither
4757 >            (CompletionStage<? extends T> other,
4758 >             Function<? super T, U> fn) {
4759 >            return cf.applyToEither(other, fn); }
4760 >        public <U> CompletionStage<U> applyToEitherAsync
4761 >            (CompletionStage<? extends T> other,
4762 >             Function<? super T, U> fn) {
4763 >            return cf.applyToEitherAsync(other, fn); }
4764 >        public <U> CompletionStage<U> applyToEitherAsync
4765 >            (CompletionStage<? extends T> other,
4766 >             Function<? super T, U> fn,
4767 >             Executor executor) {
4768 >            return cf.applyToEitherAsync(other, fn, executor); }
4769 >        public CompletionStage<Void> acceptEither
4770 >            (CompletionStage<? extends T> other,
4771 >             Consumer<? super T> action) {
4772 >            return cf.acceptEither(other, action); }
4773 >        public CompletionStage<Void> acceptEitherAsync
4774 >            (CompletionStage<? extends T> other,
4775 >             Consumer<? super T> action) {
4776 >            return cf.acceptEitherAsync(other, action); }
4777 >        public CompletionStage<Void> acceptEitherAsync
4778 >            (CompletionStage<? extends T> other,
4779 >             Consumer<? super T> action,
4780 >             Executor executor) {
4781 >            return cf.acceptEitherAsync(other, action, executor); }
4782 >        public CompletionStage<Void> runAfterEither
4783 >            (CompletionStage<?> other,
4784 >             Runnable action) {
4785 >            return cf.runAfterEither(other, action); }
4786 >        public CompletionStage<Void> runAfterEitherAsync
4787 >            (CompletionStage<?> other,
4788 >             Runnable action) {
4789 >            return cf.runAfterEitherAsync(other, action); }
4790 >        public CompletionStage<Void> runAfterEitherAsync
4791 >            (CompletionStage<?> other,
4792 >             Runnable action,
4793 >             Executor executor) {
4794 >            return cf.runAfterEitherAsync(other, action, executor); }
4795 >        public <U> CompletionStage<U> thenCompose
4796 >            (Function<? super T, ? extends CompletionStage<U>> fn) {
4797 >            return cf.thenCompose(fn); }
4798 >        public <U> CompletionStage<U> thenComposeAsync
4799 >            (Function<? super T, ? extends CompletionStage<U>> fn) {
4800 >            return cf.thenComposeAsync(fn); }
4801 >        public <U> CompletionStage<U> thenComposeAsync
4802 >            (Function<? super T, ? extends CompletionStage<U>> fn,
4803 >             Executor executor) {
4804 >            return cf.thenComposeAsync(fn, executor); }
4805 >        public <U> CompletionStage<U> handle
4806 >            (BiFunction<? super T, Throwable, ? extends U> fn) {
4807 >            return cf.handle(fn); }
4808 >        public <U> CompletionStage<U> handleAsync
4809 >            (BiFunction<? super T, Throwable, ? extends U> fn) {
4810 >            return cf.handleAsync(fn); }
4811 >        public <U> CompletionStage<U> handleAsync
4812 >            (BiFunction<? super T, Throwable, ? extends U> fn,
4813 >             Executor executor) {
4814 >            return cf.handleAsync(fn, executor); }
4815 >        public CompletionStage<T> whenComplete
4816 >            (BiConsumer<? super T, ? super Throwable> action) {
4817 >            return cf.whenComplete(action); }
4818 >        public CompletionStage<T> whenCompleteAsync
4819 >            (BiConsumer<? super T, ? super Throwable> action) {
4820 >            return cf.whenCompleteAsync(action); }
4821 >        public CompletionStage<T> whenCompleteAsync
4822 >            (BiConsumer<? super T, ? super Throwable> action,
4823 >             Executor executor) {
4824 >            return cf.whenCompleteAsync(action, executor); }
4825 >        public CompletionStage<T> exceptionally
4826 >            (Function<Throwable, ? extends T> fn) {
4827 >            return cf.exceptionally(fn); }
4828 >    }
4829 >
4830 >    /**
4831 >     * default-implemented exceptionallyAsync action is not invoked when
4832 >     * source completes normally, and source result is propagated
4833 >     */
4834 >    public void testDefaultExceptionallyAsync_normalCompletion() {
4835 >        for (boolean createIncomplete : new boolean[] { true, false })
4836 >        for (Integer v1 : new Integer[] { 1, null })
4837 >    {
4838 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
4839 >        final DelegatedCompletionStage<Integer> d =
4840 >            new DelegatedCompletionStage<Integer>(f);
4841 >        if (!createIncomplete) assertTrue(f.complete(v1));
4842 >        final CompletionStage<Integer> g = d.exceptionallyAsync
4843 >            ((Throwable t) -> {
4844 >                threadFail("should not be called");
4845 >                return null;            // unreached
4846 >            });
4847 >        if (createIncomplete) assertTrue(f.complete(v1));
4848 >
4849 >        checkCompletedNormally(g.toCompletableFuture(), v1);
4850 >    }}
4851 >
4852 >    /**
4853 >     * default-implemented exceptionallyAsync action completes with
4854 >     * function value on source exception
4855 >     */
4856 >    public void testDefaultExceptionallyAsync_exceptionalCompletion() {
4857 >        for (boolean createIncomplete : new boolean[] { true, false })
4858 >        for (Integer v1 : new Integer[] { 1, null })
4859 >    {
4860 >        final AtomicInteger a = new AtomicInteger(0);
4861 >        final CFException ex = new CFException();
4862 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
4863 >        final DelegatedCompletionStage<Integer> d =
4864 >            new DelegatedCompletionStage<Integer>(f);
4865 >        if (!createIncomplete) f.completeExceptionally(ex);
4866 >        final CompletionStage<Integer> g = d.exceptionallyAsync
4867 >            ((Throwable t) -> {
4868 >                threadAssertSame(t, ex);
4869 >                a.getAndIncrement();
4870 >                return v1;
4871 >            });
4872 >        if (createIncomplete) f.completeExceptionally(ex);
4873 >
4874 >        checkCompletedNormally(g.toCompletableFuture(), v1);
4875 >        assertEquals(1, a.get());
4876 >    }}
4877 >
4878 >    /**
4879 >     * Under default implementation, if an "exceptionally action"
4880 >     * throws an exception, it completes exceptionally with that
4881 >     * exception
4882 >     */
4883 >    public void testDefaultExceptionallyAsync_exceptionalCompletionActionFailed() {
4884 >        for (boolean createIncomplete : new boolean[] { true, false })
4885 >    {
4886 >        final AtomicInteger a = new AtomicInteger(0);
4887 >        final CFException ex1 = new CFException();
4888 >        final CFException ex2 = new CFException();
4889 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
4890 >        final DelegatedCompletionStage<Integer> d =
4891 >            new DelegatedCompletionStage<Integer>(f);
4892 >        if (!createIncomplete) f.completeExceptionally(ex1);
4893 >        final CompletionStage<Integer> g = d.exceptionallyAsync
4894 >            ((Throwable t) -> {
4895 >                threadAssertSame(t, ex1);
4896 >                a.getAndIncrement();
4897 >                throw ex2;
4898 >            });
4899 >        if (createIncomplete) f.completeExceptionally(ex1);
4900 >
4901 >        checkCompletedWithWrappedException(g.toCompletableFuture(), ex2);
4902 >        checkCompletedExceptionally(f, ex1);
4903 >        checkCompletedExceptionally(d.toCompletableFuture(), ex1);
4904 >        assertEquals(1, a.get());
4905 >    }}
4906 >
4907 >    /**
4908 >     * default-implemented exceptionallyCompose result completes
4909 >     * normally after normal completion of source
4910 >     */
4911 >    public void testDefaultExceptionallyCompose_normalCompletion() {
4912 >        for (boolean createIncomplete : new boolean[] { true, false })
4913 >        for (Integer v1 : new Integer[] { 1, null })
4914 >    {
4915 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
4916 >        final ExceptionalCompletableFutureFunction r =
4917 >            new ExceptionalCompletableFutureFunction(ExecutionMode.SYNC);
4918 >        final DelegatedCompletionStage<Integer> d =
4919 >            new DelegatedCompletionStage<Integer>(f);
4920 >        if (!createIncomplete) assertTrue(f.complete(v1));
4921 >        final CompletionStage<Integer> g = d.exceptionallyCompose(r);
4922 >        if (createIncomplete) assertTrue(f.complete(v1));
4923 >
4924 >        checkCompletedNormally(f, v1);
4925 >        checkCompletedNormally(g.toCompletableFuture(), v1);
4926 >        r.assertNotInvoked();
4927 >    }}
4928 >
4929 >    /**
4930 >     * default-implemented exceptionallyCompose result completes
4931 >     * normally after exceptional completion of source
4932 >     */
4933 >    public void testDefaultExceptionallyCompose_exceptionalCompletion() {
4934 >        for (boolean createIncomplete : new boolean[] { true, false })
4935 >    {
4936 >        final CFException ex = new CFException();
4937 >        final ExceptionalCompletableFutureFunction r =
4938 >            new ExceptionalCompletableFutureFunction(ExecutionMode.SYNC);
4939 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
4940 >        final DelegatedCompletionStage<Integer> d =
4941 >            new DelegatedCompletionStage<Integer>(f);
4942 >        if (!createIncomplete) f.completeExceptionally(ex);
4943 >        final CompletionStage<Integer> g = d.exceptionallyCompose(r);
4944 >        if (createIncomplete) f.completeExceptionally(ex);
4945 >
4946 >        checkCompletedExceptionally(f, ex);
4947 >        checkCompletedNormally(g.toCompletableFuture(), r.value);
4948 >        r.assertInvoked();
4949 >    }}
4950 >
4951 >    /**
4952 >     * default-implemented exceptionallyCompose completes
4953 >     * exceptionally on exception if action does
4954 >     */
4955 >    public void testDefaultExceptionallyCompose_actionFailed() {
4956 >        for (boolean createIncomplete : new boolean[] { true, false })
4957 >    {
4958 >        final CFException ex = new CFException();
4959 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
4960 >        final FailingExceptionalCompletableFutureFunction r
4961 >            = new FailingExceptionalCompletableFutureFunction(ExecutionMode.SYNC);
4962 >        final DelegatedCompletionStage<Integer> d =
4963 >            new DelegatedCompletionStage<Integer>(f);
4964 >        if (!createIncomplete) f.completeExceptionally(ex);
4965 >        final CompletionStage<Integer> g = d.exceptionallyCompose(r);
4966 >        if (createIncomplete) f.completeExceptionally(ex);
4967 >
4968 >        checkCompletedExceptionally(f, ex);
4969 >        checkCompletedWithWrappedException(g.toCompletableFuture(), r.ex);
4970 >        r.assertInvoked();
4971 >    }}
4972 >
4973 >    /**
4974 >     * default-implemented exceptionallyComposeAsync result completes
4975 >     * normally after normal completion of source
4976 >     */
4977 >    public void testDefaultExceptionallyComposeAsync_normalCompletion() {
4978 >        for (boolean createIncomplete : new boolean[] { true, false })
4979 >        for (Integer v1 : new Integer[] { 1, null })
4980 >    {
4981 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
4982 >        final ExceptionalCompletableFutureFunction r =
4983 >            new ExceptionalCompletableFutureFunction(ExecutionMode.ASYNC);
4984 >        final DelegatedCompletionStage<Integer> d =
4985 >            new DelegatedCompletionStage<Integer>(f);
4986 >        if (!createIncomplete) assertTrue(f.complete(v1));
4987 >        final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r);
4988 >        if (createIncomplete) assertTrue(f.complete(v1));
4989 >
4990 >        checkCompletedNormally(f, v1);
4991 >        checkCompletedNormally(g.toCompletableFuture(), v1);
4992 >        r.assertNotInvoked();
4993 >    }}
4994 >
4995 >    /**
4996 >     * default-implemented exceptionallyComposeAsync result completes
4997 >     * normally after exceptional completion of source
4998 >     */
4999 >    public void testDefaultExceptionallyComposeAsync_exceptionalCompletion() {
5000 >        for (boolean createIncomplete : new boolean[] { true, false })
5001 >    {
5002 >        final CFException ex = new CFException();
5003 >        final ExceptionalCompletableFutureFunction r =
5004 >            new ExceptionalCompletableFutureFunction(ExecutionMode.ASYNC);
5005 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
5006 >        final DelegatedCompletionStage<Integer> d =
5007 >            new DelegatedCompletionStage<Integer>(f);
5008 >        if (!createIncomplete) f.completeExceptionally(ex);
5009 >        final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r);
5010 >        if (createIncomplete) f.completeExceptionally(ex);
5011 >
5012 >        checkCompletedExceptionally(f, ex);
5013 >        checkCompletedNormally(g.toCompletableFuture(), r.value);
5014 >        r.assertInvoked();
5015 >    }}
5016 >
5017 >    /**
5018 >     * default-implemented exceptionallyComposeAsync completes
5019 >     * exceptionally on exception if action does
5020 >     */
5021 >    public void testDefaultExceptionallyComposeAsync_actionFailed() {
5022 >        for (boolean createIncomplete : new boolean[] { true, false })
5023 >    {
5024 >        final CFException ex = new CFException();
5025 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
5026 >        final FailingExceptionalCompletableFutureFunction r
5027 >            = new FailingExceptionalCompletableFutureFunction(ExecutionMode.ASYNC);
5028 >        final DelegatedCompletionStage<Integer> d =
5029 >            new DelegatedCompletionStage<Integer>(f);
5030 >        if (!createIncomplete) f.completeExceptionally(ex);
5031 >        final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r);
5032 >        if (createIncomplete) f.completeExceptionally(ex);
5033 >
5034 >        checkCompletedExceptionally(f, ex);
5035 >        checkCompletedWithWrappedException(g.toCompletableFuture(), r.ex);
5036 >        r.assertInvoked();
5037 >    }}
5038 >
5039 >    /**
5040 >     * default-implemented exceptionallyComposeAsync result completes
5041 >     * normally after normal completion of source
5042 >     */
5043 >    public void testDefaultExceptionallyComposeAsyncExecutor_normalCompletion() {
5044 >        for (boolean createIncomplete : new boolean[] { true, false })
5045 >        for (Integer v1 : new Integer[] { 1, null })
5046 >    {
5047 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
5048 >        final ExceptionalCompletableFutureFunction r =
5049 >            new ExceptionalCompletableFutureFunction(ExecutionMode.EXECUTOR);
5050 >        final DelegatedCompletionStage<Integer> d =
5051 >            new DelegatedCompletionStage<Integer>(f);
5052 >        if (!createIncomplete) assertTrue(f.complete(v1));
5053 >        final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r, new ThreadExecutor());
5054 >        if (createIncomplete) assertTrue(f.complete(v1));
5055 >
5056 >        checkCompletedNormally(f, v1);
5057 >        checkCompletedNormally(g.toCompletableFuture(), v1);
5058 >        r.assertNotInvoked();
5059 >    }}
5060 >
5061 >    /**
5062 >     * default-implemented exceptionallyComposeAsync result completes
5063 >     * normally after exceptional completion of source
5064 >     */
5065 >    public void testDefaultExceptionallyComposeAsyncExecutor_exceptionalCompletion() {
5066 >        for (boolean createIncomplete : new boolean[] { true, false })
5067 >    {
5068 >        final CFException ex = new CFException();
5069 >        final ExceptionalCompletableFutureFunction r =
5070 >            new ExceptionalCompletableFutureFunction(ExecutionMode.EXECUTOR);
5071 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
5072 >        final DelegatedCompletionStage<Integer> d =
5073 >            new DelegatedCompletionStage<Integer>(f);
5074 >        if (!createIncomplete) f.completeExceptionally(ex);
5075 >        final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r, new ThreadExecutor());
5076 >        if (createIncomplete) f.completeExceptionally(ex);
5077 >
5078 >        checkCompletedExceptionally(f, ex);
5079 >        checkCompletedNormally(g.toCompletableFuture(), r.value);
5080 >        r.assertInvoked();
5081 >    }}
5082 >
5083 >    /**
5084 >     * default-implemented exceptionallyComposeAsync completes
5085 >     * exceptionally on exception if action does
5086 >     */
5087 >    public void testDefaultExceptionallyComposeAsyncExecutor_actionFailed() {
5088 >        for (boolean createIncomplete : new boolean[] { true, false })
5089 >    {
5090 >        final CFException ex = new CFException();
5091 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
5092 >        final FailingExceptionalCompletableFutureFunction r
5093 >            = new FailingExceptionalCompletableFutureFunction(ExecutionMode.EXECUTOR);
5094 >        final DelegatedCompletionStage<Integer> d =
5095 >            new DelegatedCompletionStage<Integer>(f);
5096 >        if (!createIncomplete) f.completeExceptionally(ex);
5097 >        final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r, new ThreadExecutor());
5098 >        if (createIncomplete) f.completeExceptionally(ex);
5099 >
5100 >        checkCompletedExceptionally(f, ex);
5101 >        checkCompletedWithWrappedException(g.toCompletableFuture(), r.ex);
5102 >        r.assertInvoked();
5103 >    }}
5104  
5105   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines