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.79 by jsr166, Mon Jun 16 17:08:15 2014 UTC vs.
Revision 1.201 by jsr166, Sat Sep 22 21:04:48 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); }
# Line 544 | Line 557 | public class CompletableFutureTest exten
557          }
558      }
559  
560 <    class FailingCompletableFutureFunction extends CheckedIntegerAction
560 >    static class FailingExceptionalCompletableFutureFunction extends CheckedAction
561 >        implements Function<Throwable, CompletableFuture<Integer>>
562 >    {
563 >        final CFException ex;
564 >        FailingExceptionalCompletableFutureFunction(ExecutionMode m) { super(m); ex = new CFException(); }
565 >        public CompletableFuture<Integer> apply(Throwable x) {
566 >            invoked();
567 >            throw ex;
568 >        }
569 >    }
570 >
571 >    static class ExceptionalCompletableFutureFunction extends CheckedAction
572 >        implements Function<Throwable, CompletionStage<Integer>> {
573 >        final Integer value = 3;
574 >        ExceptionalCompletableFutureFunction(ExecutionMode m) { super(m); }
575 >        public CompletionStage<Integer> apply(Throwable x) {
576 >            invoked();
577 >            CompletableFuture<Integer> d = new CompletableFuture<Integer>();
578 >            d.complete(value);
579 >            return d;
580 >        }
581 >    }
582 >
583 >    static class FailingCompletableFutureFunction extends CheckedIntegerAction
584          implements Function<Integer, CompletableFuture<Integer>>
585      {
586 <        FailingCompletableFutureFunction(ExecutionMode m) { super(m); }
586 >        final CFException ex;
587 >        FailingCompletableFutureFunction(ExecutionMode m) { super(m); ex = new CFException(); }
588          public CompletableFuture<Integer> apply(Integer x) {
589              invoked();
590              value = x;
591 <            throw new CFException();
591 >            throw ex;
592 >        }
593 >    }
594 >
595 >    static class CountingRejectingExecutor implements Executor {
596 >        final RejectedExecutionException ex = new RejectedExecutionException();
597 >        final AtomicInteger count = new AtomicInteger(0);
598 >        public void execute(Runnable r) {
599 >            count.getAndIncrement();
600 >            throw ex;
601          }
602      }
603  
# Line 569 | Line 615 | public class CompletableFutureTest exten
615          }
616      }
617  
618 +    static final boolean defaultExecutorIsCommonPool
619 +        = ForkJoinPool.getCommonPoolParallelism() > 1;
620 +
621      /**
622       * Permits the testing of parallel code for the 3 different
623       * execution modes without copy/pasting all the test methods.
624       */
625      enum ExecutionMode {
626 <        DEFAULT {
626 >        SYNC {
627              public void checkExecutionMode() {
628                  assertFalse(ThreadExecutor.startedCurrentThread());
629                  assertNull(ForkJoinTask.getPool());
# Line 646 | Line 695 | public class CompletableFutureTest exten
695                   Function<? super T,U> a) {
696                  return f.applyToEither(g, a);
697              }
698 +            public <T> CompletableFuture<T> exceptionally
699 +                (CompletableFuture<T> f,
700 +                 Function<Throwable, ? extends T> fn) {
701 +                return f.exceptionally(fn);
702 +            }
703 +            public <T> CompletableFuture<T> exceptionallyCompose
704 +                (CompletableFuture<T> f, Function<Throwable, ? extends CompletionStage<T>> fn) {
705 +                return f.exceptionallyCompose(fn);
706 +            }
707          },
650
708          ASYNC {
709              public void checkExecutionMode() {
710 <                assertSame(ForkJoinPool.commonPool(),
711 <                           ForkJoinTask.getPool());
710 >                assertEquals(defaultExecutorIsCommonPool,
711 >                             (ForkJoinPool.commonPool() == ForkJoinTask.getPool()));
712              }
713              public CompletableFuture<Void> runAsync(Runnable a) {
714                  return CompletableFuture.runAsync(a);
# Line 720 | Line 777 | public class CompletableFutureTest exten
777                   Function<? super T,U> a) {
778                  return f.applyToEitherAsync(g, a);
779              }
780 +            public <T> CompletableFuture<T> exceptionally
781 +                (CompletableFuture<T> f,
782 +                 Function<Throwable, ? extends T> fn) {
783 +                return f.exceptionallyAsync(fn);
784 +            }
785 +
786 +            public <T> CompletableFuture<T> exceptionallyCompose
787 +                (CompletableFuture<T> f, Function<Throwable, ? extends CompletionStage<T>> fn) {
788 +                return f.exceptionallyComposeAsync(fn);
789 +            }
790 +
791          },
792  
793          EXECUTOR {
# Line 793 | Line 861 | public class CompletableFutureTest exten
861                   Function<? super T,U> a) {
862                  return f.applyToEitherAsync(g, a, new ThreadExecutor());
863              }
864 +            public <T> CompletableFuture<T> exceptionally
865 +                (CompletableFuture<T> f,
866 +                 Function<Throwable, ? extends T> fn) {
867 +                return f.exceptionallyAsync(fn, new ThreadExecutor());
868 +            }
869 +            public <T> CompletableFuture<T> exceptionallyCompose
870 +                (CompletableFuture<T> f, Function<Throwable, ? extends CompletionStage<T>> fn) {
871 +                return f.exceptionallyComposeAsync(fn, new ThreadExecutor());
872 +            }
873 +
874          };
875  
876          public abstract void checkExecutionMode();
# Line 835 | Line 913 | public class CompletableFutureTest exten
913              (CompletableFuture<T> f,
914               CompletionStage<? extends T> g,
915               Function<? super T,U> a);
916 +        public abstract <T> CompletableFuture<T> exceptionally
917 +            (CompletableFuture<T> f,
918 +             Function<Throwable, ? extends T> fn);
919 +        public abstract <T> CompletableFuture<T> exceptionallyCompose
920 +            (CompletableFuture<T> f,
921 +             Function<Throwable, ? extends CompletionStage<T>> fn);
922      }
923  
924      /**
# Line 842 | Line 926 | public class CompletableFutureTest exten
926       * normally, and source result is propagated
927       */
928      public void testExceptionally_normalCompletion() {
929 +        for (ExecutionMode m : ExecutionMode.values())
930          for (boolean createIncomplete : new boolean[] { true, false })
931          for (Integer v1 : new Integer[] { 1, null })
932      {
933          final AtomicInteger a = new AtomicInteger(0);
934          final CompletableFuture<Integer> f = new CompletableFuture<>();
935          if (!createIncomplete) assertTrue(f.complete(v1));
936 <        final CompletableFuture<Integer> g = f.exceptionally
937 <            ((Throwable t) -> {
853 <                // Should not be called
936 >        final CompletableFuture<Integer> g = m.exceptionally
937 >            (f, (Throwable t) -> {
938                  a.getAndIncrement();
939 <                throw new AssertionError();
939 >                threadFail("should not be called");
940 >                return null;            // unreached
941              });
942          if (createIncomplete) assertTrue(f.complete(v1));
943  
# Line 866 | Line 951 | public class CompletableFutureTest exten
951       * exception
952       */
953      public void testExceptionally_exceptionalCompletion() {
954 +        for (ExecutionMode m : ExecutionMode.values())
955          for (boolean createIncomplete : new boolean[] { true, false })
956          for (Integer v1 : new Integer[] { 1, null })
957      {
# Line 873 | Line 959 | public class CompletableFutureTest exten
959          final CFException ex = new CFException();
960          final CompletableFuture<Integer> f = new CompletableFuture<>();
961          if (!createIncomplete) f.completeExceptionally(ex);
962 <        final CompletableFuture<Integer> g = f.exceptionally
963 <            ((Throwable t) -> {
964 <                ExecutionMode.DEFAULT.checkExecutionMode();
962 >        final CompletableFuture<Integer> g = m.exceptionally
963 >            (f, (Throwable t) -> {
964 >                m.checkExecutionMode();
965                  threadAssertSame(t, ex);
966                  a.getAndIncrement();
967                  return v1;
# Line 886 | Line 972 | public class CompletableFutureTest exten
972          assertEquals(1, a.get());
973      }}
974  
975 +    /**
976 +     * If an "exceptionally action" throws an exception, it completes
977 +     * exceptionally with that exception
978 +     */
979      public void testExceptionally_exceptionalCompletionActionFailed() {
980 +        for (ExecutionMode m : ExecutionMode.values())
981          for (boolean createIncomplete : new boolean[] { true, false })
891        for (Integer v1 : new Integer[] { 1, null })
982      {
983          final AtomicInteger a = new AtomicInteger(0);
984          final CFException ex1 = new CFException();
985          final CFException ex2 = new CFException();
986          final CompletableFuture<Integer> f = new CompletableFuture<>();
987          if (!createIncomplete) f.completeExceptionally(ex1);
988 <        final CompletableFuture<Integer> g = f.exceptionally
989 <            ((Throwable t) -> {
990 <                ExecutionMode.DEFAULT.checkExecutionMode();
988 >        final CompletableFuture<Integer> g = m.exceptionally
989 >            (f, (Throwable t) -> {
990 >                m.checkExecutionMode();
991                  threadAssertSame(t, ex1);
992                  a.getAndIncrement();
993                  throw ex2;
# Line 905 | Line 995 | public class CompletableFutureTest exten
995          if (createIncomplete) f.completeExceptionally(ex1);
996  
997          checkCompletedWithWrappedException(g, ex2);
998 +        checkCompletedExceptionally(f, ex1);
999          assertEquals(1, a.get());
1000      }}
1001  
# Line 912 | Line 1003 | public class CompletableFutureTest exten
1003       * whenComplete action executes on normal completion, propagating
1004       * source result.
1005       */
1006 <    public void testWhenComplete_normalCompletion1() {
1006 >    public void testWhenComplete_normalCompletion() {
1007          for (ExecutionMode m : ExecutionMode.values())
1008          for (boolean createIncomplete : new boolean[] { true, false })
1009          for (Integer v1 : new Integer[] { 1, null })
# Line 922 | Line 1013 | public class CompletableFutureTest exten
1013          if (!createIncomplete) assertTrue(f.complete(v1));
1014          final CompletableFuture<Integer> g = m.whenComplete
1015              (f,
1016 <             (Integer x, Throwable t) -> {
1016 >             (Integer result, Throwable t) -> {
1017                  m.checkExecutionMode();
1018 <                threadAssertSame(x, v1);
1018 >                threadAssertSame(result, v1);
1019                  threadAssertNull(t);
1020                  a.getAndIncrement();
1021              });
# Line 942 | Line 1033 | public class CompletableFutureTest exten
1033      public void testWhenComplete_exceptionalCompletion() {
1034          for (ExecutionMode m : ExecutionMode.values())
1035          for (boolean createIncomplete : new boolean[] { true, false })
945        for (Integer v1 : new Integer[] { 1, null })
1036      {
1037          final AtomicInteger a = new AtomicInteger(0);
1038          final CFException ex = new CFException();
# Line 950 | Line 1040 | public class CompletableFutureTest exten
1040          if (!createIncomplete) f.completeExceptionally(ex);
1041          final CompletableFuture<Integer> g = m.whenComplete
1042              (f,
1043 <             (Integer x, Throwable t) -> {
1043 >             (Integer result, Throwable t) -> {
1044                  m.checkExecutionMode();
1045 <                threadAssertNull(x);
1045 >                threadAssertNull(result);
1046                  threadAssertSame(t, ex);
1047                  a.getAndIncrement();
1048              });
# Line 977 | Line 1067 | public class CompletableFutureTest exten
1067          if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1068          final CompletableFuture<Integer> g = m.whenComplete
1069              (f,
1070 <             (Integer x, Throwable t) -> {
1070 >             (Integer result, Throwable t) -> {
1071                  m.checkExecutionMode();
1072 <                threadAssertNull(x);
1072 >                threadAssertNull(result);
1073                  threadAssertTrue(t instanceof CancellationException);
1074                  a.getAndIncrement();
1075              });
# Line 994 | Line 1084 | public class CompletableFutureTest exten
1084       * If a whenComplete action throws an exception when triggered by
1085       * a normal completion, it completes exceptionally
1086       */
1087 <    public void testWhenComplete_actionFailed() {
1087 >    public void testWhenComplete_sourceCompletedNormallyActionFailed() {
1088          for (boolean createIncomplete : new boolean[] { true, false })
1089          for (ExecutionMode m : ExecutionMode.values())
1090          for (Integer v1 : new Integer[] { 1, null })
# Line 1005 | Line 1095 | public class CompletableFutureTest exten
1095          if (!createIncomplete) assertTrue(f.complete(v1));
1096          final CompletableFuture<Integer> g = m.whenComplete
1097              (f,
1098 <             (Integer x, Throwable t) -> {
1098 >             (Integer result, Throwable t) -> {
1099                  m.checkExecutionMode();
1100 <                threadAssertSame(x, v1);
1100 >                threadAssertSame(result, v1);
1101                  threadAssertNull(t);
1102                  a.getAndIncrement();
1103                  throw ex;
# Line 1022 | Line 1112 | public class CompletableFutureTest exten
1112      /**
1113       * If a whenComplete action throws an exception when triggered by
1114       * a source completion that also throws an exception, the source
1115 <     * exception takes precedence.
1115 >     * exception takes precedence (unlike handle)
1116       */
1117 <    public void testWhenComplete_actionFailedSourceFailed() {
1117 >    public void testWhenComplete_sourceFailedActionFailed() {
1118          for (boolean createIncomplete : new boolean[] { true, false })
1119          for (ExecutionMode m : ExecutionMode.values())
1030        for (Integer v1 : new Integer[] { 1, null })
1120      {
1121          final AtomicInteger a = new AtomicInteger(0);
1122          final CFException ex1 = new CFException();
# Line 1037 | Line 1126 | public class CompletableFutureTest exten
1126          if (!createIncomplete) f.completeExceptionally(ex1);
1127          final CompletableFuture<Integer> g = m.whenComplete
1128              (f,
1129 <             (Integer x, Throwable t) -> {
1129 >             (Integer result, Throwable t) -> {
1130                  m.checkExecutionMode();
1131                  threadAssertSame(t, ex1);
1132 <                threadAssertNull(x);
1132 >                threadAssertNull(result);
1133                  a.getAndIncrement();
1134                  throw ex2;
1135              });
# Line 1048 | Line 1137 | public class CompletableFutureTest exten
1137  
1138          checkCompletedWithWrappedException(g, ex1);
1139          checkCompletedExceptionally(f, ex1);
1140 +        if (testImplementationDetails) {
1141 +            assertEquals(1, ex1.getSuppressed().length);
1142 +            assertSame(ex2, ex1.getSuppressed()[0]);
1143 +        }
1144          assertEquals(1, a.get());
1145      }}
1146  
# Line 1065 | Line 1158 | public class CompletableFutureTest exten
1158          if (!createIncomplete) assertTrue(f.complete(v1));
1159          final CompletableFuture<Integer> g = m.handle
1160              (f,
1161 <             (Integer x, Throwable t) -> {
1161 >             (Integer result, Throwable t) -> {
1162                  m.checkExecutionMode();
1163 <                threadAssertSame(x, v1);
1163 >                threadAssertSame(result, v1);
1164                  threadAssertNull(t);
1165                  a.getAndIncrement();
1166                  return inc(v1);
# Line 1094 | Line 1187 | public class CompletableFutureTest exten
1187          if (!createIncomplete) f.completeExceptionally(ex);
1188          final CompletableFuture<Integer> g = m.handle
1189              (f,
1190 <             (Integer x, Throwable t) -> {
1190 >             (Integer result, Throwable t) -> {
1191                  m.checkExecutionMode();
1192 <                threadAssertNull(x);
1192 >                threadAssertNull(result);
1193                  threadAssertSame(t, ex);
1194                  a.getAndIncrement();
1195                  return v1;
# Line 1123 | Line 1216 | public class CompletableFutureTest exten
1216          if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1217          final CompletableFuture<Integer> g = m.handle
1218              (f,
1219 <             (Integer x, Throwable t) -> {
1219 >             (Integer result, Throwable t) -> {
1220                  m.checkExecutionMode();
1221 <                threadAssertNull(x);
1221 >                threadAssertNull(result);
1222                  threadAssertTrue(t instanceof CancellationException);
1223                  a.getAndIncrement();
1224                  return v1;
# Line 1138 | Line 1231 | public class CompletableFutureTest exten
1231      }}
1232  
1233      /**
1234 <     * handle result completes exceptionally if action does
1234 >     * If a "handle action" throws an exception when triggered by
1235 >     * a normal completion, it completes exceptionally
1236       */
1237 <    public void testHandle_sourceFailedActionFailed() {
1237 >    public void testHandle_sourceCompletedNormallyActionFailed() {
1238          for (ExecutionMode m : ExecutionMode.values())
1239          for (boolean createIncomplete : new boolean[] { true, false })
1240 +        for (Integer v1 : new Integer[] { 1, null })
1241      {
1242          final CompletableFuture<Integer> f = new CompletableFuture<>();
1243          final AtomicInteger a = new AtomicInteger(0);
1244 <        final CFException ex1 = new CFException();
1245 <        final CFException ex2 = new CFException();
1151 <        if (!createIncomplete) f.completeExceptionally(ex1);
1244 >        final CFException ex = new CFException();
1245 >        if (!createIncomplete) assertTrue(f.complete(v1));
1246          final CompletableFuture<Integer> g = m.handle
1247              (f,
1248 <             (Integer x, Throwable t) -> {
1248 >             (Integer result, Throwable t) -> {
1249                  m.checkExecutionMode();
1250 <                threadAssertNull(x);
1251 <                threadAssertSame(ex1, t);
1250 >                threadAssertSame(result, v1);
1251 >                threadAssertNull(t);
1252                  a.getAndIncrement();
1253 <                throw ex2;
1253 >                throw ex;
1254              });
1255 <        if (createIncomplete) f.completeExceptionally(ex1);
1255 >        if (createIncomplete) assertTrue(f.complete(v1));
1256  
1257 <        checkCompletedWithWrappedException(g, ex2);
1258 <        checkCompletedExceptionally(f, ex1);
1257 >        checkCompletedWithWrappedException(g, ex);
1258 >        checkCompletedNormally(f, v1);
1259          assertEquals(1, a.get());
1260      }}
1261  
1262 <    public void testHandle_sourceCompletedNormallyActionFailed() {
1263 <        for (ExecutionMode m : ExecutionMode.values())
1262 >    /**
1263 >     * If a "handle action" throws an exception when triggered by
1264 >     * a source completion that also throws an exception, the action
1265 >     * exception takes precedence (unlike whenComplete)
1266 >     */
1267 >    public void testHandle_sourceFailedActionFailed() {
1268          for (boolean createIncomplete : new boolean[] { true, false })
1269 <        for (Integer v1 : new Integer[] { 1, null })
1269 >        for (ExecutionMode m : ExecutionMode.values())
1270      {
1173        final CompletableFuture<Integer> f = new CompletableFuture<>();
1271          final AtomicInteger a = new AtomicInteger(0);
1272 <        final CFException ex = new CFException();
1273 <        if (!createIncomplete) assertTrue(f.complete(v1));
1272 >        final CFException ex1 = new CFException();
1273 >        final CFException ex2 = new CFException();
1274 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1275 >
1276 >        if (!createIncomplete) f.completeExceptionally(ex1);
1277          final CompletableFuture<Integer> g = m.handle
1278              (f,
1279 <             (Integer x, Throwable t) -> {
1279 >             (Integer result, Throwable t) -> {
1280                  m.checkExecutionMode();
1281 <                threadAssertSame(x, v1);
1282 <                threadAssertNull(t);
1281 >                threadAssertNull(result);
1282 >                threadAssertSame(ex1, t);
1283                  a.getAndIncrement();
1284 <                throw ex;
1284 >                throw ex2;
1285              });
1286 <        if (createIncomplete) assertTrue(f.complete(v1));
1286 >        if (createIncomplete) f.completeExceptionally(ex1);
1287  
1288 <        checkCompletedWithWrappedException(g, ex);
1289 <        checkCompletedNormally(f, v1);
1288 >        checkCompletedWithWrappedException(g, ex2);
1289 >        checkCompletedExceptionally(f, ex1);
1290          assertEquals(1, a.get());
1291      }}
1292  
# Line 1219 | Line 1319 | public class CompletableFutureTest exten
1319      {
1320          final FailingRunnable r = new FailingRunnable(m);
1321          final CompletableFuture<Void> f = m.runAsync(r);
1322 <        checkCompletedWithWrappedCFException(f);
1322 >        checkCompletedWithWrappedException(f, r.ex);
1323          r.assertInvoked();
1324      }}
1325  
1326 +    @SuppressWarnings("FutureReturnValueIgnored")
1327 +    public void testRunAsync_rejectingExecutor() {
1328 +        CountingRejectingExecutor e = new CountingRejectingExecutor();
1329 +        try {
1330 +            CompletableFuture.runAsync(() -> {}, e);
1331 +            shouldThrow();
1332 +        } catch (Throwable t) {
1333 +            assertSame(e.ex, t);
1334 +        }
1335 +
1336 +        assertEquals(1, e.count.get());
1337 +    }
1338 +
1339      /**
1340       * supplyAsync completes with result of supplier
1341       */
# Line 1253 | Line 1366 | public class CompletableFutureTest exten
1366      {
1367          FailingSupplier r = new FailingSupplier(m);
1368          CompletableFuture<Integer> f = m.supplyAsync(r);
1369 <        checkCompletedWithWrappedCFException(f);
1369 >        checkCompletedWithWrappedException(f, r.ex);
1370          r.assertInvoked();
1371      }}
1372  
1373 +    @SuppressWarnings("FutureReturnValueIgnored")
1374 +    public void testSupplyAsync_rejectingExecutor() {
1375 +        CountingRejectingExecutor e = new CountingRejectingExecutor();
1376 +        try {
1377 +            CompletableFuture.supplyAsync(() -> null, e);
1378 +            shouldThrow();
1379 +        } catch (Throwable t) {
1380 +            assertSame(e.ex, t);
1381 +        }
1382 +
1383 +        assertEquals(1, e.count.get());
1384 +    }
1385 +
1386      // seq completion methods
1387  
1388      /**
# Line 1264 | Line 1390 | public class CompletableFutureTest exten
1390       */
1391      public void testThenRun_normalCompletion() {
1392          for (ExecutionMode m : ExecutionMode.values())
1267        for (boolean createIncomplete : new boolean[] { true, false })
1393          for (Integer v1 : new Integer[] { 1, null })
1394      {
1395          final CompletableFuture<Integer> f = new CompletableFuture<>();
1396 <        final Noop r = new Noop(m);
1397 <        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 <        }
1396 >        final Noop[] rs = new Noop[6];
1397 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1398  
1399 <        checkCompletedNormally(g, null);
1399 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1400 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1401 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1402 >        checkIncomplete(h0);
1403 >        checkIncomplete(h1);
1404 >        checkIncomplete(h2);
1405 >        assertTrue(f.complete(v1));
1406 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1407 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1408 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1409 >
1410 >        checkCompletedNormally(h0, null);
1411 >        checkCompletedNormally(h1, null);
1412 >        checkCompletedNormally(h2, null);
1413 >        checkCompletedNormally(h3, null);
1414 >        checkCompletedNormally(h4, null);
1415 >        checkCompletedNormally(h5, null);
1416          checkCompletedNormally(f, v1);
1417 <        r.assertInvoked();
1417 >        for (Noop r : rs) r.assertInvoked();
1418      }}
1419  
1420      /**
# Line 1287 | Line 1423 | public class CompletableFutureTest exten
1423       */
1424      public void testThenRun_exceptionalCompletion() {
1425          for (ExecutionMode m : ExecutionMode.values())
1290        for (boolean createIncomplete : new boolean[] { true, false })
1426      {
1427          final CFException ex = new CFException();
1428          final CompletableFuture<Integer> f = new CompletableFuture<>();
1429 <        final Noop r = new Noop(m);
1430 <        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 <        }
1429 >        final Noop[] rs = new Noop[6];
1430 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1431  
1432 <        checkCompletedWithWrappedException(g, ex);
1432 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1433 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1434 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1435 >        checkIncomplete(h0);
1436 >        checkIncomplete(h1);
1437 >        checkIncomplete(h2);
1438 >        assertTrue(f.completeExceptionally(ex));
1439 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1440 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1441 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1442 >
1443 >        checkCompletedWithWrappedException(h0, ex);
1444 >        checkCompletedWithWrappedException(h1, ex);
1445 >        checkCompletedWithWrappedException(h2, ex);
1446 >        checkCompletedWithWrappedException(h3, ex);
1447 >        checkCompletedWithWrappedException(h4, ex);
1448 >        checkCompletedWithWrappedException(h5, ex);
1449          checkCompletedExceptionally(f, ex);
1450 <        r.assertNotInvoked();
1450 >        for (Noop r : rs) r.assertNotInvoked();
1451      }}
1452  
1453      /**
# Line 1309 | Line 1455 | public class CompletableFutureTest exten
1455       */
1456      public void testThenRun_sourceCancelled() {
1457          for (ExecutionMode m : ExecutionMode.values())
1312        for (boolean createIncomplete : new boolean[] { true, false })
1458          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1459      {
1460          final CompletableFuture<Integer> f = new CompletableFuture<>();
1461 <        final Noop r = new Noop(m);
1462 <        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 <        }
1461 >        final Noop[] rs = new Noop[6];
1462 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1463  
1464 <        checkCompletedWithWrappedCancellationException(g);
1464 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1465 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1466 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1467 >        checkIncomplete(h0);
1468 >        checkIncomplete(h1);
1469 >        checkIncomplete(h2);
1470 >        assertTrue(f.cancel(mayInterruptIfRunning));
1471 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1472 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1473 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1474 >
1475 >        checkCompletedWithWrappedCancellationException(h0);
1476 >        checkCompletedWithWrappedCancellationException(h1);
1477 >        checkCompletedWithWrappedCancellationException(h2);
1478 >        checkCompletedWithWrappedCancellationException(h3);
1479 >        checkCompletedWithWrappedCancellationException(h4);
1480 >        checkCompletedWithWrappedCancellationException(h5);
1481          checkCancelled(f);
1482 <        r.assertNotInvoked();
1482 >        for (Noop r : rs) r.assertNotInvoked();
1483      }}
1484  
1485      /**
# Line 1331 | Line 1487 | public class CompletableFutureTest exten
1487       */
1488      public void testThenRun_actionFailed() {
1489          for (ExecutionMode m : ExecutionMode.values())
1334        for (boolean createIncomplete : new boolean[] { true, false })
1490          for (Integer v1 : new Integer[] { 1, null })
1491      {
1492          final CompletableFuture<Integer> f = new CompletableFuture<>();
1493 <        final FailingRunnable r = new FailingRunnable(m);
1494 <        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 <        }
1493 >        final FailingRunnable[] rs = new FailingRunnable[6];
1494 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingRunnable(m);
1495  
1496 <        checkCompletedWithWrappedCFException(g);
1496 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1497 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1498 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1499 >        assertTrue(f.complete(v1));
1500 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1501 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1502 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1503 >
1504 >        checkCompletedWithWrappedException(h0, rs[0].ex);
1505 >        checkCompletedWithWrappedException(h1, rs[1].ex);
1506 >        checkCompletedWithWrappedException(h2, rs[2].ex);
1507 >        checkCompletedWithWrappedException(h3, rs[3].ex);
1508 >        checkCompletedWithWrappedException(h4, rs[4].ex);
1509 >        checkCompletedWithWrappedException(h5, rs[5].ex);
1510          checkCompletedNormally(f, v1);
1511      }}
1512  
# Line 1352 | Line 1515 | public class CompletableFutureTest exten
1515       */
1516      public void testThenApply_normalCompletion() {
1517          for (ExecutionMode m : ExecutionMode.values())
1355        for (boolean createIncomplete : new boolean[] { true, false })
1518          for (Integer v1 : new Integer[] { 1, null })
1519      {
1520          final CompletableFuture<Integer> f = new CompletableFuture<>();
1521 <        final IncFunction r = new IncFunction(m);
1522 <        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 <        }
1521 >        final IncFunction[] rs = new IncFunction[4];
1522 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1523  
1524 <        checkCompletedNormally(g, inc(v1));
1524 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1525 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1526 >        checkIncomplete(h0);
1527 >        checkIncomplete(h1);
1528 >        assertTrue(f.complete(v1));
1529 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1530 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1531 >
1532 >        checkCompletedNormally(h0, inc(v1));
1533 >        checkCompletedNormally(h1, inc(v1));
1534 >        checkCompletedNormally(h2, inc(v1));
1535 >        checkCompletedNormally(h3, inc(v1));
1536          checkCompletedNormally(f, v1);
1537 <        r.assertValue(inc(v1));
1537 >        for (IncFunction r : rs) r.assertValue(inc(v1));
1538      }}
1539  
1540      /**
# Line 1375 | Line 1543 | public class CompletableFutureTest exten
1543       */
1544      public void testThenApply_exceptionalCompletion() {
1545          for (ExecutionMode m : ExecutionMode.values())
1378        for (boolean createIncomplete : new boolean[] { true, false })
1546      {
1547          final CFException ex = new CFException();
1548          final CompletableFuture<Integer> f = new CompletableFuture<>();
1549 <        final IncFunction r = new IncFunction(m);
1550 <        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 <        }
1549 >        final IncFunction[] rs = new IncFunction[4];
1550 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1551  
1552 <        checkCompletedWithWrappedException(g, ex);
1552 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1553 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1554 >        assertTrue(f.completeExceptionally(ex));
1555 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1556 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1557 >
1558 >        checkCompletedWithWrappedException(h0, ex);
1559 >        checkCompletedWithWrappedException(h1, ex);
1560 >        checkCompletedWithWrappedException(h2, ex);
1561 >        checkCompletedWithWrappedException(h3, ex);
1562          checkCompletedExceptionally(f, ex);
1563 <        r.assertNotInvoked();
1563 >        for (IncFunction r : rs) r.assertNotInvoked();
1564      }}
1565  
1566      /**
# Line 1397 | Line 1568 | public class CompletableFutureTest exten
1568       */
1569      public void testThenApply_sourceCancelled() {
1570          for (ExecutionMode m : ExecutionMode.values())
1400        for (boolean createIncomplete : new boolean[] { true, false })
1571          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1572      {
1573          final CompletableFuture<Integer> f = new CompletableFuture<>();
1574 <        final IncFunction r = new IncFunction(m);
1575 <        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 <        }
1574 >        final IncFunction[] rs = new IncFunction[4];
1575 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1576  
1577 <        checkCompletedWithWrappedCancellationException(g);
1577 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1578 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1579 >        assertTrue(f.cancel(mayInterruptIfRunning));
1580 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1581 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1582 >
1583 >        checkCompletedWithWrappedCancellationException(h0);
1584 >        checkCompletedWithWrappedCancellationException(h1);
1585 >        checkCompletedWithWrappedCancellationException(h2);
1586 >        checkCompletedWithWrappedCancellationException(h3);
1587          checkCancelled(f);
1588 <        r.assertNotInvoked();
1588 >        for (IncFunction r : rs) r.assertNotInvoked();
1589      }}
1590  
1591      /**
# Line 1419 | Line 1593 | public class CompletableFutureTest exten
1593       */
1594      public void testThenApply_actionFailed() {
1595          for (ExecutionMode m : ExecutionMode.values())
1422        for (boolean createIncomplete : new boolean[] { true, false })
1596          for (Integer v1 : new Integer[] { 1, null })
1597      {
1598          final CompletableFuture<Integer> f = new CompletableFuture<>();
1599 <        final FailingFunction r = new FailingFunction(m);
1600 <        if (!createIncomplete) assertTrue(f.complete(v1));
1601 <        final CompletableFuture<Integer> g = m.thenApply(f, r);
1602 <        if (createIncomplete) {
1603 <            checkIncomplete(g);
1604 <            assertTrue(f.complete(v1));
1605 <        }
1599 >        final FailingFunction[] rs = new FailingFunction[4];
1600 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingFunction(m);
1601 >
1602 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1603 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1604 >        assertTrue(f.complete(v1));
1605 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1606 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1607  
1608 <        checkCompletedWithWrappedCFException(g);
1608 >        checkCompletedWithWrappedException(h0, rs[0].ex);
1609 >        checkCompletedWithWrappedException(h1, rs[1].ex);
1610 >        checkCompletedWithWrappedException(h2, rs[2].ex);
1611 >        checkCompletedWithWrappedException(h3, rs[3].ex);
1612          checkCompletedNormally(f, v1);
1613      }}
1614  
# Line 1440 | Line 1617 | public class CompletableFutureTest exten
1617       */
1618      public void testThenAccept_normalCompletion() {
1619          for (ExecutionMode m : ExecutionMode.values())
1443        for (boolean createIncomplete : new boolean[] { true, false })
1620          for (Integer v1 : new Integer[] { 1, null })
1621      {
1622          final CompletableFuture<Integer> f = new CompletableFuture<>();
1623 <        final NoopConsumer r = new NoopConsumer(m);
1624 <        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 <        }
1623 >        final NoopConsumer[] rs = new NoopConsumer[4];
1624 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1625  
1626 <        checkCompletedNormally(g, null);
1627 <        r.assertValue(v1);
1626 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1627 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1628 >        checkIncomplete(h0);
1629 >        checkIncomplete(h1);
1630 >        assertTrue(f.complete(v1));
1631 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1632 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1633 >
1634 >        checkCompletedNormally(h0, null);
1635 >        checkCompletedNormally(h1, null);
1636 >        checkCompletedNormally(h2, null);
1637 >        checkCompletedNormally(h3, null);
1638          checkCompletedNormally(f, v1);
1639 +        for (NoopConsumer r : rs) r.assertValue(v1);
1640      }}
1641  
1642      /**
# Line 1463 | Line 1645 | public class CompletableFutureTest exten
1645       */
1646      public void testThenAccept_exceptionalCompletion() {
1647          for (ExecutionMode m : ExecutionMode.values())
1466        for (boolean createIncomplete : new boolean[] { true, false })
1648      {
1649          final CFException ex = new CFException();
1650          final CompletableFuture<Integer> f = new CompletableFuture<>();
1651 <        final NoopConsumer r = new NoopConsumer(m);
1652 <        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 <        }
1651 >        final NoopConsumer[] rs = new NoopConsumer[4];
1652 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1653  
1654 <        checkCompletedWithWrappedException(g, ex);
1654 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1655 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1656 >        assertTrue(f.completeExceptionally(ex));
1657 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1658 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1659 >
1660 >        checkCompletedWithWrappedException(h0, ex);
1661 >        checkCompletedWithWrappedException(h1, ex);
1662 >        checkCompletedWithWrappedException(h2, ex);
1663 >        checkCompletedWithWrappedException(h3, ex);
1664          checkCompletedExceptionally(f, ex);
1665 <        r.assertNotInvoked();
1665 >        for (NoopConsumer r : rs) r.assertNotInvoked();
1666      }}
1667  
1668      /**
# Line 1485 | Line 1670 | public class CompletableFutureTest exten
1670       */
1671      public void testThenAccept_sourceCancelled() {
1672          for (ExecutionMode m : ExecutionMode.values())
1488        for (boolean createIncomplete : new boolean[] { true, false })
1673          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1674      {
1675          final CompletableFuture<Integer> f = new CompletableFuture<>();
1676 <        final NoopConsumer r = new NoopConsumer(m);
1677 <        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 <        }
1676 >        final NoopConsumer[] rs = new NoopConsumer[4];
1677 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1678  
1679 <        checkCompletedWithWrappedCancellationException(g);
1679 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1680 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1681 >        assertTrue(f.cancel(mayInterruptIfRunning));
1682 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1683 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1684 >
1685 >        checkCompletedWithWrappedCancellationException(h0);
1686 >        checkCompletedWithWrappedCancellationException(h1);
1687 >        checkCompletedWithWrappedCancellationException(h2);
1688 >        checkCompletedWithWrappedCancellationException(h3);
1689          checkCancelled(f);
1690 <        r.assertNotInvoked();
1690 >        for (NoopConsumer r : rs) r.assertNotInvoked();
1691      }}
1692  
1693      /**
# Line 1507 | Line 1695 | public class CompletableFutureTest exten
1695       */
1696      public void testThenAccept_actionFailed() {
1697          for (ExecutionMode m : ExecutionMode.values())
1510        for (boolean createIncomplete : new boolean[] { true, false })
1698          for (Integer v1 : new Integer[] { 1, null })
1699      {
1700          final CompletableFuture<Integer> f = new CompletableFuture<>();
1701 <        final FailingConsumer r = new FailingConsumer(m);
1702 <        if (!createIncomplete) f.complete(v1);
1703 <        final CompletableFuture<Void> g = m.thenAccept(f, r);
1704 <        if (createIncomplete) {
1705 <            checkIncomplete(g);
1706 <            f.complete(v1);
1707 <        }
1701 >        final FailingConsumer[] rs = new FailingConsumer[4];
1702 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingConsumer(m);
1703 >
1704 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1705 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1706 >        assertTrue(f.complete(v1));
1707 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1708 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1709  
1710 <        checkCompletedWithWrappedCFException(g);
1710 >        checkCompletedWithWrappedException(h0, rs[0].ex);
1711 >        checkCompletedWithWrappedException(h1, rs[1].ex);
1712 >        checkCompletedWithWrappedException(h2, rs[2].ex);
1713 >        checkCompletedWithWrappedException(h3, rs[3].ex);
1714          checkCompletedNormally(f, v1);
1715      }}
1716  
# Line 1535 | Line 1726 | public class CompletableFutureTest exten
1726      {
1727          final CompletableFuture<Integer> f = new CompletableFuture<>();
1728          final CompletableFuture<Integer> g = new CompletableFuture<>();
1729 <        final SubtractFunction r1 = new SubtractFunction(m);
1730 <        final SubtractFunction r2 = new SubtractFunction(m);
1540 <        final SubtractFunction r3 = new SubtractFunction(m);
1729 >        final SubtractFunction[] rs = new SubtractFunction[6];
1730 >        for (int i = 0; i < rs.length; i++) rs[i] = new SubtractFunction(m);
1731  
1732          final CompletableFuture<Integer> fst =  fFirst ? f : g;
1733          final CompletableFuture<Integer> snd = !fFirst ? f : g;
1734          final Integer w1 =  fFirst ? v1 : v2;
1735          final Integer w2 = !fFirst ? v1 : v2;
1736  
1737 <        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1737 >        final CompletableFuture<Integer> h0 = m.thenCombine(f, g, rs[0]);
1738 >        final CompletableFuture<Integer> h1 = m.thenCombine(fst, fst, rs[1]);
1739          assertTrue(fst.complete(w1));
1740 <        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1741 <        checkIncomplete(h1);
1742 <        checkIncomplete(h2);
1743 <        r1.assertNotInvoked();
1744 <        r2.assertNotInvoked();
1740 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, rs[2]);
1741 >        final CompletableFuture<Integer> h3 = m.thenCombine(fst, fst, rs[3]);
1742 >        checkIncomplete(h0); rs[0].assertNotInvoked();
1743 >        checkIncomplete(h2); rs[2].assertNotInvoked();
1744 >        checkCompletedNormally(h1, subtract(w1, w1));
1745 >        checkCompletedNormally(h3, subtract(w1, w1));
1746 >        rs[1].assertValue(subtract(w1, w1));
1747 >        rs[3].assertValue(subtract(w1, w1));
1748          assertTrue(snd.complete(w2));
1749 <        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1749 >        final CompletableFuture<Integer> h4 = m.thenCombine(f, g, rs[4]);
1750  
1751 <        checkCompletedNormally(h1, subtract(v1, v2));
1751 >        checkCompletedNormally(h0, subtract(v1, v2));
1752          checkCompletedNormally(h2, subtract(v1, v2));
1753 <        checkCompletedNormally(h3, subtract(v1, v2));
1754 <        r1.assertValue(subtract(v1, v2));
1755 <        r2.assertValue(subtract(v1, v2));
1756 <        r3.assertValue(subtract(v1, v2));
1753 >        checkCompletedNormally(h4, subtract(v1, v2));
1754 >        rs[0].assertValue(subtract(v1, v2));
1755 >        rs[2].assertValue(subtract(v1, v2));
1756 >        rs[4].assertValue(subtract(v1, v2));
1757 >
1758          checkCompletedNormally(f, v1);
1759          checkCompletedNormally(g, v2);
1760      }}
# Line 1677 | Line 1872 | public class CompletableFutureTest exten
1872          assertTrue(snd.complete(w2));
1873          final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1874  
1875 <        checkCompletedWithWrappedCFException(h1);
1876 <        checkCompletedWithWrappedCFException(h2);
1877 <        checkCompletedWithWrappedCFException(h3);
1875 >        checkCompletedWithWrappedException(h1, r1.ex);
1876 >        checkCompletedWithWrappedException(h2, r2.ex);
1877 >        checkCompletedWithWrappedException(h3, r3.ex);
1878 >        r1.assertInvoked();
1879 >        r2.assertInvoked();
1880 >        r3.assertInvoked();
1881          checkCompletedNormally(f, v1);
1882          checkCompletedNormally(g, v2);
1883      }}
# Line 1690 | Line 1888 | public class CompletableFutureTest exten
1888       */
1889      public void testThenAcceptBoth_normalCompletion() {
1890          for (ExecutionMode m : ExecutionMode.values())
1693        for (boolean createIncomplete : new boolean[] { true, false })
1891          for (boolean fFirst : new boolean[] { true, false })
1892          for (Integer v1 : new Integer[] { 1, null })
1893          for (Integer v2 : new Integer[] { 2, null })
1894      {
1895          final CompletableFuture<Integer> f = new CompletableFuture<>();
1896          final CompletableFuture<Integer> g = new CompletableFuture<>();
1897 <        final SubtractAction r = new SubtractAction(m);
1897 >        final SubtractAction r1 = new SubtractAction(m);
1898 >        final SubtractAction r2 = new SubtractAction(m);
1899 >        final SubtractAction r3 = new SubtractAction(m);
1900  
1901 <        assertTrue(fFirst ? f.complete(v1) : g.complete(v2));
1902 <        if (!createIncomplete)
1903 <            assertTrue(!fFirst ? f.complete(v1) : g.complete(v2));
1904 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1706 <        if (createIncomplete) {
1707 <            checkIncomplete(h);
1708 <            r.assertNotInvoked();
1709 <            assertTrue(!fFirst ? f.complete(v1) : g.complete(v2));
1710 <        }
1901 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1902 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1903 >        final Integer w1 =  fFirst ? v1 : v2;
1904 >        final Integer w2 = !fFirst ? v1 : v2;
1905  
1906 <        checkCompletedNormally(h, null);
1907 <        r.assertValue(subtract(v1, v2));
1906 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1907 >        assertTrue(fst.complete(w1));
1908 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1909 >        checkIncomplete(h1);
1910 >        checkIncomplete(h2);
1911 >        r1.assertNotInvoked();
1912 >        r2.assertNotInvoked();
1913 >        assertTrue(snd.complete(w2));
1914 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1915 >
1916 >        checkCompletedNormally(h1, null);
1917 >        checkCompletedNormally(h2, null);
1918 >        checkCompletedNormally(h3, null);
1919 >        r1.assertValue(subtract(v1, v2));
1920 >        r2.assertValue(subtract(v1, v2));
1921 >        r3.assertValue(subtract(v1, v2));
1922          checkCompletedNormally(f, v1);
1923          checkCompletedNormally(g, v2);
1924      }}
# Line 1719 | Line 1927 | public class CompletableFutureTest exten
1927       * thenAcceptBoth result completes exceptionally after exceptional
1928       * completion of either source
1929       */
1930 <    public void testThenAcceptBoth_exceptionalCompletion() {
1930 >    public void testThenAcceptBoth_exceptionalCompletion() throws Throwable {
1931          for (ExecutionMode m : ExecutionMode.values())
1724        for (boolean createIncomplete : new boolean[] { true, false })
1932          for (boolean fFirst : new boolean[] { true, false })
1933 +        for (boolean failFirst : new boolean[] { true, false })
1934          for (Integer v1 : new Integer[] { 1, null })
1935      {
1936          final CompletableFuture<Integer> f = new CompletableFuture<>();
1937          final CompletableFuture<Integer> g = new CompletableFuture<>();
1938          final CFException ex = new CFException();
1939 <        final SubtractAction r = new SubtractAction(m);
1939 >        final SubtractAction r1 = new SubtractAction(m);
1940 >        final SubtractAction r2 = new SubtractAction(m);
1941 >        final SubtractAction r3 = new SubtractAction(m);
1942  
1943 <        assertTrue((fFirst ? f : g).complete(v1));
1944 <        if (!createIncomplete)
1945 <            assertTrue((!fFirst ? f : g).completeExceptionally(ex));
1946 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1947 <        if (createIncomplete) {
1948 <            checkIncomplete(h);
1949 <            assertTrue((!fFirst ? f : g).completeExceptionally(ex));
1950 <        }
1943 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1944 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1945 >        final Callable<Boolean> complete1 = failFirst ?
1946 >            () -> fst.completeExceptionally(ex) :
1947 >            () -> fst.complete(v1);
1948 >        final Callable<Boolean> complete2 = failFirst ?
1949 >            () -> snd.complete(v1) :
1950 >            () -> snd.completeExceptionally(ex);
1951  
1952 <        checkCompletedWithWrappedException(h, ex);
1953 <        r.assertNotInvoked();
1954 <        checkCompletedNormally(fFirst ? f : g, v1);
1955 <        checkCompletedExceptionally(!fFirst ? f : g, ex);
1952 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1953 >        assertTrue(complete1.call());
1954 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1955 >        checkIncomplete(h1);
1956 >        checkIncomplete(h2);
1957 >        assertTrue(complete2.call());
1958 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1959 >
1960 >        checkCompletedWithWrappedException(h1, ex);
1961 >        checkCompletedWithWrappedException(h2, ex);
1962 >        checkCompletedWithWrappedException(h3, ex);
1963 >        r1.assertNotInvoked();
1964 >        r2.assertNotInvoked();
1965 >        r3.assertNotInvoked();
1966 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1967 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
1968      }}
1969  
1970      /**
1971       * thenAcceptBoth result completes exceptionally if either source cancelled
1972       */
1973 <    public void testThenAcceptBoth_sourceCancelled() {
1973 >    public void testThenAcceptBoth_sourceCancelled() throws Throwable {
1974          for (ExecutionMode m : ExecutionMode.values())
1975          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1754        for (boolean createIncomplete : new boolean[] { true, false })
1976          for (boolean fFirst : new boolean[] { true, false })
1977 +        for (boolean failFirst : new boolean[] { true, false })
1978          for (Integer v1 : new Integer[] { 1, null })
1979      {
1980          final CompletableFuture<Integer> f = new CompletableFuture<>();
1981          final CompletableFuture<Integer> g = new CompletableFuture<>();
1982 <        final SubtractAction r = new SubtractAction(m);
1982 >        final SubtractAction r1 = new SubtractAction(m);
1983 >        final SubtractAction r2 = new SubtractAction(m);
1984 >        final SubtractAction r3 = new SubtractAction(m);
1985  
1986 <        assertTrue((fFirst ? f : g).complete(v1));
1987 <        if (!createIncomplete)
1988 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1989 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1990 <        if (createIncomplete) {
1991 <            checkIncomplete(h);
1992 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1993 <        }
1986 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1987 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1988 >        final Callable<Boolean> complete1 = failFirst ?
1989 >            () -> fst.cancel(mayInterruptIfRunning) :
1990 >            () -> fst.complete(v1);
1991 >        final Callable<Boolean> complete2 = failFirst ?
1992 >            () -> snd.complete(v1) :
1993 >            () -> snd.cancel(mayInterruptIfRunning);
1994  
1995 <        checkCompletedWithWrappedCancellationException(h);
1996 <        checkCancelled(!fFirst ? f : g);
1997 <        r.assertNotInvoked();
1998 <        checkCompletedNormally(fFirst ? f : g, v1);
1995 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1996 >        assertTrue(complete1.call());
1997 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1998 >        checkIncomplete(h1);
1999 >        checkIncomplete(h2);
2000 >        assertTrue(complete2.call());
2001 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
2002 >
2003 >        checkCompletedWithWrappedCancellationException(h1);
2004 >        checkCompletedWithWrappedCancellationException(h2);
2005 >        checkCompletedWithWrappedCancellationException(h3);
2006 >        r1.assertNotInvoked();
2007 >        r2.assertNotInvoked();
2008 >        r3.assertNotInvoked();
2009 >        checkCompletedNormally(failFirst ? snd : fst, v1);
2010 >        checkCancelled(failFirst ? fst : snd);
2011      }}
2012  
2013      /**
# Line 1785 | Line 2021 | public class CompletableFutureTest exten
2021      {
2022          final CompletableFuture<Integer> f = new CompletableFuture<>();
2023          final CompletableFuture<Integer> g = new CompletableFuture<>();
2024 <        final FailingBiConsumer r = new FailingBiConsumer(m);
2025 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
2024 >        final FailingBiConsumer r1 = new FailingBiConsumer(m);
2025 >        final FailingBiConsumer r2 = new FailingBiConsumer(m);
2026 >        final FailingBiConsumer r3 = new FailingBiConsumer(m);
2027 >
2028 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
2029 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
2030 >        final Integer w1 =  fFirst ? v1 : v2;
2031 >        final Integer w2 = !fFirst ? v1 : v2;
2032  
2033 <        assertTrue(fFirst ? f.complete(v1) : g.complete(v2));
2034 <        assertTrue(!fFirst ? f.complete(v1) : g.complete(v2));
2033 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
2034 >        assertTrue(fst.complete(w1));
2035 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
2036 >        assertTrue(snd.complete(w2));
2037 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
2038  
2039 <        checkCompletedWithWrappedCFException(h);
2039 >        checkCompletedWithWrappedException(h1, r1.ex);
2040 >        checkCompletedWithWrappedException(h2, r2.ex);
2041 >        checkCompletedWithWrappedException(h3, r3.ex);
2042 >        r1.assertInvoked();
2043 >        r2.assertInvoked();
2044 >        r3.assertInvoked();
2045          checkCompletedNormally(f, v1);
2046          checkCompletedNormally(g, v2);
2047      }}
# Line 1802 | Line 2052 | public class CompletableFutureTest exten
2052       */
2053      public void testRunAfterBoth_normalCompletion() {
2054          for (ExecutionMode m : ExecutionMode.values())
1805        for (boolean createIncomplete : new boolean[] { true, false })
2055          for (boolean fFirst : new boolean[] { true, false })
2056          for (Integer v1 : new Integer[] { 1, null })
2057          for (Integer v2 : new Integer[] { 2, null })
2058      {
2059          final CompletableFuture<Integer> f = new CompletableFuture<>();
2060          final CompletableFuture<Integer> g = new CompletableFuture<>();
2061 <        final Noop r = new Noop(m);
2061 >        final Noop r1 = new Noop(m);
2062 >        final Noop r2 = new Noop(m);
2063 >        final Noop r3 = new Noop(m);
2064  
2065 <        assertTrue(fFirst ? f.complete(v1) : g.complete(v2));
2066 <        if (!createIncomplete)
2067 <            assertTrue(!fFirst ? f.complete(v1) : g.complete(v2));
2068 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1818 <        if (createIncomplete) {
1819 <            checkIncomplete(h);
1820 <            r.assertNotInvoked();
1821 <            assertTrue(!fFirst ? f.complete(v1) : g.complete(v2));
1822 <        }
2065 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
2066 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
2067 >        final Integer w1 =  fFirst ? v1 : v2;
2068 >        final Integer w2 = !fFirst ? v1 : v2;
2069  
2070 <        checkCompletedNormally(h, null);
2071 <        r.assertInvoked();
2070 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2071 >        assertTrue(fst.complete(w1));
2072 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2073 >        checkIncomplete(h1);
2074 >        checkIncomplete(h2);
2075 >        r1.assertNotInvoked();
2076 >        r2.assertNotInvoked();
2077 >        assertTrue(snd.complete(w2));
2078 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2079 >
2080 >        checkCompletedNormally(h1, null);
2081 >        checkCompletedNormally(h2, null);
2082 >        checkCompletedNormally(h3, null);
2083 >        r1.assertInvoked();
2084 >        r2.assertInvoked();
2085 >        r3.assertInvoked();
2086          checkCompletedNormally(f, v1);
2087          checkCompletedNormally(g, v2);
2088      }}
# Line 1831 | Line 2091 | public class CompletableFutureTest exten
2091       * runAfterBoth result completes exceptionally after exceptional
2092       * completion of either source
2093       */
2094 <    public void testRunAfterBoth_exceptionalCompletion() {
2094 >    public void testRunAfterBoth_exceptionalCompletion() throws Throwable {
2095          for (ExecutionMode m : ExecutionMode.values())
1836        for (boolean createIncomplete : new boolean[] { true, false })
2096          for (boolean fFirst : new boolean[] { true, false })
2097 +        for (boolean failFirst : new boolean[] { true, false })
2098          for (Integer v1 : new Integer[] { 1, null })
2099      {
2100          final CompletableFuture<Integer> f = new CompletableFuture<>();
2101          final CompletableFuture<Integer> g = new CompletableFuture<>();
2102          final CFException ex = new CFException();
2103 <        final Noop r = new Noop(m);
2103 >        final Noop r1 = new Noop(m);
2104 >        final Noop r2 = new Noop(m);
2105 >        final Noop r3 = new Noop(m);
2106  
2107 <        assertTrue((fFirst ? f : g).complete(v1));
2108 <        if (!createIncomplete)
2109 <            assertTrue((!fFirst ? f : g).completeExceptionally(ex));
2110 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2111 <        if (createIncomplete) {
2112 <            checkIncomplete(h);
2113 <            assertTrue((!fFirst ? f : g).completeExceptionally(ex));
2114 <        }
2107 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
2108 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
2109 >        final Callable<Boolean> complete1 = failFirst ?
2110 >            () -> fst.completeExceptionally(ex) :
2111 >            () -> fst.complete(v1);
2112 >        final Callable<Boolean> complete2 = failFirst ?
2113 >            () -> snd.complete(v1) :
2114 >            () -> snd.completeExceptionally(ex);
2115  
2116 <        checkCompletedWithWrappedException(h, ex);
2117 <        r.assertNotInvoked();
2118 <        checkCompletedNormally(fFirst ? f : g, v1);
2119 <        checkCompletedExceptionally(!fFirst ? f : g, ex);
2116 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2117 >        assertTrue(complete1.call());
2118 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2119 >        checkIncomplete(h1);
2120 >        checkIncomplete(h2);
2121 >        assertTrue(complete2.call());
2122 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2123 >
2124 >        checkCompletedWithWrappedException(h1, ex);
2125 >        checkCompletedWithWrappedException(h2, ex);
2126 >        checkCompletedWithWrappedException(h3, ex);
2127 >        r1.assertNotInvoked();
2128 >        r2.assertNotInvoked();
2129 >        r3.assertNotInvoked();
2130 >        checkCompletedNormally(failFirst ? snd : fst, v1);
2131 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
2132      }}
2133  
2134      /**
2135       * runAfterBoth result completes exceptionally if either source cancelled
2136       */
2137 <    public void testRunAfterBoth_sourceCancelled() {
2137 >    public void testRunAfterBoth_sourceCancelled() throws Throwable {
2138          for (ExecutionMode m : ExecutionMode.values())
2139          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1866        for (boolean createIncomplete : new boolean[] { true, false })
2140          for (boolean fFirst : new boolean[] { true, false })
2141 +        for (boolean failFirst : new boolean[] { true, false })
2142          for (Integer v1 : new Integer[] { 1, null })
2143      {
2144          final CompletableFuture<Integer> f = new CompletableFuture<>();
2145          final CompletableFuture<Integer> g = new CompletableFuture<>();
2146 <        final Noop r = new Noop(m);
2146 >        final Noop r1 = new Noop(m);
2147 >        final Noop r2 = new Noop(m);
2148 >        final Noop r3 = new Noop(m);
2149  
2150 <        assertTrue((fFirst ? f : g).complete(v1));
2151 <        if (!createIncomplete)
2152 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
2153 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2154 <        if (createIncomplete) {
2155 <            checkIncomplete(h);
2156 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
2157 <        }
2150 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
2151 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
2152 >        final Callable<Boolean> complete1 = failFirst ?
2153 >            () -> fst.cancel(mayInterruptIfRunning) :
2154 >            () -> fst.complete(v1);
2155 >        final Callable<Boolean> complete2 = failFirst ?
2156 >            () -> snd.complete(v1) :
2157 >            () -> snd.cancel(mayInterruptIfRunning);
2158  
2159 <        checkCompletedWithWrappedCancellationException(h);
2160 <        checkCancelled(!fFirst ? f : g);
2161 <        r.assertNotInvoked();
2162 <        checkCompletedNormally(fFirst ? f : g, v1);
2159 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2160 >        assertTrue(complete1.call());
2161 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2162 >        checkIncomplete(h1);
2163 >        checkIncomplete(h2);
2164 >        assertTrue(complete2.call());
2165 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2166 >
2167 >        checkCompletedWithWrappedCancellationException(h1);
2168 >        checkCompletedWithWrappedCancellationException(h2);
2169 >        checkCompletedWithWrappedCancellationException(h3);
2170 >        r1.assertNotInvoked();
2171 >        r2.assertNotInvoked();
2172 >        r3.assertNotInvoked();
2173 >        checkCompletedNormally(failFirst ? snd : fst, v1);
2174 >        checkCancelled(failFirst ? fst : snd);
2175      }}
2176  
2177      /**
# Line 1899 | Line 2187 | public class CompletableFutureTest exten
2187          final CompletableFuture<Integer> g = new CompletableFuture<>();
2188          final FailingRunnable r1 = new FailingRunnable(m);
2189          final FailingRunnable r2 = new FailingRunnable(m);
2190 +        final FailingRunnable r3 = new FailingRunnable(m);
2191  
2192 <        CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2193 <        assertTrue(fFirst ? f.complete(v1) : g.complete(v2));
2194 <        assertTrue(!fFirst ? f.complete(v1) : g.complete(v2));
2195 <        CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2192 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
2193 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
2194 >        final Integer w1 =  fFirst ? v1 : v2;
2195 >        final Integer w2 = !fFirst ? v1 : v2;
2196  
2197 <        checkCompletedWithWrappedCFException(h1);
2198 <        checkCompletedWithWrappedCFException(h2);
2197 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2198 >        assertTrue(fst.complete(w1));
2199 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2200 >        assertTrue(snd.complete(w2));
2201 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2202 >
2203 >        checkCompletedWithWrappedException(h1, r1.ex);
2204 >        checkCompletedWithWrappedException(h2, r2.ex);
2205 >        checkCompletedWithWrappedException(h3, r3.ex);
2206 >        r1.assertInvoked();
2207 >        r2.assertInvoked();
2208 >        r3.assertInvoked();
2209          checkCompletedNormally(f, v1);
2210          checkCompletedNormally(g, v2);
2211      }}
# Line 2193 | Line 2492 | public class CompletableFutureTest exten
2492          f.complete(v1);
2493          final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2494          final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2495 <        checkCompletedWithWrappedCFException(h0);
2496 <        checkCompletedWithWrappedCFException(h1);
2497 <        checkCompletedWithWrappedCFException(h2);
2498 <        checkCompletedWithWrappedCFException(h3);
2495 >        checkCompletedWithWrappedException(h0, rs[0].ex);
2496 >        checkCompletedWithWrappedException(h1, rs[1].ex);
2497 >        checkCompletedWithWrappedException(h2, rs[2].ex);
2498 >        checkCompletedWithWrappedException(h3, rs[3].ex);
2499          for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2500  
2501          g.complete(v2);
# Line 2205 | Line 2504 | public class CompletableFutureTest exten
2504          final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2505          final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2506  
2507 <        checkCompletedWithWrappedCFException(h4);
2507 >        checkCompletedWithWrappedException(h4, rs[4].ex);
2508          assertTrue(Objects.equals(v1, rs[4].value) ||
2509                     Objects.equals(v2, rs[4].value));
2510 <        checkCompletedWithWrappedCFException(h5);
2510 >        checkCompletedWithWrappedException(h5, rs[5].ex);
2511          assertTrue(Objects.equals(v1, rs[5].value) ||
2512                     Objects.equals(v2, rs[5].value));
2513  
# Line 2346 | Line 2645 | public class CompletableFutureTest exten
2645  
2646          // unspecified behavior - both source completions available
2647          try {
2648 <            assertEquals(null, h0.join());
2648 >            assertNull(h0.join());
2649              rs[0].assertValue(v1);
2650          } catch (CompletionException ok) {
2651              checkCompletedWithWrappedException(h0, ex);
2652              rs[0].assertNotInvoked();
2653          }
2654          try {
2655 <            assertEquals(null, h1.join());
2655 >            assertNull(h1.join());
2656              rs[1].assertValue(v1);
2657          } catch (CompletionException ok) {
2658              checkCompletedWithWrappedException(h1, ex);
2659              rs[1].assertNotInvoked();
2660          }
2661          try {
2662 <            assertEquals(null, h2.join());
2662 >            assertNull(h2.join());
2663              rs[2].assertValue(v1);
2664          } catch (CompletionException ok) {
2665              checkCompletedWithWrappedException(h2, ex);
2666              rs[2].assertNotInvoked();
2667          }
2668          try {
2669 <            assertEquals(null, h3.join());
2669 >            assertNull(h3.join());
2670              rs[3].assertValue(v1);
2671          } catch (CompletionException ok) {
2672              checkCompletedWithWrappedException(h3, ex);
# Line 2452 | Line 2751 | public class CompletableFutureTest exten
2751          f.complete(v1);
2752          final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2753          final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2754 <        checkCompletedWithWrappedCFException(h0);
2755 <        checkCompletedWithWrappedCFException(h1);
2756 <        checkCompletedWithWrappedCFException(h2);
2757 <        checkCompletedWithWrappedCFException(h3);
2754 >        checkCompletedWithWrappedException(h0, rs[0].ex);
2755 >        checkCompletedWithWrappedException(h1, rs[1].ex);
2756 >        checkCompletedWithWrappedException(h2, rs[2].ex);
2757 >        checkCompletedWithWrappedException(h3, rs[3].ex);
2758          for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2759  
2760          g.complete(v2);
# Line 2464 | Line 2763 | public class CompletableFutureTest exten
2763          final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2764          final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2765  
2766 <        checkCompletedWithWrappedCFException(h4);
2766 >        checkCompletedWithWrappedException(h4, rs[4].ex);
2767          assertTrue(Objects.equals(v1, rs[4].value) ||
2768                     Objects.equals(v2, rs[4].value));
2769 <        checkCompletedWithWrappedCFException(h5);
2769 >        checkCompletedWithWrappedException(h5, rs[5].ex);
2770          assertTrue(Objects.equals(v1, rs[5].value) ||
2771                     Objects.equals(v2, rs[5].value));
2772  
# Line 2483 | Line 2782 | public class CompletableFutureTest exten
2782          for (ExecutionMode m : ExecutionMode.values())
2783          for (Integer v1 : new Integer[] { 1, null })
2784          for (Integer v2 : new Integer[] { 2, null })
2785 +        for (boolean pushNop : new boolean[] { true, false })
2786      {
2787          final CompletableFuture<Integer> f = new CompletableFuture<>();
2788          final CompletableFuture<Integer> g = new CompletableFuture<>();
# Line 2495 | Line 2795 | public class CompletableFutureTest exten
2795          checkIncomplete(h1);
2796          rs[0].assertNotInvoked();
2797          rs[1].assertNotInvoked();
2798 +        if (pushNop) {          // ad hoc test of intra-completion interference
2799 +            m.thenRun(f, () -> {});
2800 +            m.thenRun(g, () -> {});
2801 +        }
2802          f.complete(v1);
2803          checkCompletedNormally(h0, null);
2804          checkCompletedNormally(h1, null);
# Line 2601 | Line 2905 | public class CompletableFutureTest exten
2905  
2906          // unspecified behavior - both source completions available
2907          try {
2908 <            assertEquals(null, h0.join());
2908 >            assertNull(h0.join());
2909              rs[0].assertInvoked();
2910          } catch (CompletionException ok) {
2911              checkCompletedWithWrappedException(h0, ex);
2912              rs[0].assertNotInvoked();
2913          }
2914          try {
2915 <            assertEquals(null, h1.join());
2915 >            assertNull(h1.join());
2916              rs[1].assertInvoked();
2917          } catch (CompletionException ok) {
2918              checkCompletedWithWrappedException(h1, ex);
2919              rs[1].assertNotInvoked();
2920          }
2921          try {
2922 <            assertEquals(null, h2.join());
2922 >            assertNull(h2.join());
2923              rs[2].assertInvoked();
2924          } catch (CompletionException ok) {
2925              checkCompletedWithWrappedException(h2, ex);
2926              rs[2].assertNotInvoked();
2927          }
2928          try {
2929 <            assertEquals(null, h3.join());
2929 >            assertNull(h3.join());
2930              rs[3].assertInvoked();
2931          } catch (CompletionException ok) {
2932              checkCompletedWithWrappedException(h3, ex);
# Line 2707 | Line 3011 | public class CompletableFutureTest exten
3011          assertTrue(f.complete(v1));
3012          final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
3013          final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
3014 <        checkCompletedWithWrappedCFException(h0);
3015 <        checkCompletedWithWrappedCFException(h1);
3016 <        checkCompletedWithWrappedCFException(h2);
3017 <        checkCompletedWithWrappedCFException(h3);
3014 >        checkCompletedWithWrappedException(h0, rs[0].ex);
3015 >        checkCompletedWithWrappedException(h1, rs[1].ex);
3016 >        checkCompletedWithWrappedException(h2, rs[2].ex);
3017 >        checkCompletedWithWrappedException(h3, rs[3].ex);
3018          for (int i = 0; i < 4; i++) rs[i].assertInvoked();
3019          assertTrue(g.complete(v2));
3020          final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
3021          final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
3022 <        checkCompletedWithWrappedCFException(h4);
3023 <        checkCompletedWithWrappedCFException(h5);
3022 >        checkCompletedWithWrappedException(h4, rs[4].ex);
3023 >        checkCompletedWithWrappedException(h5, rs[5].ex);
3024  
3025          checkCompletedNormally(f, v1);
3026          checkCompletedNormally(g, v2);
# Line 2777 | Line 3081 | public class CompletableFutureTest exten
3081          final CompletableFuture<Integer> g = m.thenCompose(f, r);
3082          if (createIncomplete) assertTrue(f.complete(v1));
3083  
3084 <        checkCompletedWithWrappedCFException(g);
3084 >        checkCompletedWithWrappedException(g, r.ex);
3085          checkCompletedNormally(f, v1);
3086      }}
3087  
# Line 2802 | Line 3106 | public class CompletableFutureTest exten
3106          checkCancelled(f);
3107      }}
3108  
3109 +    /**
3110 +     * thenCompose result completes exceptionally if the result of the action does
3111 +     */
3112 +    public void testThenCompose_actionReturnsFailingFuture() {
3113 +        for (ExecutionMode m : ExecutionMode.values())
3114 +        for (int order = 0; order < 6; order++)
3115 +        for (Integer v1 : new Integer[] { 1, null })
3116 +    {
3117 +        final CFException ex = new CFException();
3118 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
3119 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
3120 +        final CompletableFuture<Integer> h;
3121 +        // Test all permutations of orders
3122 +        switch (order) {
3123 +        case 0:
3124 +            assertTrue(f.complete(v1));
3125 +            assertTrue(g.completeExceptionally(ex));
3126 +            h = m.thenCompose(f, (x -> g));
3127 +            break;
3128 +        case 1:
3129 +            assertTrue(f.complete(v1));
3130 +            h = m.thenCompose(f, (x -> g));
3131 +            assertTrue(g.completeExceptionally(ex));
3132 +            break;
3133 +        case 2:
3134 +            assertTrue(g.completeExceptionally(ex));
3135 +            assertTrue(f.complete(v1));
3136 +            h = m.thenCompose(f, (x -> g));
3137 +            break;
3138 +        case 3:
3139 +            assertTrue(g.completeExceptionally(ex));
3140 +            h = m.thenCompose(f, (x -> g));
3141 +            assertTrue(f.complete(v1));
3142 +            break;
3143 +        case 4:
3144 +            h = m.thenCompose(f, (x -> g));
3145 +            assertTrue(f.complete(v1));
3146 +            assertTrue(g.completeExceptionally(ex));
3147 +            break;
3148 +        case 5:
3149 +            h = m.thenCompose(f, (x -> g));
3150 +            assertTrue(f.complete(v1));
3151 +            assertTrue(g.completeExceptionally(ex));
3152 +            break;
3153 +        default: throw new AssertionError();
3154 +        }
3155 +
3156 +        checkCompletedExceptionally(g, ex);
3157 +        checkCompletedWithWrappedException(h, ex);
3158 +        checkCompletedNormally(f, v1);
3159 +    }}
3160 +
3161 +    /**
3162 +     * exceptionallyCompose result completes normally after normal
3163 +     * completion of source
3164 +     */
3165 +    public void testExceptionallyCompose_normalCompletion() {
3166 +        for (ExecutionMode m : ExecutionMode.values())
3167 +        for (boolean createIncomplete : new boolean[] { true, false })
3168 +        for (Integer v1 : new Integer[] { 1, null })
3169 +    {
3170 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
3171 +        final ExceptionalCompletableFutureFunction r =
3172 +            new ExceptionalCompletableFutureFunction(m);
3173 +        if (!createIncomplete) assertTrue(f.complete(v1));
3174 +        final CompletableFuture<Integer> g = m.exceptionallyCompose(f, r);
3175 +        if (createIncomplete) assertTrue(f.complete(v1));
3176 +
3177 +        checkCompletedNormally(f, v1);
3178 +        checkCompletedNormally(g, v1);
3179 +        r.assertNotInvoked();
3180 +    }}
3181 +
3182 +    /**
3183 +     * exceptionallyCompose result completes normally after exceptional
3184 +     * completion of source
3185 +     */
3186 +    public void testExceptionallyCompose_exceptionalCompletion() {
3187 +        for (ExecutionMode m : ExecutionMode.values())
3188 +        for (boolean createIncomplete : new boolean[] { true, false })
3189 +    {
3190 +        final CFException ex = new CFException();
3191 +        final ExceptionalCompletableFutureFunction r =
3192 +            new ExceptionalCompletableFutureFunction(m);
3193 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
3194 +        if (!createIncomplete) f.completeExceptionally(ex);
3195 +        final CompletableFuture<Integer> g = m.exceptionallyCompose(f, r);
3196 +        if (createIncomplete) f.completeExceptionally(ex);
3197 +
3198 +        checkCompletedExceptionally(f, ex);
3199 +        checkCompletedNormally(g, r.value);
3200 +        r.assertInvoked();
3201 +    }}
3202 +
3203 +    /**
3204 +     * exceptionallyCompose completes exceptionally on exception if action does
3205 +     */
3206 +    public void testExceptionallyCompose_actionFailed() {
3207 +        for (ExecutionMode m : ExecutionMode.values())
3208 +        for (boolean createIncomplete : new boolean[] { true, false })
3209 +        for (Integer v1 : new Integer[] { 1, null })
3210 +    {
3211 +        final CFException ex = new CFException();
3212 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
3213 +        final FailingExceptionalCompletableFutureFunction r
3214 +            = new FailingExceptionalCompletableFutureFunction(m);
3215 +        if (!createIncomplete) f.completeExceptionally(ex);
3216 +        final CompletableFuture<Integer> g = m.exceptionallyCompose(f, r);
3217 +        if (createIncomplete) f.completeExceptionally(ex);
3218 +
3219 +        checkCompletedExceptionally(f, ex);
3220 +        checkCompletedWithWrappedException(g, r.ex);
3221 +        r.assertInvoked();
3222 +    }}
3223 +
3224 +
3225      // other static methods
3226  
3227      /**
# Line 2818 | Line 3238 | public class CompletableFutureTest exten
3238       * when all components complete normally
3239       */
3240      public void testAllOf_normal() throws Exception {
3241 <        for (int k = 1; k < 20; ++k) {
3241 >        for (int k = 1; k < 10; k++) {
3242              CompletableFuture<Integer>[] fs
3243                  = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3244 <            for (int i = 0; i < k; ++i)
3244 >            for (int i = 0; i < k; i++)
3245                  fs[i] = new CompletableFuture<>();
3246              CompletableFuture<Void> f = CompletableFuture.allOf(fs);
3247 <            for (int i = 0; i < k; ++i) {
3247 >            for (int i = 0; i < k; i++) {
3248                  checkIncomplete(f);
3249                  checkIncomplete(CompletableFuture.allOf(fs));
3250                  fs[i].complete(one);
# Line 2834 | Line 3254 | public class CompletableFutureTest exten
3254          }
3255      }
3256  
3257 <    public void testAllOf_backwards() throws Exception {
3258 <        for (int k = 1; k < 20; ++k) {
3257 >    public void testAllOf_normal_backwards() throws Exception {
3258 >        for (int k = 1; k < 10; k++) {
3259              CompletableFuture<Integer>[] fs
3260                  = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3261 <            for (int i = 0; i < k; ++i)
3261 >            for (int i = 0; i < k; i++)
3262                  fs[i] = new CompletableFuture<>();
3263              CompletableFuture<Void> f = CompletableFuture.allOf(fs);
3264              for (int i = k - 1; i >= 0; i--) {
# Line 2851 | Line 3271 | public class CompletableFutureTest exten
3271          }
3272      }
3273  
3274 +    public void testAllOf_exceptional() throws Exception {
3275 +        for (int k = 1; k < 10; k++) {
3276 +            CompletableFuture<Integer>[] fs
3277 +                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3278 +            CFException ex = new CFException();
3279 +            for (int i = 0; i < k; i++)
3280 +                fs[i] = new CompletableFuture<>();
3281 +            CompletableFuture<Void> f = CompletableFuture.allOf(fs);
3282 +            for (int i = 0; i < k; i++) {
3283 +                checkIncomplete(f);
3284 +                checkIncomplete(CompletableFuture.allOf(fs));
3285 +                if (i != k / 2) {
3286 +                    fs[i].complete(i);
3287 +                    checkCompletedNormally(fs[i], i);
3288 +                } else {
3289 +                    fs[i].completeExceptionally(ex);
3290 +                    checkCompletedExceptionally(fs[i], ex);
3291 +                }
3292 +            }
3293 +            checkCompletedWithWrappedException(f, ex);
3294 +            checkCompletedWithWrappedException(CompletableFuture.allOf(fs), ex);
3295 +        }
3296 +    }
3297 +
3298      /**
3299       * anyOf(no component futures) returns an incomplete future
3300       */
3301      public void testAnyOf_empty() throws Exception {
3302 +        for (Integer v1 : new Integer[] { 1, null })
3303 +    {
3304          CompletableFuture<Object> f = CompletableFuture.anyOf();
3305          checkIncomplete(f);
3306 <    }
3306 >
3307 >        f.complete(v1);
3308 >        checkCompletedNormally(f, v1);
3309 >    }}
3310  
3311      /**
3312       * anyOf returns a future completed normally with a value when
3313       * a component future does
3314       */
3315      public void testAnyOf_normal() throws Exception {
3316 <        for (int k = 0; k < 10; ++k) {
3316 >        for (int k = 0; k < 10; k++) {
3317              CompletableFuture[] fs = new CompletableFuture[k];
3318 <            for (int i = 0; i < k; ++i)
3318 >            for (int i = 0; i < k; i++)
3319                  fs[i] = new CompletableFuture<>();
3320              CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3321              checkIncomplete(f);
3322 <            for (int i = 0; i < k; ++i) {
3323 <                fs[i].complete(one);
3324 <                checkCompletedNormally(f, one);
3325 <                checkCompletedNormally(CompletableFuture.anyOf(fs), one);
3322 >            for (int i = 0; i < k; i++) {
3323 >                fs[i].complete(i);
3324 >                checkCompletedNormally(f, 0);
3325 >                int x = (int) CompletableFuture.anyOf(fs).join();
3326 >                assertTrue(0 <= x && x <= i);
3327 >            }
3328 >        }
3329 >    }
3330 >    public void testAnyOf_normal_backwards() throws Exception {
3331 >        for (int k = 0; k < 10; k++) {
3332 >            CompletableFuture[] fs = new CompletableFuture[k];
3333 >            for (int i = 0; i < k; i++)
3334 >                fs[i] = new CompletableFuture<>();
3335 >            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3336 >            checkIncomplete(f);
3337 >            for (int i = k - 1; i >= 0; i--) {
3338 >                fs[i].complete(i);
3339 >                checkCompletedNormally(f, k - 1);
3340 >                int x = (int) CompletableFuture.anyOf(fs).join();
3341 >                assertTrue(i <= x && x <= k - 1);
3342              }
3343          }
3344      }
# Line 2882 | Line 3347 | public class CompletableFutureTest exten
3347       * anyOf result completes exceptionally when any component does.
3348       */
3349      public void testAnyOf_exceptional() throws Exception {
3350 <        for (int k = 0; k < 10; ++k) {
3350 >        for (int k = 0; k < 10; k++) {
3351              CompletableFuture[] fs = new CompletableFuture[k];
3352 <            for (int i = 0; i < k; ++i)
3352 >            CFException[] exs = new CFException[k];
3353 >            for (int i = 0; i < k; i++) {
3354                  fs[i] = new CompletableFuture<>();
3355 +                exs[i] = new CFException();
3356 +            }
3357              CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3358              checkIncomplete(f);
3359 <            for (int i = 0; i < k; ++i) {
3360 <                fs[i].completeExceptionally(new CFException());
3361 <                checkCompletedWithWrappedCFException(f);
3359 >            for (int i = 0; i < k; i++) {
3360 >                fs[i].completeExceptionally(exs[i]);
3361 >                checkCompletedWithWrappedException(f, exs[0]);
3362 >                checkCompletedWithWrappedCFException(CompletableFuture.anyOf(fs));
3363 >            }
3364 >        }
3365 >    }
3366 >
3367 >    public void testAnyOf_exceptional_backwards() throws Exception {
3368 >        for (int k = 0; k < 10; k++) {
3369 >            CompletableFuture[] fs = new CompletableFuture[k];
3370 >            CFException[] exs = new CFException[k];
3371 >            for (int i = 0; i < k; i++) {
3372 >                fs[i] = new CompletableFuture<>();
3373 >                exs[i] = new CFException();
3374 >            }
3375 >            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3376 >            checkIncomplete(f);
3377 >            for (int i = k - 1; i >= 0; i--) {
3378 >                fs[i].completeExceptionally(exs[i]);
3379 >                checkCompletedWithWrappedException(f, exs[k - 1]);
3380                  checkCompletedWithWrappedCFException(CompletableFuture.anyOf(fs));
3381              }
3382          }
# Line 2899 | Line 3385 | public class CompletableFutureTest exten
3385      /**
3386       * Completion methods throw NullPointerException with null arguments
3387       */
3388 +    @SuppressWarnings("FutureReturnValueIgnored")
3389      public void testNPE() {
3390          CompletableFuture<Integer> f = new CompletableFuture<>();
3391          CompletableFuture<Integer> g = new CompletableFuture<>();
3392          CompletableFuture<Integer> nullFuture = (CompletableFuture<Integer>)null;
2906        CompletableFuture<?> h;
3393          ThreadExecutor exec = new ThreadExecutor();
3394  
3395          Runnable[] throwingActions = {
3396              () -> CompletableFuture.supplyAsync(null),
3397              () -> CompletableFuture.supplyAsync(null, exec),
3398 <            () -> CompletableFuture.supplyAsync(new IntegerSupplier(ExecutionMode.DEFAULT, 42), null),
3398 >            () -> CompletableFuture.supplyAsync(new IntegerSupplier(ExecutionMode.SYNC, 42), null),
3399  
3400              () -> CompletableFuture.runAsync(null),
3401              () -> CompletableFuture.runAsync(null, exec),
# Line 2919 | Line 3405 | public class CompletableFutureTest exten
3405  
3406              () -> f.thenApply(null),
3407              () -> f.thenApplyAsync(null),
3408 <            () -> f.thenApplyAsync((x) -> x, null),
3408 >            () -> f.thenApplyAsync(x -> x, null),
3409              () -> f.thenApplyAsync(null, exec),
3410  
3411              () -> f.thenAccept(null),
3412              () -> f.thenAcceptAsync(null),
3413 <            () -> f.thenAcceptAsync((x) -> {} , null),
3413 >            () -> f.thenAcceptAsync(x -> {} , null),
3414              () -> f.thenAcceptAsync(null, exec),
3415  
3416              () -> f.thenRun(null),
# Line 2959 | Line 3445 | public class CompletableFutureTest exten
3445              () -> f.applyToEither(g, null),
3446              () -> f.applyToEitherAsync(g, null),
3447              () -> f.applyToEitherAsync(g, null, exec),
3448 <            () -> f.applyToEither(nullFuture, (x) -> x),
3449 <            () -> f.applyToEitherAsync(nullFuture, (x) -> x),
3450 <            () -> f.applyToEitherAsync(nullFuture, (x) -> x, exec),
3451 <            () -> f.applyToEitherAsync(g, (x) -> x, null),
3448 >            () -> f.applyToEither(nullFuture, x -> x),
3449 >            () -> f.applyToEitherAsync(nullFuture, x -> x),
3450 >            () -> f.applyToEitherAsync(nullFuture, x -> x, exec),
3451 >            () -> f.applyToEitherAsync(g, x -> x, null),
3452  
3453              () -> f.acceptEither(g, null),
3454              () -> f.acceptEitherAsync(g, null),
3455              () -> f.acceptEitherAsync(g, null, exec),
3456 <            () -> f.acceptEither(nullFuture, (x) -> {}),
3457 <            () -> f.acceptEitherAsync(nullFuture, (x) -> {}),
3458 <            () -> f.acceptEitherAsync(nullFuture, (x) -> {}, exec),
3459 <            () -> f.acceptEitherAsync(g, (x) -> {}, null),
3456 >            () -> f.acceptEither(nullFuture, x -> {}),
3457 >            () -> f.acceptEitherAsync(nullFuture, x -> {}),
3458 >            () -> f.acceptEitherAsync(nullFuture, x -> {}, exec),
3459 >            () -> f.acceptEitherAsync(g, x -> {}, null),
3460  
3461              () -> f.runAfterEither(g, null),
3462              () -> f.runAfterEitherAsync(g, null),
# Line 3000 | Line 3486 | public class CompletableFutureTest exten
3486              () -> CompletableFuture.anyOf(null, f),
3487  
3488              () -> f.obtrudeException(null),
3489 +
3490 +            () -> CompletableFuture.delayedExecutor(1L, SECONDS, null),
3491 +            () -> CompletableFuture.delayedExecutor(1L, null, exec),
3492 +            () -> CompletableFuture.delayedExecutor(1L, null),
3493 +
3494 +            () -> f.orTimeout(1L, null),
3495 +            () -> f.completeOnTimeout(42, 1L, null),
3496 +
3497 +            () -> CompletableFuture.failedFuture(null),
3498 +            () -> CompletableFuture.failedStage(null),
3499          };
3500  
3501          assertThrows(NullPointerException.class, throwingActions);
# Line 3007 | Line 3503 | public class CompletableFutureTest exten
3503      }
3504  
3505      /**
3506 +     * Test submissions to an executor that rejects all tasks.
3507 +     */
3508 +    public void testRejectingExecutor() {
3509 +        for (Integer v : new Integer[] { 1, null })
3510 +    {
3511 +        final CountingRejectingExecutor e = new CountingRejectingExecutor();
3512 +
3513 +        final CompletableFuture<Integer> complete = CompletableFuture.completedFuture(v);
3514 +        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
3515 +
3516 +        List<CompletableFuture<?>> futures = new ArrayList<>();
3517 +
3518 +        List<CompletableFuture<Integer>> srcs = new ArrayList<>();
3519 +        srcs.add(complete);
3520 +        srcs.add(incomplete);
3521 +
3522 +        for (CompletableFuture<Integer> src : srcs) {
3523 +            List<CompletableFuture<?>> fs = new ArrayList<>();
3524 +            fs.add(src.thenRunAsync(() -> {}, e));
3525 +            fs.add(src.thenAcceptAsync(z -> {}, e));
3526 +            fs.add(src.thenApplyAsync(z -> z, e));
3527 +
3528 +            fs.add(src.thenCombineAsync(src, (x, y) -> x, e));
3529 +            fs.add(src.thenAcceptBothAsync(src, (x, y) -> {}, e));
3530 +            fs.add(src.runAfterBothAsync(src, () -> {}, e));
3531 +
3532 +            fs.add(src.applyToEitherAsync(src, z -> z, e));
3533 +            fs.add(src.acceptEitherAsync(src, z -> {}, e));
3534 +            fs.add(src.runAfterEitherAsync(src, () -> {}, e));
3535 +
3536 +            fs.add(src.thenComposeAsync(z -> null, e));
3537 +            fs.add(src.whenCompleteAsync((z, t) -> {}, e));
3538 +            fs.add(src.handleAsync((z, t) -> null, e));
3539 +
3540 +            for (CompletableFuture<?> future : fs) {
3541 +                if (src.isDone())
3542 +                    checkCompletedWithWrappedException(future, e.ex);
3543 +                else
3544 +                    checkIncomplete(future);
3545 +            }
3546 +            futures.addAll(fs);
3547 +        }
3548 +
3549 +        {
3550 +            List<CompletableFuture<?>> fs = new ArrayList<>();
3551 +
3552 +            fs.add(complete.thenCombineAsync(incomplete, (x, y) -> x, e));
3553 +            fs.add(incomplete.thenCombineAsync(complete, (x, y) -> x, e));
3554 +
3555 +            fs.add(complete.thenAcceptBothAsync(incomplete, (x, y) -> {}, e));
3556 +            fs.add(incomplete.thenAcceptBothAsync(complete, (x, y) -> {}, e));
3557 +
3558 +            fs.add(complete.runAfterBothAsync(incomplete, () -> {}, e));
3559 +            fs.add(incomplete.runAfterBothAsync(complete, () -> {}, e));
3560 +
3561 +            for (CompletableFuture<?> future : fs)
3562 +                checkIncomplete(future);
3563 +            futures.addAll(fs);
3564 +        }
3565 +
3566 +        {
3567 +            List<CompletableFuture<?>> fs = new ArrayList<>();
3568 +
3569 +            fs.add(complete.applyToEitherAsync(incomplete, z -> z, e));
3570 +            fs.add(incomplete.applyToEitherAsync(complete, z -> z, e));
3571 +
3572 +            fs.add(complete.acceptEitherAsync(incomplete, z -> {}, e));
3573 +            fs.add(incomplete.acceptEitherAsync(complete, z -> {}, e));
3574 +
3575 +            fs.add(complete.runAfterEitherAsync(incomplete, () -> {}, e));
3576 +            fs.add(incomplete.runAfterEitherAsync(complete, () -> {}, e));
3577 +
3578 +            for (CompletableFuture<?> future : fs)
3579 +                checkCompletedWithWrappedException(future, e.ex);
3580 +            futures.addAll(fs);
3581 +        }
3582 +
3583 +        incomplete.complete(v);
3584 +
3585 +        for (CompletableFuture<?> future : futures)
3586 +            checkCompletedWithWrappedException(future, e.ex);
3587 +
3588 +        assertEquals(futures.size(), e.count.get());
3589 +    }}
3590 +
3591 +    /**
3592 +     * Test submissions to an executor that rejects all tasks, but
3593 +     * should never be invoked because the dependent future is
3594 +     * explicitly completed.
3595 +     */
3596 +    public void testRejectingExecutorNeverInvoked() {
3597 +        for (Integer v : new Integer[] { 1, null })
3598 +    {
3599 +        final CountingRejectingExecutor e = new CountingRejectingExecutor();
3600 +
3601 +        final CompletableFuture<Integer> complete = CompletableFuture.completedFuture(v);
3602 +        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
3603 +
3604 +        List<CompletableFuture<?>> futures = new ArrayList<>();
3605 +
3606 +        List<CompletableFuture<Integer>> srcs = new ArrayList<>();
3607 +        srcs.add(complete);
3608 +        srcs.add(incomplete);
3609 +
3610 +        List<CompletableFuture<?>> fs = new ArrayList<>();
3611 +        fs.add(incomplete.thenRunAsync(() -> {}, e));
3612 +        fs.add(incomplete.thenAcceptAsync(z -> {}, e));
3613 +        fs.add(incomplete.thenApplyAsync(z -> z, e));
3614 +
3615 +        fs.add(incomplete.thenCombineAsync(incomplete, (x, y) -> x, e));
3616 +        fs.add(incomplete.thenAcceptBothAsync(incomplete, (x, y) -> {}, e));
3617 +        fs.add(incomplete.runAfterBothAsync(incomplete, () -> {}, e));
3618 +
3619 +        fs.add(incomplete.applyToEitherAsync(incomplete, z -> z, e));
3620 +        fs.add(incomplete.acceptEitherAsync(incomplete, z -> {}, e));
3621 +        fs.add(incomplete.runAfterEitherAsync(incomplete, () -> {}, e));
3622 +
3623 +        fs.add(incomplete.thenComposeAsync(z -> null, e));
3624 +        fs.add(incomplete.whenCompleteAsync((z, t) -> {}, e));
3625 +        fs.add(incomplete.handleAsync((z, t) -> null, e));
3626 +
3627 +        fs.add(complete.thenCombineAsync(incomplete, (x, y) -> x, e));
3628 +        fs.add(incomplete.thenCombineAsync(complete, (x, y) -> x, e));
3629 +
3630 +        fs.add(complete.thenAcceptBothAsync(incomplete, (x, y) -> {}, e));
3631 +        fs.add(incomplete.thenAcceptBothAsync(complete, (x, y) -> {}, e));
3632 +
3633 +        fs.add(complete.runAfterBothAsync(incomplete, () -> {}, e));
3634 +        fs.add(incomplete.runAfterBothAsync(complete, () -> {}, e));
3635 +
3636 +        for (CompletableFuture<?> future : fs)
3637 +            checkIncomplete(future);
3638 +
3639 +        for (CompletableFuture<?> future : fs)
3640 +            future.complete(null);
3641 +
3642 +        incomplete.complete(v);
3643 +
3644 +        for (CompletableFuture<?> future : fs)
3645 +            checkCompletedNormally(future, null);
3646 +
3647 +        assertEquals(0, e.count.get());
3648 +    }}
3649 +
3650 +    /**
3651       * toCompletableFuture returns this CompletableFuture.
3652       */
3653      public void testToCompletableFuture() {
# Line 3014 | Line 3655 | public class CompletableFutureTest exten
3655          assertSame(f, f.toCompletableFuture());
3656      }
3657  
3658 < //     public void testRunAfterEither_resultDeterminedAtTimeOfCreation() {
3659 < //         for (ExecutionMode m : ExecutionMode.values())
3660 < //         for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3661 < //         for (Integer v1 : new Integer[] { 1, null })
3662 < //     {
3663 < //         final CompletableFuture<Integer> f = new CompletableFuture<>();
3664 < //         final CompletableFuture<Integer> g = new CompletableFuture<>();
3665 < //         final Noop[] rs = new Noop[2];
3666 < //         for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
3667 < //         f.complete(v1);
3668 < //         final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
3669 < //         final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
3670 < //         assertTrue(g.cancel(mayInterruptIfRunning));
3671 < //         checkCompletedNormally(h0, null);
3672 < //         checkCompletedNormally(h1, null);
3673 < //         for (Noop r : rs) r.assertInvoked();
3674 < //     }}
3658 >    // jdk9
3659 >
3660 >    /**
3661 >     * newIncompleteFuture returns an incomplete CompletableFuture
3662 >     */
3663 >    public void testNewIncompleteFuture() {
3664 >        for (Integer v1 : new Integer[] { 1, null })
3665 >    {
3666 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3667 >        CompletableFuture<Integer> g = f.newIncompleteFuture();
3668 >        checkIncomplete(f);
3669 >        checkIncomplete(g);
3670 >        f.complete(v1);
3671 >        checkCompletedNormally(f, v1);
3672 >        checkIncomplete(g);
3673 >        g.complete(v1);
3674 >        checkCompletedNormally(g, v1);
3675 >        assertSame(g.getClass(), CompletableFuture.class);
3676 >    }}
3677 >
3678 >    /**
3679 >     * completedStage returns a completed CompletionStage
3680 >     */
3681 >    public void testCompletedStage() {
3682 >        AtomicInteger x = new AtomicInteger(0);
3683 >        AtomicReference<Throwable> r = new AtomicReference<>();
3684 >        CompletionStage<Integer> f = CompletableFuture.completedStage(1);
3685 >        f.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3686 >        assertEquals(x.get(), 1);
3687 >        assertNull(r.get());
3688 >    }
3689 >
3690 >    /**
3691 >     * defaultExecutor by default returns the commonPool if
3692 >     * it supports more than one thread.
3693 >     */
3694 >    public void testDefaultExecutor() {
3695 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3696 >        Executor e = f.defaultExecutor();
3697 >        Executor c = ForkJoinPool.commonPool();
3698 >        if (ForkJoinPool.getCommonPoolParallelism() > 1)
3699 >            assertSame(e, c);
3700 >        else
3701 >            assertNotSame(e, c);
3702 >    }
3703 >
3704 >    /**
3705 >     * failedFuture returns a CompletableFuture completed
3706 >     * exceptionally with the given Exception
3707 >     */
3708 >    public void testFailedFuture() {
3709 >        CFException ex = new CFException();
3710 >        CompletableFuture<Integer> f = CompletableFuture.failedFuture(ex);
3711 >        checkCompletedExceptionally(f, ex);
3712 >    }
3713 >
3714 >    /**
3715 >     * failedFuture(null) throws NPE
3716 >     */
3717 >    public void testFailedFuture_null() {
3718 >        try {
3719 >            CompletableFuture<Integer> f = CompletableFuture.failedFuture(null);
3720 >            shouldThrow();
3721 >        } catch (NullPointerException success) {}
3722 >    }
3723 >
3724 >    /**
3725 >     * copy returns a CompletableFuture that is completed normally,
3726 >     * with the same value, when source is.
3727 >     */
3728 >    public void testCopy_normalCompletion() {
3729 >        for (boolean createIncomplete : new boolean[] { true, false })
3730 >        for (Integer v1 : new Integer[] { 1, null })
3731 >    {
3732 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3733 >        if (!createIncomplete) assertTrue(f.complete(v1));
3734 >        CompletableFuture<Integer> g = f.copy();
3735 >        if (createIncomplete) {
3736 >            checkIncomplete(f);
3737 >            checkIncomplete(g);
3738 >            assertTrue(f.complete(v1));
3739 >        }
3740 >        checkCompletedNormally(f, v1);
3741 >        checkCompletedNormally(g, v1);
3742 >    }}
3743 >
3744 >    /**
3745 >     * copy returns a CompletableFuture that is completed exceptionally
3746 >     * when source is.
3747 >     */
3748 >    public void testCopy_exceptionalCompletion() {
3749 >        for (boolean createIncomplete : new boolean[] { true, false })
3750 >    {
3751 >        CFException ex = new CFException();
3752 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3753 >        if (!createIncomplete) f.completeExceptionally(ex);
3754 >        CompletableFuture<Integer> g = f.copy();
3755 >        if (createIncomplete) {
3756 >            checkIncomplete(f);
3757 >            checkIncomplete(g);
3758 >            f.completeExceptionally(ex);
3759 >        }
3760 >        checkCompletedExceptionally(f, ex);
3761 >        checkCompletedWithWrappedException(g, ex);
3762 >    }}
3763 >
3764 >    /**
3765 >     * Completion of a copy does not complete its source.
3766 >     */
3767 >    public void testCopy_oneWayPropagation() {
3768 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3769 >        assertTrue(f.copy().complete(1));
3770 >        assertTrue(f.copy().complete(null));
3771 >        assertTrue(f.copy().cancel(true));
3772 >        assertTrue(f.copy().cancel(false));
3773 >        assertTrue(f.copy().completeExceptionally(new CFException()));
3774 >        checkIncomplete(f);
3775 >    }
3776 >
3777 >    /**
3778 >     * minimalCompletionStage returns a CompletableFuture that is
3779 >     * completed normally, with the same value, when source is.
3780 >     */
3781 >    public void testMinimalCompletionStage() {
3782 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3783 >        CompletionStage<Integer> g = f.minimalCompletionStage();
3784 >        AtomicInteger x = new AtomicInteger(0);
3785 >        AtomicReference<Throwable> r = new AtomicReference<>();
3786 >        checkIncomplete(f);
3787 >        g.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3788 >        f.complete(1);
3789 >        checkCompletedNormally(f, 1);
3790 >        assertEquals(x.get(), 1);
3791 >        assertNull(r.get());
3792 >    }
3793 >
3794 >    /**
3795 >     * minimalCompletionStage returns a CompletableFuture that is
3796 >     * completed exceptionally when source is.
3797 >     */
3798 >    public void testMinimalCompletionStage2() {
3799 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3800 >        CompletionStage<Integer> g = f.minimalCompletionStage();
3801 >        AtomicInteger x = new AtomicInteger(0);
3802 >        AtomicReference<Throwable> r = new AtomicReference<>();
3803 >        g.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3804 >        checkIncomplete(f);
3805 >        CFException ex = new CFException();
3806 >        f.completeExceptionally(ex);
3807 >        checkCompletedExceptionally(f, ex);
3808 >        assertEquals(x.get(), 0);
3809 >        assertEquals(r.get().getCause(), ex);
3810 >    }
3811 >
3812 >    /**
3813 >     * failedStage returns a CompletionStage completed
3814 >     * exceptionally with the given Exception
3815 >     */
3816 >    public void testFailedStage() {
3817 >        CFException ex = new CFException();
3818 >        CompletionStage<Integer> f = CompletableFuture.failedStage(ex);
3819 >        AtomicInteger x = new AtomicInteger(0);
3820 >        AtomicReference<Throwable> r = new AtomicReference<>();
3821 >        f.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3822 >        assertEquals(x.get(), 0);
3823 >        assertEquals(r.get(), ex);
3824 >    }
3825 >
3826 >    /**
3827 >     * completeAsync completes with value of given supplier
3828 >     */
3829 >    public void testCompleteAsync() {
3830 >        for (Integer v1 : new Integer[] { 1, null })
3831 >    {
3832 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3833 >        f.completeAsync(() -> v1);
3834 >        f.join();
3835 >        checkCompletedNormally(f, v1);
3836 >    }}
3837 >
3838 >    /**
3839 >     * completeAsync completes exceptionally if given supplier throws
3840 >     */
3841 >    public void testCompleteAsync2() {
3842 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3843 >        CFException ex = new CFException();
3844 >        f.completeAsync(() -> { throw ex; });
3845 >        try {
3846 >            f.join();
3847 >            shouldThrow();
3848 >        } catch (CompletionException success) {}
3849 >        checkCompletedWithWrappedException(f, ex);
3850 >    }
3851 >
3852 >    /**
3853 >     * completeAsync with given executor completes with value of given supplier
3854 >     */
3855 >    public void testCompleteAsync3() {
3856 >        for (Integer v1 : new Integer[] { 1, null })
3857 >    {
3858 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3859 >        ThreadExecutor executor = new ThreadExecutor();
3860 >        f.completeAsync(() -> v1, executor);
3861 >        assertSame(v1, f.join());
3862 >        checkCompletedNormally(f, v1);
3863 >        assertEquals(1, executor.count.get());
3864 >    }}
3865 >
3866 >    /**
3867 >     * completeAsync with given executor completes exceptionally if
3868 >     * given supplier throws
3869 >     */
3870 >    public void testCompleteAsync4() {
3871 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3872 >        CFException ex = new CFException();
3873 >        ThreadExecutor executor = new ThreadExecutor();
3874 >        f.completeAsync(() -> { throw ex; }, executor);
3875 >        try {
3876 >            f.join();
3877 >            shouldThrow();
3878 >        } catch (CompletionException success) {}
3879 >        checkCompletedWithWrappedException(f, ex);
3880 >        assertEquals(1, executor.count.get());
3881 >    }
3882 >
3883 >    /**
3884 >     * orTimeout completes with TimeoutException if not complete
3885 >     */
3886 >    public void testOrTimeout_timesOut() {
3887 >        long timeoutMillis = timeoutMillis();
3888 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3889 >        long startTime = System.nanoTime();
3890 >        assertSame(f, f.orTimeout(timeoutMillis, MILLISECONDS));
3891 >        checkCompletedWithTimeoutException(f);
3892 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
3893 >    }
3894 >
3895 >    /**
3896 >     * orTimeout completes normally if completed before timeout
3897 >     */
3898 >    public void testOrTimeout_completed() {
3899 >        for (Integer v1 : new Integer[] { 1, null })
3900 >    {
3901 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3902 >        CompletableFuture<Integer> g = new CompletableFuture<>();
3903 >        long startTime = System.nanoTime();
3904 >        f.complete(v1);
3905 >        assertSame(f, f.orTimeout(LONG_DELAY_MS, MILLISECONDS));
3906 >        assertSame(g, g.orTimeout(LONG_DELAY_MS, MILLISECONDS));
3907 >        g.complete(v1);
3908 >        checkCompletedNormally(f, v1);
3909 >        checkCompletedNormally(g, v1);
3910 >        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS / 2);
3911 >    }}
3912 >
3913 >    /**
3914 >     * completeOnTimeout completes with given value if not complete
3915 >     */
3916 >    public void testCompleteOnTimeout_timesOut() {
3917 >        testInParallel(() -> testCompleteOnTimeout_timesOut(42),
3918 >                       () -> testCompleteOnTimeout_timesOut(null));
3919 >    }
3920 >
3921 >    /**
3922 >     * completeOnTimeout completes with given value if not complete
3923 >     */
3924 >    public void testCompleteOnTimeout_timesOut(Integer v) {
3925 >        long timeoutMillis = timeoutMillis();
3926 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3927 >        long startTime = System.nanoTime();
3928 >        assertSame(f, f.completeOnTimeout(v, timeoutMillis, MILLISECONDS));
3929 >        assertSame(v, f.join());
3930 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
3931 >        f.complete(99);         // should have no effect
3932 >        checkCompletedNormally(f, v);
3933 >    }
3934 >
3935 >    /**
3936 >     * completeOnTimeout has no effect if completed within timeout
3937 >     */
3938 >    public void testCompleteOnTimeout_completed() {
3939 >        for (Integer v1 : new Integer[] { 1, null })
3940 >    {
3941 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3942 >        CompletableFuture<Integer> g = new CompletableFuture<>();
3943 >        long startTime = System.nanoTime();
3944 >        f.complete(v1);
3945 >        assertSame(f, f.completeOnTimeout(-1, LONG_DELAY_MS, MILLISECONDS));
3946 >        assertSame(g, g.completeOnTimeout(-1, LONG_DELAY_MS, MILLISECONDS));
3947 >        g.complete(v1);
3948 >        checkCompletedNormally(f, v1);
3949 >        checkCompletedNormally(g, v1);
3950 >        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS / 2);
3951 >    }}
3952 >
3953 >    /**
3954 >     * delayedExecutor returns an executor that delays submission
3955 >     */
3956 >    public void testDelayedExecutor() {
3957 >        testInParallel(() -> testDelayedExecutor(null, null),
3958 >                       () -> testDelayedExecutor(null, 1),
3959 >                       () -> testDelayedExecutor(new ThreadExecutor(), 1),
3960 >                       () -> testDelayedExecutor(new ThreadExecutor(), 1));
3961 >    }
3962 >
3963 >    public void testDelayedExecutor(Executor executor, Integer v) throws Exception {
3964 >        long timeoutMillis = timeoutMillis();
3965 >        // Use an "unreasonably long" long timeout to catch lingering threads
3966 >        long longTimeoutMillis = 1000 * 60 * 60 * 24;
3967 >        final Executor delayer, longDelayer;
3968 >        if (executor == null) {
3969 >            delayer = CompletableFuture.delayedExecutor(timeoutMillis, MILLISECONDS);
3970 >            longDelayer = CompletableFuture.delayedExecutor(longTimeoutMillis, MILLISECONDS);
3971 >        } else {
3972 >            delayer = CompletableFuture.delayedExecutor(timeoutMillis, MILLISECONDS, executor);
3973 >            longDelayer = CompletableFuture.delayedExecutor(longTimeoutMillis, MILLISECONDS, executor);
3974 >        }
3975 >        long startTime = System.nanoTime();
3976 >        CompletableFuture<Integer> f =
3977 >            CompletableFuture.supplyAsync(() -> v, delayer);
3978 >        CompletableFuture<Integer> g =
3979 >            CompletableFuture.supplyAsync(() -> v, longDelayer);
3980 >
3981 >        assertNull(g.getNow(null));
3982 >
3983 >        assertSame(v, f.get(LONG_DELAY_MS, MILLISECONDS));
3984 >        long millisElapsed = millisElapsedSince(startTime);
3985 >        assertTrue(millisElapsed >= timeoutMillis);
3986 >        assertTrue(millisElapsed < LONG_DELAY_MS / 2);
3987 >
3988 >        checkCompletedNormally(f, v);
3989 >
3990 >        checkIncomplete(g);
3991 >        assertTrue(g.cancel(true));
3992 >    }
3993 >
3994 >    //--- tests of implementation details; not part of official tck ---
3995 >
3996 >    Object resultOf(CompletableFuture<?> f) {
3997 >        SecurityManager sm = System.getSecurityManager();
3998 >        if (sm != null) {
3999 >            try {
4000 >                System.setSecurityManager(null);
4001 >            } catch (SecurityException giveUp) {
4002 >                return "Reflection not available";
4003 >            }
4004 >        }
4005 >
4006 >        try {
4007 >            java.lang.reflect.Field resultField
4008 >                = CompletableFuture.class.getDeclaredField("result");
4009 >            resultField.setAccessible(true);
4010 >            return resultField.get(f);
4011 >        } catch (Throwable t) {
4012 >            throw new AssertionError(t);
4013 >        } finally {
4014 >            if (sm != null) System.setSecurityManager(sm);
4015 >        }
4016 >    }
4017 >
4018 >    public void testExceptionPropagationReusesResultObject() {
4019 >        if (!testImplementationDetails) return;
4020 >        for (ExecutionMode m : ExecutionMode.values())
4021 >    {
4022 >        final CFException ex = new CFException();
4023 >        final CompletableFuture<Integer> v42 = CompletableFuture.completedFuture(42);
4024 >        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
4025 >
4026 >        final Runnable noopRunnable = new Noop(m);
4027 >        final Consumer<Integer> noopConsumer = new NoopConsumer(m);
4028 >        final Function<Integer, Integer> incFunction = new IncFunction(m);
4029 >
4030 >        List<Function<CompletableFuture<Integer>, CompletableFuture<?>>> funs
4031 >            = new ArrayList<>();
4032 >
4033 >        funs.add(y -> m.thenRun(y, noopRunnable));
4034 >        funs.add(y -> m.thenAccept(y, noopConsumer));
4035 >        funs.add(y -> m.thenApply(y, incFunction));
4036 >
4037 >        funs.add(y -> m.runAfterEither(y, incomplete, noopRunnable));
4038 >        funs.add(y -> m.acceptEither(y, incomplete, noopConsumer));
4039 >        funs.add(y -> m.applyToEither(y, incomplete, incFunction));
4040 >
4041 >        funs.add(y -> m.runAfterBoth(y, v42, noopRunnable));
4042 >        funs.add(y -> m.runAfterBoth(v42, y, noopRunnable));
4043 >        funs.add(y -> m.thenAcceptBoth(y, v42, new SubtractAction(m)));
4044 >        funs.add(y -> m.thenAcceptBoth(v42, y, new SubtractAction(m)));
4045 >        funs.add(y -> m.thenCombine(y, v42, new SubtractFunction(m)));
4046 >        funs.add(y -> m.thenCombine(v42, y, new SubtractFunction(m)));
4047 >
4048 >        funs.add(y -> m.whenComplete(y, (Integer r, Throwable t) -> {}));
4049 >
4050 >        funs.add(y -> m.thenCompose(y, new CompletableFutureInc(m)));
4051 >
4052 >        funs.add(y -> CompletableFuture.allOf(y));
4053 >        funs.add(y -> CompletableFuture.allOf(y, v42));
4054 >        funs.add(y -> CompletableFuture.allOf(v42, y));
4055 >        funs.add(y -> CompletableFuture.anyOf(y));
4056 >        funs.add(y -> CompletableFuture.anyOf(y, incomplete));
4057 >        funs.add(y -> CompletableFuture.anyOf(incomplete, y));
4058 >
4059 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
4060 >                 fun : funs) {
4061 >            CompletableFuture<Integer> f = new CompletableFuture<>();
4062 >            f.completeExceptionally(ex);
4063 >            CompletableFuture<Integer> src = m.thenApply(f, incFunction);
4064 >            checkCompletedWithWrappedException(src, ex);
4065 >            CompletableFuture<?> dep = fun.apply(src);
4066 >            checkCompletedWithWrappedException(dep, ex);
4067 >            assertSame(resultOf(src), resultOf(dep));
4068 >        }
4069 >
4070 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
4071 >                 fun : funs) {
4072 >            CompletableFuture<Integer> f = new CompletableFuture<>();
4073 >            CompletableFuture<Integer> src = m.thenApply(f, incFunction);
4074 >            CompletableFuture<?> dep = fun.apply(src);
4075 >            f.completeExceptionally(ex);
4076 >            checkCompletedWithWrappedException(src, ex);
4077 >            checkCompletedWithWrappedException(dep, ex);
4078 >            assertSame(resultOf(src), resultOf(dep));
4079 >        }
4080 >
4081 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
4082 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
4083 >                 fun : funs) {
4084 >            CompletableFuture<Integer> f = new CompletableFuture<>();
4085 >            f.cancel(mayInterruptIfRunning);
4086 >            checkCancelled(f);
4087 >            CompletableFuture<Integer> src = m.thenApply(f, incFunction);
4088 >            checkCompletedWithWrappedCancellationException(src);
4089 >            CompletableFuture<?> dep = fun.apply(src);
4090 >            checkCompletedWithWrappedCancellationException(dep);
4091 >            assertSame(resultOf(src), resultOf(dep));
4092 >        }
4093 >
4094 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
4095 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
4096 >                 fun : funs) {
4097 >            CompletableFuture<Integer> f = new CompletableFuture<>();
4098 >            CompletableFuture<Integer> src = m.thenApply(f, incFunction);
4099 >            CompletableFuture<?> dep = fun.apply(src);
4100 >            f.cancel(mayInterruptIfRunning);
4101 >            checkCancelled(f);
4102 >            checkCompletedWithWrappedCancellationException(src);
4103 >            checkCompletedWithWrappedCancellationException(dep);
4104 >            assertSame(resultOf(src), resultOf(dep));
4105 >        }
4106 >    }}
4107 >
4108 >    /**
4109 >     * Minimal completion stages throw UOE for most non-CompletionStage methods
4110 >     */
4111 >    public void testMinimalCompletionStage_minimality() {
4112 >        if (!testImplementationDetails) return;
4113 >        Function<Method, String> toSignature =
4114 >            method -> method.getName() + Arrays.toString(method.getParameterTypes());
4115 >        Predicate<Method> isNotStatic =
4116 >            method -> (method.getModifiers() & Modifier.STATIC) == 0;
4117 >        List<Method> minimalMethods =
4118 >            Stream.of(Object.class, CompletionStage.class)
4119 >            .flatMap(klazz -> Stream.of(klazz.getMethods()))
4120 >            .filter(isNotStatic)
4121 >            .collect(Collectors.toList());
4122 >        // Methods from CompletableFuture permitted NOT to throw UOE
4123 >        String[] signatureWhitelist = {
4124 >            "newIncompleteFuture[]",
4125 >            "defaultExecutor[]",
4126 >            "minimalCompletionStage[]",
4127 >            "copy[]",
4128 >        };
4129 >        Set<String> permittedMethodSignatures =
4130 >            Stream.concat(minimalMethods.stream().map(toSignature),
4131 >                          Stream.of(signatureWhitelist))
4132 >            .collect(Collectors.toSet());
4133 >        List<Method> allMethods = Stream.of(CompletableFuture.class.getMethods())
4134 >            .filter(isNotStatic)
4135 >            .filter(method -> !permittedMethodSignatures.contains(toSignature.apply(method)))
4136 >            .collect(Collectors.toList());
4137 >
4138 >        List<CompletionStage<Integer>> stages = new ArrayList<>();
4139 >        CompletionStage<Integer> min =
4140 >            new CompletableFuture<Integer>().minimalCompletionStage();
4141 >        stages.add(min);
4142 >        stages.add(min.thenApply(x -> x));
4143 >        stages.add(CompletableFuture.completedStage(1));
4144 >        stages.add(CompletableFuture.failedStage(new CFException()));
4145 >
4146 >        List<Method> bugs = new ArrayList<>();
4147 >        for (Method method : allMethods) {
4148 >            Class<?>[] parameterTypes = method.getParameterTypes();
4149 >            Object[] args = new Object[parameterTypes.length];
4150 >            // Manufacture boxed primitives for primitive params
4151 >            for (int i = 0; i < args.length; i++) {
4152 >                Class<?> type = parameterTypes[i];
4153 >                if (parameterTypes[i] == boolean.class)
4154 >                    args[i] = false;
4155 >                else if (parameterTypes[i] == int.class)
4156 >                    args[i] = 0;
4157 >                else if (parameterTypes[i] == long.class)
4158 >                    args[i] = 0L;
4159 >            }
4160 >            for (CompletionStage<Integer> stage : stages) {
4161 >                try {
4162 >                    method.invoke(stage, args);
4163 >                    bugs.add(method);
4164 >                }
4165 >                catch (java.lang.reflect.InvocationTargetException expected) {
4166 >                    if (! (expected.getCause() instanceof UnsupportedOperationException)) {
4167 >                        bugs.add(method);
4168 >                        // expected.getCause().printStackTrace();
4169 >                    }
4170 >                }
4171 >                catch (ReflectiveOperationException bad) { throw new Error(bad); }
4172 >            }
4173 >        }
4174 >        if (!bugs.isEmpty())
4175 >            throw new Error("Methods did not throw UOE: " + bugs);
4176 >    }
4177 >
4178 >    /**
4179 >     * minimalStage.toCompletableFuture() returns a CompletableFuture that
4180 >     * is completed normally, with the same value, when source is.
4181 >     */
4182 >    public void testMinimalCompletionStage_toCompletableFuture_normalCompletion() {
4183 >        for (boolean createIncomplete : new boolean[] { true, false })
4184 >        for (Integer v1 : new Integer[] { 1, null })
4185 >    {
4186 >        CompletableFuture<Integer> f = new CompletableFuture<>();
4187 >        CompletionStage<Integer> minimal = f.minimalCompletionStage();
4188 >        if (!createIncomplete) assertTrue(f.complete(v1));
4189 >        CompletableFuture<Integer> g = minimal.toCompletableFuture();
4190 >        if (createIncomplete) {
4191 >            checkIncomplete(f);
4192 >            checkIncomplete(g);
4193 >            assertTrue(f.complete(v1));
4194 >        }
4195 >        checkCompletedNormally(f, v1);
4196 >        checkCompletedNormally(g, v1);
4197 >    }}
4198 >
4199 >    /**
4200 >     * minimalStage.toCompletableFuture() returns a CompletableFuture that
4201 >     * is completed exceptionally when source is.
4202 >     */
4203 >    public void testMinimalCompletionStage_toCompletableFuture_exceptionalCompletion() {
4204 >        for (boolean createIncomplete : new boolean[] { true, false })
4205 >    {
4206 >        CFException ex = new CFException();
4207 >        CompletableFuture<Integer> f = new CompletableFuture<>();
4208 >        CompletionStage<Integer> minimal = f.minimalCompletionStage();
4209 >        if (!createIncomplete) f.completeExceptionally(ex);
4210 >        CompletableFuture<Integer> g = minimal.toCompletableFuture();
4211 >        if (createIncomplete) {
4212 >            checkIncomplete(f);
4213 >            checkIncomplete(g);
4214 >            f.completeExceptionally(ex);
4215 >        }
4216 >        checkCompletedExceptionally(f, ex);
4217 >        checkCompletedWithWrappedException(g, ex);
4218 >    }}
4219 >
4220 >    /**
4221 >     * minimalStage.toCompletableFuture() gives mutable CompletableFuture
4222 >     */
4223 >    public void testMinimalCompletionStage_toCompletableFuture_mutable() {
4224 >        for (Integer v1 : new Integer[] { 1, null })
4225 >    {
4226 >        CompletableFuture<Integer> f = new CompletableFuture<>();
4227 >        CompletionStage minimal = f.minimalCompletionStage();
4228 >        CompletableFuture<Integer> g = minimal.toCompletableFuture();
4229 >        assertTrue(g.complete(v1));
4230 >        checkCompletedNormally(g, v1);
4231 >        checkIncomplete(f);
4232 >        checkIncomplete(minimal.toCompletableFuture());
4233 >    }}
4234 >
4235 >    /**
4236 >     * minimalStage.toCompletableFuture().join() awaits completion
4237 >     */
4238 >    public void testMinimalCompletionStage_toCompletableFuture_join() throws Exception {
4239 >        for (boolean createIncomplete : new boolean[] { true, false })
4240 >        for (Integer v1 : new Integer[] { 1, null })
4241 >    {
4242 >        CompletableFuture<Integer> f = new CompletableFuture<>();
4243 >        if (!createIncomplete) assertTrue(f.complete(v1));
4244 >        CompletionStage<Integer> minimal = f.minimalCompletionStage();
4245 >        if (createIncomplete) assertTrue(f.complete(v1));
4246 >        assertEquals(v1, minimal.toCompletableFuture().join());
4247 >        assertEquals(v1, minimal.toCompletableFuture().get());
4248 >        checkCompletedNormally(minimal.toCompletableFuture(), v1);
4249 >    }}
4250 >
4251 >    /**
4252 >     * Completion of a toCompletableFuture copy of a minimal stage
4253 >     * does not complete its source.
4254 >     */
4255 >    public void testMinimalCompletionStage_toCompletableFuture_oneWayPropagation() {
4256 >        CompletableFuture<Integer> f = new CompletableFuture<>();
4257 >        CompletionStage<Integer> g = f.minimalCompletionStage();
4258 >        assertTrue(g.toCompletableFuture().complete(1));
4259 >        assertTrue(g.toCompletableFuture().complete(null));
4260 >        assertTrue(g.toCompletableFuture().cancel(true));
4261 >        assertTrue(g.toCompletableFuture().cancel(false));
4262 >        assertTrue(g.toCompletableFuture().completeExceptionally(new CFException()));
4263 >        checkIncomplete(g.toCompletableFuture());
4264 >        f.complete(1);
4265 >        checkCompletedNormally(g.toCompletableFuture(), 1);
4266 >    }
4267 >
4268 >    /** Demo utility method for external reliable toCompletableFuture */
4269 >    static <T> CompletableFuture<T> toCompletableFuture(CompletionStage<T> stage) {
4270 >        CompletableFuture<T> f = new CompletableFuture<>();
4271 >        stage.handle((T t, Throwable ex) -> {
4272 >                         if (ex != null) f.completeExceptionally(ex);
4273 >                         else f.complete(t);
4274 >                         return null;
4275 >                     });
4276 >        return f;
4277 >    }
4278 >
4279 >    /** Demo utility method to join a CompletionStage */
4280 >    static <T> T join(CompletionStage<T> stage) {
4281 >        return toCompletableFuture(stage).join();
4282 >    }
4283 >
4284 >    /**
4285 >     * Joining a minimal stage "by hand" works
4286 >     */
4287 >    public void testMinimalCompletionStage_join_by_hand() {
4288 >        for (boolean createIncomplete : new boolean[] { true, false })
4289 >        for (Integer v1 : new Integer[] { 1, null })
4290 >    {
4291 >        CompletableFuture<Integer> f = new CompletableFuture<>();
4292 >        CompletionStage<Integer> minimal = f.minimalCompletionStage();
4293 >        CompletableFuture<Integer> g = new CompletableFuture<>();
4294 >        if (!createIncomplete) assertTrue(f.complete(v1));
4295 >        minimal.thenAccept(x -> g.complete(x));
4296 >        if (createIncomplete) assertTrue(f.complete(v1));
4297 >        g.join();
4298 >        checkCompletedNormally(g, v1);
4299 >        checkCompletedNormally(f, v1);
4300 >        assertEquals(v1, join(minimal));
4301 >    }}
4302 >
4303 >    static class Monad {
4304 >        static class ZeroException extends RuntimeException {
4305 >            public ZeroException() { super("monadic zero"); }
4306 >        }
4307 >        // "return", "unit"
4308 >        static <T> CompletableFuture<T> unit(T value) {
4309 >            return completedFuture(value);
4310 >        }
4311 >        // monadic zero ?
4312 >        static <T> CompletableFuture<T> zero() {
4313 >            return failedFuture(new ZeroException());
4314 >        }
4315 >        // >=>
4316 >        static <T,U,V> Function<T, CompletableFuture<V>> compose
4317 >            (Function<T, CompletableFuture<U>> f,
4318 >             Function<U, CompletableFuture<V>> g) {
4319 >            return x -> f.apply(x).thenCompose(g);
4320 >        }
4321 >
4322 >        static void assertZero(CompletableFuture<?> f) {
4323 >            try {
4324 >                f.getNow(null);
4325 >                throw new AssertionError("should throw");
4326 >            } catch (CompletionException success) {
4327 >                assertTrue(success.getCause() instanceof ZeroException);
4328 >            }
4329 >        }
4330 >
4331 >        static <T> void assertFutureEquals(CompletableFuture<T> f,
4332 >                                           CompletableFuture<T> g) {
4333 >            T fval = null, gval = null;
4334 >            Throwable fex = null, gex = null;
4335 >
4336 >            try { fval = f.get(); }
4337 >            catch (ExecutionException ex) { fex = ex.getCause(); }
4338 >            catch (Throwable ex) { fex = ex; }
4339 >
4340 >            try { gval = g.get(); }
4341 >            catch (ExecutionException ex) { gex = ex.getCause(); }
4342 >            catch (Throwable ex) { gex = ex; }
4343 >
4344 >            if (fex != null || gex != null)
4345 >                assertSame(fex.getClass(), gex.getClass());
4346 >            else
4347 >                assertEquals(fval, gval);
4348 >        }
4349 >
4350 >        static class PlusFuture<T> extends CompletableFuture<T> {
4351 >            AtomicReference<Throwable> firstFailure = new AtomicReference<>(null);
4352 >        }
4353 >
4354 >        /** Implements "monadic plus". */
4355 >        static <T> CompletableFuture<T> plus(CompletableFuture<? extends T> f,
4356 >                                             CompletableFuture<? extends T> g) {
4357 >            PlusFuture<T> plus = new PlusFuture<T>();
4358 >            BiConsumer<T, Throwable> action = (T result, Throwable ex) -> {
4359 >                try {
4360 >                    if (ex == null) {
4361 >                        if (plus.complete(result))
4362 >                            if (plus.firstFailure.get() != null)
4363 >                                plus.firstFailure.set(null);
4364 >                    }
4365 >                    else if (plus.firstFailure.compareAndSet(null, ex)) {
4366 >                        if (plus.isDone())
4367 >                            plus.firstFailure.set(null);
4368 >                    }
4369 >                    else {
4370 >                        // first failure has precedence
4371 >                        Throwable first = plus.firstFailure.getAndSet(null);
4372 >
4373 >                        // may fail with "Self-suppression not permitted"
4374 >                        try { first.addSuppressed(ex); }
4375 >                        catch (Exception ignored) {}
4376 >
4377 >                        plus.completeExceptionally(first);
4378 >                    }
4379 >                } catch (Throwable unexpected) {
4380 >                    plus.completeExceptionally(unexpected);
4381 >                }
4382 >            };
4383 >            f.whenComplete(action);
4384 >            g.whenComplete(action);
4385 >            return plus;
4386 >        }
4387 >    }
4388 >
4389 >    /**
4390 >     * CompletableFuture is an additive monad - sort of.
4391 >     * https://en.wikipedia.org/wiki/Monad_(functional_programming)#Additive_monads
4392 >     */
4393 >    public void testAdditiveMonad() throws Throwable {
4394 >        Function<Long, CompletableFuture<Long>> unit = Monad::unit;
4395 >        CompletableFuture<Long> zero = Monad.zero();
4396 >
4397 >        // Some mutually non-commutative functions
4398 >        Function<Long, CompletableFuture<Long>> triple
4399 >            = x -> Monad.unit(3 * x);
4400 >        Function<Long, CompletableFuture<Long>> inc
4401 >            = x -> Monad.unit(x + 1);
4402 >
4403 >        // unit is a right identity: m >>= unit === m
4404 >        Monad.assertFutureEquals(inc.apply(5L).thenCompose(unit),
4405 >                                 inc.apply(5L));
4406 >        // unit is a left identity: (unit x) >>= f === f x
4407 >        Monad.assertFutureEquals(unit.apply(5L).thenCompose(inc),
4408 >                                 inc.apply(5L));
4409 >
4410 >        // associativity: (m >>= f) >>= g === m >>= ( \x -> (f x >>= g) )
4411 >        Monad.assertFutureEquals(
4412 >            unit.apply(5L).thenCompose(inc).thenCompose(triple),
4413 >            unit.apply(5L).thenCompose(x -> inc.apply(x).thenCompose(triple)));
4414 >
4415 >        // The case for CompletableFuture as an additive monad is weaker...
4416 >
4417 >        // zero is a monadic zero
4418 >        Monad.assertZero(zero);
4419 >
4420 >        // left zero: zero >>= f === zero
4421 >        Monad.assertZero(zero.thenCompose(inc));
4422 >        // right zero: f >>= (\x -> zero) === zero
4423 >        Monad.assertZero(inc.apply(5L).thenCompose(x -> zero));
4424 >
4425 >        // f plus zero === f
4426 >        Monad.assertFutureEquals(Monad.unit(5L),
4427 >                                 Monad.plus(Monad.unit(5L), zero));
4428 >        // zero plus f === f
4429 >        Monad.assertFutureEquals(Monad.unit(5L),
4430 >                                 Monad.plus(zero, Monad.unit(5L)));
4431 >        // zero plus zero === zero
4432 >        Monad.assertZero(Monad.plus(zero, zero));
4433 >        {
4434 >            CompletableFuture<Long> f = Monad.plus(Monad.unit(5L),
4435 >                                                   Monad.unit(8L));
4436 >            // non-determinism
4437 >            assertTrue(f.get() == 5L || f.get() == 8L);
4438 >        }
4439 >
4440 >        CompletableFuture<Long> godot = new CompletableFuture<>();
4441 >        // f plus godot === f (doesn't wait for godot)
4442 >        Monad.assertFutureEquals(Monad.unit(5L),
4443 >                                 Monad.plus(Monad.unit(5L), godot));
4444 >        // godot plus f === f (doesn't wait for godot)
4445 >        Monad.assertFutureEquals(Monad.unit(5L),
4446 >                                 Monad.plus(godot, Monad.unit(5L)));
4447 >    }
4448 >
4449 >    /** Test long recursive chains of CompletableFutures with cascading completions */
4450 >    @SuppressWarnings("FutureReturnValueIgnored")
4451 >    public void testRecursiveChains() throws Throwable {
4452 >        for (ExecutionMode m : ExecutionMode.values())
4453 >        for (boolean addDeadEnds : new boolean[] { true, false })
4454 >    {
4455 >        final int val = 42;
4456 >        final int n = expensiveTests ? 1_000 : 2;
4457 >        CompletableFuture<Integer> head = new CompletableFuture<>();
4458 >        CompletableFuture<Integer> tail = head;
4459 >        for (int i = 0; i < n; i++) {
4460 >            if (addDeadEnds) m.thenApply(tail, v -> v + 1);
4461 >            tail = m.thenApply(tail, v -> v + 1);
4462 >            if (addDeadEnds) m.applyToEither(tail, tail, v -> v + 1);
4463 >            tail = m.applyToEither(tail, tail, v -> v + 1);
4464 >            if (addDeadEnds) m.thenCombine(tail, tail, (v, w) -> v + 1);
4465 >            tail = m.thenCombine(tail, tail, (v, w) -> v + 1);
4466 >        }
4467 >        head.complete(val);
4468 >        assertEquals(val + 3 * n, (int) tail.join());
4469 >    }}
4470 >
4471 >    /**
4472 >     * A single CompletableFuture with many dependents.
4473 >     * A demo of scalability - runtime is O(n).
4474 >     */
4475 >    @SuppressWarnings("FutureReturnValueIgnored")
4476 >    public void testManyDependents() throws Throwable {
4477 >        final int n = expensiveTests ? 1_000_000 : 10;
4478 >        final CompletableFuture<Void> head = new CompletableFuture<>();
4479 >        final CompletableFuture<Void> complete = CompletableFuture.completedFuture((Void)null);
4480 >        final AtomicInteger count = new AtomicInteger(0);
4481 >        for (int i = 0; i < n; i++) {
4482 >            head.thenRun(() -> count.getAndIncrement());
4483 >            head.thenAccept(x -> count.getAndIncrement());
4484 >            head.thenApply(x -> count.getAndIncrement());
4485 >
4486 >            head.runAfterBoth(complete, () -> count.getAndIncrement());
4487 >            head.thenAcceptBoth(complete, (x, y) -> count.getAndIncrement());
4488 >            head.thenCombine(complete, (x, y) -> count.getAndIncrement());
4489 >            complete.runAfterBoth(head, () -> count.getAndIncrement());
4490 >            complete.thenAcceptBoth(head, (x, y) -> count.getAndIncrement());
4491 >            complete.thenCombine(head, (x, y) -> count.getAndIncrement());
4492 >
4493 >            head.runAfterEither(new CompletableFuture<Void>(), () -> count.getAndIncrement());
4494 >            head.acceptEither(new CompletableFuture<Void>(), x -> count.getAndIncrement());
4495 >            head.applyToEither(new CompletableFuture<Void>(), x -> count.getAndIncrement());
4496 >            new CompletableFuture<Void>().runAfterEither(head, () -> count.getAndIncrement());
4497 >            new CompletableFuture<Void>().acceptEither(head, x -> count.getAndIncrement());
4498 >            new CompletableFuture<Void>().applyToEither(head, x -> count.getAndIncrement());
4499 >        }
4500 >        head.complete(null);
4501 >        assertEquals(5 * 3 * n, count.get());
4502 >    }
4503 >
4504 >    /** ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest tck */
4505 >    @SuppressWarnings("FutureReturnValueIgnored")
4506 >    public void testCoCompletionGarbageRetention() throws Throwable {
4507 >        final int n = expensiveTests ? 1_000_000 : 10;
4508 >        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
4509 >        CompletableFuture<Integer> f;
4510 >        for (int i = 0; i < n; i++) {
4511 >            f = new CompletableFuture<>();
4512 >            f.runAfterEither(incomplete, () -> {});
4513 >            f.complete(null);
4514 >
4515 >            f = new CompletableFuture<>();
4516 >            f.acceptEither(incomplete, x -> {});
4517 >            f.complete(null);
4518 >
4519 >            f = new CompletableFuture<>();
4520 >            f.applyToEither(incomplete, x -> x);
4521 >            f.complete(null);
4522 >
4523 >            f = new CompletableFuture<>();
4524 >            CompletableFuture.anyOf(f, incomplete);
4525 >            f.complete(null);
4526 >        }
4527 >
4528 >        for (int i = 0; i < n; i++) {
4529 >            f = new CompletableFuture<>();
4530 >            incomplete.runAfterEither(f, () -> {});
4531 >            f.complete(null);
4532 >
4533 >            f = new CompletableFuture<>();
4534 >            incomplete.acceptEither(f, x -> {});
4535 >            f.complete(null);
4536 >
4537 >            f = new CompletableFuture<>();
4538 >            incomplete.applyToEither(f, x -> x);
4539 >            f.complete(null);
4540 >
4541 >            f = new CompletableFuture<>();
4542 >            CompletableFuture.anyOf(incomplete, f);
4543 >            f.complete(null);
4544 >        }
4545 >    }
4546 >
4547 >    /**
4548 >     * Reproduction recipe for:
4549 >     * 8160402: Garbage retention with CompletableFuture.anyOf
4550 >     * 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
4551 >     */
4552 >    public void testAnyOfGarbageRetention() throws Throwable {
4553 >        for (Integer v : new Integer[] { 1, null })
4554 >    {
4555 >        final int n = expensiveTests ? 100_000 : 10;
4556 >        CompletableFuture<Integer>[] fs
4557 >            = (CompletableFuture<Integer>[]) new CompletableFuture<?>[100];
4558 >        for (int i = 0; i < fs.length; i++)
4559 >            fs[i] = new CompletableFuture<>();
4560 >        fs[fs.length - 1].complete(v);
4561 >        for (int i = 0; i < n; i++)
4562 >            checkCompletedNormally(CompletableFuture.anyOf(fs), v);
4563 >    }}
4564 >
4565 >    /**
4566 >     * Checks for garbage retention with allOf.
4567 >     *
4568 >     * As of 2016-07, fails with OOME:
4569 >     * ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest -Djsr166.methodFilter=testCancelledAllOfGarbageRetention tck
4570 >     */
4571 >    public void testCancelledAllOfGarbageRetention() throws Throwable {
4572 >        final int n = expensiveTests ? 100_000 : 10;
4573 >        CompletableFuture<Integer>[] fs
4574 >            = (CompletableFuture<Integer>[]) new CompletableFuture<?>[100];
4575 >        for (int i = 0; i < fs.length; i++)
4576 >            fs[i] = new CompletableFuture<>();
4577 >        for (int i = 0; i < n; i++)
4578 >            assertTrue(CompletableFuture.allOf(fs).cancel(false));
4579 >    }
4580 >
4581 >    /**
4582 >     * Checks for garbage retention when a dependent future is
4583 >     * cancelled and garbage-collected.
4584 >     * 8161600: Garbage retention when source CompletableFutures are never completed
4585 >     *
4586 >     * As of 2016-07, fails with OOME:
4587 >     * ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest -Djsr166.methodFilter=testCancelledGarbageRetention tck
4588 >     */
4589 >    public void testCancelledGarbageRetention() throws Throwable {
4590 >        final int n = expensiveTests ? 100_000 : 10;
4591 >        CompletableFuture<Integer> neverCompleted = new CompletableFuture<>();
4592 >        for (int i = 0; i < n; i++)
4593 >            assertTrue(neverCompleted.thenRun(() -> {}).cancel(true));
4594 >    }
4595 >
4596 >    /**
4597 >     * Checks for garbage retention when MinimalStage.toCompletableFuture()
4598 >     * is invoked many times.
4599 >     * 8161600: Garbage retention when source CompletableFutures are never completed
4600 >     *
4601 >     * As of 2016-07, fails with OOME:
4602 >     * ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest -Djsr166.methodFilter=testToCompletableFutureGarbageRetention tck
4603 >     */
4604 >    public void testToCompletableFutureGarbageRetention() throws Throwable {
4605 >        final int n = expensiveTests ? 900_000 : 10;
4606 >        CompletableFuture<Integer> neverCompleted = new CompletableFuture<>();
4607 >        CompletionStage minimal = neverCompleted.minimalCompletionStage();
4608 >        for (int i = 0; i < n; i++)
4609 >            assertTrue(minimal.toCompletableFuture().cancel(true));
4610 >    }
4611 >
4612 > //     static <U> U join(CompletionStage<U> stage) {
4613 > //         CompletableFuture<U> f = new CompletableFuture<>();
4614 > //         stage.whenComplete((v, ex) -> {
4615 > //             if (ex != null) f.completeExceptionally(ex); else f.complete(v);
4616 > //         });
4617 > //         return f.join();
4618 > //     }
4619 >
4620 > //     static <U> boolean isDone(CompletionStage<U> stage) {
4621 > //         CompletableFuture<U> f = new CompletableFuture<>();
4622 > //         stage.whenComplete((v, ex) -> {
4623 > //             if (ex != null) f.completeExceptionally(ex); else f.complete(v);
4624 > //         });
4625 > //         return f.isDone();
4626 > //     }
4627 >
4628 > //     static <U> U join2(CompletionStage<U> stage) {
4629 > //         return stage.toCompletableFuture().copy().join();
4630 > //     }
4631 >
4632 > //     static <U> boolean isDone2(CompletionStage<U> stage) {
4633 > //         return stage.toCompletableFuture().copy().isDone();
4634 > //     }
4635 >
4636 >    // For testing default implementations
4637 >    // Only non-default interface methods defined.
4638 >    static final class DelegatedCompletionStage<T> implements CompletionStage<T> {
4639 >        final CompletableFuture<T> cf;
4640 >        DelegatedCompletionStage(CompletableFuture<T> cf) { this.cf = cf; }
4641 >        public CompletableFuture<T> toCompletableFuture() {
4642 >            return cf; }
4643 >        public CompletionStage<Void> thenRun
4644 >            (Runnable action) {
4645 >            return cf.thenRun(action); }
4646 >        public CompletionStage<Void> thenRunAsync
4647 >            (Runnable action) {
4648 >            return cf.thenRunAsync(action); }
4649 >        public CompletionStage<Void> thenRunAsync
4650 >            (Runnable action,
4651 >             Executor executor) {
4652 >            return cf.thenRunAsync(action, executor); }
4653 >        public CompletionStage<Void> thenAccept
4654 >            (Consumer<? super T> action) {
4655 >            return cf.thenAccept(action); }
4656 >        public CompletionStage<Void> thenAcceptAsync
4657 >            (Consumer<? super T> action) {
4658 >            return cf.thenAcceptAsync(action); }
4659 >        public CompletionStage<Void> thenAcceptAsync
4660 >            (Consumer<? super T> action,
4661 >             Executor executor) {
4662 >            return cf.thenAcceptAsync(action, executor); }
4663 >        public <U> CompletionStage<U> thenApply
4664 >            (Function<? super T,? extends U> a) {
4665 >            return cf.thenApply(a); }
4666 >        public <U> CompletionStage<U> thenApplyAsync
4667 >            (Function<? super T,? extends U> fn) {
4668 >            return cf.thenApplyAsync(fn); }
4669 >        public <U> CompletionStage<U> thenApplyAsync
4670 >            (Function<? super T,? extends U> fn,
4671 >             Executor executor) {
4672 >            return cf.thenApplyAsync(fn, executor); }
4673 >        public <U,V> CompletionStage<V> thenCombine
4674 >            (CompletionStage<? extends U> other,
4675 >             BiFunction<? super T,? super U,? extends V> fn) {
4676 >            return cf.thenCombine(other, fn); }
4677 >        public <U,V> CompletionStage<V> thenCombineAsync
4678 >            (CompletionStage<? extends U> other,
4679 >             BiFunction<? super T,? super U,? extends V> fn) {
4680 >            return cf.thenCombineAsync(other, fn); }
4681 >        public <U,V> CompletionStage<V> thenCombineAsync
4682 >            (CompletionStage<? extends U> other,
4683 >             BiFunction<? super T,? super U,? extends V> fn,
4684 >             Executor executor) {
4685 >            return cf.thenCombineAsync(other, fn, executor); }
4686 >        public <U> CompletionStage<Void> thenAcceptBoth
4687 >            (CompletionStage<? extends U> other,
4688 >             BiConsumer<? super T, ? super U> action) {
4689 >            return cf.thenAcceptBoth(other, action); }
4690 >        public <U> CompletionStage<Void> thenAcceptBothAsync
4691 >            (CompletionStage<? extends U> other,
4692 >             BiConsumer<? super T, ? super U> action) {
4693 >            return cf.thenAcceptBothAsync(other, action); }
4694 >        public <U> CompletionStage<Void> thenAcceptBothAsync
4695 >            (CompletionStage<? extends U> other,
4696 >             BiConsumer<? super T, ? super U> action,
4697 >             Executor executor) {
4698 >            return cf.thenAcceptBothAsync(other, action, executor); }
4699 >        public CompletionStage<Void> runAfterBoth
4700 >            (CompletionStage<?> other,
4701 >             Runnable action) {
4702 >            return cf.runAfterBoth(other, action); }
4703 >        public CompletionStage<Void> runAfterBothAsync
4704 >            (CompletionStage<?> other,
4705 >             Runnable action) {
4706 >            return cf.runAfterBothAsync(other, action); }
4707 >        public CompletionStage<Void> runAfterBothAsync
4708 >            (CompletionStage<?> other,
4709 >             Runnable action,
4710 >             Executor executor) {
4711 >            return cf.runAfterBothAsync(other, action, executor); }
4712 >        public <U> CompletionStage<U> applyToEither
4713 >            (CompletionStage<? extends T> other,
4714 >             Function<? super T, U> fn) {
4715 >            return cf.applyToEither(other, fn); }
4716 >        public <U> CompletionStage<U> applyToEitherAsync
4717 >            (CompletionStage<? extends T> other,
4718 >             Function<? super T, U> fn) {
4719 >            return cf.applyToEitherAsync(other, fn); }
4720 >        public <U> CompletionStage<U> applyToEitherAsync
4721 >            (CompletionStage<? extends T> other,
4722 >             Function<? super T, U> fn,
4723 >             Executor executor) {
4724 >            return cf.applyToEitherAsync(other, fn, executor); }
4725 >        public CompletionStage<Void> acceptEither
4726 >            (CompletionStage<? extends T> other,
4727 >             Consumer<? super T> action) {
4728 >            return cf.acceptEither(other, action); }
4729 >        public CompletionStage<Void> acceptEitherAsync
4730 >            (CompletionStage<? extends T> other,
4731 >             Consumer<? super T> action) {
4732 >            return cf.acceptEitherAsync(other, action); }
4733 >        public CompletionStage<Void> acceptEitherAsync
4734 >            (CompletionStage<? extends T> other,
4735 >             Consumer<? super T> action,
4736 >             Executor executor) {
4737 >            return cf.acceptEitherAsync(other, action, executor); }
4738 >        public CompletionStage<Void> runAfterEither
4739 >            (CompletionStage<?> other,
4740 >             Runnable action) {
4741 >            return cf.runAfterEither(other, action); }
4742 >        public CompletionStage<Void> runAfterEitherAsync
4743 >            (CompletionStage<?> other,
4744 >             Runnable action) {
4745 >            return cf.runAfterEitherAsync(other, action); }
4746 >        public CompletionStage<Void> runAfterEitherAsync
4747 >            (CompletionStage<?> other,
4748 >             Runnable action,
4749 >             Executor executor) {
4750 >            return cf.runAfterEitherAsync(other, action, executor); }
4751 >        public <U> CompletionStage<U> thenCompose
4752 >            (Function<? super T, ? extends CompletionStage<U>> fn) {
4753 >            return cf.thenCompose(fn); }
4754 >        public <U> CompletionStage<U> thenComposeAsync
4755 >            (Function<? super T, ? extends CompletionStage<U>> fn) {
4756 >            return cf.thenComposeAsync(fn); }
4757 >        public <U> CompletionStage<U> thenComposeAsync
4758 >            (Function<? super T, ? extends CompletionStage<U>> fn,
4759 >             Executor executor) {
4760 >            return cf.thenComposeAsync(fn, executor); }
4761 >        public <U> CompletionStage<U> handle
4762 >            (BiFunction<? super T, Throwable, ? extends U> fn) {
4763 >            return cf.handle(fn); }
4764 >        public <U> CompletionStage<U> handleAsync
4765 >            (BiFunction<? super T, Throwable, ? extends U> fn) {
4766 >            return cf.handleAsync(fn); }
4767 >        public <U> CompletionStage<U> handleAsync
4768 >            (BiFunction<? super T, Throwable, ? extends U> fn,
4769 >             Executor executor) {
4770 >            return cf.handleAsync(fn, executor); }
4771 >        public CompletionStage<T> whenComplete
4772 >            (BiConsumer<? super T, ? super Throwable> action) {
4773 >            return cf.whenComplete(action); }
4774 >        public CompletionStage<T> whenCompleteAsync
4775 >            (BiConsumer<? super T, ? super Throwable> action) {
4776 >            return cf.whenCompleteAsync(action); }
4777 >        public CompletionStage<T> whenCompleteAsync
4778 >            (BiConsumer<? super T, ? super Throwable> action,
4779 >             Executor executor) {
4780 >            return cf.whenCompleteAsync(action, executor); }
4781 >        public CompletionStage<T> exceptionally
4782 >            (Function<Throwable, ? extends T> fn) {
4783 >            return cf.exceptionally(fn); }
4784 >    }
4785 >
4786 >    /**
4787 >     * default-implemented exceptionallyAsync action completes with
4788 >     * function value on source exception
4789 >     */
4790 >    public void testDefaulExceptionallyAsync_exceptionalCompletion() {
4791 >        for (boolean createIncomplete : new boolean[] { true, false })
4792 >        for (Integer v1 : new Integer[] { 1, null })
4793 >    {
4794 >        final AtomicInteger a = new AtomicInteger(0);
4795 >        final CFException ex = new CFException();
4796 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
4797 >        final DelegatedCompletionStage<Integer> d =
4798 >            new DelegatedCompletionStage<Integer>(f);
4799 >        if (!createIncomplete) f.completeExceptionally(ex);
4800 >        final CompletionStage<Integer> g = d.exceptionallyAsync
4801 >            ((Throwable t) -> {
4802 >                threadAssertSame(t, ex);
4803 >                a.getAndIncrement();
4804 >                return v1;
4805 >            });
4806 >        if (createIncomplete) f.completeExceptionally(ex);
4807 >
4808 >        checkCompletedNormally(g.toCompletableFuture(), v1);
4809 >        assertEquals(1, a.get());
4810 >    }}
4811 >
4812 >    /**
4813 >     * Under default implementation, if an "exceptionally action"
4814 >     * throws an exception, it completes exceptionally with that
4815 >     * exception
4816 >     */
4817 >    public void testDefaulExceptionallyAsync_exceptionalCompletionActionFailed() {
4818 >        for (boolean createIncomplete : new boolean[] { true, false })
4819 >    {
4820 >        final AtomicInteger a = new AtomicInteger(0);
4821 >        final CFException ex1 = new CFException();
4822 >        final CFException ex2 = new CFException();
4823 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
4824 >        final DelegatedCompletionStage<Integer> d =
4825 >            new DelegatedCompletionStage<Integer>(f);
4826 >        if (!createIncomplete) f.completeExceptionally(ex1);
4827 >        final CompletionStage<Integer> g = d.exceptionallyAsync
4828 >            ((Throwable t) -> {
4829 >                threadAssertSame(t, ex1);
4830 >                a.getAndIncrement();
4831 >                throw ex2;
4832 >            });
4833 >        if (createIncomplete) f.completeExceptionally(ex1);
4834 >
4835 >        checkCompletedWithWrappedException(g.toCompletableFuture(), ex2);
4836 >        checkCompletedExceptionally(f, ex1);
4837 >        checkCompletedExceptionally(d.toCompletableFuture(), ex1);
4838 >        assertEquals(1, a.get());
4839 >    }}
4840 >
4841 >    /**
4842 >     * default exceptionallyCompose result completes normally after normal
4843 >     * completion of source
4844 >     */
4845 >    public void testDefaultExceptionallyCompose_normalCompletion() {
4846 >        for (boolean createIncomplete : new boolean[] { true, false })
4847 >        for (Integer v1 : new Integer[] { 1, null })
4848 >    {
4849 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
4850 >        final ExceptionalCompletableFutureFunction r =
4851 >            new ExceptionalCompletableFutureFunction(ExecutionMode.SYNC);
4852 >        final DelegatedCompletionStage<Integer> d =
4853 >            new DelegatedCompletionStage<Integer>(f);
4854 >        if (!createIncomplete) assertTrue(f.complete(v1));
4855 >        final CompletionStage<Integer> g = d.exceptionallyCompose(r);
4856 >        if (createIncomplete) assertTrue(f.complete(v1));
4857 >
4858 >        checkCompletedNormally(f, v1);
4859 >        checkCompletedNormally(g.toCompletableFuture(), v1);
4860 >        r.assertNotInvoked();
4861 >    }}
4862 >
4863 >    /**
4864 >     * default-implemented exceptionallyCompose result completes
4865 >     * normally after exceptional completion of source
4866 >     */
4867 >    public void testDefaultExceptionallyCompose_exceptionalCompletion() {
4868 >        for (boolean createIncomplete : new boolean[] { true, false })
4869 >    {
4870 >        final CFException ex = new CFException();
4871 >        final ExceptionalCompletableFutureFunction r =
4872 >            new ExceptionalCompletableFutureFunction(ExecutionMode.SYNC);
4873 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
4874 >        final DelegatedCompletionStage<Integer> d =
4875 >            new DelegatedCompletionStage<Integer>(f);
4876 >        if (!createIncomplete) f.completeExceptionally(ex);
4877 >        final CompletionStage<Integer> g = d.exceptionallyCompose(r);
4878 >        if (createIncomplete) f.completeExceptionally(ex);
4879 >
4880 >        checkCompletedExceptionally(f, ex);
4881 >        checkCompletedNormally(g.toCompletableFuture(), r.value);
4882 >        r.assertInvoked();
4883 >    }}
4884 >
4885 >    /**
4886 >     * default-implemented exceptionallyCompose completes
4887 >     * exceptionally on exception if action does
4888 >     */
4889 >    public void testDefaultExceptionallyCompose_actionFailed() {
4890 >        for (boolean createIncomplete : new boolean[] { true, false })
4891 >        for (Integer v1 : new Integer[] { 1, null })
4892 >    {
4893 >        final CFException ex = new CFException();
4894 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
4895 >        final FailingExceptionalCompletableFutureFunction r
4896 >            = new FailingExceptionalCompletableFutureFunction(ExecutionMode.SYNC);
4897 >        final DelegatedCompletionStage<Integer> d =
4898 >            new DelegatedCompletionStage<Integer>(f);
4899 >        if (!createIncomplete) f.completeExceptionally(ex);
4900 >        final CompletionStage<Integer> g = d.exceptionallyCompose(r);
4901 >        if (createIncomplete) f.completeExceptionally(ex);
4902 >
4903 >        checkCompletedExceptionally(f, ex);
4904 >        checkCompletedWithWrappedException(g.toCompletableFuture(), r.ex);
4905 >        r.assertInvoked();
4906 >    }}
4907 >
4908 >    /**
4909 >     * default exceptionallyComposeAsync result completes normally after normal
4910 >     * completion of source
4911 >     */
4912 >    public void testDefaultExceptionallyComposeAsync_normalCompletion() {
4913 >        for (boolean createIncomplete : new boolean[] { true, false })
4914 >        for (Integer v1 : new Integer[] { 1, null })
4915 >    {
4916 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
4917 >        final ExceptionalCompletableFutureFunction r =
4918 >            new ExceptionalCompletableFutureFunction(ExecutionMode.ASYNC);
4919 >        final DelegatedCompletionStage<Integer> d =
4920 >            new DelegatedCompletionStage<Integer>(f);
4921 >        if (!createIncomplete) assertTrue(f.complete(v1));
4922 >        final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r);
4923 >        if (createIncomplete) assertTrue(f.complete(v1));
4924 >
4925 >        checkCompletedNormally(f, v1);
4926 >        checkCompletedNormally(g.toCompletableFuture(), v1);
4927 >        r.assertNotInvoked();
4928 >    }}
4929 >
4930 >    /**
4931 >     * default-implemented exceptionallyComposeAsync result completes
4932 >     * normally after exceptional completion of source
4933 >     */
4934 >    public void testDefaultExceptionallyComposeAsync_exceptionalCompletion() {
4935 >        for (boolean createIncomplete : new boolean[] { true, false })
4936 >    {
4937 >        final CFException ex = new CFException();
4938 >        final ExceptionalCompletableFutureFunction r =
4939 >            new ExceptionalCompletableFutureFunction(ExecutionMode.ASYNC);
4940 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
4941 >        final DelegatedCompletionStage<Integer> d =
4942 >            new DelegatedCompletionStage<Integer>(f);
4943 >        if (!createIncomplete) f.completeExceptionally(ex);
4944 >        final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r);
4945 >        if (createIncomplete) f.completeExceptionally(ex);
4946 >
4947 >        checkCompletedExceptionally(f, ex);
4948 >        checkCompletedNormally(g.toCompletableFuture(), r.value);
4949 >        r.assertInvoked();
4950 >    }}
4951 >
4952 >    /**
4953 >     * default-implemented exceptionallyComposeAsync completes
4954 >     * exceptionally on exception if action does
4955 >     */
4956 >    public void testDefaultExceptionallyComposeAsync_actionFailed() {
4957 >        for (boolean createIncomplete : new boolean[] { true, false })
4958 >        for (Integer v1 : new Integer[] { 1, null })
4959 >    {
4960 >        final CFException ex = new CFException();
4961 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
4962 >        final FailingExceptionalCompletableFutureFunction r
4963 >            = new FailingExceptionalCompletableFutureFunction(ExecutionMode.ASYNC);
4964 >        final DelegatedCompletionStage<Integer> d =
4965 >            new DelegatedCompletionStage<Integer>(f);
4966 >        if (!createIncomplete) f.completeExceptionally(ex);
4967 >        final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r);
4968 >        if (createIncomplete) f.completeExceptionally(ex);
4969 >
4970 >        checkCompletedExceptionally(f, ex);
4971 >        checkCompletedWithWrappedException(g.toCompletableFuture(), r.ex);
4972 >        r.assertInvoked();
4973 >    }}
4974 >
4975 >
4976 >    /**
4977 >     * default exceptionallyComposeAsync result completes normally after normal
4978 >     * completion of source
4979 >     */
4980 >    public void testDefaultExceptionallyComposeAsyncExecutor_normalCompletion() {
4981 >        for (boolean createIncomplete : new boolean[] { true, false })
4982 >        for (Integer v1 : new Integer[] { 1, null })
4983 >    {
4984 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
4985 >        final ExceptionalCompletableFutureFunction r =
4986 >            new ExceptionalCompletableFutureFunction(ExecutionMode.EXECUTOR);
4987 >        final DelegatedCompletionStage<Integer> d =
4988 >            new DelegatedCompletionStage<Integer>(f);
4989 >        if (!createIncomplete) assertTrue(f.complete(v1));
4990 >        final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r,  new ThreadExecutor());
4991 >        if (createIncomplete) assertTrue(f.complete(v1));
4992 >
4993 >        checkCompletedNormally(f, v1);
4994 >        checkCompletedNormally(g.toCompletableFuture(), v1);
4995 >        r.assertNotInvoked();
4996 >    }}
4997 >
4998 >    /**
4999 >     * default-implemented exceptionallyComposeAsync result completes
5000 >     * normally after exceptional completion of source
5001 >     */
5002 >    public void testDefaultExceptionallyComposeAsyncExecutor_exceptionalCompletion() {
5003 >        for (boolean createIncomplete : new boolean[] { true, false })
5004 >    {
5005 >        final CFException ex = new CFException();
5006 >        final ExceptionalCompletableFutureFunction r =
5007 >            new ExceptionalCompletableFutureFunction(ExecutionMode.EXECUTOR);
5008 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
5009 >        final DelegatedCompletionStage<Integer> d =
5010 >            new DelegatedCompletionStage<Integer>(f);
5011 >        if (!createIncomplete) f.completeExceptionally(ex);
5012 >        final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r,  new ThreadExecutor());
5013 >        if (createIncomplete) f.completeExceptionally(ex);
5014 >
5015 >        checkCompletedExceptionally(f, ex);
5016 >        checkCompletedNormally(g.toCompletableFuture(), r.value);
5017 >        r.assertInvoked();
5018 >    }}
5019 >
5020 >    /**
5021 >     * default-implemented exceptionallyComposeAsync completes
5022 >     * exceptionally on exception if action does
5023 >     */
5024 >    public void testDefaultExceptionallyComposeAsyncExecutor_actionFailed() {
5025 >        for (boolean createIncomplete : new boolean[] { true, false })
5026 >        for (Integer v1 : new Integer[] { 1, null })
5027 >    {
5028 >        final CFException ex = new CFException();
5029 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
5030 >        final FailingExceptionalCompletableFutureFunction r
5031 >            = new FailingExceptionalCompletableFutureFunction(ExecutionMode.EXECUTOR);
5032 >        final DelegatedCompletionStage<Integer> d =
5033 >            new DelegatedCompletionStage<Integer>(f);
5034 >        if (!createIncomplete) f.completeExceptionally(ex);
5035 >        final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r,  new ThreadExecutor());
5036 >        if (createIncomplete) f.completeExceptionally(ex);
5037 >
5038 >        checkCompletedExceptionally(f, ex);
5039 >        checkCompletedWithWrappedException(g.toCompletableFuture(), r.ex);
5040 >        r.assertInvoked();
5041 >    }}
5042  
5043   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines